|
|
@@ -506,12 +506,12 @@
|
|
|
that.shopId = shopId
|
|
|
}
|
|
|
|
|
|
- if (!that.userId) {
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/public/login'
|
|
|
- })
|
|
|
- return;
|
|
|
- }
|
|
|
+ // if (!that.userId) {
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pages/public/login'
|
|
|
+ // })
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
|
|
|
setTimeout(function() {
|
|
|
uni.navigateTo({
|
|
|
@@ -521,12 +521,12 @@
|
|
|
} else if (e.orderId) {
|
|
|
|
|
|
uni.setStorageSync('orderId', e.orderId)
|
|
|
- if (!that.userId) {
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/public/login'
|
|
|
- })
|
|
|
- return;
|
|
|
- }
|
|
|
+ // if (!that.userId) {
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pages/public/login'
|
|
|
+ // })
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
setTimeout(function() {
|
|
|
uni.navigateTo({
|
|
|
url: '/pages/index/shop/goodsList?shopId=' + e.shopId
|
|
|
@@ -1127,7 +1127,13 @@
|
|
|
},
|
|
|
goNav(url,type) {
|
|
|
console.log(url)
|
|
|
- if (this.userId) {
|
|
|
+ if(url=='/my/integral/index' || url=='/my/task/index'){
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/public/login'
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ // if (this.userId) {
|
|
|
if (uni.getStorageSync('sendMsg')) {
|
|
|
console.log('授权+1')
|
|
|
wx.requestSubscribeMessage({
|
|
|
@@ -1154,11 +1160,11 @@
|
|
|
})
|
|
|
}
|
|
|
|
|
|
- } else {
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/public/login'
|
|
|
- })
|
|
|
- }
|
|
|
+ // } else {
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pages/public/login'
|
|
|
+ // })
|
|
|
+ // }
|
|
|
},
|
|
|
goShopDet(url, e,shuzu) {
|
|
|
if (uni.getStorageSync('sendMsg')) {
|
|
|
@@ -1211,15 +1217,15 @@
|
|
|
|
|
|
console.log(url)
|
|
|
let items = encodeURIComponent(JSON.stringify(shuzu));
|
|
|
- if (this.userId) {
|
|
|
+ // if (this.userId) {
|
|
|
uni.navigateTo({
|
|
|
url:'/pages/index/shop/index?shopId='+url+'&huoListss='+items
|
|
|
})
|
|
|
- } else {
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/public/login'
|
|
|
- })
|
|
|
- }
|
|
|
+ // } else {
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pages/public/login'
|
|
|
+ // })
|
|
|
+ // }
|
|
|
},
|
|
|
defaultAddress() {
|
|
|
if (uni.getStorageSync('city')) {
|
|
|
@@ -1271,12 +1277,12 @@
|
|
|
},
|
|
|
goAddress() {
|
|
|
let userId = this.$queue.getData('userId');
|
|
|
- if (!userId) {
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/public/login'
|
|
|
- })
|
|
|
- return
|
|
|
- }
|
|
|
+ // if (!userId) {
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pages/public/login'
|
|
|
+ // })
|
|
|
+ // return
|
|
|
+ // }
|
|
|
uni.navigateTo({
|
|
|
url: '/pages/index/selectCampus'
|
|
|
})
|
|
|
@@ -1302,12 +1308,12 @@
|
|
|
}
|
|
|
|
|
|
let userId = this.$queue.getData('userId');
|
|
|
- if (!userId) {
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/public/login'
|
|
|
- })
|
|
|
- return
|
|
|
- }
|
|
|
+ // if (!userId) {
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pages/public/login'
|
|
|
+ // })
|
|
|
+ // return
|
|
|
+ // }
|
|
|
//如果是小程序跳转就是设置这个
|
|
|
if (item.describes) {
|
|
|
uni.navigateToMiniProgram({
|
|
|
@@ -1394,12 +1400,12 @@
|
|
|
// 跳转商品详情
|
|
|
goDet(goodsId, shopId) {
|
|
|
let userId = this.$queue.getData('userId');
|
|
|
- if (!userId) {
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/public/login'
|
|
|
- })
|
|
|
- return
|
|
|
- }
|
|
|
+ // if (!userId) {
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pages/public/login'
|
|
|
+ // })
|
|
|
+ // return
|
|
|
+ // }
|
|
|
uni.navigateTo({
|
|
|
url: '/pages/index/shop/goodsDet?goodsId=' + goodsId + '&shopId=' + shopId + '&orderType=2'
|
|
|
})
|