5.22部分简单功能实现

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/companyaudit/index.vue

@@ -60,7 +60,7 @@
       </el-row>
     </el-card>
     <!-- 公司审核信息 -->
-    <el-dialog title="公司审核信息" :visible.sync="dialogVisible">
+    <el-dialog title="企业注册信息" :visible.sync="dialogVisible">
       <el-form label-width="135px" ref="formData" :model="formData" size="small">
         <el-row>
           <el-col :span="24">
@@ -89,8 +89,8 @@
                 <template>
                   <el-row>
                     <el-col :span="12" v-for="(url, index) in urlList" :key="index">
-                      <span>
-                        <el-image style="width: 170px; height: 100px" :src="url"></el-image>
+                      <span @click="bigImg(url)">
+                        <el-image  style="width: 170px; height: 100px; cursor: pointer" :src="url"></el-image>
                       </span>
                     </el-col>
                   </el-row>
@@ -114,8 +114,8 @@
                 <template>
                   <el-row>
                     <el-col :span="12" v-for="(url, index) in urlList2" :key="index">
-                      <span>
-                        <el-image style="width: 170px; height: 100px" :src="url"></el-image>
+                      <span @click="bigImg(url)">
+                        <el-image style="width: 170px; height: 100px; cursor: pointer" :src="url"></el-image>
                       </span>
                     </el-col>
                   </el-row>
@@ -147,6 +147,15 @@
         </el-row>
       </el-form>
     </el-dialog>
+
+
+    <!--点击图片放大区域-->
+    <el-dialog
+        title="法定代表人身份证扫描件"
+        :visible.sync="legalPersonImgVisible"
+        width="40%">
+        <el-image :src="bigUrl"></el-image>
+    </el-dialog>
   </div>
 </template>
 
@@ -155,6 +164,8 @@
     name: 'companyaudit',
     data() {
       return {
+        bigUrl:"",
+        legalPersonImgVisible: false,
         currentItemCount: 0,
         currentPage: 1,
         size: 10,
@@ -230,6 +241,10 @@
       this.initData()
     },
     methods: {
+      bigImg(url){
+        this.bigUrl=url
+        this.legalPersonImgVisible=true
+      },
       initData() {
         let _this = this
         const params = {

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -103,12 +103,12 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="手机号"   style="width: 100%" prop="UserTelephone">
-                    <el-input v-model="formData.UserTelephone" placeholder="用于审核通知和密码找回"></el-input>
+                    <el-input v-model="formData.UserTelephone" placeholder="用于审核通知"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="密码" label-width="150px" style="width: 100%" prop="UserPass" >
-                    <el-input type="password" v-model="formData.UserPass"  auto-complete="off" placeholder="请输入密码(8-20位，字母数字组合)"></el-input>
+                    <el-input type="password" v-model="formData.UserPass"  auto-complete="off" placeholder="请输入密码"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -250,11 +250,11 @@
       };
       var checkUserPass = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入正确格式的密码(8——20位，包含英文字母、数字)！'));
+          callback(new Error('请输入正确格式的密码(8—20位，至少包含1个大写字母、1个小写字母和1个数字)！'));
         } else {
-          let re2 = /^(?=.*[0-9])[0-9A-Za-z]{8,20}$/g
+          let re2 = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,20}$/
           if (!re2.test(this.formData.UserPass)) {
-            callback(new Error('请输入正确格式的密码(8——20位，包含英文字母、数字)！'));
+            callback(new Error('请输入正确格式的密码(8—20位，至少包含1个大写字母、1个小写字母和1个数字)！'));
           } else {
             callback();
           }