Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

src/layout/index.vue

@@ -10,6 +10,8 @@
       <div class="dialog-public-background">
         <div class="title">修改密码</div>
         <div class="content">
+          <div class="ruleZf">特殊字符：`、!、@、#、$、%、^、&、*、(、)、_、+、{、}、"、:、?、>、&lt;、`、,、.、/、'、;、[、]、=、-、\、|</div>
+          <div class="ruleZf">密码规则：长度为8-20个字符，并且必须包含数字、大写字母、小写字母、特殊字符</div>
           <el-form :model="dataForm" :rules="dataRules" ref="dataForm" class="demo-dataForm">
             <el-form-item label="旧密码" prop="old">
               <el-input size="medium" placeholder="请输入旧密码" show-password v-model="dataForm.old"></el-input>
@@ -214,4 +216,9 @@ export default {
 .mobile .fixed-header {
   width: 100%;
 }
+.ruleZf {
+  line-height: 2;
+  margin-bottom: 22px;
+  color: #101611;
+}
 </style>

src/views/accountManagement/components/accountHome.vue

@@ -78,6 +78,7 @@
       <div class="airportInfoDialog dialog-public-background">
         <div class="title">{{ editDialogTitle }}</div>
         <div class="content">
+          <!-- <div class="ruleZf">特殊字符：`、!、@、#、$、%、^、&、*、(、)、_、+、{、}、"、:、?、>、&lt;、`、,、.、/、'、;、[、]、=、-、\、|</div> -->
           <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="130px" class="demo-ruleForm">
             <el-form-item label="账号名称" prop="user_name">
               <el-input v-model="ruleForm.user_name" size="medium" placeholder="请输入账号名称" />
@@ -571,5 +572,11 @@ export default {
       }
     }
   }
+  .ruleZf {
+    padding-left: 60px;
+    line-height: 2;
+    margin-bottom: 22px;
+    color: #101611;
+  }
 }
 </style>