diff --git a/pages/login/login.vue b/pages/login/login.vue
index 9f7f3049..ac0ed48e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -19,7 +19,7 @@
 
                         <!-- 绑定手机 -->
                         <view v-if="current_opt_form == 'bind_verify'" class="form-content">
-                            <form @submit="formBind">
+                            <form @submit="formBindMobile">
                                 <view class="tc">
                                     <image class="icon circle auto dis-block margin-bottom-xxl br" :src="(user.avatar || null) == null ? '/static/images/default-user.png' : user.avatar" mode="widthFix"></image>
                                     <view v-if="(user.nickname || null) != null" class="cr-base">{{ user.nickname }}</view>
@@ -44,7 +44,7 @@
                                     <view v-if="(user.nickname || null) != null" class="cr-base">{{ user.nickname }}</view>
                                 </view>
                                 <view class="margin-top-xxxl padding-top-xxxl">
-                                    <input type="text" :placeholder="$t('login.login.db1rf4')" maxlength="60" name="accounts" @input="form_input_email_event" key="login_email_1" class="form-item margin-vertical-xl wh-auto" />
+                                    <input type="text" :placeholder="$t('login.login.db1rf4')" maxlength="60" name="email" @input="form_input_email_event" key="login_email_1" class="form-item margin-vertical-xl wh-auto" />
                                     <view class="code pr margin-vertical-main">
                                         <input type="number" :placeholder="$t('login.login.t3951j')" name="verify" maxlength="4" />
                                         <button :class="'verify-submit pa round br text-size-sm cr-base ' + (verify_disabled ? 'sub-disabled' : '')" type="default" hover-class="none" size="mini" :loading="verify_loading" :disabled="verify_disabled" @tap="verify_send_event">{{ verify_submit_text }}</button>
@@ -994,12 +994,6 @@
                 e.detail.value[field_openid] = user[field_openid] || '';
                 e.detail.value[field_unionid] = user[field_unionid] || '';
                 // #endif
-
-                // 数据验证
-                var validation = [
-                    { fields: 'mobile', msg: this.$t('login.login.4c5n8o') },
-                    { fields: 'verify', msg: this.$t('login.login.01xmab') },
-                ];
                 // #ifdef MP
                 validation.push({ fields: field_openid, msg: this.$t('login.login.prqvf1') });
                 // #endif
diff --git a/pages/password/password.css b/pages/password/password.css
index 355c87a4..2992e350 100644
--- a/pages/password/password.css
+++ b/pages/password/password.css
@@ -15,4 +15,9 @@
 .password .form-item ::v-deep .uni-input-input {
     padding: 0 36rpx;
     font-size: 30rpx;
+}
+
+.eyes {
+    right: 32rpx;
+    top: calc(50% - 12rpx);
 }
\ No newline at end of file
diff --git a/pages/password/password.vue b/pages/password/password.vue
index c2cbdab9..f29898e5 100644
--- a/pages/password/password.vue
+++ b/pages/password/password.vue
@@ -6,9 +6,18 @@
                 <view class="padding-main">
                     <form @submit="formBindPwd">
                         <view class="margin-top-xxxl">
-                            <input type="text" placeholder="请输入当前密码" minlength="6" maxlength="18" name="pwd_old" password="true" class="form-item wh-auto margin-bottom-main" />
-                            <input type="text" placeholder="请输入新密码" minlength="6" maxlength="18" name="pwd_new" password="true" class="form-item wh-auto margin-bottom-main" />
-                            <input type="text" placeholder="请确认新密码" minlength="6" maxlength="18" name="pwd_renew" password="true" class="form-item wh-auto margin-bottom-main" />
+                            <view class="pr">
+                                <input type="text" placeholder="请输入当前密码" minlength="6" maxlength="18" name="my_pwd" :password="!eyes1" class="form-item wh-auto margin-bottom-main" />
+                                <view class="eyes pa" @tap="eyes1 = !eyes1"><iconfont :name="eyes1 ? 'icon-wodeqianbao-eye' : 'icon-wodeqianbao-eyeclo2'" color="#666" size="32rpx"></iconfont></view>
+                            </view>
+                            <view class="pr">
+                                <input type="text" placeholder="请输入新密码" minlength="6" maxlength="18" name="new_pwd" :password="!eyes2" class="form-item wh-auto margin-bottom-main" />
+                                <view class="eyes pa" @tap="eyes2 = !eyes2"><iconfont :name="eyes2 ? 'icon-wodeqianbao-eye' : 'icon-wodeqianbao-eyeclo2'" color="#666" size="32rpx"></iconfont></view>
+                            </view>
+                            <view class="pr">
+                                <input type="text" placeholder="请确认新密码" minlength="6" maxlength="18" name="confirm_new_pwd" :password="!eyes3" class="form-item wh-auto margin-bottom-main" />
+                                <view class="eyes pa" @tap="eyes3 = !eyes3"><iconfont :name="eyes3 ? 'icon-wodeqianbao-eye' : 'icon-wodeqianbao-eyeclo2'" color="#666" size="32rpx"></iconfont></view>
+                            </view>
                         </view>
                         <view class="margin-top-xxxxl tc">
                             <button class="bg-main br-main cr-white round text-size" form-type="submit" type="default" hover-class="none" :loading="form_submit_loading" :disabled="form_submit_loading">确认修改</button>
