From 4ff36649632c609587f5896dbab791501eb62200 Mon Sep 17 00:00:00 2001 From: woody Date: Thu, 24 Apr 2025 19:37:56 +0800 Subject: [PATCH 01/15] =?UTF-8?q?chore(env):=20=E6=9B=B4=E6=96=B0=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E5=AE=A2=E6=88=B7=E7=AB=AF=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index 28ab620..402a0de 100644 --- a/.env.production +++ b/.env.production @@ -3,8 +3,8 @@ ENV = 'production' # base api VUE_APP_BASE_API = '/prod-api' -VUE_APP_CLIENT_ADDRESS = 'http://t-app.beida413.com/#/' -VUE_APP_APP_ADDRESS = 'http://t-app.beida413.com/#/' +VUE_APP_CLIENT_ADDRESS = 'http://app.beida413.com/#/' +VUE_APP_APP_ADDRESS = 'http://app.beida413.com/#/' # 打包: # npm run build:prod From b55c1469ca9f8a23b9f6223f8dcadb4e3b5d5d03 Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 28 May 2025 16:45:28 +0800 Subject: [PATCH 02/15] =?UTF-8?q?fix(supplierSet):=20=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=B1=BB=E5=9E=8B=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20bug-130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/supply.js | 8 ++++++++ src/views/system/supplierSet/index.vue | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/src/api/supply.js b/src/api/supply.js index 7edf911..934bf6f 100644 --- a/src/api/supply.js +++ b/src/api/supply.js @@ -64,6 +64,14 @@ export function supplierProduct(params) { }) } +// 供应商类型 +export function getCustTypeList(params) { + return request({ + url: '/system/pub/enums/supply-type', + method: 'get', + params + }) +} // 供应商管理列表 export function getSupplierList(params) { return request({ diff --git a/src/views/system/supplierSet/index.vue b/src/views/system/supplierSet/index.vue index 98f4e84..7c04726 100644 --- a/src/views/system/supplierSet/index.vue +++ b/src/views/system/supplierSet/index.vue @@ -351,6 +351,12 @@ export default { site.areaList().then((res) => { this.areaData = res.data }) + this.getCustTypeList() + }, + getCustTypeList() { + api.getCustTypeList().then((res) => { + this.custTypeList = res.data + }) }, reset() { this.select = {} From 7bb1edc0ff61795629a6eed49c1870cea4944750 Mon Sep 17 00:00:00 2001 From: woody Date: Tue, 3 Jun 2025 09:10:30 +0800 Subject: [PATCH 03/15] =?UTF-8?q?fix(underDirect):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BC=9E=E4=B8=8B=E4=BC=9A=E5=91=98=E7=BC=96=E5=8F=B7=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=BC=96=E8=BE=91=20bug-140?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/announcement/noticeList/details.vue | 8 ++++---- src/views/statistics/underDirectAdd.vue | 3 ++- src/views/statistics/underDirectAddNew.vue | 3 ++- src/views/statistics/underPlacementPer.vue | 3 ++- src/views/statistics/underPlacementPerNew.vue | 3 ++- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/views/announcement/noticeList/details.vue b/src/views/announcement/noticeList/details.vue index 438e189..b61f64e 100644 --- a/src/views/announcement/noticeList/details.vue +++ b/src/views/announcement/noticeList/details.vue @@ -295,10 +295,10 @@ export default { label: '会员系统', value: 0 }, - { - label: '海圣优选', - value: 1 - }, + // { + // label: '海圣优选', + // value: 1 + // }, { label: '全部', value: 9 diff --git a/src/views/statistics/underDirectAdd.vue b/src/views/statistics/underDirectAdd.vue index 382d1ef..891961b 100644 --- a/src/views/statistics/underDirectAdd.vue +++ b/src/views/statistics/underDirectAdd.vue @@ -280,7 +280,8 @@ export default { return { creationTime: [], select: { - orderType: 1 + orderType: 1, + memberCode: '' }, // 查询参数 queryParams: { diff --git a/src/views/statistics/underDirectAddNew.vue b/src/views/statistics/underDirectAddNew.vue index 128a321..3489f51 100644 --- a/src/views/statistics/underDirectAddNew.vue +++ b/src/views/statistics/underDirectAddNew.vue @@ -240,7 +240,8 @@ export default { return { creationTime: [], select: { - orderType: 1 + orderType: 1, + memberCode: '' }, // 查询参数 queryParams: { diff --git a/src/views/statistics/underPlacementPer.vue b/src/views/statistics/underPlacementPer.vue index dbc37b6..2a32d4b 100644 --- a/src/views/statistics/underPlacementPer.vue +++ b/src/views/statistics/underPlacementPer.vue @@ -282,7 +282,8 @@ export default { queryParams: { pageNum: 1, pageSize: 50, - thetimes: [] + thetimes: [], + memberCode: '' }, total: 0, multipleSelection: [], diff --git a/src/views/statistics/underPlacementPerNew.vue b/src/views/statistics/underPlacementPerNew.vue index 6afdbca..8f7b975 100644 --- a/src/views/statistics/underPlacementPerNew.vue +++ b/src/views/statistics/underPlacementPerNew.vue @@ -279,7 +279,8 @@ export default { queryParams: { pageNum: 1, pageSize: 50, - thetimes: [] + thetimes: [], + memberCode: '' }, total: 0, multipleSelection: [], From bcf03ebb244051f178f72654d81d326f42b5b700 Mon Sep 17 00:00:00 2001 From: woody Date: Thu, 5 Jun 2025 10:19:09 +0800 Subject: [PATCH 04/15] =?UTF-8?q?feat(bonusDetail):=20=E4=B9=90=E5=AD=A6?= =?UTF-8?q?=E7=8E=AF=E5=A2=83-=E5=A5=96=E9=87=91=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=8F=8A=E6=B1=87=E6=80=BB=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../settlementCenter/bonusDetail/index.vue | 64 +---------- .../settlementCenter/totalBonus/index.vue | 104 +----------------- 2 files changed, 7 insertions(+), 161 deletions(-) diff --git a/src/views/settlementCenter/bonusDetail/index.vue b/src/views/settlementCenter/bonusDetail/index.vue index 5a44196..7fef29f 100644 --- a/src/views/settlementCenter/bonusDetail/index.vue +++ b/src/views/settlementCenter/bonusDetail/index.vue @@ -171,21 +171,12 @@ :formatter="stateFormat" /> - - @@ -213,23 +204,6 @@ :label="'复购辅导收益' + `(${isLocalSymbol()})`" :formatter="stateFormat" /> - - - - - - - - - - - - + - - - - - + - - - - - + + + {{ scope.row.approveStateVal }} + + + From 65680e8df42d5b5014781920c60d5eb0d95e549a Mon Sep 17 00:00:00 2001 From: woody Date: Thu, 5 Jun 2025 09:23:57 +0800 Subject: [PATCH 06/15] =?UTF-8?q?feat(recharge):=20=E5=85=85=E5=80=BC?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=BE=93=E5=85=A5=E8=B4=9F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/financial/recharge/doubleCz.vue | 261 +++++++++++----------- src/views/financial/recharge/singleCz.vue | 170 +++++++------- 2 files changed, 218 insertions(+), 213 deletions(-) diff --git a/src/views/financial/recharge/doubleCz.vue b/src/views/financial/recharge/doubleCz.vue index 29dd5b5..2f8f7af 100644 --- a/src/views/financial/recharge/doubleCz.vue +++ b/src/views/financial/recharge/doubleCz.vue @@ -5,12 +5,16 @@ @@ -19,21 +23,21 @@ + /> + /> @@ -41,19 +45,17 @@ class="my_search" style="margin-left: 30px" @click="getList" - > {{ '搜索' }} + > {{ '搜索' }} {{ '重置' }} {{ item.label }} + :label="item.value" + >{{ item.label }} - + /> - + /> @@ -141,12 +143,11 @@ @@ -170,223 +171,225 @@ :auto-upload="false" drag > - +
- {{'将文件拖到此处,或'}} - {{'点击上传'}} + {{ '将文件拖到此处,或' }} + {{ '点击上传' }}
-
- {{ '下载模板' }} +
+ {{ '下载模板' }}
-
- {{'提示:仅允许导入“xls”或“xlsx”格式文件!'}} +
+ {{ '提示:仅允许导入“xls”或“xlsx”格式文件!' }}
-