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

src/components/resetPassword.vue

 <style>
-  .Person_Content {
-    height: 96%;
-    margin: 18px;
-    overflow: hidden;
-  }
-
-  .PerSon_LeftNav {
-    width: 418px;
-    height: 96%;
-    position: absolute;
-    overflow-y: auto;
-    background-color: #fff;
-    display: inline-block;
-  }
-
-  .Person_Right {
-    margin-left: 440px;
-    width: 100%;
-    height: 100%;
-    overflow-y: auto;
-    background-color: #fff;
-  }
 
   .PerSon_Edit {
     text-align: right;
@@ -130,14 +108,18 @@
     height: 54px;
     line-height: 54px;
     padding: 0 30px;
+    margin-bottom: 20px;
     font-size: 20px;
     color: #333333;
-    border-bottom: 1px solid #F3F3F3;
+    font-weight: bold;
   }
 
   .Shouji_Conteng {
     max-width: 800px;
-    margin: 70px 0 0 120px;
+    background: #fff;
+    border-radius: 20px;
+    padding: 20px;
+    margin: 70px auto;
   }
 
   .phone_commonBotm {
@@ -268,10 +250,6 @@
     font-size: 14px;
   }
 
-  .Person_Content .FPF_s {
-    cursor: pointer;
-  }
-
   #demo #button {
     position: absolute;
     right: 10px;
@@ -637,11 +615,11 @@
 </style>
 
 <template>
-  <div class="Person_Content">
+  <div>
       <!-- 修改密码 -->
       <div class="Per_Shouji">
-        <div class="Shouji_Top">修改密码</div>
         <div class="Shouji_Conteng">
+        <div class="Shouji_Top">修改密码</div>
           <el-form :model="passWordMsg" ref="passWordMsg" label-position="right" :rules="rules2" label-width="100px">
             <el-form-item v-if="sureOldPwd" label="旧密码" prop="OldPwd" style="margin-bottom:30px;">
               <el-input type="password" class="w400" v-model="passWordMsg.OldPwd" maxlength="15">
@@ -656,32 +634,32 @@
               </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="密码格式：大写字母+小写字母+数字或?!&$%#_,6位以上">
                 <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="密码格式：大写字母+小写字母+数字或?!&$%#_,6位以上">
                 <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="密码格式：大写字母+小写字母+数字或?!&$%#_,6位以上">
                 <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="密码格式：大写字母+小写字母+数字或?!&$%#_,6位以上">
                 <i slot="suffix" title="隐藏密码" @click="changePass2('hide')" style="cursor:pointer;"
                   class="el-input__icon iconfont icon-xianshi"></i>
               </el-input>
             </el-form-item>
           </el-form>
-          <el-button type="primary" style="margin:30px 0 0 100px;" @click="submitForm2('passWordMsg')">确定</el-button>
+          <el-button type="primary" style="margin:30px 0 0 100px; width:120px" @click="submitForm2('passWordMsg')">确定</el-button>
         </div>
       </div>
   </div>