diff --git a/api/payment.js b/api/payment.js index a9c946f..2b5f1f7 100644 --- a/api/payment.js +++ b/api/payment.js @@ -19,6 +19,7 @@ const paymentFor = (params) => mPost(`/payment-settlement-center/pay`, params, p const getBalanceInfo = () => mGet(`/payment-settlement-center/balance/get/balance`, null, pconfig) const getWithdrawalList = () => mGet(`/payment-settlement-center/balance/get/order-withdrawal-list`, null, pconfig) const paymentOrder = (params) => mPost(`/payment-settlement-center/balance/order/withdraw`, params, pconfig) +const getAgentOrderList = (params) => mGet(`/payment-settlement-center/get/agency-payment-order-receivable-list`, params, pconfig) export { pconfig, @@ -31,5 +32,6 @@ export { paymentFor, getBalanceInfo, getWithdrawalList, - paymentOrder + paymentOrder, + getAgentOrderList } \ No newline at end of file diff --git a/pages/process/agent-list/index.js b/pages/process/agent-list/index.js index e78882f..0a67cc9 100644 --- a/pages/process/agent-list/index.js +++ b/pages/process/agent-list/index.js @@ -1,5 +1,5 @@ // pages/process/order-list/index.js -import { getFactoryOrderList } from "../../../api/saas" +import { getAgentOrderList } from "../../../api/payment" const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() @@ -11,10 +11,9 @@ Page({ tabIndex: 0, tabList: [ {id: 0, name: '全部', badge: 0, status: '' }, - {id: 1, name: '申请中', badge: 0, status: 41 }, - {id: 4, name: '待还款', badge: 0, status: 42 }, - {id: 4, name: '已还款', badge: 0, status: 42 } - // {id: 6, name: '已取消', badge: 0, status: 6 } + // {id: 1, name: '申请中', badge: 0, status: 41 }, + {id: 4, name: '待还款', badge: 0, status: 0 }, + {id: 4, name: '已还款', badge: 0, status: 1 } ], loading: true, requesting: false, @@ -22,7 +21,6 @@ Page({ top: 0, orderList: [], form: { - funcType: 0, pageNum: 1, pageSize: 10 }, @@ -66,7 +64,7 @@ Page({ } else { this.setData({ requesting: true }) } - getFactoryOrderList(this.data.form).then(result => { + getAgentOrderList(this.data.form).then(result => { this.handResult(result) }).catch(err => { this.setData({ requesting: false, loading: false }) @@ -122,7 +120,7 @@ Page({ }, lookItem: function (e) { var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] - wx.navigateTo({ url: `/pages/process/order-info/index?id=${item.id}` }) + wx.navigateTo({ url: `/pages/process/order-info/index?id=${item.orderId}` }) }, onUnload: function(){ event.remove('OrderMessage', this) diff --git a/pages/process/agent-list/index.json b/pages/process/agent-list/index.json index c111c1c..5b2e615 100644 --- a/pages/process/agent-list/index.json +++ b/pages/process/agent-list/index.json @@ -7,8 +7,8 @@ "van-tabs": "/components/tabs/index", "van-tab": "/components/tab/index", "van-cell": "/components/cell/index", + "van-tag": "/components/tag/index", "van-divider": "/components/divider/index", - "van-loading": "/components/loading/index", - "van-dialog": "/components/dialog/index" + "van-loading": "/components/loading/index" } } \ No newline at end of file diff --git a/pages/process/agent-list/index.wxml b/pages/process/agent-list/index.wxml index e0eb448..cebcbc2 100644 --- a/pages/process/agent-list/index.wxml +++ b/pages/process/agent-list/index.wxml @@ -20,22 +20,19 @@ {{item.tipsTime}} - - - - 客户名称:{{item.factoryCustomerName}} - ({{item.factoryCustomerMobile}}) + + + 客户名称:{{item.customerPersonName}} + + 已逾期 + 待还款 + 已还款 - 毛重:{{item.totalWeight}}公斤 - - 代付中 - - - 待结算 - - - 已完成 + + 品类:{{item.productName}} + 重量:{{item.settleWeight}}公斤 + 金额:{{item.settlePrice}}元 @@ -45,6 +42,4 @@ {{finished?'到底啦~':'加载中...'}} - - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml index e49d679..8df370f 100644 --- a/pages/process/order-list/index.wxml +++ b/pages/process/order-list/index.wxml @@ -26,7 +26,17 @@ 客户名称:{{item.factoryCustomerName}} ({{item.factoryCustomerMobile}}) - 毛重:{{item.totalWeight}}公斤 + 毛重:{{item.totalWeight}}公斤 + + 品类:{{item.productName}} + + + + + 品类:{{item.productName}} + + +