From 3ec25129d388bcf78abd695b451fc9221b3a780e Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Wed, 5 Nov 2025 15:11:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E4=BA=86=E9=A2=91=E9=81=93=E7=AE=A1=E7=90=86=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E5=92=8C=E7=9B=B8=E5=85=B3=E7=9A=84=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E9=85=8D=E7=BD=AE=EF=BC=88=E4=B8=8B=E4=B8=80=E6=AD=A5?= =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=BD=95=E6=98=BE=E7=A4=BA/=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E7=BC=96=E5=86=99=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 30 ++++++++++++++++++++++++++++++ src/views/channelManage/cart/cart.vue | 0 src/views/channelManage/fans/fans.vue | 0 src/views/channelManage/reward/reward.vue | 0 4 files changed, 30 insertions(+) create mode 100644 src/views/channelManage/cart/cart.vue create mode 100644 src/views/channelManage/fans/fans.vue create mode 100644 src/views/channelManage/reward/reward.vue diff --git a/src/router/index.js b/src/router/index.js index 4221c65..e663733 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -296,6 +296,7 @@ const routes = [ } ] }, + // 现金管理 { path: '/moneyManage', name: 'moneyManage', @@ -376,6 +377,35 @@ const routes = [ }, ] }, + // 频道管理 + { + path: '/channelManage', + name: 'channelManage', + meta: { permissionId: 124 }, + children: [ + // 打赏 + { + path: 'reward', + name: "reward", + component: () => import("../views/channelManage/reward/reward.vue"), + meta: { permissionId: 125 } + }, + // 铁粉 + { + path: 'fans', + name: "fans", + component: () => import("../views/channelManage/fans/fans.vue"), + meta: { permissionId: 126 } + }, + // 购物车 + { + path: 'cart', + name: "cart", + component: () => import("../views/channelManage/cart/cart.vue"), + meta: { permissionId: 127 } + } + ] + }, // 没有权限 { path: '/noPermission', diff --git a/src/views/channelManage/cart/cart.vue b/src/views/channelManage/cart/cart.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/channelManage/fans/fans.vue b/src/views/channelManage/fans/fans.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/channelManage/reward/reward.vue b/src/views/channelManage/reward/reward.vue new file mode 100644 index 0000000..e69de29 From fdca8550d223d97dab28a23cfcdf7f783c0e7485 Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Wed, 5 Nov 2025 18:14:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moneyManage/receiveDetail/receiveFinance.vue | 440 +++-- .../moneyManage/receiveDetail/receiveManage.vue | 1808 ++++++++++---------- .../moneyManage/receiveDetail/receiveService.vue | 5 +- .../receiveDetail/utils/recriveFormRules.js | 1 - 4 files changed, 1113 insertions(+), 1141 deletions(-) diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index 84e93d8..f9b9bd2 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -840,328 +840,292 @@ const handlePagination = (type, val) => { \ No newline at end of file diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue index 33dc1a4..bebc793 100644 --- a/src/views/moneyManage/receiveDetail/receiveManage.vue +++ b/src/views/moneyManage/receiveDetail/receiveManage.vue @@ -1,285 +1,285 @@ \ No newline at end of file diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index 5b8b0f0..381c976 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -198,7 +198,10 @@ - + + + diff --git a/src/views/moneyManage/receiveDetail/utils/recriveFormRules.js b/src/views/moneyManage/receiveDetail/utils/recriveFormRules.js index 7cda280..12589fc 100644 --- a/src/views/moneyManage/receiveDetail/utils/recriveFormRules.js +++ b/src/views/moneyManage/receiveDetail/utils/recriveFormRules.js @@ -15,7 +15,6 @@ export const addFormRule = { // 活动名称:必填 + 长度小于30 activity: [ { required: true, message: '请输入活动名称', trigger: 'blur' }, - { max: 30, message: '活动名称长度不能超过30个字符', trigger: 'blur' } ], // 产品名称:必填 goodsName: [ From 45765f270f35035f5cba7000d900304293dc140f Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Thu, 6 Nov 2025 09:25:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=A6=84=20refactor:=20=E5=90=88?= =?UTF-8?q?=E5=B9=B6router?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/router/index.js b/src/router/index.js index 9e0f9f1..4c20539 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -412,6 +412,7 @@ const routes = [ } ] }, + // 活动管理 { path: 'activityManage', name: "activityManage", From 38dd73dc54cddc6976a6671926652aa225412213 Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Thu, 6 Nov 2025 09:45:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/MoneyManage/CurrencySelect.vue | 1 + src/views/moneyManage/receiveDetail/receiveService.vue | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/components/MoneyManage/CurrencySelect.vue b/src/components/MoneyManage/CurrencySelect.vue index d10bbb4..f0a01ba 100644 --- a/src/components/MoneyManage/CurrencySelect.vue +++ b/src/components/MoneyManage/CurrencySelect.vue @@ -313,6 +313,7 @@ watch(() => props.modelValue, (newVal) => { border: none; border-radius: 10px; background-color: #fff; + box-shadow:0 0 0 1px rgba(200, 200, 200, 0.3) ; font-size: 12px; font-style: normal; font-weight: 700; diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index 381c976..c71cf4d 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -20,7 +20,6 @@ -
订单状态 @@ -55,7 +54,6 @@ @change="handleDatePickerChange" :default-time="defaultTime" :disabled-date="disabledDate" />
-
查询 重置 @@ -124,7 +122,6 @@ -