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 @@ + + + + + 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; }