From c4f954bca72f59416fc04ffc56372b388592daf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Sun, 12 May 2024 15:30:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=BC=95=E5=85=A5z-paging?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- pages.config.ts | 2 ++ src/pages.json | 3 ++- src/types/uni-pages.d.ts | 27 +++++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 src/types/uni-pages.d.ts diff --git a/package.json b/package.json index 0e7b3c0..7ba5f2f 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,8 @@ "pinia-plugin-persistedstate": "3.2.1", "qs": "6.5.3", "vue": "3.4.26", - "wot-design-uni": "^1.2.13" + "wot-design-uni": "^1.2.13", + "z-paging": "^2.7.10" }, "devDependencies": { "@commitlint/cli": "^18.4.3", diff --git a/pages.config.ts b/pages.config.ts index 96d65b7..9e3499f 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -12,6 +12,8 @@ export default defineUniPages({ autoscan: true, custom: { '^wd-(.*)': 'wot-design-uni/components/wd-$1/wd-$1.vue', + '^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)': + 'z-paging/components/z-paging$1/z-paging$1.vue', }, }, tabBar: { diff --git a/src/pages.json b/src/pages.json index 468dc66..d62bd4a 100644 --- a/src/pages.json +++ b/src/pages.json @@ -9,7 +9,8 @@ "easycom": { "autoscan": true, "custom": { - "^wd-(.*)": "wot-design-uni/components/wd-$1/wd-$1.vue" + "^wd-(.*)": "wot-design-uni/components/wd-$1/wd-$1.vue", + "^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue" } }, "tabBar": { diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts new file mode 100644 index 0000000..aea295e --- /dev/null +++ b/src/types/uni-pages.d.ts @@ -0,0 +1,27 @@ +/* eslint-disable */ +/* prettier-ignore */ +// @ts-nocheck +// Generated by vite-plugin-uni-pages + +interface NavigateToOptions { + url: "/pages/index/index" | + "/pages/index/about" | + "/pages/index/request" | + "/pages/index/request2" | + "/pages/index/upload" | + "/pages/index/upload2"; +} +interface RedirectToOptions extends NavigateToOptions {} + +interface SwitchTabOptions { + url: "/pages/index/index" | "/pages/index/about" +} + +type ReLaunchOptions = NavigateToOptions | SwitchTabOptions; + +declare interface Uni { + navigateTo(options: UniNamespace.NavigateToOptions & NavigateToOptions): void; + redirectTo(options: UniNamespace.RedirectToOptions & RedirectToOptions): void; + switchTab(options: UniNamespace.SwitchTabOptions & SwitchTabOptions): void; + reLaunch(options: UniNamespace.ReLaunchOptions & ReLaunchOptions): void; +} From ddcba22c3e964519c711f7019e356275f13d6a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Sun, 12 May 2024 15:53:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20wot=20=E4=B8=BB=E9=A2=98=E8=89=B2?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.config.ts | 1 + src/layouts/default.vue | 6 ++++-- src/layouts/demo.vue | 6 ++++-- src/manifest.json | 3 ++- src/style/index.scss | 6 ++++++ 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/manifest.config.ts b/manifest.config.ts index 4cc4e1f..6f8667a 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -89,6 +89,7 @@ export default defineManifestConfig({ }, 'mp-alipay': { usingComponents: true, + styleIsolation: 'shared', }, 'mp-baidu': { usingComponents: true, diff --git a/src/layouts/default.vue b/src/layouts/default.vue index 5a296ff..80ed2dc 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -1,5 +1,7 @@ diff --git a/src/layouts/demo.vue b/src/layouts/demo.vue index 44407ec..80ed2dc 100644 --- a/src/layouts/demo.vue +++ b/src/layouts/demo.vue @@ -1,5 +1,7 @@ diff --git a/src/manifest.json b/src/manifest.json index f6ad007..0999421 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -59,7 +59,8 @@ "usingComponents": true }, "mp-alipay": { - "usingComponents": true + "usingComponents": true, + "styleIsolation": "shared" }, "mp-baidu": { "usingComponents": true diff --git a/src/style/index.scss b/src/style/index.scss index 3456387..466319f 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -5,3 +5,9 @@ padding-top: 4px; color: red; } + +:root, +page { + // 修改按钮背景色 + --wot-button-primary-bg-color: green; +} From c51391570f2eaa3fb2c352cdc6795c30dc2afd0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Sun, 12 May 2024 16:24:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/default.vue | 12 +++++++++++- src/layouts/demo.vue | 12 +++++++++++- src/style/index.scss | 5 ++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/layouts/default.vue b/src/layouts/default.vue index 80ed2dc..768d875 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -1,7 +1,17 @@ + + diff --git a/src/layouts/demo.vue b/src/layouts/demo.vue index 80ed2dc..768d875 100644 --- a/src/layouts/demo.vue +++ b/src/layouts/demo.vue @@ -1,7 +1,17 @@ + + diff --git a/src/style/index.scss b/src/style/index.scss index 466319f..0c33c31 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -8,6 +8,9 @@ :root, page { + // 修改按主题色 + // --wot-color-theme: #37c2bc; + // 修改按钮背景色 - --wot-button-primary-bg-color: green; + // --wot-button-primary-bg-color: green; } From 34ecd2c9a8ce779e0cac2b897aaf0e188094e544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com> Date: Sun, 12 May 2024 16:45:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E5=BC=95=E5=85=A5iconfont?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .stylelintrc.cjs | 1 + src/pages/index/about.vue | 8 ++++++++ src/style/iconfont.css | 28 ++++++++++++++++++++++++++++ src/style/index.scss | 2 ++ 4 files changed, 39 insertions(+) create mode 100644 src/style/iconfont.css diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs index 2cb661a..574beef 100644 --- a/.stylelintrc.cjs +++ b/.stylelintrc.cjs @@ -53,5 +53,6 @@ module.exports = { 'no-duplicate-selectors': null, 'scss/comment-no-empty': null, 'selector-class-pattern': null, + 'font-family-no-missing-generic-family-keyword': null, }, } diff --git a/src/pages/index/about.vue b/src/pages/index/about.vue index 8ba7b35..fafcd89 100644 --- a/src/pages/index/about.vue +++ b/src/pages/index/about.vue @@ -27,6 +27,14 @@ 上传demo 上传demo2(请求状态一体化) + + iconfont: + + + + + + diff --git a/src/style/iconfont.css b/src/style/iconfont.css new file mode 100644 index 0000000..35da86c --- /dev/null +++ b/src/style/iconfont.css @@ -0,0 +1,28 @@ +@font-face { + font-family: 'iconfont'; /* Project id 4543091 */ + src: + url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAOwAAsAAAAAB9AAAANjAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDHAqDBIJqATYCJAMQCwoABCAFhGcHPRvnBsgusG3kMyE15/44PsBX09waBHv0REDt97oHAQDFrOIyPirRiULQ+TJcXV0hCYTuVFcBC915/2vX/32Q80hkZ5PZGZ9snvwruVLloidKqYN6iKC53bOtbKwVLSIi3W6zCWZbs3VbER3j9JpGX3ySYcc94IQRTK5s4epS/jSqIgvg37qlY2/jwQN7D9ADpfRCmIknQByTscVZPTBr+hnnCKg2o4bjakvXEPjuY65DJGeJNtBUhn1JxOBuB2UZmUpBOXdsFp4oxOv4GHgs3h/+wRDcicqSZJG1q9kK1z/Af9NpqxjpC2QaAdpHlCFh4spcYXs5sMWpSk5wUj31G2dLQKVKkZ/w7f/8/i/A3JVUSZK9f7xIKJeU14IFpBI/Qfkkz46GT/CuaGREfCtKJUougWeQWHvVC5Lcz2BGS+SePR99vj3yjJx7h574tp7uWcOh4yfaTjS/245TT/vkQrN+a7RLkK8+Vd+bz+FSGh+9srDQKPeJ2s29z7ah4+efdoxefRbbGwfy7ht+SuIWukzsu1b6ePP+6kN1aamb47qsPim1Ia3xdEpDcl1dckPKGYnneI23+57r2W1Mmkqs6ajrChRCs5qyQ66rTVWhgZaG7toOeHm5cxn0sSQuNDEgcUTdNTSupKI1JRZih/JssAUKezPeOJJzbNozF6zWJuuVavVU5Tgtkop/SDzHa7ytvnCTq0PhkEfi4xLLtb0PuwyOAYqmrYQApFJyoJjTnfz+ve94vvv2f/yWgxl8Jd8Di2DRDPuob59mU/+VfDCROQyR8xSnmP9fXm7liagmN39OlmbvjqG0sMsJKrU0EFXogaRSH5bNY1CmxhyUq7QC1cY1T67RwuQk5CoM2RUQNLoEUb03kDS6h2XzcyjT7iOUa/QXqq1Hn6/GUBAaGcGcWJFlGUmCoVOp8kLvABHnVczGYiOE2SVEUH5OXj/TSnTCDjHAviAWcE4RZYaGWszNiKoayGSGTASeY+PcrMjNpVMvyREMDRoxBMYRVojFMkQiMOhohubdzxtAiOapMMbERpKMnQT9SL4ceQysVdJZVa9kEbsFogIcRyEUE2kN0mL7CDVIGhBzupWMEHA5bDvipgq5hKJcKef8ivbx1kC15KgcYkghhzLxYNntxoKCReJ82jAHAAA=') + format('woff2'), + url('//at.alicdn.com/t/c/font_4543091_njpo5b95nl.woff?t=1715485842402') format('woff'), + url('//at.alicdn.com/t/c/font_4543091_njpo5b95nl.ttf?t=1715485842402') format('truetype'); +} + +.iconfont { + font-family: 'iconfont' !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-my:before { + content: '\e78c'; +} + +.icon-package:before { + content: '\e9c2'; +} + +.icon-chat:before { + content: '\e600'; +} diff --git a/src/style/index.scss b/src/style/index.scss index 0c33c31..86184d9 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -1,3 +1,5 @@ +@import './iconfont.css'; + .test { // 可以通过 @apply 多个样式封装整体样式 @apply mt-4 ml-4;