diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index e525ffb16..03c931527 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -524,4 +524,27 @@ App({ } }, + // 登录校验 + is_login_check(res) { + if(res.code == -400) + { + wx.clearStorage(); + wx.showModal({ + title: '温馨提示', + content: '授权用户信息', + confirmText: '确认', + cancelText: '暂不', + success: (result) => { + if (result.confirm) { + wx.navigateTo({ + url: "/pages/login/login?event_callback=init" + }); + } + }, + }); + return false; + } + return true; + }, + }); \ No newline at end of file diff --git a/public/appmini/old/weixin/app.wxss b/public/appmini/old/weixin/app.wxss index 3fe0892f0..429d51cbf 100755 --- a/public/appmini/old/weixin/app.wxss +++ b/public/appmini/old/weixin/app.wxss @@ -78,6 +78,7 @@ textarea { .br-r { border-right: solid 1px #efefef; } /* 虚线边框 */ +.br-dashed { border: dashed 1px #efefef; } .br-b-dashed { border-bottom: dashed 1px #efefef; } .br-t-dashed { border-top: dashed 1px #efefef; } .br-l-dashed { border-left: dashed 1px #efefef; } diff --git a/public/appmini/old/weixin/pages/buy/buy.js b/public/appmini/old/weixin/pages/buy/buy.js index 42b6ffcd5..c76d45d7a 100755 --- a/public/appmini/old/weixin/pages/buy/buy.js +++ b/public/appmini/old/weixin/pages/buy/buy.js @@ -131,7 +131,9 @@ Page({ data_list_loding_status: 2, data_list_loding_msg: res.data.msg, }); - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { diff --git a/public/appmini/old/weixin/pages/cart/cart.js b/public/appmini/old/weixin/pages/cart/cart.js index f13c1c603..653865c4c 100755 --- a/public/appmini/old/weixin/pages/cart/cart.js +++ b/public/appmini/old/weixin/pages/cart/cart.js @@ -76,7 +76,7 @@ Page({ data_bottom_line_status: true, data_list_loding_msg: '购物车空空如也', - // 是否展示型 + // 站点模式 common_site_type: data.common_site_type || 0, common_is_exhibition_mode_btn_text: data.common_is_exhibition_mode_btn_text || '立即咨询', customer_service_tel: data.customer_service_tel || null, @@ -87,7 +87,9 @@ Page({ data_bottom_line_status: false, data_list_loding_msg: res.data.msg, }); - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js index dc93a568f..d1d15c03a 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js @@ -315,7 +315,9 @@ Page({ }); app.showToast(res.data.msg, "success"); } else { - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { @@ -350,7 +352,9 @@ Page({ this.popup_close_event(); app.showToast(res.data.msg, "success"); } else { - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { @@ -866,5 +870,4 @@ Page({ path: '/pages/goods-detail/goods-detail?goods_id=' + this.data.goods.id +'&referrer='+user_id }; }, - }); diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml index d883e4efe..d9c268c8e 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml @@ -235,7 +235,7 @@ - + diff --git a/public/appmini/old/weixin/pages/lib/online-service/content.wxml b/public/appmini/old/weixin/pages/lib/online-service/content.wxml index 968819ec6..85ebbdd84 100644 --- a/public/appmini/old/weixin/pages/lib/online-service/content.wxml +++ b/public/appmini/old/weixin/pages/lib/online-service/content.wxml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/user-address/user-address.js b/public/appmini/old/weixin/pages/user-address/user-address.js index f9826ee2f..176eff1f0 100755 --- a/public/appmini/old/weixin/pages/user-address/user-address.js +++ b/public/appmini/old/weixin/pages/user-address/user-address.js @@ -77,8 +77,9 @@ Page({ this.setData({ data_list_loding_status: 0 }); - - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { diff --git a/public/appmini/old/weixin/pages/user-answer-list/user-answer-list.js b/public/appmini/old/weixin/pages/user-answer-list/user-answer-list.js index 45ca82189..35dfe1f36 100755 --- a/public/appmini/old/weixin/pages/user-answer-list/user-answer-list.js +++ b/public/appmini/old/weixin/pages/user-answer-list/user-answer-list.js @@ -91,8 +91,9 @@ Page({ this.setData({ data_list_loding_status: 0 }); - - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { diff --git a/public/appmini/old/weixin/pages/user-coupon/user-coupon.js b/public/appmini/old/weixin/pages/user-coupon/user-coupon.js index e70047d55..a86f87616 100644 --- a/public/appmini/old/weixin/pages/user-coupon/user-coupon.js +++ b/public/appmini/old/weixin/pages/user-coupon/user-coupon.js @@ -66,7 +66,9 @@ Page({ data_list_loding_status: 2, data_list_loding_msg: res.data.msg, }); - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { diff --git a/public/appmini/old/weixin/pages/user-faovr/user-faovr.js b/public/appmini/old/weixin/pages/user-faovr/user-faovr.js index 49e263d23..0d585aad4 100755 --- a/public/appmini/old/weixin/pages/user-faovr/user-faovr.js +++ b/public/appmini/old/weixin/pages/user-faovr/user-faovr.js @@ -89,8 +89,9 @@ Page({ this.setData({ data_list_loding_status: 0 }); - - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { diff --git a/public/appmini/old/weixin/pages/user-goods-browse/user-goods-browse.js b/public/appmini/old/weixin/pages/user-goods-browse/user-goods-browse.js index c273d9c33..347f823b6 100755 --- a/public/appmini/old/weixin/pages/user-goods-browse/user-goods-browse.js +++ b/public/appmini/old/weixin/pages/user-goods-browse/user-goods-browse.js @@ -88,8 +88,9 @@ Page({ this.setData({ data_list_loding_status: 0 }); - - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { diff --git a/public/appmini/old/weixin/pages/user-integral/user-integral.js b/public/appmini/old/weixin/pages/user-integral/user-integral.js index f81a47b3e..8207ee317 100755 --- a/public/appmini/old/weixin/pages/user-integral/user-integral.js +++ b/public/appmini/old/weixin/pages/user-integral/user-integral.js @@ -91,8 +91,9 @@ Page({ this.setData({ data_list_loding_status: 0 }); - - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { diff --git a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml index 990894f72..182c22c93 100755 --- a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml +++ b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml @@ -16,7 +16,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss index b72fd920c..593a2abed 100755 --- a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss +++ b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss @@ -28,8 +28,8 @@ min-height: 160rpx; margin-left: 180rpx; } -.goods .goods-item:not(:last-child) { - border-bottom: 1px dashed #efefef; +.goods .goods-item:last-child { + border-bottom: 0; } .goods-item { padding: 20rpx 10rpx; diff --git a/public/appmini/old/weixin/pages/user-order/user-order.js b/public/appmini/old/weixin/pages/user-order/user-order.js index ae33f3158..0c3d31992 100755 --- a/public/appmini/old/weixin/pages/user-order/user-order.js +++ b/public/appmini/old/weixin/pages/user-order/user-order.js @@ -156,8 +156,9 @@ Page({ data_list_loding_status: 0, load_status: 1, }); - - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { diff --git a/public/appmini/old/weixin/pages/user-order/user-order.wxml b/public/appmini/old/weixin/pages/user-order/user-order.wxml index b4ca039d9..0d9c2fccc 100755 --- a/public/appmini/old/weixin/pages/user-order/user-order.wxml +++ b/public/appmini/old/weixin/pages/user-order/user-order.wxml @@ -14,7 +14,7 @@ {{item.add_time}} {{item.status_name}} - + diff --git a/public/appmini/old/weixin/pages/user-order/user-order.wxss b/public/appmini/old/weixin/pages/user-order/user-order.wxss index b88114d62..4ec527203 100755 --- a/public/appmini/old/weixin/pages/user-order/user-order.wxss +++ b/public/appmini/old/weixin/pages/user-order/user-order.wxss @@ -24,8 +24,8 @@ .goods-title { line-height: 36rpx; } -.list-item .goods-item:not(:last-child) { - border-bottom: 1px dashed #efefef; +.list-item .goods-item:last-child { + border-bottom: 0; } .goods-item { padding: 20rpx 10rpx; diff --git a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js index 8e36fa3db..60b5b5b7f 100644 --- a/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js +++ b/public/appmini/old/weixin/pages/user-orderaftersale/user-orderaftersale.js @@ -134,8 +134,9 @@ Page({ data_list_loding_status: 0, data_list_loding_msg: res.data.msg, }); - - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { diff --git a/public/appmini/old/weixin/pages/user/user.js b/public/appmini/old/weixin/pages/user/user.js index 3333542ca..6a9cc8a8c 100755 --- a/public/appmini/old/weixin/pages/user/user.js +++ b/public/appmini/old/weixin/pages/user/user.js @@ -107,7 +107,10 @@ Page({ common_app_is_head_vice_nav: data.common_app_is_head_vice_nav || 0, }); } else { - app.showToast(res.data.msg); + if(app.is_login_check(res.data)) + { + app.showToast(res.data.msg); + } } }, fail: () => { @@ -119,7 +122,7 @@ Page({ // 清除缓存 clear_storage(e) { - wx.clearStorage() + wx.clearStorage(); app.showToast("清除缓存成功", "success"); }, diff --git a/public/appmini/old/weixin/pages/user/user.wxml b/public/appmini/old/weixin/pages/user/user.wxml index 95a363c11..f8e36a724 100755 --- a/public/appmini/old/weixin/pages/user/user.wxml +++ b/public/appmini/old/weixin/pages/user/user.wxml @@ -57,7 +57,7 @@ - 清除缓存 + 安全退出