|
@@ -297,15 +297,22 @@
|
|
|
console.log(e)
|
|
|
// 普通二维码,用户扫箱体的二维码开箱
|
|
|
if(e.scanType == 'QR_CODE'){
|
|
|
- _this.openDevice(e.result)
|
|
|
+ let params = parseQueryString(e.result)
|
|
|
+ if(params.codeType == 'hexiao'){ // 扫商户码
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/checkOut/checkOut?scene='+params.officialPartnerNo
|
|
|
+ })
|
|
|
+ }else{ // 扫箱体码
|
|
|
+ _this.openDevice(e.result)
|
|
|
+ }
|
|
|
}
|
|
|
// 小程序码,用户核销
|
|
|
- if(e.scanType == 'WX_CODE'){
|
|
|
- let scene = e.path.split('?')[1]
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/checkOut/checkOut?scene='+scene.split("=")[1]
|
|
|
- })
|
|
|
- }
|
|
|
+ // if(e.scanType == 'WX_CODE'){
|
|
|
+ // let scene = e.path.split('?')[1]
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pages/checkOut/checkOut?scene='+scene.split("=")[1]
|
|
|
+ // })
|
|
|
+ // }
|
|
|
},
|
|
|
fail(err) {
|
|
|
console.log(err)
|