diff --git a/package-lock.json b/package-lock.json
index 7b0259a..c6339f1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,9 +23,13 @@
"@dcloudio/uni-mp-xhs": "3.0.0-4010520240507001",
"@dcloudio/uni-quickapp-webview": "3.0.0-4010520240507001",
"@dcloudio/uni-ui": "^1.5.5",
- "uview-ui": "^2.0.36",
+ "dayjs": "^1.11.11",
+ "js-md5": "^0.8.3",
+ "normalize.css": "^8.0.1",
+ "qs": "^6.12.1",
"vue": "^3.4.21",
- "vue-i18n": "^9.1.9"
+ "vue-i18n": "^9.1.9",
+ "wot-design-uni": "^1.2.26"
},
"devDependencies": {
"@dcloudio/types": "^3.4.8",
@@ -38,7 +42,8 @@
"sass": "^1.77.5",
"sass-loader": "^10.1.1",
"unocss": "~0.58.9",
- "vite": "5.2.8"
+ "vite": "5.2.8",
+ "vite-plugin-zip-pack": "1.0.7"
}
},
"node_modules/@ampproject/remapping": {
@@ -5913,6 +5918,21 @@
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"dev": true
},
+ "node_modules/body-parser/node_modules/qs": {
+ "version": "6.11.0",
+ "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
+ "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+ "dev": true,
+ "dependencies": {
+ "side-channel": "^1.0.4"
+ },
+ "engines": {
+ "node": ">=0.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -6060,7 +6080,6 @@
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
"integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
- "dev": true,
"dependencies": {
"es-define-property": "^1.0.0",
"es-errors": "^1.3.0",
@@ -6353,6 +6372,12 @@
"url": "https://opencollective.com/core-js"
}
},
+ "node_modules/core-util-is": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz",
+ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+ "dev": true
+ },
"node_modules/cross-env": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
@@ -6486,6 +6511,11 @@
"node": ">=10"
}
},
+ "node_modules/dayjs": {
+ "version": "1.11.11",
+ "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.11.tgz",
+ "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="
+ },
"node_modules/debug": {
"version": "4.3.5",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
@@ -6542,7 +6572,6 @@
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
- "dev": true,
"dependencies": {
"es-define-property": "^1.0.0",
"es-errors": "^1.3.0",
@@ -6739,7 +6768,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
"integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
- "dev": true,
"dependencies": {
"get-intrinsic": "^1.2.4"
},
@@ -6751,7 +6779,6 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
- "dev": true,
"engines": {
"node": ">= 0.4"
}
@@ -7047,6 +7074,21 @@
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"dev": true
},
+ "node_modules/express/node_modules/qs": {
+ "version": "6.11.0",
+ "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
+ "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+ "dev": true,
+ "dependencies": {
+ "side-channel": "^1.0.4"
+ },
+ "engines": {
+ "node": ">=0.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -7274,7 +7316,6 @@
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
"integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
- "dev": true,
"dependencies": {
"es-errors": "^1.3.0",
"function-bind": "^1.1.2",
@@ -7372,7 +7413,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
- "dev": true,
"dependencies": {
"get-intrinsic": "^1.1.3"
},
@@ -7412,7 +7452,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
- "dev": true,
"dependencies": {
"es-define-property": "^1.0.0"
},
@@ -7424,7 +7463,6 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
"integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -7436,7 +7474,6 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
- "dev": true,
"engines": {
"node": ">= 0.4"
},
@@ -7593,6 +7630,12 @@
}
]
},
+ "node_modules/immediate": {
+ "version": "3.0.6",
+ "resolved": "https://registry.npmmirror.com/immediate/-/immediate-3.0.6.tgz",
+ "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
+ "dev": true
+ },
"node_modules/immutable": {
"version": "4.3.6",
"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
@@ -7774,6 +7817,12 @@
"dev": true,
"peer": true
},
+ "node_modules/isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+ "dev": true
+ },
"node_modules/isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -9700,6 +9749,11 @@
"resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.7.tgz",
"integrity": "sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ=="
},
+ "node_modules/js-md5": {
+ "version": "0.8.3",
+ "resolved": "https://registry.npmmirror.com/js-md5/-/js-md5-0.8.3.tgz",
+ "integrity": "sha512-qR0HB5uP6wCuRMrWPTrkMaev7MJZwJuuw4fnwAzRgP4J4/F8RwtodOKpGp4XpqsLBFzzgqIO42efFAyz2Et6KQ=="
+ },
"node_modules/js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -9839,6 +9893,18 @@
"graceful-fs": "^4.1.6"
}
},
+ "node_modules/jszip": {
+ "version": "3.10.1",
+ "resolved": "https://registry.npmmirror.com/jszip/-/jszip-3.10.1.tgz",
+ "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
+ "dev": true,
+ "dependencies": {
+ "lie": "~3.3.0",
+ "pako": "~1.0.2",
+ "readable-stream": "~2.3.6",
+ "setimmediate": "^1.0.5"
+ }
+ },
"node_modules/kleur": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -9890,6 +9956,15 @@
"resolved": "https://registry.npmjs.org/licia/-/licia-1.40.0.tgz",
"integrity": "sha512-iNujT47WfM7NTHOhxnXUdvW2ELAXNuViJZaLimId6a6b++5VQmse042Wkrx774KoYvVwD98qbdEtS3CWaAzzFQ=="
},
+ "node_modules/lie": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmmirror.com/lie/-/lie-3.3.0.tgz",
+ "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+ "dev": true,
+ "dependencies": {
+ "immediate": "~3.0.5"
+ }
+ },
"node_modules/lilconfig": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
@@ -10334,6 +10409,11 @@
"node": ">=0.10.0"
}
},
+ "node_modules/normalize.css": {
+ "version": "8.0.1",
+ "resolved": "https://registry.npmmirror.com/normalize.css/-/normalize.css-8.0.1.tgz",
+ "integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg=="
+ },
"node_modules/npm-run-path": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
@@ -10357,7 +10437,6 @@
"version": "1.13.1",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
"integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
- "dev": true,
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
@@ -10880,6 +10959,12 @@
"node": ">= 0.6.0"
}
},
+ "node_modules/process-nextick-args": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+ "dev": true
+ },
"node_modules/prompts": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
@@ -10937,12 +11022,11 @@
}
},
"node_modules/qs": {
- "version": "6.11.0",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
- "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
- "dev": true,
+ "version": "6.12.2",
+ "resolved": "https://registry.npmmirror.com/qs/-/qs-6.12.2.tgz",
+ "integrity": "sha512-x+NLUpx9SYrcwXtX7ob1gnkSems4i/mGZX5SlYxwIau6RrUSODO89TR/XDGGpn5RPWSYIB+aSfuSlV5+CmbTBg==",
"dependencies": {
- "side-channel": "^1.0.4"
+ "side-channel": "^1.0.6"
},
"engines": {
"node": ">=0.6"
@@ -11026,6 +11110,27 @@
"pify": "^2.3.0"
}
},
+ "node_modules/readable-stream": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+ "dev": true,
+ "dependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "node_modules/readable-stream/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
"node_modules/readdirp": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -11501,7 +11606,6 @@
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
- "dev": true,
"dependencies": {
"define-data-property": "^1.1.4",
"es-errors": "^1.3.0",
@@ -11514,6 +11618,12 @@
"node": ">= 0.4"
}
},
+ "node_modules/setimmediate": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmmirror.com/setimmediate/-/setimmediate-1.0.5.tgz",
+ "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
+ "dev": true
+ },
"node_modules/setprototypeof": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -11545,7 +11655,6 @@
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
"integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
- "dev": true,
"dependencies": {
"call-bind": "^1.0.7",
"es-errors": "^1.3.0",
@@ -11667,6 +11776,21 @@
"integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==",
"dev": true
},
+ "node_modules/string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "dependencies": {
+ "safe-buffer": "~5.1.0"
+ }
+ },
+ "node_modules/string_decoder/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
"node_modules/string-hash": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
@@ -12392,14 +12516,6 @@
"node": ">= 0.4.0"
}
},
- "node_modules/uview-ui": {
- "version": "2.0.36",
- "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.36.tgz",
- "integrity": "sha512-ASSZT6M8w3GTO1eFPbsgEFV0U5UujK+8pTNr+MSUbRNcRMC1u63DDTLJVeArV91kWM0bfAexK3SK9pnTqF9TtA==",
- "engines": {
- "HBuilderX": "^3.1.0"
- }
- },
"node_modules/v8-to-istanbul": {
"version": "8.1.1",
"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
@@ -12495,6 +12611,18 @@
}
}
},
+ "node_modules/vite-plugin-zip-pack": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmmirror.com/vite-plugin-zip-pack/-/vite-plugin-zip-pack-1.0.7.tgz",
+ "integrity": "sha512-URNInflOMS8eSv9kfHK9O+TYBhFrbe3+0v5TM0PQZOTJ73/VDl1pfQC1f0xu687+c1zMuirMjsVQ3e23F3xU7w==",
+ "dev": true,
+ "dependencies": {
+ "jszip": "^3.10.1"
+ },
+ "peerDependencies": {
+ "vite": ">=2.x"
+ }
+ },
"node_modules/vue": {
"version": "3.4.21",
"resolved": "https://registry.npmjs.org/vue/-/vue-3.4.21.tgz",
@@ -12755,6 +12883,17 @@
"node": ">= 8"
}
},
+ "node_modules/wot-design-uni": {
+ "version": "1.2.28",
+ "resolved": "https://registry.npmmirror.com/wot-design-uni/-/wot-design-uni-1.2.28.tgz",
+ "integrity": "sha512-f7e2BdSNwrLL+45Ucxp+o7WXlwfzWfdKQ9OS/V5Ny05+p8nrij89SmXbXAPPCpcKxhsn1oSZb8f1hsXiINZWOg==",
+ "engines": {
+ "HBuilderX": "^3.8.7"
+ },
+ "peerDependencies": {
+ "vue": ">=3.2.47"
+ }
+ },
"node_modules/wrap-ansi": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
diff --git a/package.json b/package.json
index d93c381..4c56088 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
"@dcloudio/uni-ui": "^1.5.5",
"dayjs": "^1.11.11",
"js-md5": "^0.8.3",
+ "normalize.css": "^8.0.1",
"qs": "^6.12.1",
"vue": "^3.4.21",
"vue-i18n": "^9.1.9",
diff --git a/src/App.vue b/src/App.vue
index 5d01416..d8e7136 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -21,4 +21,7 @@ uni-page{
uni-page-body{
height: 100%;
}
+body{
+ font-family: 'PingFang SC','Source Han Sans';
+}
diff --git a/src/main.js b/src/main.js
index 6514f69..4fde2a8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,6 +4,7 @@ import {
} from "vue";
import App from "./App.vue";
import 'virtual:uno.css';
+import 'normalize.css/normalize.css';
import { requestInterceptor } from './interceptors'
export function createApp() {
diff --git a/src/pages.json b/src/pages.json
index 3df268c..7b0e589 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -4,8 +4,8 @@
"path": "pages/ycnc/index",
"type": "home",
"style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "奶茶活动"
+ "navigationBarTitleText": "奶茶活动",
+ "navigationBarBackgroundColor": "#FFF"
}
},
{
@@ -13,7 +13,8 @@
"type": "page",
"style": {
"navigationStyle": "custom",
- "navigationBarTitleText": "商品详情"
+ "navigationBarTitleText": "商品详情",
+ "navigationBarBackgroundColor": "#FFF"
}
},
{
@@ -21,7 +22,8 @@
"type": "page",
"style": {
"navigationStyle": "custom",
- "navigationBarTitleText": "我的订单"
+ "navigationBarTitleText": "我的订单",
+ "navigationBarBackgroundColor": "#FFF"
}
},
{
@@ -29,7 +31,8 @@
"type": "page",
"style": {
"navigationStyle": "custom",
- "navigationBarTitleText": "订单详情"
+ "navigationBarTitleText": "订单详情",
+ "navigationBarBackgroundColor": "#FFF"
}
}
],
diff --git a/src/pages/ycnc/components/brand.vue b/src/pages/ycnc/components/brand.vue
index d7edb1f..689d6f9 100644
--- a/src/pages/ycnc/components/brand.vue
+++ b/src/pages/ycnc/components/brand.vue
@@ -28,18 +28,20 @@
\ No newline at end of file
diff --git a/src/pages/ycnc/components/order-item.vue b/src/pages/ycnc/components/order-item.vue
index 104cb89..f0b9b36 100644
--- a/src/pages/ycnc/components/order-item.vue
+++ b/src/pages/ycnc/components/order-item.vue
@@ -95,7 +95,8 @@
color: #6C6C6C;
}
.info-item{
- margin-bottom:12px
+ margin-bottom:12rpx;
+ // font-family: PingFang SC, PingFang SC;
}
.text-over{
max-width:80%;
@@ -117,10 +118,12 @@
.name{
font-size: 24rpx;
color: #333333;
+ font-family: PingFang SC-Bold;
}
.num{
font-size: 20rpx;
color: #9E9E9E;
+ font-family: PingFang SC-Medium;
}
}
.btns{
diff --git a/src/pages/ycnc/components/product-item.vue b/src/pages/ycnc/components/product-item.vue
index 9cd5408..c77a39f 100644
--- a/src/pages/ycnc/components/product-item.vue
+++ b/src/pages/ycnc/components/product-item.vue
@@ -7,14 +7,13 @@
class="img"
/>
-
{{ config[detail.brandFlag].name}}
{{ detail.voucherTitle }}
- {{ detail.voucherAmount }}元
+ {{ detail.voucherOriginalPrice }}元
- {{ detail.voucherOriginalPrice }}
+ {{ detail.voucherAmount }}
点击购买
@@ -53,29 +52,30 @@
\ No newline at end of file
diff --git a/src/pages/ycnc/order.vue b/src/pages/ycnc/order.vue
index eff1a2e..70ba033 100644
--- a/src/pages/ycnc/order.vue
+++ b/src/pages/ycnc/order.vue
@@ -3,6 +3,7 @@
style: {
navigationStyle: 'custom',
navigationBarTitleText: '我的订单',
+ navigationBarBackgroundColor:'#FFF',
},
}
diff --git a/src/pages/ycnc/orderDetail.vue b/src/pages/ycnc/orderDetail.vue
index c66f02c..f28a9a0 100644
--- a/src/pages/ycnc/orderDetail.vue
+++ b/src/pages/ycnc/orderDetail.vue
@@ -3,6 +3,7 @@
style: {
navigationStyle: 'custom',
navigationBarTitleText: '订单详情',
+ navigationBarBackgroundColor:'#FFF',
},
}
@@ -124,11 +125,13 @@
.name{
font-size: 24rpx;
color: #333333;
+ font-family: PingFang SC-Bold;
}
.amount{
color: #333333;
font-weight: 400;
font-size:24rpx;
+
text:nth-child(1){
font-size:20rpx;
}
@@ -137,7 +140,8 @@
}
}
.num{
- font-size: 20rpx;
+ font-family: PingFang SC-Medium;
+ font-size: 24rpx;
color: #9E9E9E;
}
}
diff --git a/src/static/ycnc/bg-btn.png b/src/static/ycnc/bg-btn.png
deleted file mode 100644
index 4e55fba..0000000
Binary files a/src/static/ycnc/bg-btn.png and /dev/null differ
diff --git a/src/static/ycnc/bg-bwcj.png b/src/static/ycnc/bg-bwcj.png
index 7772c47..ba28a26 100644
Binary files a/src/static/ycnc/bg-bwcj.png and b/src/static/ycnc/bg-bwcj.png differ
diff --git a/src/static/ycnc/bg-cbd.png b/src/static/ycnc/bg-cbd.png
index 50503b3..3096fdc 100644
Binary files a/src/static/ycnc/bg-cbd.png and b/src/static/ycnc/bg-cbd.png differ
diff --git a/src/static/ycnc/bg-coco.png b/src/static/ycnc/bg-coco.png
index 767276a..bc71cfd 100644
Binary files a/src/static/ycnc/bg-coco.png and b/src/static/ycnc/bg-coco.png differ
diff --git a/src/static/ycnc/bg-cyys.png b/src/static/ycnc/bg-cyys.png
index 9d795df..0e59d4f 100644
Binary files a/src/static/ycnc/bg-cyys.png and b/src/static/ycnc/bg-cyys.png differ
diff --git a/src/static/ycnc/bg-mxbc.png b/src/static/ycnc/bg-mxbc.png
index 9c1ccef..a970429 100644
Binary files a/src/static/ycnc/bg-mxbc.png and b/src/static/ycnc/bg-mxbc.png differ
diff --git a/src/static/ycnc/bg-nodata.png b/src/static/ycnc/bg-nodata.png
index 2d7ee07..c40b061 100644
Binary files a/src/static/ycnc/bg-nodata.png and b/src/static/ycnc/bg-nodata.png differ
diff --git a/src/static/ycnc/bg-nxdc.png b/src/static/ycnc/bg-nxdc.png
index 7adfd62..94ceff2 100644
Binary files a/src/static/ycnc/bg-nxdc.png and b/src/static/ycnc/bg-nxdc.png differ
diff --git a/src/static/ycnc/bg-product.jpg b/src/static/ycnc/bg-product.jpg
deleted file mode 100644
index 4e2d4ab..0000000
Binary files a/src/static/ycnc/bg-product.jpg and /dev/null differ
diff --git a/src/static/ycnc/bg-product.png b/src/static/ycnc/bg-product.png
index 5a3497c..5d4a33c 100644
Binary files a/src/static/ycnc/bg-product.png and b/src/static/ycnc/bg-product.png differ
diff --git a/src/static/ycnc/bg.png b/src/static/ycnc/bg.png
index b15b136..63d8b9c 100644
Binary files a/src/static/ycnc/bg.png and b/src/static/ycnc/bg.png differ
diff --git a/src/static/ycnc/bg1.png b/src/static/ycnc/bg1.png
new file mode 100644
index 0000000..b15b136
Binary files /dev/null and b/src/static/ycnc/bg1.png differ
diff --git a/src/uni.scss b/src/uni.scss
index 288300d..654a075 100644
--- a/src/uni.scss
+++ b/src/uni.scss
@@ -12,6 +12,7 @@
* 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
*/
+
/* 颜色变量 */
/* 行为相关颜色 */
diff --git a/src/utils/utils.js b/src/utils/utils.js
index bc30fc8..0c072ed 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,9 +1,9 @@
//获取url后面拼接的参数
export const getQueryString = (name) => {
- let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
- let r = window.location.search.substr(1).match(reg);
- if (r != null) return unescape(r[2]);
- return null;
+ let urlStr = window.location.href.split('?')[1]
+ const urlSearchParams = new URLSearchParams(urlStr)
+ const result = Object.fromEntries(urlSearchParams.entries())
+ return result[name]
}
//是否iOS设备