diff --git a/api/saas.js b/api/saas.js index a6104d2..e842f92 100644 --- a/api/saas.js +++ b/api/saas.js @@ -117,5 +117,6 @@ export { closeOutOrder, auditOutOrder, receiptOutOrder, - createOutOrder + createOutOrder, + bindBankCard } \ No newline at end of file diff --git a/api/ztb.js b/api/ztb.js index ea0f36b..0131292 100644 --- a/api/ztb.js +++ b/api/ztb.js @@ -35,8 +35,8 @@ const getRelation = () => mGet(`/recycle-service/proxy-sell/get/relation`, null, const postRelation = (code) => mPost(`/recycle-service/proxy-sell/bind/relation?code=${code}`, null, zconfig) // /proxy-sell/get/proxy-order/{orderId}客户查看订单详情 const getProxyOrderInfo = (id) => mGet(`/recycle-service/proxy-sell/get/proxy-order/${id}`, null, zconfig) -const getProxyOrderItemInfo = (params) => mGet(`/recycle-service/proxy-sell/get/agency-sell-order-info/by-id`, params, zconfig) -// recycle-service/proxy-sell/get/proxy-order-list +const getProxyOrderItemInfo = (id) => mGet(`/recycle-service/proxy-sell/get/agency-sell-order-detail/${id}`, null, zconfig) +// recycle-service/proxy-sell/get/proxy-order-list /proxy-sell/get/agency-sell-order-detail/{orderItemId} const getProxyOrderList = (params) => mGet(`/recycle-service/proxy-sell/get/proxy-order-list`, params, zconfig) // recycle-service/proxy-sell/create/order const createProxyOrder = (params) => mPost(`/recycle-service/proxy-sell/create/order`, params, zconfig) diff --git a/pages/agent/order-detail/index.js b/pages/agent/order-detail/index.js index 2b3351e..ca58e80 100644 --- a/pages/agent/order-detail/index.js +++ b/pages/agent/order-detail/index.js @@ -39,7 +39,7 @@ Scene({ util.showToast(err) }) } else if(this.data.itemId){ - getProxyOrderItemInfo({orderItemId: this.data.id}).then(result => { + getProxyOrderItemInfo(this.data.itemId).then(result => { this.setResult(result) wx.hideLoading() }).catch(err => { diff --git a/pages/home/user-info/index.wxml b/pages/home/user-info/index.wxml index 0a2a86c..663e865 100644 --- a/pages/home/user-info/index.wxml +++ b/pages/home/user-info/index.wxml @@ -49,6 +49,12 @@ 修改手机号码 + + + + 联系客服 + + diff --git a/pages/index/scene.js b/pages/index/scene.js index c3e5d00..66c7cc3 100644 --- a/pages/index/scene.js +++ b/pages/index/scene.js @@ -1,4 +1,3 @@ - export default function Scene(config) { const { onLoad } = config config.onLoad = function(options) { diff --git a/pages/process/order-price/index.js b/pages/process/order-price/index.js index 27747d8..fb47ec0 100644 --- a/pages/process/order-price/index.js +++ b/pages/process/order-price/index.js @@ -41,12 +41,14 @@ Scene({ getFactoryOrderInfo(options.id).then(result => { wx.hideLoading() result.data.sign = 1 + this.data.step = 1 for (let index = 0; index < 2; index++) { if(util.isEmpty(result.data.totalWeighingPicture[index])){ result.data.totalWeighingPicture[index] = { url: 'error' } + this.data.step = 2 } } - this.setData({ form: result.data }) + this.setData({ form: result.data, step: this.data.step }) }).catch(err => { wx.hideLoading() util.showToast(err) diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml index ae1dba3..7cb2772 100644 --- a/pages/storage/order-info/index.wxml +++ b/pages/storage/order-info/index.wxml @@ -35,6 +35,7 @@ 司机姓名 + {{orderInfo.driverName}}