Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Login2019.vue

@@ -167,12 +167,20 @@
             <i class="icon-login-password iconfont icon-mima" :style="{color: pwd_bline==true?'#E95252':'#000000'}"></i>
             <input class="input FPF_b" @focus="pwd_bline=true" @blur="pwd_bline=false" autocomplete="new-password"
               maxlength="20" v-model="password" style="background-color:transparent !important" type="password"
-              placeholder="请输入新密码" />
+              placeholder="新密码：大写字母+小写字母+数字或?!&$%#_" />
+            <div class="pwd_bline_left" :class="pwd_bline==true?'_bline_w':''"></div>
+            <div class="pwd_bline_right" :class="pwd_bline==true?'_bline_w':''"></div>
+          </div>
+          <div class="login-commonBotm">
+            <i class="icon-login-password iconfont icon-mima" :style="{color: pwd_bline==true?'#E95252':'#000000'}"></i>
+            <input class="input FPF_b" @focus="pwd_bline=true" @blur="pwd_bline=false" autocomplete="new-password"
+              maxlength="20" v-model="passwordSure" style="background-color:transparent !important" type="password"
+              placeholder="确认密码：大写字母+小写字母+数字或?!&$%#_" />
             <div class="pwd_bline_left" :class="pwd_bline==true?'_bline_w':''"></div>
             <div class="pwd_bline_right" :class="pwd_bline==true?'_bline_w':''"></div>
           </div>
 
-          <div class="login-commonBotm btValidate">
+          <!-- <div class="login-commonBotm btValidate">
             <i class="icon-login-password iconfont icon-yanzhengma"
               :style="{color: validate_bline==true?'#E95252':'#000000'}"></i>
             <input class="input FPF_b phoneValidate" maxlength="4" onkeyup="value=value.replace(/[^\d]/g,'')"
@@ -184,7 +192,7 @@
               <span v-show="show" @click="getCode" class="FPF_s">获取验证码</span>
               <span v-show="!show" class="count FPF_s">{{count}}s重新获取</span>
             </div>
-          </div>
+          </div> -->
           <div class="forgetPw">
             <div class="error-msg" style="float:left;width:auto;">
               <div v-show="passwordIsShow"><img src="../assets/img/login-error-tips.png" />{{ passwordErrorMsg }}</div>
@@ -233,6 +241,7 @@
         },
         groupModel: "",
         password: "",
+        passwordSure:"",
         mobileNumber: "",
         code: "",
         mobileCodeType: 1,
@@ -437,12 +446,16 @@
         this.mobileCodeType = 2;
       },
       changePwd() {
+        if (this.passwordSure != this.password) {
+          this.Error('新密码和确认密码不一致');
+          return;
+        }
         let msg = {
           password: this.password,
-          mobileNumber: this.mobileNumber,
-          code: this.code
+          mobileNumber: this.mobileNumber
+         // code: this.code
         };
-        this.apipost("user_change_password_by_mobileNumber", msg, res => {
+        this.apipost("user_change_password_by_mobile", msg, res => {
           if (res.data.resultCode == 1) {
             this.isShow = 1;
             this.$notify.success({

src/components/PersonalInfoSet.vue

@@ -773,26 +773,26 @@
               </el-input>
             </el-form-item>
             <el-form-item v-if="visible" label="新密码" style="margin-bottom:30px;" prop="Pwd">
-              <el-input type="password" class="w400" v-model="passWordMsg.Pwd" maxlength="15" placeholder="请输入新密码">
+              <el-input type="password" class="w400" v-model="passWordMsg.Pwd" maxlength="15" placeholder="密码格式：大写字母+小写字母+数字或?!&$%#_">
                 <i slot="suffix" title="显示密码" @click="changePass('show')" style="cursor:pointer;"
                   class="el-input__icon iconfont icon-yincang"></i>
               </el-input>
             </el-form-item>
             <el-form-item v-else label="新密码" style="margin-bottom:30px;" prop="Pwd">
-              <el-input type="text" class="w400" v-model="passWordMsg.Pwd" maxlength="15" placeholder="请输入新密码">
+              <el-input type="text" class="w400" v-model="passWordMsg.Pwd" maxlength="15" placeholder="密码格式：大写字母+小写字母+数字或?!&$%#_">
                 <i slot="suffix" title="隐藏密码" @click="changePass('hide')" style="cursor:pointer;"
                   class="el-input__icon iconfont icon-xianshi"></i>
               </el-input>
             </el-form-item>
             <el-form-item v-if="SureVisible" label="确认密码" style="margin-bottom:30px;" prop="surePassword">
               <el-input type="password" class="w400" v-model="passWordMsg.surePassword" maxlength="15"
-                placeholder="请输入新密码">
+                placeholder="密码格式：大写字母+小写字母+数字或?!&$%#_">
                 <i slot="suffix" title="显示密码" @click="changePass2('show')" style="cursor:pointer;"
                   class="el-input__icon iconfont icon-yincang"></i>
               </el-input>
             </el-form-item>
             <el-form-item v-else label="确认密码" style="margin-bottom:30px;" prop="surePassword">
-              <el-input type="text" class="w400" v-model="passWordMsg.surePassword" maxlength="15" placeholder="请输入新密码">
+              <el-input type="text" class="w400" v-model="passWordMsg.surePassword" maxlength="15" placeholder="密码格式：大写字母+小写字母+数字或?!&$%#_">
                 <i slot="suffix" title="隐藏密码" @click="changePass2('hide')" style="cursor:pointer;"
                   class="el-input__icon iconfont icon-xianshi"></i>
               </el-input>

src/components/administrative/userManagement.vue

@@ -166,11 +166,11 @@
               readonly></el-input>
           </el-form-item>
           <el-form-item :label="$t('adm.adm_newPd')" prop="Pwd">
-            <el-input class="w217" type="password" v-model="pwdMsg.Pwd" :placeholder="$t('pub.pleaseImport')">
+            <el-input class="w217" type="password" v-model="pwdMsg.Pwd" placeholder="新密码：大写字母+小写字母+数字或?!&$%#_">
             </el-input>
           </el-form-item>
           <el-form-item :label="$t('adm.adm_Reinput')" prop="Pwd1">
-            <el-input class="w217" type="password" v-model="pwdMsg.Pwd1" :placeholder="$t('pub.pleaseImport')">
+            <el-input class="w217" type="password" v-model="pwdMsg.Pwd1" placeholder="确认密码：大写字母+小写字母+数字或?!&$%#_">
             </el-input>
           </el-form-item>
         </el-form>