diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/.env b/yanzhu-ui/yanzhu-ui-mall-uniapp/.env index ac9e161..221fe9e 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/.env +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/.env @@ -26,7 +26,8 @@ SHOPRO_WEBSOCKET_PATH=/infra/ws SHOPRO_DEV_PORT=3000 # 客户端静态资源地址 空=默认使用服务端指定的CDN资源地址前缀 | local=本地 | http(s)://xxx.xxx=自定义静态资源地址前缀 -SHOPRO_STATIC_URL=http://test.yudao.iocoder.cn +#SHOPRO_STATIC_URL=http://test.yudao.iocoder.cn +SHOPRO_STATIC_URL=//62.234.3.186/saasimages ### SHOPRO_STATIC_URL = https://file.sheepjs.com # 前端 H5 访问域名 diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/README.md b/yanzhu-ui/yanzhu-ui-mall-uniapp/README.md index ba30293..6bf540a 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/README.md +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/README.md @@ -15,7 +15,7 @@ ## 🐯 商城简介 -**芋道商城**，基于 [芋道开发平台](https://github.com/YunaiV/ruoyi-vue-pro) 构建，以开发者为中心，打造中国第一流的 Java 开源商城系统，全部开源，个人与企业可 100% 免费使用。 +**研筑商城**，基于 [研筑开发平台](https://github.com/YunaiV/ruoyi-vue-pro) 构建，以开发者为中心，打造中国第一流的 Java 开源商城系统，全部开源，个人与企业可 100% 免费使用。 > 有任何问题，或者想要的功能，可以在 Issues 中提给艿艿。 > diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/manifest.json b/yanzhu-ui/yanzhu-ui-mall-uniapp/manifest.json index 8d32e77..aba73ad 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/manifest.json +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/manifest.json @@ -1,6 +1,6 @@ { - "name": "芋道商城", - "appid": "__UNI__460BC4C", + "name": "研筑商城", + "appid": "__UNI__7C4002F", "description": "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。", "versionName": "2026.01", "versionCode": "183", @@ -202,7 +202,7 @@ "template": "index.html", "router": { "mode": "history", - "base": "/" + "base": "/saash5/" }, "sdkConfigs": { "maps": {} @@ -210,7 +210,7 @@ "async": { "timeout": 20000 }, - "title": "芋道商城", + "title": "研筑商城", "optimization": { "treeShaking": { "enable": true diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/package-lock.json b/yanzhu-ui/yanzhu-ui-mall-uniapp/package-lock.json index 7f73354..a6dbc61 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/package-lock.json +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/package-lock.json @@ -10,16 +10,51 @@ "license": "MIT", "dependencies": { "dayjs": "^1.11.7", - "lodash": "^4.17.21", + "lodash": "^4.17.23", "lodash-es": "^4.17.21", "luch-request": "^3.0.8", "pinia": "^2.0.33", "pinia-plugin-persist-uni": "^1.2.0", + "vue": "^3.5.11", "weixin-js-sdk": "^1.6.0" }, "devDependencies": { "prettier": "^2.8.7", - "vconsole": "^3.15.0" + "vconsole": "^3.15.0", + "vite": "^4.5.3" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", + "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", + "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz", + "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.29.0" + }, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" } }, "node_modules/@babel/runtime": { @@ -32,18 +67,511 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/types": { + "version": "7.29.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", + "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.27.1", + "@babel/helper-validator-identifier": "^7.28.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@dcloudio/types": { "version": "2.6.12", "resolved": "https://registry.npmjs.org/@dcloudio/types/-/types-2.6.12.tgz", "integrity": "sha512-mrCMwcINy1IFjU9VUqLeWBkj404yWs5paLDttBcA+eqUjanuUQbBcTVPqlrGgkyzLXDcV2oDDZRSNxNpXi4kMQ==", "license": "Apache-2.0" }, + "node_modules/@esbuild/android-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "license": "MIT" + }, + "node_modules/@vue/compiler-core": { + "version": "3.5.27", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.27.tgz", + "integrity": "sha512-gnSBQjZA+//qDZen+6a2EdHqJ68Z7uybrMf3SPjEGgG4dicklwDVmMC1AeIHxtLVPT7sn6sH1KOO+tS6gwOUeQ==", + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.28.5", + "@vue/shared": "3.5.27", + "entities": "^7.0.0", + "estree-walker": "^2.0.2", + "source-map-js": "^1.2.1" + } + }, + "node_modules/@vue/compiler-dom": { + "version": "3.5.27", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.27.tgz", + "integrity": "sha512-oAFea8dZgCtVVVTEC7fv3T5CbZW9BxpFzGGxC79xakTr6ooeEqmRuvQydIiDAkglZEAd09LgVf1RoDnL54fu5w==", + "license": "MIT", + "dependencies": { + "@vue/compiler-core": "3.5.27", + "@vue/shared": "3.5.27" + } + }, + "node_modules/@vue/compiler-sfc": { + "version": "3.5.27", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.27.tgz", + "integrity": "sha512-sHZu9QyDPeDmN/MRoshhggVOWE5WlGFStKFwu8G52swATgSny27hJRWteKDSUUzUH+wp+bmeNbhJnEAel/auUQ==", + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.28.5", + "@vue/compiler-core": "3.5.27", + "@vue/compiler-dom": "3.5.27", + "@vue/compiler-ssr": "3.5.27", + "@vue/shared": "3.5.27", + "estree-walker": "^2.0.2", + "magic-string": "^0.30.21", + "postcss": "^8.5.6", + "source-map-js": "^1.2.1" + } + }, + "node_modules/@vue/compiler-ssr": { + "version": "3.5.27", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.27.tgz", + "integrity": "sha512-Sj7h+JHt512fV1cTxKlYhg7qxBvack+BGncSpH+8vnN+KN95iPIcqB5rsbblX40XorP+ilO7VIKlkuu3Xq2vjw==", + "license": "MIT", + "dependencies": { + "@vue/compiler-dom": "3.5.27", + "@vue/shared": "3.5.27" + } + }, "node_modules/@vue/devtools-api": { "version": "6.6.4", "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz", "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==", "license": "MIT" }, + "node_modules/@vue/reactivity": { + "version": "3.5.27", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.27.tgz", + "integrity": "sha512-vvorxn2KXfJ0nBEnj4GYshSgsyMNFnIQah/wczXlsNXt+ijhugmW+PpJ2cNPe4V6jpnBcs0MhCODKllWG+nvoQ==", + "license": "MIT", + "dependencies": { + "@vue/shared": "3.5.27" + } + }, + "node_modules/@vue/runtime-core": { + "version": "3.5.27", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.27.tgz", + "integrity": "sha512-fxVuX/fzgzeMPn/CLQecWeDIFNt3gQVhxM0rW02Tvp/YmZfXQgcTXlakq7IMutuZ/+Ogbn+K0oct9J3JZfyk3A==", + "license": "MIT", + "dependencies": { + "@vue/reactivity": "3.5.27", + "@vue/shared": "3.5.27" + } + }, + "node_modules/@vue/runtime-dom": { + "version": "3.5.27", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.27.tgz", + "integrity": "sha512-/QnLslQgYqSJ5aUmb5F0z0caZPGHRB8LEAQ1s81vHFM5CBfnun63rxhvE/scVb/j3TbBuoZwkJyiLCkBluMpeg==", + "license": "MIT", + "dependencies": { + "@vue/reactivity": "3.5.27", + "@vue/runtime-core": "3.5.27", + "@vue/shared": "3.5.27", + "csstype": "^3.2.3" + } + }, + "node_modules/@vue/server-renderer": { + "version": "3.5.27", + "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.27.tgz", + "integrity": "sha512-qOz/5thjeP1vAFc4+BY3Nr6wxyLhpeQgAE/8dDtKo6a6xdk+L4W46HDZgNmLOBUDEkFXV3G7pRiUqxjX0/2zWA==", + "license": "MIT", + "dependencies": { + "@vue/compiler-ssr": "3.5.27", + "@vue/shared": "3.5.27" + }, + "peerDependencies": { + "vue": "3.5.27" + } + }, + "node_modules/@vue/shared": { + "version": "3.5.27", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.27.tgz", + "integrity": "sha512-dXr/3CgqXsJkZ0n9F3I4elY8wM9jMJpP3pvRG52r6m0tu/MsAFIe6JpXVGeNMd/D9F4hQynWT8Rfuj0bdm9kFQ==", + "license": "MIT" + }, "node_modules/copy-text-to-clipboard": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.2.tgz", @@ -69,12 +597,89 @@ "url": "https://opencollective.com/core-js" } }, + "node_modules/csstype": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", + "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", + "license": "MIT" + }, "node_modules/dayjs": { "version": "1.11.19", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz", "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==", "license": "MIT" }, + "node_modules/entities": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz", + "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/esbuild": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/android-arm": "0.18.20", + "@esbuild/android-arm64": "0.18.20", + "@esbuild/android-x64": "0.18.20", + "@esbuild/darwin-arm64": "0.18.20", + "@esbuild/darwin-x64": "0.18.20", + "@esbuild/freebsd-arm64": "0.18.20", + "@esbuild/freebsd-x64": "0.18.20", + "@esbuild/linux-arm": "0.18.20", + "@esbuild/linux-arm64": "0.18.20", + "@esbuild/linux-ia32": "0.18.20", + "@esbuild/linux-loong64": "0.18.20", + "@esbuild/linux-mips64el": "0.18.20", + "@esbuild/linux-ppc64": "0.18.20", + "@esbuild/linux-riscv64": "0.18.20", + "@esbuild/linux-s390x": "0.18.20", + "@esbuild/linux-x64": "0.18.20", + "@esbuild/netbsd-x64": "0.18.20", + "@esbuild/openbsd-x64": "0.18.20", + "@esbuild/sunos-x64": "0.18.20", + "@esbuild/win32-arm64": "0.18.20", + "@esbuild/win32-ia32": "0.18.20", + "@esbuild/win32-x64": "0.18.20" + } + }, + "node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "license": "MIT" + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/lodash": { "version": "4.17.23", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", @@ -96,12 +701,45 @@ "@dcloudio/types": "^2.0.16" } }, + "node_modules/magic-string": { + "version": "0.30.21", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", + "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.5" + } + }, "node_modules/mutation-observer": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/mutation-observer/-/mutation-observer-1.0.3.tgz", "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==", "dev": true }, + "node_modules/nanoid": { + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" + }, "node_modules/pinia": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.3.1.tgz", @@ -168,6 +806,34 @@ } } }, + "node_modules/postcss": { + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", + "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.11", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, "node_modules/prettier": { "version": "2.8.8", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", @@ -184,6 +850,32 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, + "node_modules/rollup": { + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", + "dev": true, + "license": "MIT", + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=14.18.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/vconsole": { "version": "3.15.1", "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.15.1.tgz", @@ -197,6 +889,83 @@ "mutation-observer": "^1.0.3" } }, + "node_modules/vite": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", + "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "^0.18.10", + "postcss": "^8.4.27", + "rollup": "^3.27.1" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + }, + "peerDependencies": { + "@types/node": ">= 14", + "less": "*", + "lightningcss": "^1.21.0", + "sass": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.4.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + } + } + }, + "node_modules/vue": { + "version": "3.5.27", + "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.27.tgz", + "integrity": "sha512-aJ/UtoEyFySPBGarREmN4z6qNKpbEguYHMmXSiOGk69czc+zhs0NF6tEFrY8TZKAl8N/LYAkd4JHVd5E/AsSmw==", + "license": "MIT", + "dependencies": { + "@vue/compiler-dom": "3.5.27", + "@vue/compiler-sfc": "3.5.27", + "@vue/runtime-dom": "3.5.27", + "@vue/server-renderer": "3.5.27", + "@vue/shared": "3.5.27" + }, + "peerDependencies": { + "typescript": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, "node_modules/vue-demi": { "version": "0.14.10", "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz", diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/package.json b/yanzhu-ui/yanzhu-ui-mall-uniapp/package.json index 151a979..da86406 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/package.json +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/package.json @@ -1,11 +1,12 @@ { "id": "shopro", "name": "shopro", - "displayName": "芋道商城", + "displayName": "研筑商城", "version": "1.0.0", - "description": "芋道商城，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能", + "description": "研筑商城，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能", "scripts": { - "prettier": "prettier --write \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"" + "prettier": "prettier --write \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"", + "build:h5": "vite build --mode production" }, "repository": "https://github.com/sheepjs/shop.git", "keywords": [ @@ -99,6 +100,7 @@ }, "devDependencies": { "prettier": "^2.8.7", - "vconsole": "^3.15.0" + "vconsole": "^3.15.0", + "vite": "^4.5.3" } } diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/pages.json b/yanzhu-ui/yanzhu-ui-mall-uniapp/pages.json index 36a4a00..6293e4f 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/pages.json +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/pages.json @@ -672,7 +672,7 @@ ], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "芋道商城", + "navigationBarTitleText": "研筑商城", "navigationBarBackgroundColor": "#FFFFFF", "backgroundColor": "#FFFFFF", "navigationStyle": "custom", diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/index/index.vue b/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/index/index.vue index e0e2ff4..a0e46ae 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/index/index.vue +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/index/index.vue @@ -89,21 +89,29 @@ // 如果你的首页不是这个页面，需要把代码搬过去。 if (sheep.$platform.os === 'ios') { if (await sheep.$platform.checkNetwork()) { - await sheep.$store('app').init(); + // 避免重复初始化，只在必要时调用 + const appStore = sheep.$store('app'); + if (!appStore.template?.home) { + await appStore.init(); + } } } // #endif - + // 检查登录状态 const userStore = $store('user'); if (!userStore.isLogin) { - showAuthModal('smsLogin'); + showAuthModal('accountLogin'); } }); // 下拉刷新 onPullDownRefresh(() => { - sheep.$store('app').init(); + // 避免重复初始化，只在必要时调用 + const appStore = sheep.$store('app'); + if (!appStore.template?.home) { + appStore.init(); + } setTimeout(function () { uni.stopPullDownRefresh(); }, 800); diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/index/user.vue b/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/index/user.vue index 42d769b..b23550f 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/index/user.vue +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/index/user.vue @@ -15,6 +15,7 @@ > + @@ -42,6 +43,22 @@ }); onPageScroll(() => {}); + + function goToSystemSetting() { + uni.navigateTo({ + url: '/pages/public/setting' + }); + } - + diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/order/detail.vue b/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/order/detail.vue index 759de88..9debbf0 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/order/detail.vue +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/order/detail.vue @@ -15,31 +15,31 @@ {{ formatOrderStatus(state.orderInfo) }} diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/public/setting.vue b/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/public/setting.vue index 34da0df..41958dc 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/public/setting.vue +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/public/setting.vue @@ -147,7 +147,7 @@ return; } sheep.$store('user').logout(); - sheep.$router.go('/pages/index/user'); + sheep.$router.go('/pages/index/index'); }, }); } diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/user/info.vue b/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/user/info.vue index 00e20a4..4df8877 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/user/info.vue +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/pages/user/info.vue @@ -173,8 +173,10 @@ + - + + @@ -224,7 +226,7 @@ // 选择微信的头像，进行上传 async function onChooseAvatar(e) { - debugger; + const tempUrl = e.detail.avatarUrl || ''; if (!tempUrl) return; const files = await uploadFilesFromPath(tempUrl); @@ -273,6 +275,7 @@ }); } + // 保存信息 async function onSubmit() { const { code } = await UserApi.updateUser({ @@ -353,13 +356,22 @@ .logout-btn { width: 710rpx; height: 80rpx; - background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); + background: linear-gradient(90deg, rgba(0, 0, 255, 0.5),rgba(0, 0, 255, 0.8)); border-radius: 40rpx; font-size: 30rpx; font-weight: 500; color: $white; } + .save-btn { + width: 710rpx; + height: 80rpx; + background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); + border-radius: 40rpx; + font-size: 30rpx; + font-weight: 500; + color: $white; + } .radio-dark { filter: grayscale(100%); filter: gray; diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-auth-modal/components/account-login.vue b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-auth-modal/components/account-login.vue index d5d6056..fe9efd5 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-auth-modal/components/account-login.vue +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-auth-modal/components/account-login.vue @@ -4,9 +4,10 @@ - + + 账号登录 如果未设置过密码，请点击忘记密码 diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-coupon-card/s-coupon-card.vue b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-coupon-card/s-coupon-card.vue index dac69e3..f1da300 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-coupon-card/s-coupon-card.vue +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-coupon-card/s-coupon-card.vue @@ -25,28 +25,28 @@ return [{ title: '已领取', value: '0', - icon: '/static/img/shop/order/nouse_coupon.png', + icon: '/static/img/shop/nouse_coupon.png', path: '/pages/coupon/list', type: 'geted', }, { title: '已使用', value: '0', - icon: '/static/img/shop/order/useend_coupon.png', + icon: '/static/img/shop/useend_coupon.png', path: '/pages/coupon/list', type: 'used', }, { title: '已失效', value: '0', - icon: '/static/img/shop/order/out_coupon.png', + icon: '/static/img/shop/out_coupon.png', path: '/pages/coupon/list', type: 'expired', }, { title: '领券中心', value: '0', - icon: '/static/img/shop/order/all_coupon.png', + icon: '/static/img/shop/all_coupon.png', path: '/pages/coupon/list', type: 'all', }, diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-order-card/s-order-card.vue b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-order-card/s-order-card.vue index b3d851b..ed44098 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-order-card/s-order-card.vue +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-order-card/s-order-card.vue @@ -13,7 +13,7 @@ absolute="rightTop" size="small" > - + {{ item.title }} @@ -31,7 +31,7 @@ { title: '待付款', value: '1', - icon: '/static/img/shop/order/no_pay.png', + icon: '/static/img/shop/no_pay.png', path: '/pages/order/list', type: 'unpaid', count: 'unpaidCount', @@ -39,7 +39,7 @@ { title: '待收货', value: '3', - icon: '/static/img/shop/order/no_take.png', + icon: '/static/img/shop/no_take.png', path: '/pages/order/list', type: 'noget', count: 'deliveredCount', @@ -47,7 +47,7 @@ { title: '待评价', value: '4', - icon: '/static/img/shop/order/no_comment.png', + icon: '/static/img/shop/no_comment.png', path: '/pages/order/list', type: 'nocomment', count: 'uncommentedCount', @@ -55,7 +55,7 @@ { title: '售后单', value: '0', - icon: '/static/img/shop/order/change_order.png', + icon: '/static/img/shop/change_order.png', path: '/pages/order/aftersale/list', type: 'aftersale', count: 'afterSaleCount', @@ -63,7 +63,7 @@ { title: '全部订单', value: '0', - icon: '/static/img/shop/order/all_order.png', + icon: '/static/img/shop/all_order.png', path: '/pages/order/list', }, ]; diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-share-modal/canvas-poster/poster/groupon.js b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-share-modal/canvas-poster/poster/groupon.js index c182d3f..22e952e 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-share-modal/canvas-poster/poster/groupon.js +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-share-modal/canvas-poster/poster/groupon.js @@ -2,7 +2,7 @@ import sheep from '@/sheep'; import { formatImageUrlProtocol, getWxaQrcode } from './index'; const groupon = async (poster) => { - debugger; + const width = poster.width; const userInfo = sheep.$store('user').userInfo; const wxa_qrcode = await getWxaQrcode(poster.shareInfo.path, poster.shareInfo.query); diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-wallet-card/s-wallet-card.vue b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-wallet-card/s-wallet-card.vue index aff0bf8..b3e1dc0 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-wallet-card/s-wallet-card.vue +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/components/s-wallet-card/s-wallet-card.vue @@ -30,7 +30,7 @@ - + 我的钱包 diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/config/index.js b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/config/index.js index 803558c..30038a4 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/config/index.js +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/config/index.js @@ -12,7 +12,7 @@ if (process.env.NODE_ENV === 'development') { if (typeof baseUrl === 'undefined') { console.error('请检查.env配置文件是否存在'); } else { - console.log(`[芋道商城 ${version}] https://doc.iocoder.cn`); + console.log(`[研筑商城 ${version}] https://doc.iocoder.cn`); } export const apiPath = import.meta.env.SHOPRO_API_PATH; diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/hooks/useModal.js b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/hooks/useModal.js index 5b4d163..e2fa87e 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/hooks/useModal.js +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/hooks/useModal.js @@ -6,20 +6,27 @@ import test from '@/sheep/helper/test.js'; import AuthUtil from '@/sheep/api/member/auth'; // 打开授权弹框 -export function showAuthModal(type = 'smsLogin') { +export function showAuthModal(type = 'accountLogin') { + // 检查用户是否已登录 + const userStore = $store('user'); + if (userStore.isLogin) { + console.log('用户已登录，无需显示登录弹框'); + return; + } + const modal = $store('modal'); // #ifdef H5 closeAuthModal(); setTimeout(() => { modal.$patch((state) => { - state.auth = type; + state.auth = "accountLogin";//type; }); }, 200); // #endif // #ifndef H5 modal.$patch((state) => { - state.auth = type; + state.auth = "accountLogin";//type; }); // #endif } diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/index.js b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/index.js index c135334..f05f197 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/index.js +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/index.js @@ -29,6 +29,9 @@ export async function ShoproInit() { // 应用初始化 await $store('app').init(); + // 初始化用户状态（等待完成） + await $store('user').initialize(); + // 平台初始化加载(各平台provider提供不同的加载流程) $platform.load(); diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/libs/mplive-manifest-plugin.js b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/libs/mplive-manifest-plugin.js index d1df9bf..64358cc 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/libs/mplive-manifest-plugin.js +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/libs/mplive-manifest-plugin.js @@ -7,26 +7,40 @@ let Manifest = fs.readFileSync(manifestPath, { }); function mpliveMainfestPlugin(isOpen) { - if (process.env.UNI_PLATFORM !== 'mp-weixin') return; + if (process.env.UNI_PLATFORM !== 'mp-weixin') return { name: 'mplive-mainfest-plugin' }; - const manifestData = JSON.parse(Manifest) + try { + const manifestData = JSON.parse(Manifest) - if (isOpen === '0') { - delete manifestData['mp-weixin'].plugins['live-player-plugin']; - } - - if (isOpen === '1') { - manifestData['mp-weixin'].plugins['live-player-plugin'] = { - "version": "1.3.5", - "provider": "wx2b03c6e691cd7370" + if (isOpen === '0') { + if (manifestData['mp-weixin'] && manifestData['mp-weixin'].plugins) { + delete manifestData['mp-weixin'].plugins['live-player-plugin']; + } } + + if (isOpen === '1') { + if (!manifestData['mp-weixin']) { + manifestData['mp-weixin'] = {}; + } + if (!manifestData['mp-weixin'].plugins) { + manifestData['mp-weixin'].plugins = {}; + } + manifestData['mp-weixin'].plugins['live-player-plugin'] = { + "version": "1.3.5", + "provider": "wx2b03c6e691cd7370" + } + } + + Manifest = JSON.stringify(manifestData, null, 2) + + fs.writeFileSync(manifestPath, Manifest, { + "flag": "w" + }) + } catch (error) { + console.error('Error processing manifest.json:', error); } - Manifest = JSON.stringify(manifestData, null, 2) - - fs.writeFileSync(manifestPath, Manifest, { - "flag": "w" - }) + return { name: 'mplive-mainfest-plugin' }; } export default mpliveMainfestPlugin diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/platform/provider/wechat/openPlatform.js b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/platform/provider/wechat/openPlatform.js index a80f0d7..2cd1971 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/platform/provider/wechat/openPlatform.js +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/platform/provider/wechat/openPlatform.js @@ -15,7 +15,7 @@ const login = () => { provider: 'weixin', onlyAuthorize: true, }); - debugger + if (loginRes.errMsg == 'login:ok') { // TODO third.wechat.login 函数未实现 const res = await third.wechat.login({ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/request/index.js b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/request/index.js index b5d8511..98f9b10 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/request/index.js +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/request/index.js @@ -119,6 +119,9 @@ http.interceptors.response.use( // 存储租户ID if (response.data.data.tenantId) { uni.setStorageSync('tenant-id', response.data.data.tenantId); + console.log('登录成功，存储租户ID:', response.data.data.tenantId); + } else { + console.log('登录成功，但响应中没有租户ID'); } } @@ -131,6 +134,16 @@ http.interceptors.response.use( if (response.data.code === 401) { return refreshToken(response.config); } + // 特殊：如果 400 错误码，并且是租户ID缺失，则弹出登录框 + if (response.data.code === 400 && response.data.msg?.includes('租户标识未传递')) { + // 检查是否刚刚登录成功或登录后的回调请求 + const isLoginRequest = response.config.url.indexOf('/member/auth/') >= 0; + const isTemplateRequest = response.config.url.indexOf('/promotion/diy-template/') >= 0; + if (!isLoginRequest && !isTemplateRequest) { + showAuthModal(); + } + return Promise.reject(response.data); + } // 特殊：处理分销用户绑定失败的提示 if ((response.data.code + '').includes('1011007')) { console.error(`分销用户绑定失败，原因：${response.data.msg}`); diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/store/app.js b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/store/app.js index eaa1f87..c51107f 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/store/app.js +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/store/app.js @@ -51,7 +51,7 @@ const app = defineStore({ }), actions: { // 获取Shopro应用配置和模板 - async init(templateId = null) { + async init(templateId = null, skipTenant = false) { // 检查网络 const networkStatus = await $platform.checkNetwork(); if (!networkStatus) { @@ -63,16 +63,22 @@ const app = defineStore({ $router.error('EnvError'); } - // 加载租户 - await adaptTenant(); + // 加载租户（如果需要） + if (!skipTenant) { + await adaptTenant(); + } // 加载装修配置 - await adaptTemplate(this.template, templateId); + const templateSuccess = await adaptTemplate(this.template, templateId); + if (!templateSuccess) { + console.error('模板初始化失败，停止后续初始化'); + return Promise.resolve(false); + } // TODO 芋艿：【初始化优化】未来支持管理后台可配；对应 https://api.shopro.sheepjs.com/shop/api/init if (true) { this.info = { - name: '芋道商城', + name: '研筑商城', logo: 'https://static.iocoder.cn/ruoyi-vue-pro-logo.png', version: '2026.01', copyright: '全部开源，个人与企业可 100% 免费使用', @@ -182,33 +188,39 @@ const adaptTenant = async () => { /** 初始化装修模版 */ const adaptTemplate = async (appTemplate, templateId) => { - const { data: diyTemplate } = templateId - ? // 查询指定模板，一般是预览时使用 - await DiyApi.getDiyTemplate(templateId) - : await DiyApi.getUsedDiyTemplate(); - // 模板不存在 - if (!diyTemplate) { - $router.error('TemplateError'); - return; - } - - const tabBar = diyTemplate?.property?.tabBar; - if (tabBar) { - appTemplate.basic.tabbar = tabBar; - // TODO 商城装修没有对 tabBar 进行角标配置，测试角标需打开以下注释 - // appTemplate.basic.tabbar.items.forEach((tabBar) => { - // tabBar.dot = false - // tabBar.badge = 100 - // }) - // appTemplate.basic.tabbar.badgeStyle = { - // backgroundColor: '#882222', - // } - if (tabBar?.theme) { - appTemplate.basic.theme = tabBar?.theme; + try { + const { data: diyTemplate } = templateId + ? // 查询指定模板，一般是预览时使用 + await DiyApi.getDiyTemplate(templateId) + : await DiyApi.getUsedDiyTemplate(); + // 模板不存在 + if (!diyTemplate) { + console.error('模板不存在'); + return false; } + + const tabBar = diyTemplate?.property?.tabBar; + if (tabBar) { + appTemplate.basic.tabbar = tabBar; + // TODO 商城装修没有对 tabBar 进行角标配置，测试角标需打开以下注释 + // appTemplate.basic.tabbar.items.forEach((tabBar) => { + // tabBar.dot = false + // tabBar.badge = 100 + // }) + // appTemplate.basic.tabbar.badgeStyle = { + // backgroundColor: '#882222', + // } + if (tabBar?.theme) { + appTemplate.basic.theme = tabBar?.theme; + } + } + appTemplate.home = diyTemplate?.home; + appTemplate.user = diyTemplate?.user; + return true; + } catch (error) { + console.error('模板初始化失败:', error); + return false; } - appTemplate.home = diyTemplate?.home; - appTemplate.user = diyTemplate?.user; }; export default app; diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/store/modal.js b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/store/modal.js index bde9e0a..342507a 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/store/modal.js +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/store/modal.js @@ -3,7 +3,7 @@ import { defineStore } from 'pinia'; const modal = defineStore({ id: 'modal', state: () => ({ - auth: '', // 授权弹框 accountLogin|smsLogin|resetPassword|changeMobile|changePassword|changeUsername + auth: '', // 授权弹框 accountLogin|smsLogin|resetPassword|changeMobile|changePassword|changeUsername，默认为空 share: false, // 分享弹框 menu: false, // 快捷菜单弹框 advHistory: [], // 广告弹框记录 diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/store/user.js b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/store/user.js index 8c3d007..8a55442 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/store/user.js +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/store/user.js @@ -41,12 +41,48 @@ const user = defineStore({ state: () => ({ userInfo: clone(defaultUserInfo), // 用户信息 userWallet: clone(defaultUserWallet), // 用户钱包信息 - isLogin: !!uni.getStorageSync('token'), // 登录状态 + isLogin: false, // 登录状态，初始值为 false，由持久化插件恢复 numData: cloneDeep(defaultNumData), // 用户其他数据 lastUpdateTime: 0, // 上次更新时间 }), actions: { + // 初始化用户状态 + async initialize() { + // 检查 token 是否存在 + const token = uni.getStorageSync('token'); + // 检查 refresh-token 是否存在 + const refreshToken = uni.getStorageSync('refresh-token'); + // 检查持久化的用户数据是否存在 + const userStoreData = uni.getStorageSync('user-store'); + // 如果有用户数据但没有 token 和 refresh-token，说明登录状态已失效 + if (userStoreData && !token && !refreshToken) { + this.resetUserData(); + } + // 如果有 token 或 refresh-token 但 isLogin 为 false，更新登录状态 + else if ((token || refreshToken) && !this.isLogin) { + this.isLogin = true; + // 如果只有 refresh-token 没有 token，尝试刷新 token + if (!token && refreshToken) { + try { + const AuthUtil = await import('@/sheep/api/member/auth'); + const refreshTokenResult = await AuthUtil.default.refreshToken(refreshToken); + if (refreshTokenResult.code === 0) { + this.setToken(refreshTokenResult.data.accessToken, refreshTokenResult.data.refreshToken); + } else { + // 刷新失败，重置用户数据 + this.resetUserData(); + } + } catch (e) { + // 刷新失败，重置用户数据 + this.resetUserData(); + } + } else { + // 有 token，直接更新用户信息 + this.loginAfter(true); + } + } + }, // 获取用户信息 async getInfo() { const { code, data } = await UserApi.getUserInfo(); @@ -95,7 +131,7 @@ const user = defineStore({ this.isLogin = true; uni.setStorageSync('token', token); uni.setStorageSync('refresh-token', refreshToken); - this.loginAfter(); + this.loginAfter(true); } return this.isLogin; }, @@ -133,21 +169,18 @@ const user = defineStore({ }, // 登录后，加载各种信息 - async loginAfter() { + async loginAfter(isLogin=false) { + if(!isLogin) { + return; + } + // 先更新用户数据 await this.updateUserData(); - // 加载购物车 - cart().getList(); - // 登录后设置全局分享参数 - $share.getShareInfo(); - - // 提醒绑定手机号 - if (app().platform.bind_mobile && !this.userInfo.mobile) { - showAuthModal('changeMobile'); - } - - // 绑定推广员 - $share.bindBrokerageUser(); + // 登录成功后，延迟重新获取模板信息 + // 确保租户ID已经被正确存储到本地存储中 + setTimeout(() => { + app().init(null, true); + }, 100); }, // 登出系统 diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/url/index.js b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/url/index.js index a7b82e4..e23ab29 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/url/index.js +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/sheep/url/index.js @@ -21,12 +21,8 @@ export default { }, // 静态资源地址 static: (url = '', staticurl = '') => { - if (staticurl === '') { - staticurl = staticUrl; - } - if (staticurl !== 'local') { - url = cdn(url, staticurl); - } + + return url; }, // css背景图片地址 diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/all_coupon.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/all_coupon.png new file mode 100644 index 0000000..98f1556 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/all_coupon.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/all_order.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/all_order.png new file mode 100644 index 0000000..d599baa Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/all_order.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/coupon_icon.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/coupon_icon.png new file mode 100644 index 0000000..ad1599a Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/coupon_icon.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/mplive/ended.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/mplive/ended.png new file mode 100644 index 0000000..ece8451 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/mplive/ended.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/mplive/living.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/mplive/living.png new file mode 100644 index 0000000..b15d435 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/mplive/living.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/mplive/start.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/mplive/start.png new file mode 100644 index 0000000..78896e7 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/mplive/start.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/sign.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/sign.png new file mode 100644 index 0000000..f33ccab Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/app/sign.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/avatar/notice.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/avatar/notice.png new file mode 100644 index 0000000..e7e9dbb Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/avatar/notice.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/avatar/unknown.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/avatar/unknown.png new file mode 100644 index 0000000..83deb24 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/avatar/unknown.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/change_order.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/change_order.png new file mode 100644 index 0000000..3bc78bb Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/change_order.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/chat/default.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/chat/default.png new file mode 100644 index 0000000..7d942b5 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/chat/default.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/chat/goods.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/chat/goods.png new file mode 100644 index 0000000..52ef3d0 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/chat/goods.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/chat/image.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/chat/image.png new file mode 100644 index 0000000..1b0dbe2 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/chat/image.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/chat/order.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/chat/order.png new file mode 100644 index 0000000..8d6d6dd Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/chat/order.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/background.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/background.png new file mode 100644 index 0000000..27b151e Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/background.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon1.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon1.png new file mode 100644 index 0000000..ff4f014 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon1.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon2.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon2.png new file mode 100644 index 0000000..ca79fec Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon2.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon3.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon3.png new file mode 100644 index 0000000..f374d6c Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon3.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon4.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon4.png new file mode 100644 index 0000000..d11e5d9 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon4.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon5.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon5.png new file mode 100644 index 0000000..19e8ef9 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon5.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon7.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon7.png new file mode 100644 index 0000000..c2a8631 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon7.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon8.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon8.png new file mode 100644 index 0000000..36a46cc Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon8.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon9.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon9.png new file mode 100644 index 0000000..36a46cc Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/commission_icon9.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/forbidden.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/forbidden.png new file mode 100644 index 0000000..871a9bd Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/forbidden.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/title1.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/title1.png new file mode 100644 index 0000000..b282b57 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/title1.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/title2.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/title2.png new file mode 100644 index 0000000..691f832 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/commission/title2.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/config/goods-poster-bg.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/config/goods-poster-bg.png new file mode 100644 index 0000000..52cbcb5 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/config/goods-poster-bg.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/config/groupon-poster-bg.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/config/groupon-poster-bg.png new file mode 100644 index 0000000..130b461 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/config/groupon-poster-bg.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/config/user-poster-bg.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/config/user-poster-bg.png new file mode 100644 index 0000000..d89b838 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/config/user-poster-bg.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/default.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/default.png new file mode 100644 index 0000000..7d942b5 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/default.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/default_avatar.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/default_avatar.png new file mode 100644 index 0000000..4ed687c Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/default_avatar.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/empty_network.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/empty_network.png new file mode 100644 index 0000000..da7b9fe Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/empty_network.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/activity-btn-disabled.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/activity-btn-disabled.png new file mode 100644 index 0000000..6666807 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/activity-btn-disabled.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/collect_0.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/collect_0.png new file mode 100644 index 0000000..229e229 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/collect_0.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/collect_1.gif b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/collect_1.gif new file mode 100644 index 0000000..81ddb9e Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/collect_1.gif differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/dis.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/dis.png new file mode 100644 index 0000000..f20625f Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/dis.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-bg.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-bg.png new file mode 100644 index 0000000..ff92ab3 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-bg.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-btn-long.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-btn-long.png new file mode 100644 index 0000000..5542362 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-btn-long.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-btn.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-btn.png new file mode 100644 index 0000000..26af19e Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-btn.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-header.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-header.png new file mode 100644 index 0000000..e531c5d Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-header.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-icon.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-icon.png new file mode 100644 index 0000000..6d52118 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-icon.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-tag-white.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-tag-white.png new file mode 100644 index 0000000..305b1fe Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-tag-white.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-tag.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-tag.png new file mode 100644 index 0000000..2cddd70 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-tag.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-tip-bg.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-tip-bg.png new file mode 100644 index 0000000..34cb0ae Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/groupon-tip-bg.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/message.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/message.png new file mode 100644 index 0000000..43957d9 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/message.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/score-bg.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/score-bg.png new file mode 100644 index 0000000..748b855 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/score-bg.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/score1.svg b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/score1.svg new file mode 100644 index 0000000..9166af3 --- /dev/null +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/score1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-bg.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-bg.png new file mode 100644 index 0000000..cde2672 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-bg.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-btn.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-btn.png new file mode 100644 index 0000000..d74b87e Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-btn.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-header.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-header.png new file mode 100644 index 0000000..a0855d7 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-header.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-icon.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-icon.png new file mode 100644 index 0000000..3b30057 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-icon.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-tip-bg.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-tip-bg.png new file mode 100644 index 0000000..60b133c Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/seckill-tip-bg.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/share.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/share.png new file mode 100644 index 0000000..06f8d23 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/goods/share.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/line.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/line.png new file mode 100644 index 0000000..82e647f Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/line.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/no_comment.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/no_comment.png new file mode 100644 index 0000000..d5e1e36 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/no_comment.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/no_pay.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/no_pay.png new file mode 100644 index 0000000..6300596 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/no_pay.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/no_take.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/no_take.png new file mode 100644 index 0000000..f27edc0 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/no_take.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/nouse_coupon.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/nouse_coupon.png new file mode 100644 index 0000000..fe0bf18 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/nouse_coupon.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/all_coupon.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/all_coupon.png new file mode 100644 index 0000000..98f1556 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/all_coupon.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/all_order.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/all_order.png new file mode 100644 index 0000000..d599baa Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/all_order.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/cargo.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/cargo.png new file mode 100644 index 0000000..8dc66fd Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/cargo.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/change_order.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/change_order.png new file mode 100644 index 0000000..3bc78bb Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/change_order.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/no_comment.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/no_comment.png new file mode 100644 index 0000000..d5e1e36 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/no_comment.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/no_pay.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/no_pay.png new file mode 100644 index 0000000..6300596 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/no_pay.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/no_take.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/no_take.png new file mode 100644 index 0000000..f27edc0 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/no_take.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/nouse_coupon.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/nouse_coupon.png new file mode 100644 index 0000000..fe0bf18 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/nouse_coupon.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_bg.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_bg.png new file mode 100644 index 0000000..b179020 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_bg.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_close.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_close.png new file mode 100644 index 0000000..b4d2ec9 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_close.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_express.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_express.png new file mode 100644 index 0000000..15c1d60 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_express.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_loading.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_loading.png new file mode 100644 index 0000000..f6abde3 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_loading.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_paty_fail.gif b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_paty_fail.gif new file mode 100644 index 0000000..04fbc7d Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_paty_fail.gif differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_pay_success.gif b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_pay_success.gif new file mode 100644 index 0000000..9cc35d3 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_pay_success.gif differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_success.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_success.png new file mode 100644 index 0000000..b2951e3 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/order_success.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/out_coupon.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/out_coupon.png new file mode 100644 index 0000000..164776f Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/out_coupon.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/useend_coupon.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/useend_coupon.png new file mode 100644 index 0000000..d668455 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/order/useend_coupon.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/out_coupon.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/out_coupon.png new file mode 100644 index 0000000..164776f Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/out_coupon.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/alipay.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/alipay.png new file mode 100644 index 0000000..a23fffa Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/alipay.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/alipay_api.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/alipay_api.png new file mode 100644 index 0000000..98ccf35 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/alipay_api.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/bank.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/bank.png new file mode 100644 index 0000000..e2c6d74 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/bank.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/cod_disabled.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/cod_disabled.png new file mode 100644 index 0000000..c3126ab Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/cod_disabled.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/wallet.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/wallet.png new file mode 100644 index 0000000..79d4213 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/wallet.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/wechat.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/wechat.png new file mode 100644 index 0000000..e72e887 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/wechat.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/wechat_api.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/wechat_api.png new file mode 100644 index 0000000..dd6685f Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/pay/wechat_api.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/platform/WechatMiniProgram.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/platform/WechatMiniProgram.png new file mode 100644 index 0000000..97e6656 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/platform/WechatMiniProgram.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/platform/WechatOfficialAccount.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/platform/WechatOfficialAccount.png new file mode 100644 index 0000000..4d9a02c Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/platform/WechatOfficialAccount.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/platform/wechat.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/platform/wechat.png new file mode 100644 index 0000000..3a63b51 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/platform/wechat.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/priceTag.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/priceTag.png new file mode 100644 index 0000000..658455b Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/priceTag.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/search.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/search.png new file mode 100644 index 0000000..bed2e10 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/search.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/seckill-header.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/seckill-header.png new file mode 100644 index 0000000..a0855d7 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/seckill-header.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/share/share_guide.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/share/share_guide.png new file mode 100644 index 0000000..88c00c4 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/share/share_guide.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/share/share_link.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/share/share_link.png new file mode 100644 index 0000000..d08a852 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/share/share_link.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/share/share_poster.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/share/share_poster.png new file mode 100644 index 0000000..c99e36a Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/share/share_poster.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/share/share_wx.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/share/share_wx.png new file mode 100644 index 0000000..b2a662f Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/share/share_wx.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/sign.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/sign.png new file mode 100644 index 0000000..f33ccab Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/sign.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/sort1.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/sort1.png new file mode 100644 index 0000000..ae43321 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/sort1.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/sort2.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/sort2.png new file mode 100644 index 0000000..7141108 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/sort2.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/sort3.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/sort3.png new file mode 100644 index 0000000..445c3eb Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/sort3.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tabbar/category2.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tabbar/category2.png new file mode 100644 index 0000000..388d3bd --- /dev/null +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tabbar/category2.png @@ -0,0 +1,2 @@ +export default "/static/img/shop/tabbar/category2.png" +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImNhdGVnb3J5Mi5wbmc/aW1wb3J0Il0sInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBkZWZhdWx0IFwiL3N0YXRpYy9pbWcvc2hvcC90YWJiYXIvY2F0ZWdvcnkyLnBuZ1wiIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyJ9 \ No newline at end of file diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/browse.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/browse.png new file mode 100644 index 0000000..8babc99 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/browse.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/cart.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/cart.png new file mode 100644 index 0000000..6d48afb Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/cart.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/collect.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/collect.png new file mode 100644 index 0000000..32f9abb Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/collect.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/home.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/home.png new file mode 100644 index 0000000..f4ae4f2 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/home.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/search.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/search.png new file mode 100644 index 0000000..5bc81e7 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/search.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/user.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/user.png new file mode 100644 index 0000000..9a8d076 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/tools/user.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/upload-camera.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/upload-camera.png new file mode 100644 index 0000000..260be62 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/upload-camera.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/useend_coupon.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/useend_coupon.png new file mode 100644 index 0000000..d668455 Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/useend_coupon.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/user/address/edit.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/user/address/edit.png new file mode 100644 index 0000000..a25a91f Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/user/address/edit.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/user/wallet_card_bg.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/user/wallet_card_bg.png new file mode 100644 index 0000000..f6d582b Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/user/wallet_card_bg.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/user/wallet_icon.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/user/wallet_icon.png new file mode 100644 index 0000000..b036f7b Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/user/wallet_icon.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/user/withdraw_bg.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/user/withdraw_bg.png new file mode 100644 index 0000000..34e2fde Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/user/withdraw_bg.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/wallet_icon.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/wallet_icon.png new file mode 100644 index 0000000..b036f7b Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/wallet_icon.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/writeOff.png b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/writeOff.png new file mode 100644 index 0000000..74c415d Binary files /dev/null and b/yanzhu-ui/yanzhu-ui-mall-uniapp/static/img/shop/writeOff.png differ diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/vite.config.js b/yanzhu-ui/yanzhu-ui-mall-uniapp/vite.config.js index 3223d62..09dd534 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/vite.config.js +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/vite.config.js @@ -11,6 +11,9 @@ export default (command, mode) => { const env = loadEnv(mode, __dirname, 'SHOPRO_'); return { envPrefix: "SHOPRO_", + build: { + outDir: path.resolve(__dirname, '/saash5'), + }, plugins: [ uni(), // viteCompression({ @@ -30,12 +33,17 @@ export default (command, mode) => { overlay: true, }, proxy: { - '/app-api': { - target: 'http://localhost:48080/',//'http://62.234.3.186/', + '/app-api': { + target: 'http://localhost:48080/', //target: 'http://62.234.3.186/', ws: false, changeOrigin: true, }, + '/saasimages/': { + target: 'http://62.234.3.186/saasimages/', + ws: false, + changeOrigin: true, + } } }, }; diff --git a/yanzhu-ui/yanzhu-ui-mall-uniapp/yarn.lock b/yanzhu-ui/yanzhu-ui-mall-uniapp/yarn.lock index 68e5e2c..6e44635 100644 --- a/yanzhu-ui/yanzhu-ui-mall-uniapp/yarn.lock +++ b/yanzhu-ui/yanzhu-ui-mall-uniapp/yarn.lock @@ -4,29 +4,29 @@ "@babel/helper-string-parser@^7.27.1": version "7.27.1" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687" + resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz" integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA== "@babel/helper-validator-identifier@^7.28.5": version "7.28.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4" + resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz" integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q== "@babel/parser@^7.28.5": version "7.29.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.0.tgz#669ef345add7d057e92b7ed15f0bac07611831b6" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz" integrity sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww== dependencies: "@babel/types" "^7.29.0" "@babel/runtime@^7.17.2": version "7.28.6" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.6.tgz#d267a43cb1836dc4d182cce93ae75ba954ef6d2b" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz" integrity sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA== "@babel/types@^7.29.0": version "7.29.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.0.tgz#9f5b1e838c446e72cf3cd4b918152b8c605e37c7" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz" integrity sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A== dependencies: "@babel/helper-string-parser" "^7.27.1" @@ -34,17 +34,22 @@ "@dcloudio/types@^2.0.16": version "2.6.12" - resolved "https://registry.yarnpkg.com/@dcloudio/types/-/types-2.6.12.tgz#6c9559b9e65483f355dd61cb88fe8c14c8e61189" + resolved "https://registry.npmjs.org/@dcloudio/types/-/types-2.6.12.tgz" integrity sha512-mrCMwcINy1IFjU9VUqLeWBkj404yWs5paLDttBcA+eqUjanuUQbBcTVPqlrGgkyzLXDcV2oDDZRSNxNpXi4kMQ== +"@esbuild/darwin-arm64@0.18.20": + version "0.18.20" + resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz" + integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA== + "@jridgewell/sourcemap-codec@^1.5.5": version "1.5.5" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba" + resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz" integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og== "@vue/compiler-core@3.5.27": version "3.5.27" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.5.27.tgz#ce4402428e26095586eb889c41f6e172eb3960bd" + resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.27.tgz" integrity sha512-gnSBQjZA+//qDZen+6a2EdHqJ68Z7uybrMf3SPjEGgG4dicklwDVmMC1AeIHxtLVPT7sn6sH1KOO+tS6gwOUeQ== dependencies: "@babel/parser" "^7.28.5" @@ -55,7 +60,7 @@ "@vue/compiler-dom@3.5.27": version "3.5.27" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.27.tgz#32b2bc87f0a652c253986796ace0ed6213093af8" + resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.27.tgz" integrity sha512-oAFea8dZgCtVVVTEC7fv3T5CbZW9BxpFzGGxC79xakTr6ooeEqmRuvQydIiDAkglZEAd09LgVf1RoDnL54fu5w== dependencies: "@vue/compiler-core" "3.5.27" @@ -63,7 +68,7 @@ "@vue/compiler-sfc@3.5.27": version "3.5.27" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.5.27.tgz#84651b8816bf8e7d6e62fddd14db86efd6d6f1b6" + resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.27.tgz" integrity sha512-sHZu9QyDPeDmN/MRoshhggVOWE5WlGFStKFwu8G52swATgSny27hJRWteKDSUUzUH+wp+bmeNbhJnEAel/auUQ== dependencies: "@babel/parser" "^7.28.5" @@ -78,7 +83,7 @@ "@vue/compiler-ssr@3.5.27": version "3.5.27" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.5.27.tgz#b480cad09dacf8f3d9c82b9843402f1a803baee7" + resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.27.tgz" integrity sha512-Sj7h+JHt512fV1cTxKlYhg7qxBvack+BGncSpH+8vnN+KN95iPIcqB5rsbblX40XorP+ilO7VIKlkuu3Xq2vjw== dependencies: "@vue/compiler-dom" "3.5.27" @@ -86,19 +91,19 @@ "@vue/devtools-api@^6.6.3": version "6.6.4" - resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz#cbe97fe0162b365edc1dba80e173f90492535343" + resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz" integrity sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g== "@vue/reactivity@3.5.27": version "3.5.27" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.5.27.tgz#d870557de1389a27b8abcb7cbfa30978dc69a000" + resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.27.tgz" integrity sha512-vvorxn2KXfJ0nBEnj4GYshSgsyMNFnIQah/wczXlsNXt+ijhugmW+PpJ2cNPe4V6jpnBcs0MhCODKllWG+nvoQ== dependencies: "@vue/shared" "3.5.27" "@vue/runtime-core@3.5.27": version "3.5.27" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.5.27.tgz#bb43744ed070166c7d581b849ac22b71a9ccf127" + resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.27.tgz" integrity sha512-fxVuX/fzgzeMPn/CLQecWeDIFNt3gQVhxM0rW02Tvp/YmZfXQgcTXlakq7IMutuZ/+Ogbn+K0oct9J3JZfyk3A== dependencies: "@vue/reactivity" "3.5.27" @@ -106,7 +111,7 @@ "@vue/runtime-dom@3.5.27": version "3.5.27" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.5.27.tgz#392513252c7ca7e5277240fdc70b8093449127f5" + resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.27.tgz" integrity sha512-/QnLslQgYqSJ5aUmb5F0z0caZPGHRB8LEAQ1s81vHFM5CBfnun63rxhvE/scVb/j3TbBuoZwkJyiLCkBluMpeg== dependencies: "@vue/reactivity" "3.5.27" @@ -116,7 +121,7 @@ "@vue/server-renderer@3.5.27": version "3.5.27" - resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.5.27.tgz#8137d0d7ec3b59d5992bb04c553775d209dddba7" + resolved "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.27.tgz" integrity sha512-qOz/5thjeP1vAFc4+BY3Nr6wxyLhpeQgAE/8dDtKo6a6xdk+L4W46HDZgNmLOBUDEkFXV3G7pRiUqxjX0/2zWA== dependencies: "@vue/compiler-ssr" "3.5.27" @@ -124,96 +129,129 @@ "@vue/shared@3.5.27": version "3.5.27" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.27.tgz#33a63143d8fb9ca1b3efbc7ecf9bd0ab05f7e06e" + resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.5.27.tgz" integrity sha512-dXr/3CgqXsJkZ0n9F3I4elY8wM9jMJpP3pvRG52r6m0tu/MsAFIe6JpXVGeNMd/D9F4hQynWT8Rfuj0bdm9kFQ== copy-text-to-clipboard@^3.0.1: version "3.2.2" - resolved "https://registry.yarnpkg.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.2.tgz#99bc79db3f2d355ec33a08d573aff6804491ddb9" + resolved "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.2.tgz" integrity sha512-T6SqyLd1iLuqPA90J5N4cTalrtovCySh58iiZDGJ6FGznbclKh4UI+FGacQSgFzwKG77W7XT5gwbVEbd9cIH1A== core-js@^3.11.0: version "3.48.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.48.0.tgz#1f813220a47bbf0e667e3885c36cd6f0593bf14d" + resolved "https://registry.npmjs.org/core-js/-/core-js-3.48.0.tgz" integrity sha512-zpEHTy1fjTMZCKLHUZoVeylt9XrzaIN2rbPXEt0k+q7JE5CkCZdo6bNq55bn24a69CH7ErAVLKijxJja4fw+UQ== csstype@^3.2.3: version "3.2.3" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.2.3.tgz#ec48c0f3e993e50648c86da559e2610995cf989a" + resolved "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz" integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ== dayjs@^1.11.7: version "1.11.19" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.19.tgz#15dc98e854bb43917f12021806af897c58ae2938" + resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz" integrity sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw== entities@^7.0.0: version "7.0.1" - resolved "https://registry.yarnpkg.com/entities/-/entities-7.0.1.tgz#26e8a88889db63417dcb9a1e79a3f1bc92b5976b" + resolved "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz" integrity sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA== +esbuild@^0.18.10: + version "0.18.20" + resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz" + integrity sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA== + optionalDependencies: + "@esbuild/android-arm" "0.18.20" + "@esbuild/android-arm64" "0.18.20" + "@esbuild/android-x64" "0.18.20" + "@esbuild/darwin-arm64" "0.18.20" + "@esbuild/darwin-x64" "0.18.20" + "@esbuild/freebsd-arm64" "0.18.20" + "@esbuild/freebsd-x64" "0.18.20" + "@esbuild/linux-arm" "0.18.20" + "@esbuild/linux-arm64" "0.18.20" + "@esbuild/linux-ia32" "0.18.20" + "@esbuild/linux-loong64" "0.18.20" + "@esbuild/linux-mips64el" "0.18.20" + "@esbuild/linux-ppc64" "0.18.20" + "@esbuild/linux-riscv64" "0.18.20" + "@esbuild/linux-s390x" "0.18.20" + "@esbuild/linux-x64" "0.18.20" + "@esbuild/netbsd-x64" "0.18.20" + "@esbuild/openbsd-x64" "0.18.20" + "@esbuild/sunos-x64" "0.18.20" + "@esbuild/win32-arm64" "0.18.20" + "@esbuild/win32-ia32" "0.18.20" + "@esbuild/win32-x64" "0.18.20" + estree-walker@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz" integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== +fsevents@~2.3.2: + version "2.3.3" + resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + lodash-es@^4.17.21: version "4.17.23" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.23.tgz#58c4360fd1b5d33afc6c0bbd3d1149349b1138e0" + resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz" integrity sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg== lodash@^4.17.23: version "4.17.23" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz" integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w== luch-request@^3.0.8: version "3.1.1" - resolved "https://registry.yarnpkg.com/luch-request/-/luch-request-3.1.1.tgz#a62b0aab54c5acd9da5b5fd0564ed2cdb8af9c2f" + resolved "https://registry.npmjs.org/luch-request/-/luch-request-3.1.1.tgz" integrity sha512-p7+mlcEtgRcd0OfXC4XZbyiwSr1XgCeqNT7LlVUjnk7InYl/8d5Rk7BUqAYNA2WRafI1wRIUQWRWZRpeUwWR0w== dependencies: "@dcloudio/types" "^2.0.16" magic-string@^0.30.21: version "0.30.21" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91" + resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz" integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ== dependencies: "@jridgewell/sourcemap-codec" "^1.5.5" mutation-observer@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/mutation-observer/-/mutation-observer-1.0.3.tgz#42e9222b101bca82e5ba9d5a7acf4a14c0f263d0" + resolved "https://registry.npmjs.org/mutation-observer/-/mutation-observer-1.0.3.tgz" integrity sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA== nanoid@^3.3.11: version "3.3.11" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b" + resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz" integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w== picocolors@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz" integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== pinia-plugin-persist-uni@^1.2.0: version "1.3.2" - resolved "https://registry.yarnpkg.com/pinia-plugin-persist-uni/-/pinia-plugin-persist-uni-1.3.2.tgz#bff4621be537eec1f545a621e6113a01b45a4866" + resolved "https://registry.npmjs.org/pinia-plugin-persist-uni/-/pinia-plugin-persist-uni-1.3.2.tgz" integrity sha512-Z47MWlAI3dnm9xENwodYyT6B3TMDuwFK7MHHymwQyrTchuhG2Yu26w7bYlIap7df0fCwNCmAo0n7n1RK3Ute+w== dependencies: vue-demi "^0.12.1" -pinia@^2.0.33: +pinia@^2.0.33, pinia@>2.0.0: version "2.3.1" - resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.3.1.tgz#54c476675b72f5abcfafa24a7582531ea8c23d94" + resolved "https://registry.npmjs.org/pinia/-/pinia-2.3.1.tgz" integrity sha512-khUlZSwt9xXCaTbbxFYBKDc/bWAGWJjOgvxETwkTN7KRm66EeT1ZdZj6i2ceh9sP2Pzqsbc704r2yngBrxBVug== dependencies: "@vue/devtools-api" "^6.6.3" vue-demi "^0.14.10" -postcss@^8.5.6: +postcss@^8.4.27, postcss@^8.5.6: version "8.5.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.6.tgz#2825006615a619b4f62a9e7426cc120b349a8f3c" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz" integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg== dependencies: nanoid "^3.3.11" @@ -222,17 +260,24 @@ postcss@^8.5.6: prettier@^2.8.7: version "2.8.8" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" + resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz" integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== +rollup@^3.27.1: + version "3.29.5" + resolved "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz" + integrity sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w== + optionalDependencies: + fsevents "~2.3.2" + source-map-js@^1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" + resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz" integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== vconsole@^3.15.0: version "3.15.1" - resolved "https://registry.yarnpkg.com/vconsole/-/vconsole-3.15.1.tgz#569a8ab15f353259527bbcf004f02946b4482cff" + resolved "https://registry.npmjs.org/vconsole/-/vconsole-3.15.1.tgz" integrity sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g== dependencies: "@babel/runtime" "^7.17.2" @@ -240,19 +285,30 @@ vconsole@^3.15.0: core-js "^3.11.0" mutation-observer "^1.0.3" +vite@^4.5.3: + version "4.5.3" + resolved "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz" + integrity sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg== + dependencies: + esbuild "^0.18.10" + postcss "^8.4.27" + rollup "^3.27.1" + optionalDependencies: + fsevents "~2.3.2" + vue-demi@^0.12.1: version "0.12.5" - resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.12.5.tgz#8eeed566a7d86eb090209a11723f887d28aeb2d1" + resolved "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.5.tgz" integrity sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q== vue-demi@^0.14.10: version "0.14.10" - resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.10.tgz#afc78de3d6f9e11bf78c55e8510ee12814522f04" + resolved "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz" integrity sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg== -vue@^3.5.11: +"vue@^2.0.0 || >=3.0.0", "vue@^2.7.0 || ^3.5.11", "vue@^3.0.0-0 || ^2.6.0", vue@^3.5.11, vue@3.5.27: version "3.5.27" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.5.27.tgz#e55fd941b614459ab2228489bc19d1692e05876c" + resolved "https://registry.npmjs.org/vue/-/vue-3.5.27.tgz" integrity sha512-aJ/UtoEyFySPBGarREmN4z6qNKpbEguYHMmXSiOGk69czc+zhs0NF6tEFrY8TZKAl8N/LYAkd4JHVd5E/AsSmw== dependencies: "@vue/compiler-dom" "3.5.27" @@ -263,5 +319,5 @@ vue@^3.5.11: weixin-js-sdk@^1.6.0: version "1.6.5" - resolved "https://registry.yarnpkg.com/weixin-js-sdk/-/weixin-js-sdk-1.6.5.tgz#01fe5220b91dbfe089fc0730d061be0e68271e6a" + resolved "https://registry.npmjs.org/weixin-js-sdk/-/weixin-js-sdk-1.6.5.tgz" integrity sha512-Gph1WAWB2YN/lMOFB/ymb+hbU/wYazzJgu6PMMktCy9cSCeW5wA6Zwt0dpahJbJ+RJEwtTv2x9iIu0U4enuVSQ==