|
@@ -88,7 +88,8 @@
|
|
|
this.shopId = options.shopId
|
|
this.shopId = options.shopId
|
|
|
this.uid = options.uid || ''
|
|
this.uid = options.uid || ''
|
|
|
console.log(this.uid);
|
|
console.log(this.uid);
|
|
|
- let info = localStorage.getItem('wechatuserInfo');
|
|
|
|
|
|
|
+ let info = localStorage.getItem('weChatUserInfo');
|
|
|
|
|
+ console.log(info);
|
|
|
this.localUserInfo = JSON.parse(info)
|
|
this.localUserInfo = JSON.parse(info)
|
|
|
if (this.localUserInfo) {
|
|
if (this.localUserInfo) {
|
|
|
this.vidTokenExist()
|
|
this.vidTokenExist()
|
|
@@ -110,10 +111,10 @@
|
|
|
this.getShopInfo();
|
|
this.getShopInfo();
|
|
|
} else {
|
|
} else {
|
|
|
uni.$u.toast('登录已过期,请重新登录!');
|
|
uni.$u.toast('登录已过期,请重新登录!');
|
|
|
- localStorage.removeItem('wechatuserInfo');
|
|
|
|
|
|
|
+ localStorage.removeItem('weChatUserInfo');
|
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
|
uni.redirectTo({
|
|
uni.redirectTo({
|
|
|
- url: '/pages/index/index?shopId=' + this.shopId
|
|
|
|
|
|
|
+ url: '/pages/index/index?shopId=' + this.shopId + '&uid=' + this.uid
|
|
|
})
|
|
})
|
|
|
}, 1000)
|
|
}, 1000)
|
|
|
}
|
|
}
|
|
@@ -250,16 +251,6 @@
|
|
|
uni.hideLoading();
|
|
uni.hideLoading();
|
|
|
uni.$u.toast('支付失败!');
|
|
uni.$u.toast('支付失败!');
|
|
|
}
|
|
}
|
|
|
- } else if (res.data.code == 403) {
|
|
|
|
|
- uni.$u.toast('登录已过期,请重新登录!');
|
|
|
|
|
- localStorage.removeItem('wechatuserInfo');
|
|
|
|
|
- setTimeout(() => {
|
|
|
|
|
- uni.redirectTo({
|
|
|
|
|
- url: '/pages/index/index'
|
|
|
|
|
- })
|
|
|
|
|
- }, 1000)
|
|
|
|
|
-
|
|
|
|
|
- return;
|
|
|
|
|
} else {
|
|
} else {
|
|
|
uni.$u.toast('线下订单创建失败!');
|
|
uni.$u.toast('线下订单创建失败!');
|
|
|
}
|
|
}
|
|
@@ -278,9 +269,14 @@
|
|
|
this.showPhone = false
|
|
this.showPhone = false
|
|
|
this.getShopInfo()
|
|
this.getShopInfo()
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
} else {
|
|
} else {
|
|
|
- uni.$u.toast('获取微信登录信息失败!');
|
|
|
|
|
|
|
+ uni.$u.toast('获取微信登录信息失败,请重新登录!');
|
|
|
|
|
+ // localStorage.removeItem('weChatUserInfo');
|
|
|
|
|
+ // setTimeout(() => {
|
|
|
|
|
+ // uni.redirectTo({
|
|
|
|
|
+ // url: '/pages/index/index?shopId=' + this.shopId + '&uid=' + this.uid
|
|
|
|
|
+ // })
|
|
|
|
|
+ // }, 1000)
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
GetQueryString(name) {
|
|
GetQueryString(name) {
|