From c605d0619d1f5c0436a4e32dd046f5ab56756f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 26 Jan 2026 21:14:04 +0800
Subject: [PATCH] =?UTF-8?q?chore(env):=20=E5=90=AF=E7=94=A8=E5=BC=80?=
=?UTF-8?q?=E5=8F=91=E7=8E=AF=E5=A2=83API=E5=9C=B0=E5=9D=80=E5=B9=B6?=
=?UTF-8?q?=E6=B8=85=E7=90=86=E5=86=97=E4=BD=99=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 启用 .env.development 中的 VITE_API_URL 配置
- 删除 src/views/glt/shopDealerOrder/components/Import.vue 文件
- 删除 src/views/glt/shopDealerOrder2/components/Import.vue 文件
- 删除 src/views/glt/shopDealerWithdraw/components/Import.vue 文件
- 删除 src/views/glt/shopDealerApply/index.vue 文件
- 删除 src/views/glt/shopDealerCapital/index.vue 文件
- 删除 src/views/glt/shopDealerOrder/index.vue 文件
- 从 shopDealerOrder 组件中移除导入模板说明信息
---
.env.development | 2 +-
.../glt/shopDealerApply/components/search.vue | 158 ----
.../components/shopDealerApplyEdit.vue | 645 ----------------
src/views/glt/shopDealerApply/index.vue | 458 ------------
.../shopDealerCapital/components/search.vue | 117 ---
.../components/shopDealerCapitalEdit.vue | 406 ----------
src/views/glt/shopDealerCapital/index.vue | 295 --------
.../glt/shopDealerOrder/components/Import.vue | 89 ---
.../glt/shopDealerOrder/components/search.vue | 182 -----
.../components/shopDealerOrderEdit.vue | 363 ---------
src/views/glt/shopDealerOrder/index.vue | 448 -----------
.../shopDealerOrder2/components/Import.vue | 79 --
.../shopDealerOrder2/components/search.vue | 143 ----
.../components/shopDealerOrderEdit.vue | 333 ---------
src/views/glt/shopDealerOrder2/index.vue | 500 -------------
.../components/RefereeTree.vue | 204 -----
.../shopDealerReferee/components/search.vue | 185 -----
.../components/shopDealerRefereeEdit.vue | 158 ----
src/views/glt/shopDealerReferee/index.vue | 563 --------------
.../shopDealerWithdraw/components/Import.vue | 89 ---
.../shopDealerWithdraw/components/search.vue | 101 ---
.../components/shopDealerWithdrawEdit.vue | 697 ------------------
src/views/glt/shopDealerWithdraw/index.vue | 464 ------------
.../shopDealerApplyRs/components/search.vue | 0
.../components/shop-dealer-apply-import.vue | 0
.../components/shopDealerApplyEdit.vue | 0
.../{glt => shop}/shopDealerApplyRs/index.vue | 0
.../shopDealerCapital/components/search.vue | 101 ++-
src/views/shop/shopDealerCapital/index.vue | 45 +-
.../shopDealerOrder/components/Import.vue | 10 -
.../shopDealerOrder/components/search.vue | 285 ++++---
.../components/shopDealerOrderEdit.vue | 76 +-
src/views/shop/shopDealerOrder/index.vue | 179 +++--
.../shopDealerUser/components/search.vue | 0
.../components/shopDealerApplyEdit.vue | 0
.../{glt => shop}/shopDealerUser/index.vue | 0
36 files changed, 373 insertions(+), 7002 deletions(-)
delete mode 100644 src/views/glt/shopDealerApply/components/search.vue
delete mode 100644 src/views/glt/shopDealerApply/components/shopDealerApplyEdit.vue
delete mode 100644 src/views/glt/shopDealerApply/index.vue
delete mode 100644 src/views/glt/shopDealerCapital/components/search.vue
delete mode 100644 src/views/glt/shopDealerCapital/components/shopDealerCapitalEdit.vue
delete mode 100644 src/views/glt/shopDealerCapital/index.vue
delete mode 100644 src/views/glt/shopDealerOrder/components/Import.vue
delete mode 100644 src/views/glt/shopDealerOrder/components/search.vue
delete mode 100644 src/views/glt/shopDealerOrder/components/shopDealerOrderEdit.vue
delete mode 100644 src/views/glt/shopDealerOrder/index.vue
delete mode 100644 src/views/glt/shopDealerOrder2/components/Import.vue
delete mode 100644 src/views/glt/shopDealerOrder2/components/search.vue
delete mode 100644 src/views/glt/shopDealerOrder2/components/shopDealerOrderEdit.vue
delete mode 100644 src/views/glt/shopDealerOrder2/index.vue
delete mode 100644 src/views/glt/shopDealerReferee/components/RefereeTree.vue
delete mode 100644 src/views/glt/shopDealerReferee/components/search.vue
delete mode 100644 src/views/glt/shopDealerReferee/components/shopDealerRefereeEdit.vue
delete mode 100644 src/views/glt/shopDealerReferee/index.vue
delete mode 100644 src/views/glt/shopDealerWithdraw/components/Import.vue
delete mode 100644 src/views/glt/shopDealerWithdraw/components/search.vue
delete mode 100644 src/views/glt/shopDealerWithdraw/components/shopDealerWithdrawEdit.vue
delete mode 100644 src/views/glt/shopDealerWithdraw/index.vue
rename src/views/{glt => shop}/shopDealerApplyRs/components/search.vue (100%)
rename src/views/{glt => shop}/shopDealerApplyRs/components/shop-dealer-apply-import.vue (100%)
rename src/views/{glt => shop}/shopDealerApplyRs/components/shopDealerApplyEdit.vue (100%)
rename src/views/{glt => shop}/shopDealerApplyRs/index.vue (100%)
rename src/views/{glt => shop}/shopDealerUser/components/search.vue (100%)
rename src/views/{glt => shop}/shopDealerUser/components/shopDealerApplyEdit.vue (100%)
rename src/views/{glt => shop}/shopDealerUser/index.vue (100%)
diff --git a/.env.development b/.env.development
index b8ccd8b..fbcc74b 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
VITE_APP_NAME=后台管理(开发环境)
-#VITE_API_URL=http://127.0.0.1:9200/api
+VITE_API_URL=http://127.0.0.1:9200/api
#VITE_SERVER_API_URL=http://127.0.0.1:8000/api
diff --git a/src/views/glt/shopDealerApply/components/search.vue b/src/views/glt/shopDealerApply/components/search.vue
deleted file mode 100644
index 054a3a1..0000000
--- a/src/views/glt/shopDealerApply/components/search.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 跟进中
- 已签约
- 已取消
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
-
- 重置
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerApply/components/shopDealerApplyEdit.vue b/src/views/glt/shopDealerApply/components/shopDealerApplyEdit.vue
deleted file mode 100644
index 777e3b3..0000000
--- a/src/views/glt/shopDealerApply/components/shopDealerApplyEdit.vue
+++ /dev/null
@@ -1,645 +0,0 @@
-
-
-
-
-
-
- 客户信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 报备人信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 审核状态
-
-
-
-
-
-
-
- 跟进中
- 正在跟进中
-
-
- 已签约
- 客户已签约
-
-
- 已取消
- 客户已取消
-
-
-
-
-
-
-
-
-
-
-
-
-
- 跟进情况
-
-
-
-
-
- 历史跟进记录
-
-
-
-
跟进 #{{ historyRecords.length - index }}
- {{
- record.createTime
- }}
-
删除
-
-
- {{ record.content }}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerApply/index.vue b/src/views/glt/shopDealerApply/index.vue
deleted file mode 100644
index 5eaa246..0000000
--- a/src/views/glt/shopDealerApply/index.vue
+++ /dev/null
@@ -1,458 +0,0 @@
-
- $router.go(-1)">
-
-
-
-
-
-
-
- 跟进中
- 已签约
- 已取消
-
-
-
- {{ record.dealerName }}
- 联系人:{{ record.realName }}
- 联系电话:{{ record.mobile }}
- 户号:{{ record.dealerCode }}
-
-
-
- {{ record.nickName }}
- {{ record.phone }}
- {{ record.rate }}
-
-
- {{ record.comments }}
- {{
- record.updateTime
- }}
-
-
-
- {{ record.createTime }}
- 保护期:7天
-
-
-
-
-
- 编辑
-
-
-
-
-
- 已签约
-
-
-
-
- 驳回
-
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerCapital/components/search.vue b/src/views/glt/shopDealerCapital/components/search.vue
deleted file mode 100644
index ad1a2c6..0000000
--- a/src/views/glt/shopDealerCapital/components/search.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
- 导出xls
-
-
-
-
diff --git a/src/views/glt/shopDealerCapital/components/shopDealerCapitalEdit.vue b/src/views/glt/shopDealerCapital/components/shopDealerCapitalEdit.vue
deleted file mode 100644
index 35917d9..0000000
--- a/src/views/glt/shopDealerCapital/components/shopDealerCapitalEdit.vue
+++ /dev/null
@@ -1,406 +0,0 @@
-
-
-
-
-
-
- 基本信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 资金流动信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 元
-
-
-
-
-
-
-
-
-
-
-
- 关联信息
-
-
-
-
-
- 转账相关操作需要填写对方用户ID
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerCapital/index.vue b/src/views/glt/shopDealerCapital/index.vue
deleted file mode 100644
index e73f34a..0000000
--- a/src/views/glt/shopDealerCapital/index.vue
+++ /dev/null
@@ -1,295 +0,0 @@
-
- $router.go(-1)">
-
-
-
-
-
-
-
-
-
-
- 显示
- 隐藏
-
-
-
- 修改
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerOrder/components/Import.vue b/src/views/glt/shopDealerOrder/components/Import.vue
deleted file mode 100644
index 5f99953..0000000
--- a/src/views/glt/shopDealerOrder/components/Import.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
- 将文件拖到此处,或点击上传
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerOrder/components/search.vue b/src/views/glt/shopDealerOrder/components/search.vue
deleted file mode 100644
index 355d4c3..0000000
--- a/src/views/glt/shopDealerOrder/components/search.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- 批量删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 重置
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 导入数据
-
-
-
-
-
- 批量结算
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerOrder/components/shopDealerOrderEdit.vue b/src/views/glt/shopDealerOrder/components/shopDealerOrderEdit.vue
deleted file mode 100644
index 7f8420e..0000000
--- a/src/views/glt/shopDealerOrder/components/shopDealerOrderEdit.vue
+++ /dev/null
@@ -1,363 +0,0 @@
-
-
-
-
-
-
- 基本信息
-
-
-
-
-
- {{ form.title }}
-
-
-
-
- {{ form.orderNo }}
-
-
-
-
- {{ parseFloat(form.orderPrice || 0).toFixed(2) }}
-
-
-
-
- {{ parseFloat(form.degreePrice || 0).toFixed(2) }}
-
-
-
-
- {{ form.rate }}
-
-
-
-
- {{ form.price }}
-
-
-
-
- {{ parseFloat(form.settledPrice || 0).toFixed(2) }}
-
-
-
-
- {{ parseFloat(form.payPrice || 0).toFixed(2) }}
-
-
-
- 开发调试
-
-
业务员({{ form.userId }}):{{ form.nickname }}
-
一级分销商({{ form.firstUserId }}):{{
- form.firstNickname
- }},一级佣金30%:{{ form.firstMoney }}
-
二级分销商({{ form.secondUserId }}):{{
- form.secondNickname
- }},二级佣金10%:{{ form.secondMoney }}
-
三级分销商({{ form.thirdUserId }}):{{
- form.thirdNickname
- }},三级佣金60%:{{ form.thirdMoney }}
-
-
-
- 收益计算
-
-
-
-
-
- 一级佣金30%
-
-
-
-
- {{ form.firstUserId }}
-
-
- {{ form.firstNickname }}
-
-
-
-
- {{ '30%' }}
-
-
- {{ form.firstMoney }}
-
-
-
-
-
-
-
-
- 二级佣金10%
-
-
-
-
- {{ form.secondUserId }}
-
-
- {{ form.secondNickname }}
-
-
-
- 10%
-
- {{ form.secondMoney }}
-
-
-
-
-
-
-
-
- 三级佣金60%
-
-
-
-
- {{ form.thirdUserId }}
-
-
- {{ form.thirdNickname }}
-
-
-
-
- {{ '60%' }}
-
-
- {{ form.thirdMoney }}
-
-
-
-
-
-
- {{ form.settleTime }}
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerOrder/index.vue b/src/views/glt/shopDealerOrder/index.vue
deleted file mode 100644
index b3950f8..0000000
--- a/src/views/glt/shopDealerOrder/index.vue
+++ /dev/null
@@ -1,448 +0,0 @@
-
- $router.go(-1)">
-
-
-
-
-
-
-
- {{ record.title }}
- 用户ID:{{ record.userId }}
-
-
-
- {{ record.orderPrice.toFixed(2) }}
-
-
-
- {{ record.degreePrice.toFixed(2) }}
-
-
-
- {{ record.price }}
-
-
-
- {{ record.settledPrice.toFixed(2) }}
-
-
-
- {{ record.payPrice.toFixed(2) }}
-
-
-
-
-
-
一级
- 用户{{ record.firstUserId }} - ¥{{
- parseFloat(record.firstMoney || '0').toFixed(2)
- }}
-
-
-
二级
- 用户{{ record.secondUserId }} - ¥{{
- parseFloat(record.secondMoney || '0').toFixed(2)
- }}
-
-
-
三级
- 用户{{ record.thirdUserId }} - ¥{{
- parseFloat(record.thirdMoney || '0').toFixed(2)
- }}
-
-
-
-
-
- 已签约
- 未签约
-
-
-
- 未结算
- 已结算
-
-
-
-
-
- {{ record.createTime }}
-
-
- {{ record.settleTime }}
-
-
-
-
-
-
- 结算
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerOrder2/components/Import.vue b/src/views/glt/shopDealerOrder2/components/Import.vue
deleted file mode 100644
index 0b81392..0000000
--- a/src/views/glt/shopDealerOrder2/components/Import.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
-
- 将文件拖到此处,或点击上传
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerOrder2/components/search.vue b/src/views/glt/shopDealerOrder2/components/search.vue
deleted file mode 100644
index 4b85f74..0000000
--- a/src/views/glt/shopDealerOrder2/components/search.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-
-
-
-
- 导出xls
-
-
-
-
diff --git a/src/views/glt/shopDealerOrder2/components/shopDealerOrderEdit.vue b/src/views/glt/shopDealerOrder2/components/shopDealerOrderEdit.vue
deleted file mode 100644
index 5267361..0000000
--- a/src/views/glt/shopDealerOrder2/components/shopDealerOrderEdit.vue
+++ /dev/null
@@ -1,333 +0,0 @@
-
-
-
-
-
-
- 基本信息
-
-
-
-
-
- {{ form.orderNo }}
-
-
-
-
- {{ parseFloat(form.payPrice || 0).toFixed(2) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 收益计算
-
-
-
-
-
- 一级佣金10%
-
-
-
-
- {{ form.firstUserId }}
-
-
- {{ form.firstNickname }}
-
-
-
-
- {{ '10%' }}
-
-
- {{ form.firstMoney }}
-
-
-
-
-
-
-
-
- 二级佣金10%
-
-
-
-
- {{ form.secondUserId }}
-
-
- {{ form.secondNickname }}
-
-
-
- 10%
-
- {{ form.secondMoney }}
-
-
-
-
-
-
-
-
- 三级佣金60%
-
-
-
-
- {{ form.thirdUserId }}
-
-
- {{ form.thirdNickname }}
-
-
-
-
- {{ '60%' }}
-
-
- {{ form.thirdMoney }}
-
-
-
-
-
-
- {{ form.settleTime }}
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerOrder2/index.vue b/src/views/glt/shopDealerOrder2/index.vue
deleted file mode 100644
index 392cec5..0000000
--- a/src/views/glt/shopDealerOrder2/index.vue
+++ /dev/null
@@ -1,500 +0,0 @@
-
- $router.go(-1)">
-
-
-
-
-
-
-
- {{ record.title }}
- {{ record.nickname }}({{ record.userId }})
-
-
-
- {{ parseFloat(record.orderPrice).toFixed(2) }}
-
-
-
- {{ record.degreePrice.toFixed(2) }}
-
-
-
- {{ record.price || 0 }}
-
-
-
- {{ record.settledPrice.toFixed(2) }}
-
-
-
- {{ record.payPrice.toFixed(2) }}
-
-
-
- {{ record.firstMoney }}
- {{ record.firstNickname || '-' }}
-
-
-
- {{ record.secondMoney }}
- {{ record.secondNickname || '-' }}
-
-
-
- {{ record.thirdNickname || '-' }} {{ record.thirdMoney }}
-
-
-
-
-
-
-
-
-
一级
- 用户{{ record.firstUserId }} - ¥{{
- parseFloat(record.firstMoney || '0').toFixed(2)
- }}
-
-
-
二级
- 用户{{ record.secondUserId }} - ¥{{
- parseFloat(record.secondMoney || '0').toFixed(2)
- }}
-
-
-
三级
- 用户{{ record.thirdUserId }} - ¥{{
- parseFloat(record.thirdMoney || '0').toFixed(2)
- }}
-
-
-
-
-
- 已签约
- 未签约
-
-
-
- 未结算
- 已结算
-
-
-
-
-
- {{ record.createTime }}
-
-
- {{ record.settleTime }}
-
-
-
-
-
-
-
- 结算
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerReferee/components/RefereeTree.vue b/src/views/glt/shopDealerReferee/components/RefereeTree.vue
deleted file mode 100644
index 45a0f6c..0000000
--- a/src/views/glt/shopDealerReferee/components/RefereeTree.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerReferee/components/search.vue b/src/views/glt/shopDealerReferee/components/search.vue
deleted file mode 100644
index b237175..0000000
--- a/src/views/glt/shopDealerReferee/components/search.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
-
- 重置
-
-
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerReferee/components/shopDealerRefereeEdit.vue b/src/views/glt/shopDealerReferee/components/shopDealerRefereeEdit.vue
deleted file mode 100644
index 0fe37c5..0000000
--- a/src/views/glt/shopDealerReferee/components/shopDealerRefereeEdit.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerReferee/index.vue b/src/views/glt/shopDealerReferee/index.vue
deleted file mode 100644
index 4f72029..0000000
--- a/src/views/glt/shopDealerReferee/index.vue
+++ /dev/null
@@ -1,563 +0,0 @@
-
- $router.go(-1)">
-
-
-
-
-
-
-
-
-
{{ record.dealerName }}({{ record.dealerId }})
-
-
-
-
-
-
-
-
-
-
-
-
{{ record.nickname }}({{ record.userId }})
-
-
-
-
-
-
- {{ getLevelText(record.level || 0) }}
-
-
-
-
-
- 查看关系链
-
-
-
-
-
-
- 编辑
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerWithdraw/components/Import.vue b/src/views/glt/shopDealerWithdraw/components/Import.vue
deleted file mode 100644
index 5f99953..0000000
--- a/src/views/glt/shopDealerWithdraw/components/Import.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
- 将文件拖到此处,或点击上传
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerWithdraw/components/search.vue b/src/views/glt/shopDealerWithdraw/components/search.vue
deleted file mode 100644
index 472b7dc..0000000
--- a/src/views/glt/shopDealerWithdraw/components/search.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- 批量删除
-
-
-
-
-
-
-
- 重置
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerWithdraw/components/shopDealerWithdrawEdit.vue b/src/views/glt/shopDealerWithdraw/components/shopDealerWithdrawEdit.vue
deleted file mode 100644
index 8721290..0000000
--- a/src/views/glt/shopDealerWithdraw/components/shopDealerWithdrawEdit.vue
+++ /dev/null
@@ -1,697 +0,0 @@
-
-
-
-
-
-
- 基本信息
-
-
-
-
- {{ form.comments }}
-
-
-
-
-
-
- 收款信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ form.bankName }}
-
-
- {{ form.bankAccount }}
-
-
- {{ form.bankCard }}
-
-
-
-
-
-
-
- 审核信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerWithdraw/index.vue b/src/views/glt/shopDealerWithdraw/index.vue
deleted file mode 100644
index 2999e31..0000000
--- a/src/views/glt/shopDealerWithdraw/index.vue
+++ /dev/null
@@ -1,464 +0,0 @@
-
- $router.go(-1)">
-
-
-
-
-
-
-
- 待审核
- 审核通过
- 已驳回
- 已打款
-
-
-
-
-
- {{ record.realName || '未实名认证' }}
- {{ record.phone }}
-
-
-
-
-
-
- 微信
- {{ record.wechatName }}
- {{ record.wechatName }}
-
-
-
-
- 支付宝
- {{ record.alipayName }}
- {{ record.alipayAccount }}
-
-
-
-
- 银行卡
- {{ record.bankName }}
- {{ record.bankAccount }}
- {{ record.bankCard }}
-
-
-
-
-
- 驳回原因:{{ record.rejectReason }}
-
-
-
-
-
-
-
- {{ record.createTime }}
- {{
- record.auditTime
- }}
-
-
-
-
-
-
- 编辑
-
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/glt/shopDealerApplyRs/components/search.vue b/src/views/shop/shopDealerApplyRs/components/search.vue
similarity index 100%
rename from src/views/glt/shopDealerApplyRs/components/search.vue
rename to src/views/shop/shopDealerApplyRs/components/search.vue
diff --git a/src/views/glt/shopDealerApplyRs/components/shop-dealer-apply-import.vue b/src/views/shop/shopDealerApplyRs/components/shop-dealer-apply-import.vue
similarity index 100%
rename from src/views/glt/shopDealerApplyRs/components/shop-dealer-apply-import.vue
rename to src/views/shop/shopDealerApplyRs/components/shop-dealer-apply-import.vue
diff --git a/src/views/glt/shopDealerApplyRs/components/shopDealerApplyEdit.vue b/src/views/shop/shopDealerApplyRs/components/shopDealerApplyEdit.vue
similarity index 100%
rename from src/views/glt/shopDealerApplyRs/components/shopDealerApplyEdit.vue
rename to src/views/shop/shopDealerApplyRs/components/shopDealerApplyEdit.vue
diff --git a/src/views/glt/shopDealerApplyRs/index.vue b/src/views/shop/shopDealerApplyRs/index.vue
similarity index 100%
rename from src/views/glt/shopDealerApplyRs/index.vue
rename to src/views/shop/shopDealerApplyRs/index.vue
diff --git a/src/views/shop/shopDealerCapital/components/search.vue b/src/views/shop/shopDealerCapital/components/search.vue
index 82fea9d..ad1a2c6 100644
--- a/src/views/shop/shopDealerCapital/components/search.vue
+++ b/src/views/shop/shopDealerCapital/components/search.vue
@@ -1,19 +1,28 @@
-
-
-
-
- 添加
-
+
+ 导出xls
diff --git a/src/views/shop/shopDealerOrder/components/shopDealerOrderEdit.vue b/src/views/shop/shopDealerOrder/components/shopDealerOrderEdit.vue
index 7f8420e..5267361 100644
--- a/src/views/shop/shopDealerOrder/components/shopDealerOrderEdit.vue
+++ b/src/views/shop/shopDealerOrder/components/shopDealerOrderEdit.vue
@@ -24,66 +24,36 @@
-
-
- {{ form.title }}
-
-
{{ form.orderNo }}
-
- {{ parseFloat(form.orderPrice || 0).toFixed(2) }}
-
-
-
-
- {{ parseFloat(form.degreePrice || 0).toFixed(2) }}
-
-
-
-
- {{ form.rate }}
-
-
-
-
- {{ form.price }}
-
-
-
-
- {{ parseFloat(form.settledPrice || 0).toFixed(2) }}
-
-
-
-
+
{{ parseFloat(form.payPrice || 0).toFixed(2) }}
-
开发调试
-
-
业务员({{ form.userId }}):{{ form.nickname }}
-
一级分销商({{ form.firstUserId }}):{{
- form.firstNickname
- }},一级佣金30%:{{ form.firstMoney }}
-
二级分销商({{ form.secondUserId }}):{{
- form.secondNickname
- }},二级佣金10%:{{ form.secondMoney }}
-
三级分销商({{ form.thirdUserId }}):{{
- form.thirdNickname
- }},三级佣金60%:{{ form.thirdMoney }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
收益计算
@@ -92,7 +62,7 @@
- 一级佣金30%
+ 一级佣金10%
@@ -105,7 +75,7 @@
- {{ '30%' }}
+ {{ '10%' }}
{{ form.firstMoney }}
@@ -179,7 +149,7 @@
import { assignObject } from 'ele-admin-pro';
import { ShopDealerOrder } from '@/api/shop/shopDealerOrder/model';
import { FormInstance } from 'ant-design-vue/es/form';
- import { updateShopDealerOrder} from '@/api/shop/shopDealerOrder';
+ import { updateShopDealerOrder } from '@/api/shop/shopDealerOrder';
// 是否是修改
const isUpdate = ref(false);
diff --git a/src/views/shop/shopDealerOrder/index.vue b/src/views/shop/shopDealerOrder/index.vue
index b3950f8..acf3f1f 100644
--- a/src/views/shop/shopDealerOrder/index.vue
+++ b/src/views/shop/shopDealerOrder/index.vue
@@ -7,7 +7,6 @@
:columns="columns"
:datasource="datasource"
:customRow="customRow"
- v-model:selection="selection"
tool-class="ele-toolbar-form"
class="sys-org-table"
>
@@ -24,11 +23,13 @@
{{ record.title }}
- 用户ID:{{ record.userId }}
+ {{ record.nickname }}({{ record.userId }})
- {{ record.orderPrice.toFixed(2) }}
+ {{ parseFloat(record.orderPrice).toFixed(2) }}
@@ -36,7 +37,7 @@
- {{ record.price }}
+ {{ record.price || 0 }}
@@ -47,6 +48,30 @@
{{ record.payPrice.toFixed(2) }}
+
+ {{ record.firstMoney }}
+ {{ record.firstNickname || '-' }}
+
+
+
+ {{ record.secondMoney }}
+ {{ record.secondNickname || '-' }}
+
+
+
+ {{ record.firstDividend }}
+ {{ record.firstDividendUserName || '-' }}
+
+
+
+ {{ record.secondDividend }}
+ {{ record.secondDividendUserName || '-' }}
+
+
@@ -93,9 +118,22 @@
- 结算
+
+ 结算
+
+
+
+
+
+
+
+
+
+
+
+
import { createVNode, ref } from 'vue';
import { message, Modal } from 'ant-design-vue';
- import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+ import {
+ ExclamationCircleOutlined,
+ DollarOutlined
+ } from '@ant-design/icons-vue';
import type { EleProTable } from 'ele-admin-pro';
import type {
DatasourceFunction,
@@ -139,7 +180,10 @@
ShopDealerOrder,
ShopDealerOrderParam
} from '@/api/shop/shopDealerOrder/model';
- import { exportShopDealerOrder } from '@/api/shop/shopDealerOrder';
+ import {
+ exportShopDealerOrder,
+ updateShopDealerOrder
+ } from '@/api/shop/shopDealerOrder';
// 表格实例
const tableRef = ref | null>(null);
@@ -169,9 +213,8 @@
}
// 保存当前搜索条件用于导出
currentWhere.value = { ...where };
- // 未结算订单
- where.isSettled = 0;
- where.myOrder = 1;
+ // 已结算订单
+ where.isSettled = 1;
return pageShopDealerOrder({
...where,
...orders,
@@ -182,88 +225,77 @@
// 表格列配置
const columns = ref([
+ {
+ key: 'index',
+ width: 48,
+ align: 'center',
+ fixed: 'left',
+ hideInSetting: true,
+ customRender: ({ index }) => index + (tableRef.value?.tableIndex ?? 0)
+ },
{
title: '订单编号',
dataIndex: 'orderNo',
- key: 'orderNo'
+ key: 'orderNo',
+ align: 'center',
+ width: 200
},
{
- title: '客户名称',
+ title: '买家',
dataIndex: 'title',
- key: 'title',
- width: 220
+ key: 'title'
},
{
- title: '结算电量',
+ title: '订单金额',
dataIndex: 'orderPrice',
key: 'orderPrice',
align: 'center'
},
{
- title: '换算成度',
- dataIndex: 'degreePrice',
- key: 'degreePrice',
+ title: '一级佣金(10%)',
+ dataIndex: 'firstNickname',
+ key: 'firstNickname',
align: 'center'
},
{
- title: '结算单价',
- dataIndex: 'price',
- key: 'price',
+ title: '二级佣金(5%)',
+ dataIndex: 'secondNickname',
+ key: 'secondNickname',
align: 'center'
},
{
- title: '结算金额',
- dataIndex: 'settledPrice',
- key: 'settledPrice',
+ title: '一级门店分红(2%/3%)',
+ dataIndex: 'firstDividendUserName',
+ key: 'firstDividendUserName',
align: 'center'
},
{
- title: '税费',
- dataIndex: 'rate',
- key: 'rate',
+ title: '二级门店分红(1%)',
+ dataIndex: 'secondDividendUserName',
+ key: 'secondDividendUserName',
align: 'center'
},
- {
- title: '实发金额',
- dataIndex: 'payPrice',
- key: 'payPrice',
- align: 'center'
- },
- {
- title: '签约状态',
- dataIndex: 'isInvalid',
- key: 'isInvalid',
- align: 'center',
- width: 100
- },
- {
- title: '月份',
- dataIndex: 'month',
- key: 'month',
- align: 'center',
- width: 100
- },
{
title: '结算状态',
dataIndex: 'isSettled',
key: 'isSettled',
- align: 'center',
- width: 100
+ align: 'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
- align: 'center'
- },
- {
- title: '操作',
- key: 'action',
- width: 180,
- fixed: 'right',
align: 'center',
- hideInSetting: true
+ width: 180
}
+ // {
+ // title: '操作',
+ // key: 'action',
+ // width: 180,
+ // fixed: 'right',
+ // align: 'center',
+ // hideInSetting: true
+ // }
]);
/* 搜索 */
@@ -272,6 +304,37 @@
tableRef?.value?.reload({ where: where });
};
+ /* 结算单个订单 */
+ const settleOrder = (row: ShopDealerOrder) => {
+ const totalCommission = (
+ parseFloat(row.firstMoney || '0') +
+ parseFloat(row.secondMoney || '0') +
+ parseFloat(row.thirdMoney || '0')
+ ).toFixed(2);
+
+ Modal.confirm({
+ title: '确认结算',
+ content: `确定要结算此订单吗?总佣金金额:¥${totalCommission}`,
+ icon: createVNode(DollarOutlined),
+ okText: '确认结算',
+ okType: 'primary',
+ cancelText: '取消',
+ onOk: () => {
+ const hide = message.loading('正在结算...', 0);
+ // 这里调用结算API
+ updateShopDealerOrder({
+ ...row,
+ isSettled: 1
+ });
+ setTimeout(() => {
+ hide();
+ message.success('结算成功');
+ reload();
+ }, 1000);
+ }
+ });
+ };
+
/* 批量结算 */
const batchSettle = () => {
if (!selection.value.length) {
@@ -327,7 +390,7 @@
/* 打开编辑弹窗 */
const openEdit = (row?: ShopDealerOrder) => {
current.value = row ?? null;
- showEdit.value = true;
+ // showEdit.value = true;
};
/* 删除单个 */
diff --git a/src/views/glt/shopDealerUser/components/search.vue b/src/views/shop/shopDealerUser/components/search.vue
similarity index 100%
rename from src/views/glt/shopDealerUser/components/search.vue
rename to src/views/shop/shopDealerUser/components/search.vue
diff --git a/src/views/glt/shopDealerUser/components/shopDealerApplyEdit.vue b/src/views/shop/shopDealerUser/components/shopDealerApplyEdit.vue
similarity index 100%
rename from src/views/glt/shopDealerUser/components/shopDealerApplyEdit.vue
rename to src/views/shop/shopDealerUser/components/shopDealerApplyEdit.vue
diff --git a/src/views/glt/shopDealerUser/index.vue b/src/views/shop/shopDealerUser/index.vue
similarity index 100%
rename from src/views/glt/shopDealerUser/index.vue
rename to src/views/shop/shopDealerUser/index.vue