|
@@ -8,18 +8,19 @@
|
|
|
// } else {
|
|
// } else {
|
|
|
// this.externalBrowser(e);
|
|
// this.externalBrowser(e);
|
|
|
// }
|
|
// }
|
|
|
- if (this.$isWxBrowser() && this.$u.test.isEmpty(e.query)) {
|
|
|
|
|
|
|
+ if (this.$isWxBrowser() && this.$u.test.isEmpty(e.query.isWxBrowse)) {
|
|
|
// uni.reLaunch({
|
|
// uni.reLaunch({
|
|
|
// url: "/pages/index/guide"
|
|
// url: "/pages/index/guide"
|
|
|
// })
|
|
// })
|
|
|
- let path = 'pages/index/guide?login=1';
|
|
|
|
|
|
|
+ let path = 'pages/index/guide?isWxBrowse=1';
|
|
|
window.location.href = authUrl(path);
|
|
window.location.href = authUrl(path);
|
|
|
- } else if (this.$isWxBrowser() && !this.$u.test.isEmpty(e.query.login)) {
|
|
|
|
|
|
|
+ } else if (this.$isWxBrowser() && !this.$u.test.isEmpty(e.query.isWxBrowse) && this.$u.test.isEmpty(e.query.userId)) {
|
|
|
uni.reLaunch({
|
|
uni.reLaunch({
|
|
|
- url: 'pages/index/guide'
|
|
|
|
|
|
|
+ url: 'pages/index/guide?isWxBrowse=1'
|
|
|
})
|
|
})
|
|
|
} else if (this.$isWxBrowser() && !this.$u.test.isEmpty(e.query.userId)) {
|
|
} else if (this.$isWxBrowser() && !this.$u.test.isEmpty(e.query.userId)) {
|
|
|
- if (e.query.userId != uni.getStorageSync("userId")) {
|
|
|
|
|
|
|
+ let userId = uni.getStorageSync("userId");
|
|
|
|
|
+ if (e.query.userId != userId) {
|
|
|
let url = window.location.href;
|
|
let url = window.location.href;
|
|
|
let len = url.indexOf("userId=") - 1
|
|
let len = url.indexOf("userId=") - 1
|
|
|
let tmp = url.substring(0, len)
|
|
let tmp = url.substring(0, len)
|
|
@@ -27,10 +28,9 @@
|
|
|
window.location.href = tmp
|
|
window.location.href = tmp
|
|
|
} else {
|
|
} else {
|
|
|
uni.reLaunch({
|
|
uni.reLaunch({
|
|
|
- url: 'pages/index/guide?userId=' + e.query.userId
|
|
|
|
|
|
|
+ url: 'pages/index/guide?isWxBrowse=1&userId=' + e.query.userId
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
} else {
|
|
} else {
|
|
|
if (!this.$u.test.isEmpty(e.query.userId)) {
|
|
if (!this.$u.test.isEmpty(e.query.userId)) {
|
|
|
uni.reLaunch({
|
|
uni.reLaunch({
|