Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hhl

src/views/caseManagement/components/mediation.vue

@@ -188,7 +188,7 @@ export default {
         this.caseApplicationSelectByIdFn({
           id: this.mediationData.id
         });
-        this.getUser();
+        this.getUser(); 
       }
     }
   },
@@ -199,7 +199,10 @@ export default {
       secretaryRoleByUserId({
         userId: this.userId
       }).then(res => {
-        this.isSecretaryRole = res.data.isSecretaryRole;
+         this.isSecretaryRole = res.data.isSecretaryRole;
+         if(this.recordArrMediate){
+          this.isSecretaryRole = false
+        }
       })
     },
     /**上传地址*/

src/views/login.vue

@@ -177,17 +177,17 @@ export default {
     width: 50%;
     height: 90%;
     .leftIcon {
-      height: 10%;
+      height: 20%;
       width: 100%;
-      margin: 5% 10% 1% 15%;
+      margin: 0% 10% 1% 15%;
       .Icon {
-        width: 45px;
-        height: 45px;
-        background-image: url("../assets/images/mediate.svg");
+        width: 100px;
+        height: 105px;
+        background-image: url("../assets/images/logos.png");
         background-size: cover;
       }
       div {
-        font-size: 17px;
+        font-size: 18px;
       }
     }
     .leftImage {