From 73b918b4e9c2af6a571ced7f2653c254b6e0182c Mon Sep 17 00:00:00 2001 From: puhui999 Date: Tue, 1 Aug 2023 10:23:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=20combinationActi?= =?UTF-8?q?vity.data.ts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/combinationActivity.data.ts | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/views/mall/promotion/combination/activity/combinationActivity.data.ts b/src/views/mall/promotion/combination/activity/combinationActivity.data.ts index 2ddb8d19..b426649d 100644 --- a/src/views/mall/promotion/combination/activity/combinationActivity.data.ts +++ b/src/views/mall/promotion/combination/activity/combinationActivity.data.ts @@ -9,11 +9,6 @@ export const rules = reactive({ startTime: [required], endTime: [required], userSize: [required], - totalNum: [required], - successNum: [required], - orderUserCount: [required], - virtualGroup: [required], - status: [required], limitDuration: [required] }) @@ -58,7 +53,7 @@ const crudSchemas = reactive([ }, { label: '参与人数', - field: 'orderUserCount', + field: 'userSize', isSearch: false, form: { component: 'InputNumber', @@ -117,13 +112,6 @@ const crudSchemas = reactive([ isSearch: false, isForm: false }, - { - label: '虚拟成团', - field: 'virtualGroup', - isSearch: false, - isTable: false, - isForm: false - }, { label: '活动状态', field: 'status', From 39df9be98837dfb4f91fa3d9547cae6013a41379 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Wed, 2 Aug 2023 23:05:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8E=E5=89=8D=E7=AB=AF=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E5=90=AF=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/store/modules/permission.ts | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index e6be32f8..abfbf701 100644 --- a/package.json +++ b/package.json @@ -128,6 +128,7 @@ "vite-plugin-purge-icons": "^0.9.2", "vite-plugin-svg-icons": "^2.0.1", "vite-plugin-top-level-await": "^1.3.1", + "vue-eslint-parser": "^9.3.1", "vue-tsc": "^1.8.8" }, "license": "MIT", diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index 5f24a767..c729cea0 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -2,7 +2,7 @@ import { defineStore } from 'pinia' import { store } from '../index' import { cloneDeep } from 'lodash-es' import remainingRouter from '@/router/modules/remaining' -import { generateRoute, flatMultiLevelRoutes } from '@/utils/routerHelper' +import { flatMultiLevelRoutes, generateRoute } from '@/utils/routerHelper' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' const { wsCache } = useCache() @@ -34,11 +34,11 @@ export const usePermissionStore = defineStore('permission', { async generateRoutes(): Promise { return new Promise(async (resolve) => { // 获得菜单列表，它在登录的时候，setUserInfoAction 方法中已经进行获取 - let res: AppCustomRouteRecordRaw[] + let res: AppCustomRouteRecordRaw[] = [] if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) { res = wsCache.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[] } - const routerMap: AppRouteRecordRaw[] = generateRoute(res as AppCustomRouteRecordRaw[]) + const routerMap: AppRouteRecordRaw[] = generateRoute(res) // 动态路由，404一定要放到最后面 this.addRouters = routerMap.concat([ { From c327f79177f000edab15c8304d73ed5bc7c910bd Mon Sep 17 00:00:00 2001 From: puhui999 Date: Wed, 2 Aug 2023 23:58:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20combinationActivity=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tionactivity.ts => combinationActivity.ts} | 2 - .../CombinationActivityForm.vue | 5 +- .../combinationActivity.data.ts | 50 +++++++++++++------ .../combination/{activity => }/index.vue | 10 ++-- 4 files changed, 43 insertions(+), 24 deletions(-) rename src/api/mall/promotion/combination/{combinationactivity.ts => combinationActivity.ts} (97%) rename src/views/mall/promotion/combination/{activity => }/CombinationActivityForm.vue (98%) rename src/views/mall/promotion/combination/{activity => }/combinationActivity.data.ts (75%) rename src/views/mall/promotion/combination/{activity => }/index.vue (89%) diff --git a/src/api/mall/promotion/combination/combinationactivity.ts b/src/api/mall/promotion/combination/combinationActivity.ts similarity index 97% rename from src/api/mall/promotion/combination/combinationactivity.ts rename to src/api/mall/promotion/combination/combinationActivity.ts index 71d5d2a4..1e211c86 100644 --- a/src/api/mall/promotion/combination/combinationactivity.ts +++ b/src/api/mall/promotion/combination/combinationActivity.ts @@ -1,8 +1,6 @@ import request from '@/config/axios' import { Sku, Spu } from '@/api/mall/product/spu' -// TODO @puhui999: combinationActivity.ts - export interface CombinationActivityVO { id?: number name?: string diff --git a/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue b/src/views/mall/promotion/combination/CombinationActivityForm.vue similarity index 98% rename from src/views/mall/promotion/combination/activity/CombinationActivityForm.vue rename to src/views/mall/promotion/combination/CombinationActivityForm.vue index 115f8fd4..265eb98e 100644 --- a/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue +++ b/src/views/mall/promotion/combination/CombinationActivityForm.vue @@ -6,6 +6,7 @@ :is-col="true" :rules="rules" :schema="allSchemas.formSchema" + class="mt-10px" >