diff --git a/components/no-data/no-data.vue b/components/no-data/no-data.vue
index f927d8b4..a4baddf2 100644
--- a/components/no-data/no-data.vue
+++ b/components/no-data/no-data.vue
@@ -66,8 +66,9 @@
{{propMsg || $t('form.form.bniyyt')}}
-
-
+
+
+
@@ -75,6 +76,9 @@
{{propMsg || $t('common.no_relevant_data_tips')}}
+
+
+
@@ -99,6 +103,8 @@
title: app.globalData.get_application_title(),
network_type_value: '',
not_network_await_status: 0,
+ is_login_required: 0,
+ login_btn_class: 'bg-main br-main cr-white round',
// 骨架屏配置
// 商品分类内容-左侧
@@ -154,9 +160,19 @@
default: false,
}
},
+ // 属性值改变监听
+ watch: {
+ propMsg() {
+ this.login_required_handle();
+ },
+ propBackBtn() {
+ this.login_required_handle();
+ },
+ },
// 页面被展示
created: function () {
self = this;
+ this.login_required_handle();
uni.getNetworkType({
success: function (res) {
// 当前网络
@@ -182,6 +198,39 @@
},
// #endif
methods: {
+ // 根据提示文案更新是否展示登录按钮（登录失效、请重新登录、请先登录等）
+ login_required_handle() {
+ var msg = this.propMsg;
+ var flag = 0;
+ if ((msg || null) != null && msg !== '') {
+ var text = String(msg);
+ var keywords = ['登录失效', '请重新登录', '重新登录', '请先登录', '未登录', '请登录'];
+ for (var i = 0; i < keywords.length; i++) {
+ if (text.indexOf(keywords[i]) !== -1) {
+ flag = 1;
+ break;
+ }
+ }
+ if (flag == 0) {
+ var lower = text.toLowerCase();
+ var en_keywords = ['please log in', 'log in first', 'login expired', 'please login', 'log in again', 'not logged in'];
+ for (var j = 0; j < en_keywords.length; j++) {
+ if (lower.indexOf(en_keywords[j]) !== -1) {
+ flag = 1;
+ break;
+ }
+ }
+ }
+ }
+ this.is_login_required = flag;
+ this.login_btn_class = 'bg-main br-main cr-white round' + (this.propBackBtn ? ' margin-left-lg' : '');
+ },
+
+ // 跳转登录页
+ login_event() {
+ app.globalData.url_open('/pages/login/login');
+ },
+
// 定时任务
countdown(self) {
// 销毁之前的任务
diff --git a/pages/plugins/vip/member-code/member-code.vue b/pages/plugins/vip/member-code/member-code.vue
index cc263af9..99dd2944 100644
--- a/pages/plugins/vip/member-code/member-code.vue
+++ b/pages/plugins/vip/member-code/member-code.vue
@@ -30,9 +30,6 @@
-
-
-
@@ -51,7 +48,6 @@
data_list_loding_status: 1,
data_list_loding_msg: '',
bottom_fixed_style: '',
- is_to_login: 0,
screen_brightness_value: 0,
plugins_wallet: null,
user: null,
@@ -137,7 +133,6 @@
qrcode["code"] = user.number_code;
this.setData({
data_list_loding_status: 3,
- is_to_login: 0,
user: user,
barcode: barcode,
qrcode: qrcode,
@@ -154,14 +149,12 @@
this.setData({
data_list_loding_status: 0,
data_list_loding_msg: this.$t('member-code.member-code.kx4yk8'),
- is_to_login: 0,
});
}
} else {
this.setData({
data_list_loding_status: 0,
data_list_loding_msg: this.$t('setup.setup.nwt4o1'),
- is_to_login: 1,
});
}
},
diff --git a/pages/plugins/wallet/payment-code/payment-code.vue b/pages/plugins/wallet/payment-code/payment-code.vue
index 391559f9..d74b1368 100644
--- a/pages/plugins/wallet/payment-code/payment-code.vue
+++ b/pages/plugins/wallet/payment-code/payment-code.vue
@@ -33,9 +33,6 @@
-
-
-
@@ -54,7 +51,6 @@
data_list_loding_status: 1,
data_list_loding_msg: '',
bottom_fixed_style: '',
- is_to_login: 0,
screen_brightness_value: 0,
plugins_vip: null,
scheduled_timer: null,
@@ -146,7 +142,6 @@
this.setData({
data_list_loding_status: 0,
data_list_loding_msg: this.$t('setup.setup.nwt4o1'),
- is_to_login: 1,
});
}
},
@@ -179,7 +174,6 @@
qrcode['code'] = res.data.data.code;
this.setData({
data_list_loding_status: 3,
- is_to_login: 0,
barcode: barcode,
qrcode: qrcode,
payment_code: res.data.data.code,
@@ -190,7 +184,6 @@
this.setData({
data_list_loding_status: 0,
data_list_loding_msg: res.data.msg,
- is_to_login: 0,
});
}
},
@@ -198,7 +191,6 @@
this.setData({
data_list_loding_status: 2,
data_list_loding_msg: this.$t('common.internet_error_tips'),
- is_to_login: 0,
});
app.globalData.showToast(this.$t('common.internet_error_tips'));
},