From 0f47284235efa5171f2da91ff135814a4a51300c Mon Sep 17 00:00:00 2001 From: Jason <5340635+wen-jason@user.noreply.gitee.com> Date: Thu, 8 Sep 2022 19:09:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=AB=99=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=8C=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/api/consumer.ts | 5 + admin/src/components/popover-input/index.vue | 108 ++++++++++ admin/src/permission.ts | 2 +- admin/src/router/index.ts | 1 + admin/src/views/article/lists/index.vue | 13 +- admin/src/views/consumer/lists/detail.vue | 71 +++++- admin/src/views/consumer/lists/index.vue | 4 +- .../src/views/setting/website/information.vue | 74 ++++++- app/package-lock.json | 204 +++++++++--------- app/src/main.ts | 1 + app/src/pages/login/login.vue | 8 +- app/src/stores/app.ts | 4 +- app/yarn.lock | 79 +++---- 13 files changed, 399 insertions(+), 175 deletions(-) create mode 100644 admin/src/components/popover-input/index.vue diff --git a/admin/src/api/consumer.ts b/admin/src/api/consumer.ts index f38f0698..10577297 100644 --- a/admin/src/api/consumer.ts +++ b/admin/src/api/consumer.ts @@ -9,3 +9,8 @@ export function getUserList(params: any) { export function getUserDetail(params: any) { return request.get({ url: '/user/detail', params }) } + +// 用户编辑 +export function userEdit(params: any) { + return request.post({ url: '/user/edit', params }) +} diff --git a/admin/src/components/popover-input/index.vue b/admin/src/components/popover-input/index.vue new file mode 100644 index 00000000..a95d5a26 --- /dev/null +++ b/admin/src/components/popover-input/index.vue @@ -0,0 +1,108 @@ + + + + + + + + + + + + 取消 + 确定 + + + + + + + + + + + + + + diff --git a/admin/src/permission.ts b/admin/src/permission.ts index 2f553ecd..11bdcaeb 100644 --- a/admin/src/permission.ts +++ b/admin/src/permission.ts @@ -78,6 +78,6 @@ router.beforeEach(async (to, from, next) => { }) router.afterEach(() => { - // console.log(router.getRoutes()) + console.log(router.getRoutes()) NProgress.done() }) diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts index 69d3be48..9ed6e36e 100644 --- a/admin/src/router/index.ts +++ b/admin/src/router/index.ts @@ -86,6 +86,7 @@ export function findFirstValidRoute(routes: RouteRecordRaw[]): string | undefine } export function getRoutePath(perms: string) { + console.log(router.getRoutes()) console.log(router.getRoutes().find((item) => item.meta?.perms == perms)?.path) return router.getRoutes().find((item) => item.meta?.perms == perms)?.path || '' } diff --git a/admin/src/views/article/lists/index.vue b/admin/src/views/article/lists/index.vue index 637376e9..a6f27c5a 100644 --- a/admin/src/views/article/lists/index.vue +++ b/admin/src/views/article/lists/index.vue @@ -34,7 +34,7 @@ @@ -57,6 +57,12 @@ /> + @@ -64,10 +70,9 @@ diff --git a/admin/src/views/consumer/lists/detail.vue b/admin/src/views/consumer/lists/detail.vue index 7800438c..f7cd9932 100644 --- a/admin/src/views/consumer/lists/detail.vue +++ b/admin/src/views/consumer/lists/detail.vue @@ -10,11 +10,59 @@ {{ formData.sn }} - {{ formData.nickname }} - {{ formData.username }} - {{ formData.realName || '-' }} - {{ formData.sex }} - {{ formData.mobile || '-' }} + + {{ formData.nickname }} + + + {{ formData.username }} + + + + + + + + {{ formData.realName || '-' }} + + + + + + + + {{ formData.sex }} + + + + + + + + {{ formData.mobile || '-' }} + + + + + + {{ formData.channel }} {{ formData.createTime }} {{ formData.lastLoginTime }} @@ -25,7 +73,8 @@ diff --git a/admin/src/views/consumer/lists/index.vue b/admin/src/views/consumer/lists/index.vue index 8fab42b4..915c87b3 100644 --- a/admin/src/views/consumer/lists/index.vue +++ b/admin/src/views/consumer/lists/index.vue @@ -47,10 +47,10 @@ - + - - + + + 后台设置 - + 建议尺寸:100*100像素,支持jpg,jpeg,png格式 - + 建议尺寸:200*200像素,支持jpg,jpeg,png格式 - + 建议尺寸:400*400像素,支持jpg,jpeg,png格式 - - - + + + 商城设置 + + + + + + + + + 建议尺寸:100*100px,支持jpg,jpeg,png格式 + + + + 保存 @@ -51,7 +70,9 @@ const formData = reactive({ name: '', // 网站名称 favicon: '', // 网站图标 logo: '', // 网站logo - backdrop: '' // 登录页广告图 + backdrop: '', // 登录页广告图 + shopName: '', + shopLogo: '' }) // 表单验证 @@ -62,6 +83,41 @@ const rules = { message: '请输入网站名称', trigger: ['blur'] } + ], + favicon: [ + { + required: true, + message: '请选择网站图标', + trigger: ['change'] + } + ], + logo: [ + { + required: true, + message: '请选择网站logo', + trigger: ['change'] + } + ], + backdrop: [ + { + required: true, + message: '请选择登录页广告图', + trigger: ['change'] + } + ], + shopName: [ + { + required: true, + message: '请输入店铺/商城名称', + trigger: ['blur'] + } + ], + shopLogo: [ + { + required: true, + message: '请选择商城LOGO', + trigger: ['change'] + } ] } diff --git a/app/package-lock.json b/app/package-lock.json index 9feb4af5..06e9b088 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -22,7 +22,7 @@ "@dcloudio/uni-quickapp-webview": "^3.0.0-alpha-3050520220824001", "lodash-es": "^4.17.21", "pinia": "^2.0.20", - "uview-plus": "^3.1.6", + "uni-crazy-router": "^1.1.1", "vconsole": "^3.14.6", "vue": "^3.2.37", "vue-i18n": "^9.2.2", @@ -526,6 +526,11 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/runtime/node_modules/regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + }, "node_modules/@babel/standalone": { "version": "7.18.13", "resolved": "https://registry.npmmirror.com/@babel/standalone/-/standalone-7.18.13.tgz", @@ -1538,6 +1543,12 @@ "vite": "^2.8.0" } }, + "node_modules/@vitejs/plugin-legacy/node_modules/regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", + "dev": true + }, "node_modules/@vitejs/plugin-vue": { "version": "2.3.4", "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-2.3.4.tgz", @@ -2134,16 +2145,6 @@ "fsevents": "~2.3.2" } }, - "node_modules/clipboard": { - "version": "2.0.11", - "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz", - "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==", - "dependencies": { - "good-listener": "^1.2.2", - "select": "^1.1.2", - "tiny-emitter": "^2.0.0" - } - }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", @@ -2313,11 +2314,6 @@ "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.20.tgz", "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==" }, - "node_modules/dayjs": { - "version": "1.11.5", - "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz", - "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==" - }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz", @@ -2358,11 +2354,6 @@ "integrity": "sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==", "dev": true }, - "node_modules/delegate": { - "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz", - "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" - }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz", @@ -3149,14 +3140,6 @@ "node": ">=10" } }, - "node_modules/good-listener": { - "version": "1.2.2", - "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz", - "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==", - "dependencies": { - "delegate": "^3.1.2" - } - }, "node_modules/graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz", @@ -4249,6 +4232,16 @@ "node": ">=0.6" } }, + "node_modules/querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmmirror.com/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", + "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", + "peer": true, + "engines": { + "node": ">=0.4.x" + } + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -4307,9 +4300,10 @@ } }, "node_modules/regenerator-runtime": { - "version": "0.13.9", - "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + "version": "0.12.1", + "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", + "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==", + "peer": true }, "node_modules/regexpp": { "version": "3.2.0", @@ -4419,11 +4413,6 @@ "node": ">=12.0.0" } }, - "node_modules/select": { - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz", - "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" - }, "node_modules/semver": { "version": "7.3.7", "resolved": "https://registry.npmmirror.com/semver/-/semver-7.3.7.tgz", @@ -4723,11 +4712,6 @@ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, - "node_modules/tiny-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz", - "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" - }, "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -4824,6 +4808,15 @@ "node": ">=4.2.0" } }, + "node_modules/uni-crazy-router": { + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/uni-crazy-router/-/uni-crazy-router-1.1.1.tgz", + "integrity": "sha512-vxGq9AgSx85Ed6lkg1R5tQ1umTqluUhNDyMXE0lmdIVgCGRVblE/iaHoPKQmPgwvZTObVvVaHKQk0et5O44UWQ==", + "peerDependencies": { + "regenerator-runtime": "0.12.1", + "url": "^0.11.0" + } + }, "node_modules/universalify": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz", @@ -4870,6 +4863,22 @@ "punycode": "^2.1.0" } }, + "node_modules/url": { + "version": "0.11.0", + "resolved": "https://registry.npmmirror.com/url/-/url-0.11.0.tgz", + "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", + "peer": true, + "dependencies": { + "punycode": "1.3.2", + "querystring": "0.2.0" + } + }, + "node_modules/url/node_modules/punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmmirror.com/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==", + "peer": true + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -4884,18 +4893,6 @@ "node": ">= 0.4.0" } }, - "node_modules/uview-plus": { - "version": "3.1.6", - "resolved": "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.1.6.tgz", - "integrity": "sha512-C/JX3KBah0AcW6zg3y0nH/L3VphzE040npG7d6K58qFR9Mi+QBoPiHAG212DwzBP8vSYWrQ6K+3WgbPFKMULqw==", - "dependencies": { - "clipboard": "^2.0.11", - "dayjs": "^1.11.3" - }, - "engines": { - "HBuilderX": "^3.1.0" - } - }, "node_modules/v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", @@ -5668,6 +5665,13 @@ "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", "requires": { "regenerator-runtime": "^0.13.4" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + } } }, "@babel/standalone": { @@ -6505,6 +6509,14 @@ "magic-string": "^0.26.1", "regenerator-runtime": "^0.13.9", "systemjs": "^6.12.1" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", + "dev": true + } } }, "@vitejs/plugin-vue": { @@ -6990,16 +7002,6 @@ "readdirp": "~3.6.0" } }, - "clipboard": { - "version": "2.0.11", - "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz", - "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==", - "requires": { - "good-listener": "^1.2.2", - "select": "^1.1.2", - "tiny-emitter": "^2.0.0" - } - }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", @@ -7137,11 +7139,6 @@ "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.20.tgz", "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==" }, - "dayjs": { - "version": "1.11.5", - "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz", - "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==" - }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz", @@ -7171,11 +7168,6 @@ "integrity": "sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ==", "dev": true }, - "delegate": { - "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz", - "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" - }, "depd": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz", @@ -7797,14 +7789,6 @@ "slash": "^3.0.0" } }, - "good-listener": { - "version": "1.2.2", - "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz", - "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==", - "requires": { - "delegate": "^3.1.2" - } - }, "graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz", @@ -8604,6 +8588,12 @@ "side-channel": "^1.0.4" } }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmmirror.com/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", + "peer": true + }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -8650,9 +8640,10 @@ } }, "regenerator-runtime": { - "version": "0.13.9", - "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + "version": "0.12.1", + "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", + "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==", + "peer": true }, "regexpp": { "version": "3.2.0", @@ -8734,11 +8725,6 @@ "source-map-js": ">=0.6.2 <2.0.0" } }, - "select": { - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz", - "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" - }, "semver": { "version": "7.3.7", "resolved": "https://registry.npmmirror.com/semver/-/semver-7.3.7.tgz", @@ -8977,11 +8963,6 @@ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, - "tiny-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz", - "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" - }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -9047,6 +9028,12 @@ "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", "devOptional": true }, + "uni-crazy-router": { + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/uni-crazy-router/-/uni-crazy-router-1.1.1.tgz", + "integrity": "sha512-vxGq9AgSx85Ed6lkg1R5tQ1umTqluUhNDyMXE0lmdIVgCGRVblE/iaHoPKQmPgwvZTObVvVaHKQk0et5O44UWQ==", + "requires": {} + }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz", @@ -9081,6 +9068,24 @@ "punycode": "^2.1.0" } }, + "url": { + "version": "0.11.0", + "resolved": "https://registry.npmmirror.com/url/-/url-0.11.0.tgz", + "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==", + "peer": true, + "requires": { + "punycode": "1.3.2", + "querystring": "0.2.0" + }, + "dependencies": { + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmmirror.com/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==", + "peer": true + } + } + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -9092,15 +9097,6 @@ "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", "dev": true }, - "uview-plus": { - "version": "3.1.6", - "resolved": "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.1.6.tgz", - "integrity": "sha512-C/JX3KBah0AcW6zg3y0nH/L3VphzE040npG7d6K58qFR9Mi+QBoPiHAG212DwzBP8vSYWrQ6K+3WgbPFKMULqw==", - "requires": { - "clipboard": "^2.0.11", - "dayjs": "^1.11.3" - } - }, "v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", diff --git a/app/src/main.ts b/app/src/main.ts index 9857b486..3251d788 100644 --- a/app/src/main.ts +++ b/app/src/main.ts @@ -2,6 +2,7 @@ import { createSSRApp } from 'vue' import App from './App.vue' import plugins from './plugins' import './styles/index.scss' +import './router' export function createApp() { const app = createSSRApp(App) app.use(plugins) diff --git a/app/src/pages/login/login.vue b/app/src/pages/login/login.vue index 787bb3bc..f6ff2ab3 100644 --- a/app/src/pages/login/login.vue +++ b/app/src/pages/login/login.vue @@ -3,9 +3,9 @@ class="bg-white login min-h-full flex flex-col items-center px-[40rpx] pt-[80rpx] box-border" > - + - 这里是商城名称 + {{ appStore.config.website.name }} @@ -117,8 +117,9 @@ import { login } from '@/api/account' import { smsSend } from '@/api/app' import { SMSEnum } from '@/enums/appEnums' import { useLockFn } from '@/hooks/useLockFn' +import { useAppStore } from '@/stores/app' import { useUserStore } from '@/stores/user' -import { reactive, ref, shallowRef, watch } from 'vue' +import { reactive, ref, shallowRef } from 'vue' enum LoginTypeEnum { MOBILE = 'mobile', ACCOUNT = 'account', @@ -130,6 +131,7 @@ const codeTips = ref('') const isCheckAgreement = ref(false) const userStore = useUserStore() +const appStore = useAppStore() const formData = reactive({ username: '', password: '', diff --git a/app/src/stores/app.ts b/app/src/stores/app.ts index 4a98e27e..f5991586 100644 --- a/app/src/stores/app.ts +++ b/app/src/stores/app.ts @@ -7,7 +7,9 @@ interface AppSate { export const useAppStore = defineStore({ id: 'appStore', state: (): AppSate => ({ - config: {} + config: { + website: {} + } }), getters: {}, actions: { diff --git a/app/yarn.lock b/app/yarn.lock index 19392a66..a08b643e 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -1442,15 +1442,6 @@ optionalDependencies: "fsevents" "~2.3.2" -"clipboard@^2.0.11": - "integrity" "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==" - "resolved" "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz" - "version" "2.0.11" - dependencies: - "good-listener" "^1.2.2" - "select" "^1.1.2" - "tiny-emitter" "^2.0.0" - "color-convert@^1.9.0": "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==" "resolved" "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz" @@ -1580,11 +1571,6 @@ "resolved" "https://registry.npmmirror.com/csstype/-/csstype-2.6.20.tgz" "version" "2.6.20" -"dayjs@^1.11.3": - "integrity" "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==" - "resolved" "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz" - "version" "1.11.5" - "debug@^4.1.0", "debug@^4.1.1", "debug@^4.3.2", "debug@^4.3.3", "debug@^4.3.4": "integrity" "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==" "resolved" "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz" @@ -1616,11 +1602,6 @@ "resolved" "https://registry.npmmirror.com/defined/-/defined-1.0.0.tgz" "version" "1.0.0" -"delegate@^3.1.2": - "integrity" "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" - "resolved" "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz" - "version" "3.2.0" - "depd@2.0.0": "integrity" "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" "resolved" "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz" @@ -2157,13 +2138,6 @@ "merge2" "^1.4.1" "slash" "^3.0.0" -"good-listener@^1.2.2": - "integrity" "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==" - "resolved" "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz" - "version" "1.2.2" - dependencies: - "delegate" "^3.1.2" - "graceful-fs@^4.1.6", "graceful-fs@^4.2.0": "integrity" "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" "resolved" "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz" @@ -2882,6 +2856,11 @@ "resolved" "https://registry.npmmirror.com/punycode/-/punycode-2.1.1.tgz" "version" "2.1.1" +"punycode@1.3.2": + "integrity" "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" + "resolved" "https://registry.npmmirror.com/punycode/-/punycode-1.3.2.tgz" + "version" "1.3.2" + "qrcode-reader@^1.0.4": "integrity" "sha512-rRjALGNh9zVqvweg1j5OKIQKNsw3bLC+7qwlnead5K/9cb1cEIAGkwikt/09U0K+2IDWGD9CC6SP7tHAjUeqvQ==" "resolved" "https://registry.npmmirror.com/qrcode-reader/-/qrcode-reader-1.0.4.tgz" @@ -2899,6 +2878,11 @@ dependencies: "side-channel" "^1.0.4" +"querystring@0.2.0": + "integrity" "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==" + "resolved" "https://registry.npmmirror.com/querystring/-/querystring-0.2.0.tgz" + "version" "0.2.0" + "queue-microtask@^1.2.2": "integrity" "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" "resolved" "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz" @@ -2938,11 +2922,21 @@ dependencies: "picomatch" "^2.2.1" -"regenerator-runtime@^0.13.4", "regenerator-runtime@^0.13.9": +"regenerator-runtime@^0.13.4": "integrity" "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" "resolved" "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz" "version" "0.13.9" +"regenerator-runtime@^0.13.9": + "integrity" "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + "resolved" "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz" + "version" "0.13.9" + +"regenerator-runtime@0.12.1": + "integrity" "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==" + "resolved" "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz" + "version" "0.12.1" + "regexpp@^3.2.0": "integrity" "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==" "resolved" "https://registry.npmmirror.com/regexpp/-/regexpp-3.2.0.tgz" @@ -3017,11 +3011,6 @@ "immutable" "^4.0.0" "source-map-js" ">=0.6.2 <2.0.0" -"select@^1.1.2": - "integrity" "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" - "resolved" "https://registry.npmmirror.com/select/-/select-1.1.2.tgz" - "version" "1.1.2" - "semver@^6.3.0": "integrity" "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" "resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz" @@ -3208,11 +3197,6 @@ "resolved" "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz" "version" "0.2.0" -"tiny-emitter@^2.0.0": - "integrity" "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" - "resolved" "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz" - "version" "2.1.0" - "to-fast-properties@^2.0.0": "integrity" "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==" "resolved" "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz" @@ -3267,6 +3251,11 @@ "resolved" "https://registry.npmmirror.com/typescript/-/typescript-4.7.4.tgz" "version" "4.7.4" +"uni-crazy-router@^1.1.1": + "integrity" "sha512-vxGq9AgSx85Ed6lkg1R5tQ1umTqluUhNDyMXE0lmdIVgCGRVblE/iaHoPKQmPgwvZTObVvVaHKQk0et5O44UWQ==" + "resolved" "https://registry.npmmirror.com/uni-crazy-router/-/uni-crazy-router-1.1.1.tgz" + "version" "1.1.1" + "universalify@^2.0.0": "integrity" "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" "resolved" "https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz" @@ -3297,6 +3286,14 @@ dependencies: "punycode" "^2.1.0" +"url@^0.11.0": + "integrity" "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==" + "resolved" "https://registry.npmmirror.com/url/-/url-0.11.0.tgz" + "version" "0.11.0" + dependencies: + "punycode" "1.3.2" + "querystring" "0.2.0" + "util-deprecate@^1.0.2": "integrity" "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" "resolved" "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz" @@ -3307,14 +3304,6 @@ "resolved" "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz" "version" "1.0.1" -"uview-plus@^3.1.6": - "integrity" "sha512-C/JX3KBah0AcW6zg3y0nH/L3VphzE040npG7d6K58qFR9Mi+QBoPiHAG212DwzBP8vSYWrQ6K+3WgbPFKMULqw==" - "resolved" "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.1.6.tgz" - "version" "3.1.6" - dependencies: - "clipboard" "^2.0.11" - "dayjs" "^1.11.3" - "v8-compile-cache@^2.0.3": "integrity" "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==" "resolved" "https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"