diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js
index c12fbd76e1557f5857ffc0fb0e5a498a6722e6fd..a399d1751d96f0f129564703fafd9e99aa6e9668 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 dd17acfdfc81d127e107ddc1caca1040cf56d9a5..25d86abe24121df67a982fadc0b451077a047afd 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 da3e4da29ac176e2de6462cb4e611f068f8d63d2..ce6c4dd2f2ed204671d8e4f4ef3c4163ad7526ec 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 63b109c4a9e5dc3ba51f9b96c32381a8a1a56f85..df186480002be39632e6ac31a76403273f821042 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 d627e08212d6124fc3c5235235e421b1fdba99c1..be770b886f4c88fa6d81c5beb5185d3edddd25d1 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 489796a006a203958b6aeee10e428ee832a5e002..2dfca52d4de27688c0da0ae2e48c821f7ad9e27f 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 9e7a8f9ce10c67ce91dbecde4234e38647a59391..ce65ff5b9bc8915e8923bfe30abb8831a7fb42ef 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 713b8b33f518a6551355b4ca06c445aa274792dd..142c7e4bdc08dda7d4a34cdc61147f9f1a97c866 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 a2ba7ed71f13bb2b2bb976b3dc83b5d3d2b5d2ce..7f6c96c4e8d922eb3acd50981b6c03830fa1a69e 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 c4578ce96491dcdd125ec2e3bd903d24c5b6c086..91b5afac28a55161c12ce99864f64eefa7102491 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 e6dd48a4b66298c2ccb20e5f74028e1a62290d86..03a3d72ddb5afe9fa5f8d7c0f8a129ea1b9efd5d 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 480c5a2ecf1693cd75ae912538abd09450e27d57..e150a7bca650ae38a0d910612458e0eb858db7b4 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 d8f95005be5f33540eeb22f09abc264e845c3b38..0374e1db1d3ac5b212819e0190808e5f9f887ead 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 342c55ecaa034096b16fdda4c3f6b4529ddeb9e9..2901f4f380f910d965f87400b8e97e0314a56c62 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 53953e704cc1b779d3c7e9d3d6b388c58f3340f2..920783f1d8f8136f60cc69f5450119620a705fca 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 a96d44f630fde689064eb0cf8075603b101bb6e1..c36ac57b8553b8626e99a8acd3be7f55c95c9e54 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 be4a3ff28a2e22919f588add4caa47e0e14223b3..02192b549a6d0f2250a14c2e48f2ddf79c4ee1de 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 fc11e6ed930dd2d2dd34b3b6b230ac49bf2a0ff7..998384603992f4c88a934a3b1f3d46aed16281d7 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 41720dc8dbe0f6ce99846bed99753fedf2e32abc..a611904ac941c81b6a0923aeeb5158f7a22d9e2a 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 cc1f4904af39d1681d56fee575579b9ba612a192..03b548c8206f54267eb29fe2d681b7a51fd786e4 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 ec696f988ca2125e119bb9ade719a136248a0d8b..eb648adffdc653e7232ababf9a8753f15b364165 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 8f88d32cddc5a1bc0c2c46f2c900098715cf2882..bf50f19391f48562bc2e1c4bfd391f8a8677b3c9 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 e074cd306f653ec8b555207235ec4d4333e4dc6c..e9fde2db1d6a363ab0379a0d43d3be350626566e 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 40110220af997140b9b947ffe3af2681cf42dd8d..a1fd99aa205d93dc2afd24a61db3949a8f7d3406 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 8da0514c7b04cda8d1893fee0751a8aba8b0f98b..cf5d841a65f40765b208200dcad3fd14c4475508 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 851288d4bb8e4fea3990ebbb4f636a54c34c6bd8..3e0159befce2ebdf01d2386d65ac83dad7cf771d 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 082738f958595bafbb1f0573ad4431a7c15d27de..615215a080bc73dc9bb26741c0c3bb950e7cc569 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 a5c0aebe3ea8abd599b3df60b3e29115537dcbc0..67f79bfd53f3223841475de90d6c1ce28ce60a04 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({