|
@@ -94,23 +94,7 @@
|
|
|
userPhone: '',
|
|
|
stepIndex: 0, // 当前步奏下标
|
|
|
serverIndex: 0, // 选择服务下标
|
|
|
- itemList: [ // 服务列表
|
|
|
- {
|
|
|
- id: 1,
|
|
|
- name: '极速快洗',
|
|
|
- price: 10
|
|
|
- },
|
|
|
- {
|
|
|
- id: 12,
|
|
|
- name: '精致洗',
|
|
|
- price: 20
|
|
|
- },
|
|
|
- {
|
|
|
- id: 13,
|
|
|
- name: '打蜡洗',
|
|
|
- price: 30
|
|
|
- }
|
|
|
- ],
|
|
|
+ itemList: [], // 服务类型
|
|
|
isRead: '', // 是否同意协议
|
|
|
couponList: [
|
|
|
{
|
|
@@ -166,6 +150,9 @@
|
|
|
uni.$once('read', this.read)
|
|
|
this.getUserPhone()
|
|
|
this.getServerList()
|
|
|
+ // 存储当前扫码的设备及网点id
|
|
|
+ this.$store.state.vuex_orderInfo.bizId = option.bizId || '9898'
|
|
|
+ this.$store.state.vuex_orderInfo.storeId = option.storeId || ''
|
|
|
},
|
|
|
onUnload() {
|
|
|
uni.removeStorageSync('stepIndex')
|
|
@@ -295,9 +282,8 @@
|
|
|
let data = res.data
|
|
|
// 保存成功后 请求预支付返回吊起微信支付所需参数
|
|
|
this.getPayData(data)
|
|
|
- // uni.redirectTo({
|
|
|
- // url:`/pages/work/index/index?washCarType=${data.itemCode}&orderNo=${data.orderNo}`
|
|
|
- // })
|
|
|
+ this.$store.state.vuex_orderInfo.itemCode = data.itemCode
|
|
|
+ this.$store.state.vuex_orderInfo.orderNo = data.orderNo
|
|
|
} else {
|
|
|
uni.hideLoading()
|
|
|
// 刷新服务项
|
|
@@ -307,9 +293,9 @@
|
|
|
})
|
|
|
},
|
|
|
// 预支付 返回微信支付所需参数
|
|
|
- getPayData (data) {
|
|
|
- signPay({orderId:data.id}).then(res =>{
|
|
|
- console.log(res,'11111111')
|
|
|
+ getPayData (orderData) {
|
|
|
+ signPay({orderId:orderData.id}).then(res =>{
|
|
|
+ console.log(res,'预支付')
|
|
|
uni.hideLoading()
|
|
|
if (res.status == 200) {
|
|
|
let data = res.data
|
|
@@ -317,7 +303,7 @@
|
|
|
if (data.tradeStatus && data.tradeStatus=="PAID") {
|
|
|
// 付款成功后开始洗车
|
|
|
uni.redirectTo({
|
|
|
- url:`/pages/work/index/index?washCarType=${data.itemCode}&orderNo=${data.orderNo}`
|
|
|
+ url:`/pages/work/index/index`
|
|
|
})
|
|
|
} else {
|
|
|
uni.requestPayment({
|
|
@@ -331,7 +317,7 @@
|
|
|
console.log('success:' + JSON.stringify(res));
|
|
|
// 付款成功后开始洗车
|
|
|
uni.redirectTo({
|
|
|
- url:`/pages/work/index/index?washCarType=${data.itemCode}&orderNo=${data.orderNo}`
|
|
|
+ url:`/pages/work/index/index`
|
|
|
})
|
|
|
},
|
|
|
fail: function (err) {
|