Browse Source

no message

feature/v1.1
xpz2018 5 years ago
parent
commit
de266737ec
3 changed files with 13 additions and 3 deletions
  1. 2
      pages/home/employee/index.js
  2. 5
      pages/process/payment/index.js
  3. 9
      pages/process/payment/index.js.rej

2
pages/home/employee/index.js

@ -115,6 +115,7 @@ Page({
this.fetchMemberList() this.fetchMemberList()
}).catch(err => { }).catch(err => {
wx.hideLoading() wx.hideLoading()
console.log(err)
util.showToast(err) util.showToast(err)
}) })
}, },
@ -126,6 +127,7 @@ Page({
wx.hideLoading() wx.hideLoading()
}).catch(err => { }).catch(err => {
wx.hideLoading() wx.hideLoading()
console.log(err)
util.showToast(err) util.showToast(err)
}) })
}, },

5
pages/process/payment/index.js

@ -154,9 +154,8 @@ Page({
util.showToast('请选择要付款的订单') util.showToast('请选择要付款的订单')
return return
} }
Dialog.confirm({ title: '温馨提示', message: '该客户注册成为纸通宝用户,才可以使用千鸟代付,现在去注册?' }).then(() => {
var cid = this.data.orderList[0].factoryCustomerId
wx.navigateTo({ url: '/pages/client/registe/index?id=' + cid })
Dialog.confirm({ title: '温馨提示', message: '订单已经付款,在此进行确认?' }).then(() => {
this.agentPayment(this.data.params.settleType)
}).catch(err => { }).catch(err => {
}) })
}, },

9
pages/process/payment/index.js.rej

@ -0,0 +1,9 @@
diff a/pages/process/payment/index.js b/pages/process/payment/index.js (rejected hunks)
@@ -154,7 +154,6 @@
util.showToast('请选择要付款的订单')
return
}
- this.agentPayment(this.data.params.settleType)
Dialog.confirm({ title: '温馨提示', message: '该客户注册成为纸通宝用户,才可以使用千鸟代付,现在去注册?' }).then(() => {
var cid = this.data.orderList[0].factoryCustomerId
wx.navigateTo({ url: '/pages/client/registe/index?id=' + cid })
Loading…
Cancel
Save