no message

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
 }

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)

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"
   }
 }

pages/process/agent-list/index.wxml

@@ -20,22 +20,19 @@
       <view style="background-color:#f3f3f3;" wx:if="{{item.tipsTime}}">
         <text class="text-sg" style="line-height:64rpx;padding-left:32rpx">{{item.tipsTime}}</text>
       </view>
-      <view class="flex flex-justify item-content" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
-        <view style="height: 88rpx">
-          <view class="flex flex-center text-sg text-black">
-            <text>客户名称：{{item.factoryCustomerName}}</text>
-            <text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">({{item.factoryCustomerMobile}})</text>
+      <view class="item-content" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
+        <view class="flex flex-justify">
+          <text class="text-sg text-black">客户名称：{{item.customerPersonName}}</text>
+          <view class="flex" >
+            <van-tag plain round type="danger" wx:if="{{item.status == 0 && item.periodStatus == 2}}">已逾期</van-tag>
+            <view class="text-df" style="color:#FA541C;margin-left:12rpx" wx:if="{{item.status == 0}}">待还款</view>
+            <view class="text-df" style="color:#028A00;margin-left:12rpx" wx:if="{{item.status == 1}}">已还款</view>
           </view>
-          <view class="text-sm text-gray" style="margin-top:12rpx">毛重：{{item.totalWeight}}公斤</view>
         </view>
-        <view class="flex flex-center" wx:if="{{item.status == 41}}">
-          <view class="text-df" style="color:#028A00">代付中</view>
-        </view>
-        <view class="flex flex-center" wx:elif="{{item.status == 42}}">
-          <view class="text-df" style="color:#028A00">待结算</view>
-        </view>
-        <view class="flex flex-center" wx:elif="{{item.status == 5}}">
-          <view class="text-df" style="color:#028A00">已完成</view>
+        <view class="flex flex-justify" style="margin-top:12rpx">
+          <view class="text-sm text-gray">品类：{{item.productName}}</view>
+          <view class="text-sm text-gray">重量：{{item.settleWeight}}公斤</view>
+          <view class="text-sm text-gray">金额：{{item.settlePrice}}元</view>
         </view>
       </view>
     </view>
@@ -45,6 +42,4 @@
     <van-loading type="spinner" size="16" wx:if="{{!finished}}" />
     <text class="text-sm" style="margin-left:8rpx">{{finished?'到底啦～':'加载中...'}}</text>
   </van-divider>
-</refresh-view>
-
-<van-dialog id="van-dialog" />
+</refresh-view>

pages/process/order-list/index.wxml

@@ -26,7 +26,17 @@
             <text>客户名称：{{item.factoryCustomerName}}</text>
             <text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">({{item.factoryCustomerMobile}})</text>
           </view>
-          <view class="text-sm text-gray" style="margin-top:12rpx">毛重：{{item.totalWeight}}公斤</view>
+          <view class="text-sm text-gray" style="margin-top:12rpx" wx:if="{{item.status == 1}}">毛重：{{item.totalWeight}}公斤</view>
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:elif="{{item.status == 2}}">
+            <text class="text-sm text-gray">品类：{{item.productName}}</text>
+            <text class="text-sm text-gray"></text>
+            <text class="text-sm text-gray"></text>
+          </view>
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:else>
+            <text class="text-sm text-gray">品类：{{item.productName}}</text>
+            <text class="text-sm text-gray"></text>
+            <text class="text-sm text-gray"></text>
+          </view>
         </view>
         <view class="flex flex-center" wx:if="{{item.status == 1}}" style="height: 88rpx">
           <van-button plain type="default" custom-style="height:64rpx;width:132rpx" data-id="{{item.id}}"