Browse Source

no message

feature/v1.4
xpz2018 4 years ago
parent
commit
1b443163d5
3 changed files with 9 additions and 11 deletions
  1. 8
      pages/agent/order-list/index.js
  2. 8
      pages/storage/order-info/index.js
  3. 4
      pages/storage/order-list/index.js

8
pages/agent/order-list/index.js

@ -93,14 +93,6 @@ Scene({
this.refresh.setRefresh(false) this.refresh.setRefresh(false)
}) })
}, },
lookItem: function (e) {
var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
if(item.status == 1){
wx.navigateTo({ url: `/pages/storage/order-settlement/index?id=${item.weightNoteId}` })
} else [
wx.navigateTo({ url: `/pages/storage/order-info/index?id=${item.weightNoteId}` })
]
},
onUnload: function(){ onUnload: function(){
event.remove('OrderMessage', this) event.remove('OrderMessage', this)
} }

8
pages/storage/order-info/index.js

@ -67,12 +67,18 @@ Scene({
this.data.auditable = true this.data.auditable = true
} }
} }
var activeNames = ['1']
if(result.data.outboundDeliveryOrder.status == 2){
activeNames = ['2']
} else if(result.data.outboundDeliveryOrder.status == 3){
activeNames = ['2', '1']
}
this.setData({ this.setData({
safeBottom: app.globalData.safeBottom, safeBottom: app.globalData.safeBottom,
poundInfo: result.data.weightNote, poundInfo: result.data.weightNote,
orderInfo: result.data.outboundDeliveryOrder, orderInfo: result.data.outboundDeliveryOrder,
auditable: this.data.auditable, auditable: this.data.auditable,
activeNames: result.data.outboundDeliveryOrder.status >= 2 ? ['2'] : ['1']
activeNames: activeNames
}) })
} }
wx.hideLoading() wx.hideLoading()

4
pages/storage/order-list/index.js

@ -140,9 +140,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.status == 1){ if(item.status == 1){
wx.navigateTo({ url: `/pages/storage/order-settlement/index?id=${item.weightNoteId}` })
wx.navigateTo({ url: `/pages/storage/order-settlement/index?id=${item.id}` })
} else [ } else [
wx.navigateTo({ url: `/pages/storage/order-info/index?id=${item.weightNoteId}` })
wx.navigateTo({ url: `/pages/storage/order-info/index?id=${item.id}` })
] ]
}, },
onUnload: function(){ onUnload: function(){

Loading…
Cancel
Save