Merge branch 'master' of http://47.105.106.177:66/root/sup-server

dsk-srm-server/src/login.vue

@@ -430,7 +430,7 @@ export default {
         this.$message.error('账号、验证码不能为空！');
         return false;
       }
-      this.$store.dispatch("user/smsLogin", this.yzmparam).then(res => {
+      this.$store.dispatch("user/smsLoginHandler", this.yzmparam).then(res => {
         this.toList();
       });
     },

dsk-srm-server/src/views/certificationManagement.vue

@@ -74,16 +74,22 @@
               <el-input v-model="form.registeredAddress"></el-input>
             </el-form-item>
 
-            <el-form-item label="企业注册地：" prop="addressDetail" style="width:100%">
+            <el-form-item label="办公地址：" prop="addressDetail" style="width:100%">
               <el-input v-model="form.addressDetail"></el-input>
             </el-form-item>
 
-            <el-form-item label="营业执照扫描件：" prop="licenseUrl">
+            <el-form-item label="营业执照扫描件：" prop="licenseUrl" class="license-url">
               <img v-if="form.licenseUrl" :src="form.licenseUrl" alt="">
+              <div class="img-model" v-if="form.licenseUrl">
+                <i class="el-icon-full-screen" @click="viewImg(form.licenseUrl)"></i>
+              </div>
             </el-form-item>
 
-            <el-form-item label="法人代表身份证扫描件：" prop="cardUrl">
+            <el-form-item label="法人代表身份证扫描件：" prop="cardUrl" class="card-url">
               <img v-if="form.licenseUrl" :src="form.cardUrl" alt="">
+              <div class="img-model" v-if="form.licenseUrl">
+                <i class="el-icon-full-screen" @click="viewImg(form.licenseUrl)"></i>
+              </div>
             </el-form-item>
 
             <el-form-item label="供应商类型选择：" prop="catId">
@@ -98,6 +104,13 @@
 
     </el-form>
 
+    <el-dialog :visible.sync="viewDialogStatus" width="650px" @close="viewDialogClose" :show-close="false" custom-class="view-dialog">
+      <img :src="viewSrc">
+      <span slot="footer">
+        <el-button @click="viewDialogClose">关闭</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 <script>
@@ -143,7 +156,9 @@ export default {
       props: {
         value: "catId",
         label: "name"
-      }
+      },
+      viewSrc: "",
+      viewDialogStatus: false
     };
   },
   //可访问data属性
@@ -171,6 +186,14 @@ export default {
       } catch (error) {
         console.log(error);
       }
+    },
+    viewImg(src) {
+      this.viewSrc = src;
+      this.viewDialogStatus = true;
+    },
+    viewDialogClose() {
+      this.viewSrc = "";
+      this.viewDialogStatus = false;
     }
   },
 }
@@ -227,7 +250,42 @@ export default {
 
               img {
                 width: 100%;
-                max-height: 200px;
+                height: 100%;
+              }
+            }
+          }
+
+          ::v-deep .card-url,
+          ::v-deep .license-url {
+            .el-form-item__content {
+              position: relative;
+              height: 200px;
+
+              &:hover .img-model {
+                visibility: visible;
+                opacity: 1;
+              }
+
+              .img-model {
+                position: absolute;
+                left: 0;
+                top: 0;
+                width: 100%;
+                height: 100%;
+                background: rgba(0, 0, 0, 0.6);
+                opacity: 0;
+                visibility: hidden;
+                transition: opacity 0.3s;
+
+                & > i {
+                  position: absolute;
+                  left: 50%;
+                  top: 50%;
+                  transform: translate(-50%, -50%);
+                  color: #fff;
+                  font-size: 30px;
+                  cursor: pointer;
+                }
               }
             }
           }
@@ -259,5 +317,29 @@ export default {
       }
     }
   }
+
+  ::v-deep .view-dialog {
+    display: flex;
+    flex-direction: column;
+    margin: 0 !important;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%,-50%);
+    max-height: 80%;
+    overflow: hidden;
+
+    .el-dialog__body {
+      height: calc(100% - 100px);
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      overflow: auto;
+
+      &>img {
+        width: 100%;
+      }
+    }
+  }
+
 }
 </style>