@@ -34,6 +43,10 @@
                 data_list_loding_msg: '',
 
                 form_submit_loading: false,
+                // 是否显示密码
+                eyes1: false,
+                eyes2: false,
+                eyes3: false,
             };
         },
         onLoad(params) {
@@ -76,7 +89,7 @@
                 }
             },
 
-            formBindPwd() {
+            formBindPwd(e) {
                 // 小程序数据
                 // #ifdef MP
                 var field_openid = client_type + '_openid';
@@ -87,9 +100,9 @@
 
                 // 数据验证
                 var validation = [
-                    { fields: 'pwd_old', msg: '请输入密码' },
-                    { fields: 'pwd_new', msg: '请输入新密码' },
-                    { fields: 'pwd_renew', msg: '确认新密码' },
+                    { 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') });
@@ -104,7 +117,7 @@
 
                     // 网络请求
                     uni.request({
-                        url: app.globalData.get_request_url('apppwdbind', 'user'),
+                        url: app.globalData.get_request_url('loginpwdupdate', 'safety'),
                         method: 'POST',
                         data: e.detail.value,
                         dataType: 'json',
@@ -114,7 +127,7 @@
                                 form_submit_loading: false,
                             });
                             app.globalData.showToast(res.data.msg);
-                            if (res.data.code == 0 && (res.data.data || null) != null) {
+                            if (res.data.code == 0) {
                                 // 默认返回上一页
                                 uni.navigateBack();
                             }
diff --git a/pages/setup/setup.vue b/pages/setup/setup.vue
index 7f8f6fb7..d7ad7136 100644
--- a/pages/setup/setup.vue
+++ b/pages/setup/setup.vue
@@ -14,14 +14,14 @@
                         <text>{{ $t('setup.setup.x81v6d') }}</text>
                         <text class="fr cr-grey">{{ user.mobile_security || '' }} {{ $t('setup.setup.j6skqh') }}</text>
                     </view>
-                    <view class="padding-top-xxl padding-bottom-xxl padding-right-xxxl arrow-right br-t" data-value="/pages/password/password" @tap="url_event">
-                        <text>更换密码</text>
-                        <text class="fr cr-grey">{{ $t('setup.setup.j6skqh') }}</text>
-                    </view>
                     <view class="padding-top-xxl padding-bottom-xxl padding-right-xxxl arrow-right br-t" data-value="/pages/login/login?opt_type=bind_email&opt_form=bind_email" @tap="url_event">
                         <text>更换邮箱</text>
                         <text class="fr cr-grey">{{ user.email_security || '' }} {{ $t('setup.setup.j6skqh') }}</text>
                     </view>
+                    <view class="padding-top-xxl padding-bottom-xxl padding-right-xxxl arrow-right br-t" data-value="/pages/password/password" @tap="url_event">
+                        <text>更换密码</text>
+                        <text class="fr cr-grey">{{ $t('setup.setup.j6skqh') }}</text>
+                    </view>
                     <view v-if="home_use_multilingual_status == 1" class="padding-top-xxl padding-bottom-xxl padding-right-xxxl arrow-right br-t" data-value="/pages/login/login?opt_form=bind_verify" @tap="open_language_event">
                         <text>{{ $t('setup.setup.r7jz13') }}</text>
                         <text class="fr cr-grey">{{ language }}</text>