diff --git a/App.vue b/App.vue
index 0f0e3cc0..016af88f 100644
--- a/App.vue
+++ b/App.vue
@@ -3065,6 +3065,13 @@
                 var client_value = this.application_client_type();
                 // 当前页面地址
                 var url = this.current_page(false);
+                // 不参与设置页面标题
+                var no_setup_pages = [
+                    'pages/login/login'
+                ];
+                if(no_setup_pages.indexOf(url) != -1) {
+                    return false;
+                }
                 // 支付宝平台以下条件不增加标题
                 if(client_value == 'alipay') {
                     // 自定义头页面
@@ -3076,6 +3083,7 @@
                         'pages/plugins/signin/detail/detail',
                         'pages/plugins/membershiplevelvip/index/index',
                         'pages/plugins/ask/index/index',
+                        'pages/cashier/cashier'
                     ];
                     // 当前tab页面
                     if(this.is_system_tabbar_pages('/'+url) != -1 || pages_always.indexOf(url) != -1) {
diff --git a/manifest.json b/manifest.json
index 132142e1..cc7f523c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -186,18 +186,19 @@
             }
         },
         "__usePrivacyCheck__" : true,
-        "plugins" : {}
+        "plugins" : {
+            // 腾讯地图路线规划插件（需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件，教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a）
+            // "routePlan" : {
+            //     "version" : "1.0.19",
+            //     "provider" : "wx50b5593e81dd937a"
+            // },
+            // 直播（需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件，教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370）
+            // "live-player-plugin" : {
+            //     "version" : "1.3.5",
+            //     "provider" : "wx2b03c6e691cd7370"
+            // }
+        }
     },
-    // 腾讯地图路线规划插件（需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件，教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a）
-    // "routePlan" : {
-    //     "version" : "1.0.19",
-    //     "provider" : "wx50b5593e81dd937a"
-    // },
-    // 直播（需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件，教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370）
-    // "live-player-plugin" : {
-    //     "version" : "1.3.5",
-    //     "provider" : "wx2b03c6e691cd7370"
-    // }
     "mp-alipay" : {
         "usingComponents" : true,
         "appid" : "2021001173639600"
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 55319f5a..d1355ddf 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -541,6 +541,7 @@
                     current_opt_type_title: {
                         auth: this.$t('login.login.jw378f'),
                         bind: this.$t('login.login.np9177'),
+                        bind_verify: 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'),
@@ -1473,6 +1474,7 @@
                 // 重新设置静态资源
                 this.set_resources_data();
                 // 设置这标题
+                console.log( this.current_opt_type_title[this.navigation_bar_title_key] )
                 uni.setNavigationBarTitle({
                     title: this.current_opt_type_title[this.navigation_bar_title_key],
                 });
diff --git a/pages/password/password.vue b/pages/password/password.vue
index 4464cc56..9adee54e 100644
--- a/pages/password/password.vue
+++ b/pages/password/password.vue
@@ -6,7 +6,7 @@
                 <view class="padding-main">
                     <form @submit="form_bind_pwd">
                         <view class="margin-top-xxxl">
-                            <view class="pr">
+                            <view v-if="(user.is_setup_pwd || 0) == 1" class="pr">
                                 <input type="text" :placeholder="$t('password.password.4e24j1')" minlength="6" maxlength="18" name="my_pwd" :password="!eyes1" class="form-item margin-bottom-main" />
                                 <view class="eyes pa" data-index="1" @tap="eyes_event"><iconfont :name="eyes1 ? 'icon-wodeqianbao-eye' : 'icon-eye-half'" color="#666" size="32rpx"></iconfont></view>
                             </view>
@@ -46,6 +46,7 @@
                 data_list_loding_status: 1,
                 data_list_loding_msg: '',
                 form_submit_loading: false,
+                user: {},
                 // 是否显示密码
                 eyes1: false,
                 eyes2: false,
@@ -107,11 +108,12 @@
             // 绑定表单
             form_bind_pwd(e) {
                 // 数据验证
-                var validation = [
-                    { fields: 'my_pwd', msg: this.$t('login.login.277w03') },
-                    { fields: 'new_pwd', msg: this.$t('password.password.1lwiaz') },
-                    { fields: 'confirm_new_pwd', msg: this.$t('password.password.3pp6t7') },
-                ];
+                var validation = [];
+                if((this.user.is_setup_pwd || 0) == 1) {
+                    validation.push({ fields: 'my_pwd', msg: this.$t('login.login.277w03') });
+                }
+                validation.push({ fields: 'new_pwd', msg: this.$t('password.password.1lwiaz') });
+                validation.push({ fields: 'confirm_new_pwd', msg: this.$t('password.password.3pp6t7') });
                 if (app.globalData.fields_check(e.detail.value, validation)) {
                     uni.showLoading({
                         title: this.$t('common.processing_in_text'),
@@ -131,12 +133,20 @@
                             this.setData({
                                 form_submit_loading: false,
                             });
-                            app.globalData.showToast(res.data.msg, 'success');
                             if (res.data.code == 0) {
+                                app.globalData.showToast(res.data.msg, 'success');
+                                if((res.data.data || null) != null) {
+                                    this.setData({
+                                        user: res.data.data
+                                    });
+                                    uni.setStorageSync(app.globalData.data.cache_user_info_key, res.data.data);
+                                }
                                 setTimeout(() => {
                                     // 默认返回上一页
                                     uni.navigateBack();
                                 }, 1500);
+                            } else {
+                                app.globalData.showToast(res.data.msg);
                             }
                         },
                         fail: () => {