Browse Source

no message

feature/v2.1
xpz2018 4 years ago
parent
commit
27fce794c4
4 changed files with 18 additions and 2 deletions
  1. 4
      pages/process/agent-list/index.js
  2. 7
      pages/process/order-info/index.js
  3. 7
      pages/process/outside-info/index.js
  4. 2
      pages/process/template/index.wxml

4
pages/process/agent-list/index.js

@ -92,9 +92,9 @@ Scene({
lookItem: function (e) { lookItem: function (e) {
var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
if(item.orderType == 1){ if(item.orderType == 1){
wx.navigateTo({ url: `/pages/process/order-info/index?agent=1&id=${item.orderId}` })
wx.navigateTo({ url: `/pages/process/order-info/index?agent=1&id=${item.orderId}&status=${item.status}` })
} else { } else {
wx.navigateTo({ url: `/pages/process/outside-info/index?agent=1&id=${item.orderId}` })
wx.navigateTo({ url: `/pages/process/outside-info/index?agent=1&id=${item.orderId}&status=${item.status}` })
} }
} }

7
pages/process/order-info/index.js

@ -13,6 +13,7 @@ Scene({
*/ */
data: { data: {
safeBottom: app.globalData.safeBottom, safeBottom: app.globalData.safeBottom,
status: 0,
form: null, form: null,
agent: 0, agent: 0,
title: '过磅详情' title: '过磅详情'
@ -24,6 +25,9 @@ Scene({
if(options.agent){ if(options.agent){
this.data.agent = Number(options.agent) this.data.agent = Number(options.agent)
} }
if(options.status){
this.data.status = Number(options.status)
}
if(options.id){ if(options.id){
this.fetchOrderInfo(options.id) this.fetchOrderInfo(options.id)
} }
@ -43,6 +47,9 @@ Scene({
} else if(result.data.status == 5){ } else if(result.data.status == 5){
this.data.title = '已完成' this.data.title = '已完成'
} }
if(this.data.status || this.data.status == 0){
result.data.paymentOrderInfo.receivableStatus = this.data.status
}
if(result.data.paymentOrderInfo.receivablePrice){ if(result.data.paymentOrderInfo.receivablePrice){
if(result.data.paymentOrderInfo.paidPrice){ if(result.data.paymentOrderInfo.paidPrice){
result.data.paymentOrderInfo.lessPrice = math.minus(result.data.paymentOrderInfo.receivablePrice, result.data.paymentOrderInfo.paidPrice) result.data.paymentOrderInfo.lessPrice = math.minus(result.data.paymentOrderInfo.receivablePrice, result.data.paymentOrderInfo.paidPrice)

7
pages/process/outside-info/index.js

@ -13,6 +13,7 @@ Scene({
*/ */
data: { data: {
safeBottom: app.globalData.safeBottom, safeBottom: app.globalData.safeBottom,
status: null,
agent: 0, agent: 0,
id: null, id: null,
form: null, form: null,
@ -29,6 +30,9 @@ Scene({
if(options.agent){ if(options.agent){
this.data.agent = Number(options.agent) this.data.agent = Number(options.agent)
} }
if(options.status){
this.data.status = Number(options.status)
}
event.on('OrderMessage', this, this.onEvent) event.on('OrderMessage', this, this.onEvent)
}, },
onEvent: function(message){ onEvent: function(message){
@ -62,6 +66,9 @@ Scene({
imageList.push({url: result.data.orderImageList[index]}) imageList.push({url: result.data.orderImageList[index]})
} }
} }
if(this.data.status || this.data.status == 0){
result.data.paymentOrderInfo.receivableStatus = this.data.status
}
if(result.data.paymentOrderInfo.receivablePrice){ if(result.data.paymentOrderInfo.receivablePrice){
if(result.data.paymentOrderInfo.paidPrice){ if(result.data.paymentOrderInfo.paidPrice){
result.data.paymentOrderInfo.lessPrice = math.minus(result.data.paymentOrderInfo.receivablePrice, result.data.paymentOrderInfo.paidPrice) result.data.paymentOrderInfo.lessPrice = math.minus(result.data.paymentOrderInfo.receivablePrice, result.data.paymentOrderInfo.paidPrice)

2
pages/process/template/index.wxml

@ -113,6 +113,8 @@
return '待还款' return '待还款'
} else if(paymentOrderInfo.receivableStatus == 1) { } else if(paymentOrderInfo.receivableStatus == 1) {
return '已还款' return '已还款'
} else if(paymentOrderInfo.receivableStatus == 2) {
return '部分还款'
} else if(paymentOrderInfo.lessPrice > 0) { } else if(paymentOrderInfo.lessPrice > 0) {
return '部分还款' return '部分还款'
} else if(paymentOrderInfo.paidPrice > 0 && paymentOrderInfo.lessPrice == 0) { } else if(paymentOrderInfo.paidPrice > 0 && paymentOrderInfo.lessPrice == 0) {

Loading…
Cancel
Save