diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js
index e525ffb16b35b3d2533af962951e1e88e1a60523..03c931527676ccfbd272c25aa81c9355fd4ff6d4 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 3fe0892f08f427f93fc06306348542b2d294c706..429d51cbff28a1980441f768cf404756d82914f2 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 42b6ffcd5dcee7fff923da049c1ae98a1efb0915..c76d45d7a32e5019528d41fd0f36b451fd246c6c 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 f13c1c60350102cad7f92351a28f0fada04c1b39..653865c4c764aebe8869c15efb045f4552530986 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 dc93a568f76ba7e957a5e14d3f6c0130be7afff8..d1d15c03a034dceaf4b385664a0556e084d64f24 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 d883e4efe751934be19ebe11d4ecdb5346931dfb..d9c268c8ec0727ced484365958b7c062eb0cf8cf 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 968819ec6ea3bfbc093928f1760fb24768a242cf..85ebbdd84f334820db579a940671522bf81fe2bb 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 f9826ee2f808938aa8c3fa420863039ad2522700..176eff1f06faf3133d0d59202c44b048e7271006 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 45ca82189c5dd4b56fd9d86681bb6667a443f6e2..35dfe1f3617cbe01bf7336e45f5943755647f36e 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 e70047d5526792855d1fd89d414bcf476a60afb3..a86f876169244cea2782e8c89590a79c90c9e80e 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 49e263d236026c357cc2e5e76b0c68b796c4299e..0d585aad466b18cc8e642445d54fde55b3702eb2 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 c273d9c33c2efce9992389fa94a0aa9c5a0b1147..347f823b687c66dbd52fc560b384a87d6951de43 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 f81a47b3ee396a67d3a7ca84f88707db77b68a52..8207ee3177faae8e9f582a204b52dfa75390c509 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 990894f721ce379aff7595ba4e77cc83658e6b0e..182c22c937d884a980368ebb27187af62e1bdc0f 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 b72fd920c9c320553e080e28ca3f849f2b7b2b20..593a2abed6ab3fe6ea3a46d443eed23d6ea8e230 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 ae33f3158e8f9d5cab5dca9b4e12eb00fdebacb4..0c3d319922e127683b98a628760885bebb3a3045 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 b4ca039d95e019fc24a1457cb8ba898723800b74..0d9c2fcccb207fee85e5f77da779ba061ab8d0b6 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 b88114d6260e8d2fe0d33666874954c5e9d8f61c..4ec5272035432bcf2bce5333cece93a477154e7b 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 8e36fa3dbf1403ce53e3055433691fe92fe04d42..60b5b5b7ff116d502a215a8e35e1e74a751bc67e 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 3333542caefc6094546356d6c94fdeef8aece9b8..6a9cc8a8c431c49b90ebe09a96222727f0bfbaf9 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 95a363c113712a07ba091ba4a0fcf82f8fa1a77c..f8e36a724871edbb788485375b2313c6d3250353 100755
--- a/public/appmini/old/weixin/pages/user/user.wxml
+++ b/public/appmini/old/weixin/pages/user/user.wxml
@@ -57,7 +57,7 @@
- 清除缓存
+ 安全退出