|
@@ -116,19 +116,11 @@
|
|
|
methods: {
|
|
|
// 检验登录token是否过期
|
|
|
checkLogin () {
|
|
|
- uni.checkSession({
|
|
|
- success:(res) => {
|
|
|
- console.log('已登录')
|
|
|
- checkLogin().then(res =>{
|
|
|
- if (res.status == '200'){
|
|
|
- this.hasLogin = true
|
|
|
- } else {
|
|
|
- this.hasLogin = false
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- fail: (err) => {
|
|
|
- console.log('登录过期')
|
|
|
+ checkLogin().then(res =>{
|
|
|
+ console.log(res,'11111111111')
|
|
|
+ if (res.status == '200'){
|
|
|
+ this.hasLogin = true
|
|
|
+ } else {
|
|
|
this.hasLogin = false
|
|
|
}
|
|
|
})
|
|
@@ -249,21 +241,21 @@
|
|
|
},
|
|
|
// 扫码洗车
|
|
|
scanCode () {
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/getOrder/getOrder'
|
|
|
- })
|
|
|
- // if (this.hasLogin) {
|
|
|
- // uni.scanCode({
|
|
|
- // success: function (res) {
|
|
|
- // console.log('条码类型:' + res.scanType);
|
|
|
- // console.log('条码内容:' + res.result);
|
|
|
- // }
|
|
|
- // });
|
|
|
- // } else {
|
|
|
- // uni.navigateTo({
|
|
|
- // url: '/pages/login/login'
|
|
|
- // })
|
|
|
- // }
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pages/getOrder/getOrder'
|
|
|
+ // })
|
|
|
+ if (this.hasLogin) {
|
|
|
+ uni.scanCode({
|
|
|
+ success: function (res) {
|
|
|
+ console.log('条码类型:' + res.scanType);
|
|
|
+ console.log('条码内容:' + res.result);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/login/login'
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
},
|
|
|
// 创建标记点
|