From b26d0ec533acd4ca47e5f4e449872b042b63b2b1 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Thu, 29 Apr 2021 14:46:40 +0800 Subject: [PATCH] no message --- api/saas.js | 1 + api/ztb.js | 4 +++- pages/agent/select-list/index.js | 13 ++++++++++--- pages/agent/select-list/index.wxml | 10 +++++----- pages/home/user-info/index.wxml | 4 ++-- pages/settlement/bank-add/index.js | 5 +++-- pages/storage/order-create/index.js | 16 +++++++++++----- pages/storage/order-create/index.wxml | 4 ++-- 8 files changed, 37 insertions(+), 20 deletions(-) diff --git a/api/saas.js b/api/saas.js index 25c206e..a6104d2 100644 --- a/api/saas.js +++ b/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, diff --git a/api/ztb.js b/api/ztb.js index df404f3..62b9778 100644 --- a/api/ztb.js +++ b/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, diff --git a/pages/agent/select-list/index.js b/pages/agent/select-list/index.js index 0efa46b..7b7909e 100644 --- a/pages/agent/select-list/index.js +++ b/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 diff --git a/pages/agent/select-list/index.wxml b/pages/agent/select-list/index.wxml index a28371e..637c684 100644 --- a/pages/agent/select-list/index.wxml +++ b/pages/agent/select-list/index.wxml @@ -17,12 +17,12 @@ - - 广州九尾造纸厂 - 粤KUU283 - 「黄纸边」 + + + {{item.plateNumber}} + 「{{item.categoryName}}」 - 下单时间：2021年4月28日 17:23:48 + 下单纸厂：{{item.millName || ''}} diff --git a/pages/home/user-info/index.wxml b/pages/home/user-info/index.wxml index 1e4f4d3..0a2a86c 100644 --- a/pages/home/user-info/index.wxml +++ b/pages/home/user-info/index.wxml @@ -26,14 +26,14 @@ 关注纸厂 - + diff --git a/pages/settlement/bank-add/index.js b/pages/settlement/bank-add/index.js index 1914cfd..c17c118 100644 --- a/pages/settlement/bank-add/index.js +++ b/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('添加成功') diff --git a/pages/storage/order-create/index.js b/pages/storage/order-create/index.js index 2ed3f46..577d964 100644 --- a/pages/storage/order-create/index.js +++ b/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 } diff --git a/pages/storage/order-create/index.wxml b/pages/storage/order-create/index.wxml index 09a4997..b214c0b 100644 --- a/pages/storage/order-create/index.wxml +++ b/pages/storage/order-create/index.wxml @@ -13,7 +13,7 @@ 关联代卖单 - {{form.factoryName || '请选择代卖订单'}} + {{form.agencySellOrderItemId || '请选择代卖订单'}} @@ -22,7 +22,7 @@ * 收货方名称 - {{form.factoryName || '请选择收货方'}} + {{form.consigneeName || '请选择收货方'}}