|
@ -20,15 +20,15 @@ Page({ |
|
|
timingFunc: 'easeIn' |
|
|
timingFunc: 'easeIn' |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
let that = this |
|
|
let that = this |
|
|
const versionNum = '1.2.15' |
|
|
const versionNum = '1.2.16' |
|
|
api.getScanSwitch(versionNum).then(function (res) { |
|
|
api.getScanSwitch(versionNum).then(function (res) { |
|
|
console.log(res.data) |
|
|
console.log(res.data) |
|
|
let state = res.data ? res.data.scanFlag : '1' |
|
|
let state = res.data ? res.data.scanFlag : '1' |
|
|
that.setData({ |
|
|
that.setData({ |
|
|
experience: state |
|
|
experience: state |
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
// if (state == '0') { // 跳过扫码
|
|
|
// if (state == '0') { // 跳过扫码
|
|
|
// // app.globalData.tempGridId = '1169158285790900226' //'1191534416067149825'
|
|
|
// // app.globalData.tempGridId = '1169158285790900226' //'1191534416067149825'
|
|
|
// wx.reLaunch({
|
|
|
// wx.reLaunch({
|
|
@ -50,10 +50,10 @@ Page({ |
|
|
scan() { |
|
|
scan() { |
|
|
wx.scanCode({ |
|
|
wx.scanCode({ |
|
|
success: (res) => { |
|
|
success: (res) => { |
|
|
console.log("扫码结果",res); |
|
|
console.log("扫码结果", res); |
|
|
console.log('/'+decodeURIComponent(res.path)); |
|
|
console.log('/' + decodeURIComponent(res.path)); |
|
|
wx.reLaunch({ |
|
|
wx.reLaunch({ |
|
|
url: '/'+decodeURIComponent(res.path) |
|
|
url: '/' + decodeURIComponent(res.path) |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
fail: (res) => { |
|
|
fail: (res) => { |
|
|