Browse Source

no message

feature/v1.4
xpz2018 4 years ago
parent
commit
8e2ea170b0
3 changed files with 13 additions and 3 deletions
  1. 2
      app.js
  2. 2
      pages/agent/index/index.js
  3. 12
      pages/storage/order-info/index.js

2
app.js

@ -1,6 +1,6 @@
//app.js
App({
evn: 2, // 0: 开发版本;1:测试版本;2:生产版本
evn: 0, // 0: 开发版本;1:测试版本;2:生产版本
tmplIds: ['AFoM5TOfsgERsfcetNSB0UlmEixnLF1ySXr54Bqno2M', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'],
version: '1.4.1',
xAppId: '503258978847953926',

2
pages/agent/index/index.js

@ -1,6 +1,7 @@
// pages/index/index.js
import { getBalanceInfo } from "../../../api/payment"
import util from '../../../utils/util'
const math = require('../../../utils/math')
const event = require('../../../utils/event')
const app = getApp()
@ -34,6 +35,7 @@ Component({
onRestart: function () {
getBalanceInfo().then(result => {
if(result.data){
result.data.accountMoney = math.minus(result.data.accountMoney, result.data.frozenMoney)
this.setData({ banlanceInfo: result.data })
}
}).catch(err => { })

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

@ -48,16 +48,24 @@ Scene({
this.data.fileList.push({ url: element})
}
}
if(app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0){
if(result.data.outboundDeliveryOrder.status == 0){
this.data.auditable = true
}
}
this.setData({
safeBottom: app.globalData.safeBottom,
poundInfo: result.data.weightNote,
orderInfo: result.data.outboundDeliveryOrder,
form: result.data.outboundDeliveryOrderSettlementInfo,
auditable: this.data.auditable,
fileList: this.data.fileList
})
} else {
if(app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 && result.data.outboundDeliveryOrder.status == 0){
this.data.auditable = true
if(app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0){
if(result.data.outboundDeliveryOrder.status == 0){
this.data.auditable = true
}
}
this.setData({
safeBottom: app.globalData.safeBottom,

Loading…
Cancel
Save