diff --git a/pages/bidding/detail/index.js b/pages/bidding/detail/index.js index 901fbb6..4853582 100644 --- a/pages/bidding/detail/index.js +++ b/pages/bidding/detail/index.js @@ -140,9 +140,11 @@ Page({ if (!this.data.biddingInfo) { return } - wx.navigateTo({ - url: '/pages/shop/detail/index?storeId=' + this.data.biddingInfo.biddingActivity.storeId - }) + if(!app.globalData.userInfo){ + wx.navigateTo({ url: '/pages/login/index'}) + return + } + wx.navigateTo({ url: '/pages/shop/detail/index?storeId=' + this.data.biddingInfo.biddingActivity.storeId }) }, formatePrice: function (value, kg) { if (value || value == 0) { diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml index 3be51f2..a880be5 100644 --- a/pages/home/index/index.wxml +++ b/pages/home/index/index.wxml @@ -5,7 +5,7 @@ - + diff --git a/pages/mall/detail/index.js b/pages/mall/detail/index.js index 8ed89c8..dd578ca 100644 --- a/pages/mall/detail/index.js +++ b/pages/mall/detail/index.js @@ -308,6 +308,10 @@ Page({ if (!this.data.orderInfo) { return } + if(!app.globalData.userInfo){ + wx.navigateTo({ url: '/pages/login/index'}) + return + } util.navigateTo('/pages/shop/detail/index?storeId=' + this.data.orderInfo.storeId) }, biddingPrice: function (price) { diff --git a/pages/mall/detail/index.wxml b/pages/mall/detail/index.wxml index c47c5bf..3edca63 100644 --- a/pages/mall/detail/index.wxml +++ b/pages/mall/detail/index.wxml @@ -73,7 +73,7 @@ {{item.mobile}} - {{item.updateTime}} + {{item.updateTime || ''}} ¥{{formate.formatePrice2(item.biddingUnitPrice, kg)}} diff --git a/pages/morder/detail/index.js b/pages/morder/detail/index.js index 6fcbfec..b31cda4 100644 --- a/pages/morder/detail/index.js +++ b/pages/morder/detail/index.js @@ -206,9 +206,11 @@ Page({ if(!this.data.orderInfo){ return } - wx.navigateTo({ - url: '/pages/shop/detail/index?storeId=' + this.data.orderInfo.storeId - }) + if(!app.globalData.userInfo){ + wx.navigateTo({ url: '/pages/login/index'}) + return + } + wx.navigateTo({ url: '/pages/shop/detail/index?storeId=' + this.data.orderInfo.storeId }) }, bindInput: function(e){ if(e.target.id == 'grossWeight'){ diff --git a/pages/purchase/detail/index.js b/pages/purchase/detail/index.js index 4edbc95..49ca3c4 100644 --- a/pages/purchase/detail/index.js +++ b/pages/purchase/detail/index.js @@ -56,23 +56,6 @@ Page({ wx.previewImage({ urls: imgList, current: e.currentTarget.dataset.url }) }, check: function(){ - // if (!app.globalData.userInfo.isAuth) { - // this.wuxDialog.open({ - // resetOnClose: true, - // title: '温馨提示', - // content: '您还没有进行个人信息认证,现在去进行个人信息认证?', - // buttons: [{ - // text: '确定', - // type: 'primary', - // onTap(e) { - // wx.navigateTo({ - // url: '/pages/home/idcard/index' - // }) - // } - // }] - // }) - // return false - // } if (!app.globalData.userInfo.isVIP) { this.wuxDialog.open({ resetOnClose: true, @@ -82,9 +65,7 @@ Page({ text: '确定', type: 'primary', onTap(e) { - wx.navigateTo({ - url: '/pages/ztbvip/index' - }) + wx.navigateTo({ url: '/pages/ztbvip/index' }) } }] }) @@ -96,6 +77,10 @@ Page({ if (!this.data.orderInfo) { return } + if(!app.globalData.userInfo){ + wx.navigateTo({ url: '/pages/login/index'}) + return + } if(this.check()){ wx.navigateTo({ url: '/pages/shop/detail/index?storeId=' + this.data.orderInfo.storeId }) } diff --git a/pages/purchase/detail/index.wxml b/pages/purchase/detail/index.wxml index 3c1fdb8..8dff89d 100644 --- a/pages/purchase/detail/index.wxml +++ b/pages/purchase/detail/index.wxml @@ -20,7 +20,6 @@ {{orderInfo.unitPrice ? '采购单价:¥' + formate.formatePrice2(orderInfo.unitPrice, kg) : '价格面议'}} - 采购信息 @@ -38,7 +37,7 @@ {{orderInfo.description}} - +