From 373157e6b02e43c90b001c1e0ce8f6558b34f227 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 28 Nov 2019 14:19:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/appmini/old/alipay/app.js | 22 ++++++------------- .../alipay/pages/answer-form/answer-form.js | 2 ++ .../alipay/pages/answer-list/answer-list.js | 2 +- public/appmini/old/alipay/pages/buy/buy.js | 6 +++-- public/appmini/old/alipay/pages/cart/cart.js | 2 +- .../appmini/old/alipay/pages/coupon/coupon.js | 2 +- .../extraction-address/extraction-address.js | 2 +- .../pages/goods-comment/goods-comment.js | 2 +- .../alipay/pages/goods-detail/goods-detail.js | 14 +++++------- .../old/alipay/pages/message/message.js | 2 +- .../user-address-save/user-address-save.js | 8 +++++-- .../alipay/pages/user-address/user-address.js | 2 +- .../user-answer-list/user-answer-list.js | 2 +- .../alipay/pages/user-coupon/user-coupon.js | 2 +- .../old/alipay/pages/user-faovr/user-faovr.js | 2 +- .../user-goods-browse/user-goods-browse.js | 2 +- .../pages/user-integral/user-integral.js | 2 +- .../user-order-comments.js | 2 +- .../user-order-detail/user-order-detail.js | 2 +- .../old/alipay/pages/user-order/user-order.js | 2 +- .../user-orderaftersale-detail.js | 2 +- .../user-orderaftersale.js | 2 +- .../appmini/old/alipay/pages/user/user.axml | 2 +- public/appmini/old/alipay/pages/user/user.js | 2 +- .../baidu/pages/goods-detail/goods-detail.js | 2 +- .../old/qq/pages/goods-detail/goods-detail.js | 2 +- .../pages/goods-detail/goods-detail.js | 2 +- .../weixin/pages/goods-detail/goods-detail.js | 2 +- 28 files changed, 47 insertions(+), 51 deletions(-) diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js index c12fbd76e..a399d1751 100644 --- a/public/appmini/old/alipay/app.js +++ b/public/appmini/old/alipay/app.js @@ -646,24 +646,16 @@ App({ } }, - // 登录校验 - is_login_check(res) { + /** + * 登录校验 + * object 回调操作对象 + * method 回调操作对象的函数 + */ + is_login_check(res, object, method) { if(res.code == -400) { my.clearStorage(); - my.confirm({ - title: '温馨提示', - content: '授权用户信息', - confirmButtonText: '确认', - cancelButtonText: '暂不', - success: (result) => { - if (result.confirm) { - my.navigateTo({ - url: "/pages/login/login?event_callback=init" - }); - } - }, - }); + this.get_user_info(object, method); return false; } return true; diff --git a/public/appmini/old/alipay/pages/answer-form/answer-form.js b/public/appmini/old/alipay/pages/answer-form/answer-form.js index dd17acfdf..25d86abe2 100755 --- a/public/appmini/old/alipay/pages/answer-form/answer-form.js +++ b/public/appmini/old/alipay/pages/answer-form/answer-form.js @@ -82,6 +82,8 @@ Page({ this.setData({form_submit_loading: false}); if (app.is_login_check(res.data)) { app.showToast(res.data.msg); + } else { + app.showToast('提交失败，请重试！'); } } }, diff --git a/public/appmini/old/alipay/pages/answer-list/answer-list.js b/public/appmini/old/alipay/pages/answer-list/answer-list.js index da3e4da29..ce6c4dd2f 100644 --- a/public/appmini/old/alipay/pages/answer-list/answer-list.js +++ b/public/appmini/old/alipay/pages/answer-list/answer-list.js @@ -76,7 +76,7 @@ Page({ this.setData({ data_list_loding_status: 0 }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'get_data_list')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/buy/buy.js b/public/appmini/old/alipay/pages/buy/buy.js index 63b109c4a..df1864800 100644 --- a/public/appmini/old/alipay/pages/buy/buy.js +++ b/public/appmini/old/alipay/pages/buy/buy.js @@ -143,7 +143,7 @@ Page({ data_list_loding_status: 2, data_list_loding_msg: res.data.msg, }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'init')) { app.showToast(res.data.msg); } } @@ -210,8 +210,10 @@ Page({ my.redirectTo({url: '/pages/user-order/user-order'}); } } else { - app.showToast(res.data.msg); this.setData({ buy_submit_disabled_status: false }); + if (app.is_login_check(res.data, this, 'buy_submit_event')) { + app.showToast(res.data.msg); + } } }, fail: () => { diff --git a/public/appmini/old/alipay/pages/cart/cart.js b/public/appmini/old/alipay/pages/cart/cart.js index d627e0821..be770b886 100644 --- a/public/appmini/old/alipay/pages/cart/cart.js +++ b/public/appmini/old/alipay/pages/cart/cart.js @@ -104,7 +104,7 @@ Page({ data_bottom_line_status: false, data_list_loding_msg: res.data.msg, }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'get_data')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/coupon/coupon.js b/public/appmini/old/alipay/pages/coupon/coupon.js index 489796a00..2dfca52d4 100644 --- a/public/appmini/old/alipay/pages/coupon/coupon.js +++ b/public/appmini/old/alipay/pages/coupon/coupon.js @@ -62,7 +62,7 @@ Page({ data_list_loding_status: 2, data_list_loding_msg: res.data.msg, }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, self, 'get_data_list')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/extraction-address/extraction-address.js b/public/appmini/old/alipay/pages/extraction-address/extraction-address.js index 9e7a8f9ce..ce65ff5b9 100644 --- a/public/appmini/old/alipay/pages/extraction-address/extraction-address.js +++ b/public/appmini/old/alipay/pages/extraction-address/extraction-address.js @@ -75,7 +75,7 @@ Page({ this.setData({ data_list_loding_status: 0 }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'get_data_list')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/goods-comment/goods-comment.js b/public/appmini/old/alipay/pages/goods-comment/goods-comment.js index 713b8b33f..142c7e4bd 100644 --- a/public/appmini/old/alipay/pages/goods-comment/goods-comment.js +++ b/public/appmini/old/alipay/pages/goods-comment/goods-comment.js @@ -125,7 +125,7 @@ Page({ this.setData({ data_list_loding_status: 0 }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'get_data_list')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js index a2ba7ed71..7f6c96c4e 100644 --- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js @@ -313,7 +313,7 @@ Page({ }); app.showToast(res.data.msg, 'success'); } else { - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'goods_favor_event')) { app.showToast(res.data.msg); } } @@ -329,7 +329,7 @@ Page({ // 加入购物车事件 goods_cart_event(e, spec) { - var user = app.get_user_info(this, 'goods_cart_event'); + var user = app.get_user_info(this, 'goods_buy_confirm_event'); if (user != false) { // 用户未绑定用户则转到登录页面 if (app.user_is_need_login(user)) { @@ -352,7 +352,7 @@ Page({ this.popup_close_event(); app.showToast(res.data.msg, 'success'); } else { - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'goods_buy_confirm_event')) { app.showToast(res.data.msg); } } @@ -483,9 +483,7 @@ Page({ this.setData({goods_specifications_choose: temp_data}); } } else { - if (app.is_login_check(res.data)) { - app.showToast(res.data.msg); - } + app.showToast(res.data.msg); } }, fail: () => { @@ -540,9 +538,7 @@ Page({ goods_spec_base_inventory: res.data.data.inventory, }); } else { - if (app.is_login_check(res.data)) { - app.showToast(res.data.msg); - } + app.showToast(res.data.msg); } }, fail: () => { diff --git a/public/appmini/old/alipay/pages/message/message.js b/public/appmini/old/alipay/pages/message/message.js index c4578ce96..91b5afac2 100644 --- a/public/appmini/old/alipay/pages/message/message.js +++ b/public/appmini/old/alipay/pages/message/message.js @@ -98,7 +98,7 @@ Page({ this.setData({ data_list_loding_status: 0 }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'get_data_list')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/user-address-save/user-address-save.js b/public/appmini/old/alipay/pages/user-address-save/user-address-save.js index e6dd48a4b..03a3d72dd 100644 --- a/public/appmini/old/alipay/pages/user-address-save/user-address-save.js +++ b/public/appmini/old/alipay/pages/user-address-save/user-address-save.js @@ -108,7 +108,7 @@ Page({ self.init_value(); }, 500); } else { - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, self, 'get_user_address')) { app.showToast(res.data.msg); } } @@ -310,7 +310,11 @@ Page({ my.navigateBack(); }, 1000); } else { - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } else { + app.showToast('提交失败，请重试！'); + } } }, fail: () => { diff --git a/public/appmini/old/alipay/pages/user-address/user-address.js b/public/appmini/old/alipay/pages/user-address/user-address.js index 480c5a2ec..e150a7bca 100644 --- a/public/appmini/old/alipay/pages/user-address/user-address.js +++ b/public/appmini/old/alipay/pages/user-address/user-address.js @@ -85,7 +85,7 @@ Page({ this.setData({ data_list_loding_status: 0 }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'get_data_list')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/user-answer-list/user-answer-list.js b/public/appmini/old/alipay/pages/user-answer-list/user-answer-list.js index d8f95005b..0374e1db1 100644 --- a/public/appmini/old/alipay/pages/user-answer-list/user-answer-list.js +++ b/public/appmini/old/alipay/pages/user-answer-list/user-answer-list.js @@ -98,7 +98,7 @@ Page({ this.setData({ data_list_loding_status: 0 }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'get_data_list')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/user-coupon/user-coupon.js b/public/appmini/old/alipay/pages/user-coupon/user-coupon.js index 342c55eca..2901f4f38 100644 --- a/public/appmini/old/alipay/pages/user-coupon/user-coupon.js +++ b/public/appmini/old/alipay/pages/user-coupon/user-coupon.js @@ -66,7 +66,7 @@ Page({ data_list_loding_status: 2, data_list_loding_msg: res.data.msg, }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, self, 'get_data_list')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/user-faovr/user-faovr.js b/public/appmini/old/alipay/pages/user-faovr/user-faovr.js index 53953e704..920783f1d 100644 --- a/public/appmini/old/alipay/pages/user-faovr/user-faovr.js +++ b/public/appmini/old/alipay/pages/user-faovr/user-faovr.js @@ -96,7 +96,7 @@ Page({ this.setData({ data_list_loding_status: 0 }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'get_data_list')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/user-goods-browse/user-goods-browse.js b/public/appmini/old/alipay/pages/user-goods-browse/user-goods-browse.js index a96d44f63..c36ac57b8 100644 --- a/public/appmini/old/alipay/pages/user-goods-browse/user-goods-browse.js +++ b/public/appmini/old/alipay/pages/user-goods-browse/user-goods-browse.js @@ -95,7 +95,7 @@ Page({ this.setData({ data_list_loding_status: 0 }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'get_data_list')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/user-integral/user-integral.js b/public/appmini/old/alipay/pages/user-integral/user-integral.js index be4a3ff28..02192b549 100644 --- a/public/appmini/old/alipay/pages/user-integral/user-integral.js +++ b/public/appmini/old/alipay/pages/user-integral/user-integral.js @@ -98,7 +98,7 @@ Page({ this.setData({ data_list_loding_status: 0 }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'get_data_list')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/user-order-comments/user-order-comments.js b/public/appmini/old/alipay/pages/user-order-comments/user-order-comments.js index fc11e6ed9..998384603 100644 --- a/public/appmini/old/alipay/pages/user-order-comments/user-order-comments.js +++ b/public/appmini/old/alipay/pages/user-order-comments/user-order-comments.js @@ -56,7 +56,7 @@ Page({ data_list_loding_status: 2, data_list_loding_msg: res.data.msg, }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, self, 'init')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js index 41720dc8d..a611904ac 100644 --- a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js +++ b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js @@ -113,7 +113,7 @@ Page({ data_bottom_line_status: false, data_list_loding_msg: res.data.msg, }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, self, 'init')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/user-order/user-order.js b/public/appmini/old/alipay/pages/user-order/user-order.js index cc1f4904a..03b548c82 100644 --- a/public/appmini/old/alipay/pages/user-order/user-order.js +++ b/public/appmini/old/alipay/pages/user-order/user-order.js @@ -164,7 +164,7 @@ Page({ data_list_loding_status: 0, load_status: 1, }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'get_data_list')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js index ec696f988..eb648adff 100644 --- a/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js +++ b/public/appmini/old/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js @@ -166,7 +166,7 @@ Page({ data_bottom_line_status: false, data_list_loding_msg: res.data.msg, }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, self, 'init')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js index 8f88d32cd..bf50f1939 100644 --- a/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js +++ b/public/appmini/old/alipay/pages/user-orderaftersale/user-orderaftersale.js @@ -134,7 +134,7 @@ Page({ data_list_loding_status: 0, data_list_loding_msg: res.data.msg, }); - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, self, 'get_data_list')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/alipay/pages/user/user.axml b/public/appmini/old/alipay/pages/user/user.axml index e074cd306..e9fde2db1 100644 --- a/public/appmini/old/alipay/pages/user/user.axml +++ b/public/appmini/old/alipay/pages/user/user.axml @@ -55,7 +55,7 @@ - 清除缓存 + 安全退出 diff --git a/public/appmini/old/alipay/pages/user/user.js b/public/appmini/old/alipay/pages/user/user.js index 40110220a..a1fd99aa2 100644 --- a/public/appmini/old/alipay/pages/user/user.js +++ b/public/appmini/old/alipay/pages/user/user.js @@ -124,7 +124,7 @@ Page({ this.setData({common_app_mini_alipay_openid: app.get_user_openid()}); } } else { - if (app.is_login_check(res.data)) { + if (app.is_login_check(res.data, this, 'get_data')) { app.showToast(res.data.msg); } } diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js index 8da0514c7..cf5d841a6 100755 --- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js @@ -293,7 +293,7 @@ Page({ // 加入购物车事件 goods_cart_event(e, spec) { - var user = app.get_user_cache_info(this, 'goods_cart_event'); + var user = app.get_user_cache_info(this, 'goods_buy_confirm_event'); // 用户未绑定用户则转到登录页面 if (app.user_is_need_login(user)) { swan.navigateTo({ diff --git a/public/appmini/old/qq/pages/goods-detail/goods-detail.js b/public/appmini/old/qq/pages/goods-detail/goods-detail.js index 851288d4b..3e0159bef 100755 --- a/public/appmini/old/qq/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.js @@ -305,7 +305,7 @@ Page({ // 加入购物车事件 goods_cart_event(e, spec) { - var user = app.get_user_cache_info(this, 'goods_cart_event'); + var user = app.get_user_cache_info(this, 'goods_buy_confirm_event'); // 用户未绑定用户则转到登录页面 if (app.user_is_need_login(user)) { qq.navigateTo({ diff --git a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js index 082738f95..615215a08 100755 --- a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js @@ -300,7 +300,7 @@ Page({ // 加入购物车事件 goods_cart_event(e, spec) { - var user = app.get_user_cache_info(this, 'goods_cart_event'); + var user = app.get_user_cache_info(this, 'goods_buy_confirm_event'); // 用户未绑定用户则转到登录页面 if (app.user_is_need_login(user)) { tt.navigateTo({ 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 a5c0aebe3..67f79bfd5 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js @@ -331,7 +331,7 @@ Page({ // 加入购物车事件 goods_cart_event(e, spec) { - var user = app.get_user_cache_info(this, 'goods_cart_event'); + var user = app.get_user_cache_info(this, 'goods_buy_confirm_event'); // 用户未绑定用户则转到登录页面 if (app.user_is_need_login(user)) { wx.navigateTo({ -- GitLab