diff --git a/lang/en.json b/lang/en.json
index 68ae8b69..726d1fa1 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -76,6 +76,7 @@
"article-category": "All articles",
"article-detail": "Article details",
"setup": "set up",
+ "password": "password modify",
"personal": "personal data",
"logout": "Account cancellation",
"plugins-seckill-index": "Limited time flash sale",
@@ -238,6 +239,7 @@
"s665h5": "Obtain verification code",
"jw378f": "Authorized User Information",
"np9177": "Bind phone",
+ "tgsa4d": "Bind email",
"158yg2": "Login with mobile verification code",
"r329eu": "Email verification code login",
"39hn6v": "Account password registration",
diff --git a/lang/zh.json b/lang/zh.json
index 1adb2768..5e581ea8 100644
--- a/lang/zh.json
+++ b/lang/zh.json
@@ -80,6 +80,7 @@
"article-detail": "文章详情",
"setup": "设置",
"personal": "个人资料",
+ "password": "密码修改",
"logout": "账号注销",
"plugins-seckill-index": "限时秒杀",
"plugins-coupon-index": "领券中心",
@@ -241,6 +242,7 @@
"s665h5": "获取验证码",
"jw378f": "授权用户信息",
"np9177": "绑定手机",
+ "tgsa4d": "绑定邮箱",
"158yg2": "手机验证码登录",
"r329eu": "邮箱验证码登录",
"39hn6v": "账号密码注册",
diff --git a/pages/login/login.vue b/pages/login/login.vue
index ac0ed48e..88ddb81c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -524,9 +524,6 @@
uni.setStorageSync(app.globalData.data.cache_user_info_key, user);
}
}
-
- // 数据初始化
- this.init();
},
// 页面显示
@@ -537,6 +534,9 @@
// 异步初始化配置
this.init_config();
+ // 数据初始化
+ this.init();
+
// 分享菜单处理
app.globalData.page_share_handle();
},
@@ -548,6 +548,7 @@
current_opt_type_title: {
auth: this.$t('login.login.jw378f'),
bind: this.$t('login.login.np9177'),
+ bind_email: this.$t('login.login.tgsa4d'),
login_username: this.$t('login.login.725312'),
login_sms: this.$t('login.login.158yg2'),
login_email: this.$t('login.login.r329eu'),
@@ -595,10 +596,6 @@
}
}
// #endif
- this.setData({
- navigation_bar_title_key: type,
- });
- this.set_navigation_bar_title();
// 是否参数指定类型和表单
if ((this.params.opt_type || null) != null) {
@@ -619,7 +616,9 @@
current_opt_form: form,
is_exist_base_data: is_base,
is_refreshed_base_data: 1,
+ navigation_bar_title_key: type
});
+ this.set_navigation_bar_title();
// 登录成功
if (this.current_opt_form == 'success') {
@@ -1369,8 +1368,8 @@
// 表单类型事件
opt_form_event(e) {
var value = e.currentTarget.dataset.value;
- // 手机更换绑定来源则直接返回
- if (value == 'bind' && (this.params.opt_form || null) != null && this.params.opt_form == 'bind_verify') {
+ // 手机或邮箱更换绑定来源则直接返回
+ if (value == 'bind' && (this.params.opt_form || null) != null && (this.params.opt_form == 'bind_verify' || this.params.opt_form == 'bind_email')) {
uni.navigateBack();
}
diff --git a/pages/password/password.vue b/pages/password/password.vue
index 553b9fa2..615c2086 100644
--- a/pages/password/password.vue
+++ b/pages/password/password.vue
@@ -41,7 +41,6 @@
theme_view: app.globalData.get_theme_value_view(),
data_list_loding_status: 1,
data_list_loding_msg: '',
-
form_submit_loading: false,
// 是否显示密码
eyes1: false,
@@ -90,23 +89,12 @@
},
formBindPwd(e) {
- // 小程序数据
- // #ifdef MP
- var field_openid = client_type + '_openid';
- var field_unionid = client_type + '_unionid';
- e.detail.value[field_openid] = user[field_openid] || '';
- e.detail.value[field_unionid] = user[field_unionid] || '';
- // #endif
-
// 数据验证
var validation = [
{ fields: 'my_pwd', msg: '请输入密码' },
{ fields: 'new_pwd', msg: '请输入新密码' },
{ fields: 'confirm_new_pwd', msg: '确认新密码' },
];
- // #ifdef MP
- validation.push({ fields: field_openid, msg: this.$t('login.login.prqvf1') });
- // #endif
if (app.globalData.fields_check(e.detail.value, validation)) {
uni.showLoading({
title: this.$t('common.processing_in_text'),
diff --git a/pages/setup/setup.vue b/pages/setup/setup.vue
index d7ad7136..87437b28 100644
--- a/pages/setup/setup.vue
+++ b/pages/setup/setup.vue
@@ -22,7 +22,7 @@
更换密码
{{ $t('setup.setup.j6skqh') }}
-
+
{{ $t('setup.setup.r7jz13') }}
{{ language }}