no message

api/saas.js

@@ -62,6 +62,7 @@ const closeOutOrder = (params) => mPost(`/ztb-factory/close/outbound-delivery-or
 const auditOutOrder = (params) => mPost(`/ztb-factory/audit/outbount-delivery-order`, params, sconfig)
 const receiptOutOrder = (params) => mPost(`/ztb-factory/confirm/outbound-delivery-order-receipt`, params, sconfig)
 const createOutOrder = (params) => mPost(`/ztb-factory/relevancy/weight-note/and/outbound-delivery-order`, params, sconfig)
+const bindBankCard = (params) => mPost(`/ztb-factory/factory/binding/bank-card`, params, sconfig)
 
 export {
   sconfig,

api/ztb.js

@@ -46,7 +46,8 @@ const hasActivity = () => mGet(`/recycle-service/proxy-sell-activity/get/has-act
 const getActivityList = (params) => mGet(`/recycle-service/proxy-sell-activity/list`, params, zconfig)
 // /recycle-service/get/store-product-list
 const paperCategoryList = (params) => mPost(`/recycle-service/paperCategoryList`, params, zconfig)
-
+///proxy-sell/get/relevancy-agency-order-list/by-factory
+const getAgencyOrderList = (params) => mGet(`/recycle-service/proxy-sell/get/relevancy-agency-order-list/by-factory`, params, zconfig)
 //获取废品品类列表，不传params返回一级品类，传一级品类返回二级品类
 const getLategoriesList = (params) => mGet(`/recycle-service/scrap-category/get/categories-list`, params, zconfig)
 //提交用户信息
@@ -84,6 +85,7 @@ export {
   cancelProxyOrderItem,
   hasActivity,
   getActivityList,
+  getAgencyOrderList,
   paperCategoryList,
   getLategoriesList,
   updateUserInfo,

pages/agent/select-list/index.js

@@ -1,6 +1,6 @@
 // pages/process/order-list/index.js
 import Scene from '../../index/scene'
-import { getPeymentList } from "../../../api/saas"
+import { getAgencyOrderList } from "../../../api/ztb"
 const util = require('../../../utils/util')
 const app = getApp()
 
@@ -39,9 +39,16 @@ Scene({
       return
     }
     this.data.requesting = true
-    getPeymentList(this.data.form).then(result => {
+    getAgencyOrderList(this.data.form).then(result => {
       if (result.data && result.data.records && result.data.records.length) {
-        var respList = result.data.records
+        var respList = []
+        for (let index = 0; index < result.data.records.length; index++) {
+          const element = result.data.records[index]
+          for (let i = 0; i < element.orderItems.length; i++) {
+            const item = element.orderItems[i]
+            respList.push({id: item.id, millName: element.paperMillName, categoryName: item.paperCategoryName, plateNumber: item.plateNumber, createTime: element.createTime, logoImg: element.logoImg })
+          }
+        }
         let nowList = `orderList[${this.data.orderList.length}]`
         var num = this.data.form.pageNum
         var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total

pages/agent/select-list/index.wxml

@@ -17,12 +17,12 @@
       <view slot="title" class="flex flex-justify" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
         <van-image round width="80rpx" height="80rpx" src="{{ item.logoImg || '/assets/image/icon_logo.png' }}" />
         <view style="margin-left:18rpx;width:100%;flex:1">
-          <view class="flex flex-justify {{index != 0 || 'text-blue'}}">
-            <text class="text-sg text-bold text-cut" style="width:220rpx">广州九尾造纸厂</text>
-            <text class="text-sg text-bold">粤KUU283</text>
-            <text class="text-sg text-bold">「黄纸边」</text>
+          <view class="flex {{ itemId != item.id || 'text-blue'}}">
+            <!-- <text class="text-sg text-bold text-cut" style="width:220rpx">{{item.millName}}</text> -->
+            <text class="text-sg text-bold">{{item.plateNumber}}</text>
+            <text class="text-sg text-bold" style="margin-left: 32rpx">「{{item.categoryName}}」</text>
           </view>
-          <view class="text-sm text-gray" style="line-height:32rpx">下单时间：2021年4月28日 17:23:48</view>
+          <view class="text-sm text-gray" style="line-height:32rpx">下单纸厂：{{item.millName || ''}}</view>
         </view>
       </view>
     </van-cell>

pages/home/user-info/index.wxml

@@ -26,14 +26,14 @@
       <text class="text-sg">关注纸厂</text>
     </view>
   </van-cell>
-  <van-cell clickable bind:click="settingAgent">
+  <!-- <van-cell clickable bind:click="settingAgent">
     <view slot="title" class="flex flex-justify">
       <view class="text-black">默认使用千鸟代付</view>
       <view class="flex flex-center">
         <van-switch checked="{{ agenting }}" size="22px" />
       </view>
     </view>
-  </van-cell>
+  </van-cell> -->
 </van-cell-group>
 <view style="height:24rpx"></view>
 <van-cell-group>

pages/settlement/bank-add/index.js

@@ -1,7 +1,8 @@
 // pages/setting/bank-add/index.js
 import Scene from '../../index/scene'
-import { getBankcardInfo, ocrBankcard, verifyBankcard } from "../../../api/payment"
+import { getBankcardInfo, ocrBankcard } from "../../../api/payment"
 import { postCaptcha } from "../../../api/user"
+import { bindBankCard } from "../../../api/saas"
 const util = require('../../../utils/util')
 const event = require('../../../utils/event')
 const app = getApp()
@@ -147,7 +148,7 @@ Scene({
       return
     }
     wx.showLoading({ title: '处理中', mask: true })
-    verifyBankcard(this.data.form).then(res => {
+    bindBankCard(this.data.form).then(res => {
       wx.hideLoading()
       if(res.data.trxstatus == 1){
         util.showBackToast('添加成功')

pages/storage/order-create/index.js

@@ -61,7 +61,7 @@ Scene({
   chooseList: function(e){
     var url = ''
     if(e.currentTarget.id == 'orderId'){
-      url = `/pages/agent/select-list/index?itemId=1`
+      url = `/pages/agent/select-list/index?itemId=${this.data.form.agencySellOrderItemId}`
     } else if(e.currentTarget.id == 'factoryId'){
       url = `/pages/home/factory-list/index?type=1`
     }
@@ -76,9 +76,15 @@ Scene({
           that.data.form.deliveryChannelType = 1
           that.data.form.factoryDeliveryChannelId = data.detail.id
         }
-        that.setData({ ['form.factoryName']: data.detail.name })
+        that.setData({ ['form.consigneeName']: data.detail.name })
       } else if (data.what == 62) {
-        console.log(data.detail)
+        that.data.form.agencySellOrderItemId = data.detail.id
+        that.data.form.plateNumber = data.detail.plateNumber
+        that.data.form.productName = data.detail.categoryName
+        that.data.form.consigneeName = data.detail.millName
+        that.data.form.factoryDeliveryChannelId = ''
+        that.data.form.deliveryChannelType = 2
+        that.setData({ form: that.data.form })
       }
     }
     wx.navigateTo({url, events})
@@ -127,11 +133,11 @@ Scene({
     this.data.form[e.currentTarget.id] = e.detail
   },
   submitForm: function(){
-    if(util.isEmpty(this.data.form.factoryName)){
+    if(util.isEmpty(this.data.form.consigneeName)){
       util.showToast('请选择出货方名称')
       return
     }
-    if(util.isEmpty(this.data.form.productId) || Number(this.data.form.productId) <= 0){
+    if(util.isEmpty(this.data.form.productName)){
       util.showToast('请选择废纸品类')
       return
     }

pages/storage/order-create/index.wxml

@@ -13,7 +13,7 @@
       <view class="flex flex-center text-black">
         <text>关联代卖单</text>
       </view>
-      <view class="{{form.factoryName ? 'text-black' : 'text-gray'}}">{{form.factoryName || '请选择代卖订单'}}</view>
+      <view class="{{form.agencySellOrderItemId ? 'text-black' : 'text-gray'}}">{{form.agencySellOrderItemId || '请选择代卖订单'}}</view>
     </view>
   </van-cell>
   <van-cell id="factoryId" clickable center is-link bind:click="chooseList">
@@ -22,7 +22,7 @@
         <view class="text-red text-xl" style="line-height: 10px; padding-top: 8px">*</view>
         <text>收货方名称</text>
       </view>
-      <view class="{{form.factoryName ? 'text-black' : 'text-gray'}}">{{form.factoryName || '请选择收货方'}}</view>
+      <view class="{{form.consigneeName ? 'text-black' : 'text-gray'}}">{{form.consigneeName || '请选择收货方'}}</view>
     </view>
   </van-cell>
   <van-cell clickable center is-link bind:click="showCategory">