From d6f1cd437133360997fc9631825d89fde465b233 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 17 Jun 2024 18:14:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E9=85=8D=E9=80=81?=
=?UTF-8?q?=E5=95=86=E7=BC=B4=E8=B4=B9=E9=A1=B5=E9=9D=A2=E5=8F=8A=E7=9B=B8?=
=?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/agent.js | 20 +
pages.json | 19 +-
pages/agent/centerV2.vue | 18 +
pages/agent/delivery/mer_list.vue | 123 ++++
pages/agent/delivery/payment.vue | 740 ++++++++++++++++++++++++
pages/agent/delivery/payment_record.vue | 124 ++++
pages/agent/user/commission.vue | 2 +-
pages/agent/user/list.vue | 2 +-
pages/user/index.vue | 2 +-
9 files changed, 1046 insertions(+), 4 deletions(-)
create mode 100644 pages/agent/delivery/mer_list.vue
create mode 100644 pages/agent/delivery/payment.vue
create mode 100644 pages/agent/delivery/payment_record.vue
diff --git a/api/agent.js b/api/agent.js
index 4afc6b4..6b642b7 100644
--- a/api/agent.js
+++ b/api/agent.js
@@ -49,3 +49,23 @@ export function roleAndCorrelationRole(data) {
return request.get(`agent/role_and_correlation_role`, data);
}
+
+// 配送商 - 获取缴费列表
+export function deliveryPaymentList(data) {
+ return request.get(`agent/delivery/payment_list`, data);
+}
+export function deliveryCreateOrder(data) {
+ return request.post(`agent/delivery/create_order`, data);
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index a74e328..3ba1302 100644
--- a/pages.json
+++ b/pages.json
@@ -1397,7 +1397,6 @@
}
]
},
-
{
"root": "pages/agent",
"name": "agent",
@@ -1452,6 +1451,24 @@
"style": {
"navigationBarTitleText": "我的邀请"
}
+ },
+ {
+ "path": "delivery/mer_list",
+ "style": {
+ "navigationBarTitleText": "我的商户"
+ }
+ },
+ {
+ "path": "delivery/payment",
+ "style": {
+ "navigationBarTitleText": "资金缴费"
+ }
+ },
+ {
+ "path": "delivery/payment_record",
+ "style": {
+ "navigationBarTitleText": "缴费记录"
+ }
}
]
},
diff --git a/pages/agent/centerV2.vue b/pages/agent/centerV2.vue
index 20196f8..0598d1f 100644
--- a/pages/agent/centerV2.vue
+++ b/pages/agent/centerV2.vue
@@ -146,6 +146,24 @@ export default {
url: '/pages/agent/user/order',
icon: 'icon-dingdanguanli',
});
+ menuList.push({
+ title: '我的商户',
+ type: 'link',
+ url: '/pages/agent/delivery/mer_list',
+ icon: 'icon-ziti',
+ });
+ menuList.push({
+ title: '资金缴费',
+ type: 'link',
+ url: '/pages/agent/delivery/payment',
+ icon: 'icon-yue2',
+ });
+ menuList.push({
+ title: '缴费记录',
+ type: 'link',
+ url: '/pages/agent/delivery/payment_record',
+ icon: 'icon-dingdan-xuanzhong',
+ });
}
// 我的邀请
if(['6'].includes(String(agentType))){
diff --git a/pages/agent/delivery/mer_list.vue b/pages/agent/delivery/mer_list.vue
new file mode 100644
index 0000000..d7f2613
--- /dev/null
+++ b/pages/agent/delivery/mer_list.vue
@@ -0,0 +1,123 @@
+
+
+
+
+
+ 配送商关联商户列表
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/agent/delivery/payment.vue b/pages/agent/delivery/payment.vue
new file mode 100644
index 0000000..74da659
--- /dev/null
+++ b/pages/agent/delivery/payment.vue
@@ -0,0 +1,740 @@
+
+
+
+
+
+
+
+
+ 缴费金额
+
+ ¥
+
+
+
+
+
+
+ 赠送额度
+
+ 赠送冠名品牌额度:{{ payment_current.title_quota | toFixedTwo}}
+ 赠送其他品牌额度:{{ payment_current.other_quota | toFixedTwo}}
+ 切换支付项
+
+
+
+
+ 支付方式
+
+
+
+
+
+
+
+
+
+ 确认支付
+ 确认支付
+
+
+
+
+
+
+
+
+
+ ¥{{ item.price | toFixedTwo}}
+ 赠送冠名品牌额度:{{ item.title_quota | toFixedTwo }}
+ 赠送其他品牌额度:{{ item.other_quota | toFixedTwo }}
+
+ 选中
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/agent/delivery/payment_record.vue b/pages/agent/delivery/payment_record.vue
new file mode 100644
index 0000000..1da45e0
--- /dev/null
+++ b/pages/agent/delivery/payment_record.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+ 资金缴费记录
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/agent/user/commission.vue b/pages/agent/user/commission.vue
index 82d773e..baf0278 100644
--- a/pages/agent/user/commission.vue
+++ b/pages/agent/user/commission.vue
@@ -59,7 +59,7 @@ export default {
if(Number(_this.agent_id) <= 0){
_this.$util.Tips({
title: '非法访问,信息不存在!',
- },{tab:5,url:'/pages/agent/center'});
+ },{tab:5,url:`/pages/agent/centerV2?agent_id=${_this.agent_id}`});
return false;
}
// 判断:是否登录
diff --git a/pages/agent/user/list.vue b/pages/agent/user/list.vue
index bb448d5..6f73048 100644
--- a/pages/agent/user/list.vue
+++ b/pages/agent/user/list.vue
@@ -67,7 +67,7 @@ export default {
if(Number(_this.agent_id) <= 0){
_this.$util.Tips({
title: '非法访问,信息不存在!',
- },{tab:5,url:'/pages/agent/center'});
+ },{tab:5,url:`/pages/agent/centerV2?agent_id=${_this.agent_id}`});
return false;
}
// 判断:是否登录
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 3e7b7d2..2c07a7d 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -558,7 +558,7 @@
filterMenus: function(item){
let that = this;
if(item.url=='/pages/users/user_money/index') item.isShow = that.balance_func_status == 1
- else if(item.url == '/pages/agent/center'){
+ else if(item.url == '/pages/agent/center' || item.url == '/pages/agent/centerV2'){
console.log('是否为代理人员:',that.is_agent)
item.isShow = that.is_agent || false;
}