diff --git a/api/agent.js b/api/agent.js index 89f2d98..b911041 100644 --- a/api/agent.js +++ b/api/agent.js @@ -86,8 +86,18 @@ export function contractAgainSign(data) { } - - +// 缴费账单 - 账单信息获取 +export function agentPayRecordInfo(data) { + return request.get(`agent/pay_record/get_info`, data); +} +// 缴费账单 - 生成缴费订单 +export function agentPayRecordCreateOrder(data) { + return request.post(`agent/pay_record/pay`, data); +} +// 缴费账单 - 申请退款 +export function agentPayRecordApplyRefund(data) { + return request.post(`agent/pay_record/refund`, data); +} diff --git a/components/payment/index.vue b/components/payment/index.vue index 60eef8b..e101f0d 100644 --- a/components/payment/index.vue +++ b/components/payment/index.vue @@ -148,7 +148,7 @@ export default { } let that = this; let type = '' - if (paytype == 'wechat') { + if (paytype == 'wechat' || paytype == 'weixin') { // #ifdef H5 type = this.$wechat.isWeixin() ? 'weixin' : 'h5'; // #endif diff --git a/pages.json b/pages.json index 45eb6c6..064ec58 100644 --- a/pages.json +++ b/pages.json @@ -1485,13 +1485,13 @@ { "path": "delivery/payment", "style": { - "navigationBarTitleText": "资金缴费" + "navigationBarTitleText": "货款缴费" } }, { "path": "delivery/payment_record", "style": { - "navigationBarTitleText": "缴费记录" + "navigationBarTitleText": "货款记录" } }, { @@ -1499,8 +1499,13 @@ "style": { "navigationBarTitleText": "合作协议" } + }, + { + "path": "user/pay_record", + "style": { + "navigationBarTitleText": "缴费账单" + } } - ] }, { diff --git a/pages/agent/centerV2.vue b/pages/agent/centerV2.vue index 353a7a2..8c48024 100644 --- a/pages/agent/centerV2.vue +++ b/pages/agent/centerV2.vue @@ -109,7 +109,7 @@ import {roleAndCorrelationRole} from "@/api/agent"; import {storeLoginSimulation} from "@/api/store"; export default { - name: 'business', + name: 'agentV2', components: { authorize, qrCode @@ -154,13 +154,13 @@ export default { icon: 'icon-ziti', }); menuList.push({ - title: '资金缴费', + title: '货款缴费', type: 'link', url: '/pages/agent/delivery/payment', icon: 'icon-yue2', }); menuList.push({ - title: '缴费记录', + title: '货款记录', type: 'link', url: '/pages/agent/delivery/payment_record', icon: 'icon-dingdan-xuanzhong', @@ -191,6 +191,12 @@ export default { url: '/pages/agent/contract/index?role_type='+ agentType +'&role_id=' + agentId, icon: 'icon-bianji4', }); + menuList.push({ + title: '缴费账单', + type: 'link', + url: '/pages/agent/user/pay_record', + icon: 'icon-dingdan-xuanzhong', + }); diff --git a/pages/agent/invite/record.vue b/pages/agent/invite/record.vue index 39a4c83..6d976d5 100644 --- a/pages/agent/invite/record.vue +++ b/pages/agent/invite/record.vue @@ -48,7 +48,6 @@ import emptyPage from '@/components/emptyPage.vue'; import {agentApplyRecord} from "@/api/agent"; import authorize from '@/components/Authorize'; import payment from '@/components/payment'; -import {getUserInfo} from "@/api/user"; export default { components: { diff --git a/pages/agent/user/pay_record.vue b/pages/agent/user/pay_record.vue new file mode 100644 index 0000000..fd15bc3 --- /dev/null +++ b/pages/agent/user/pay_record.vue @@ -0,0 +1,320 @@ + + + + +