瀏覽代碼

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

hhl123456789 2 年之前
父節點
當前提交
9efd609de8
共有 7 個檔案被更改,包括 11 行新增8 行删除
  1. 二進制
      public/favicon.ico
  2. 二進制
      public/favicon1.ico
  3. 二進制
      src/assets/images/logo.png
  4. 二進制
      src/assets/images/logos.png
  5. 二進制
      src/assets/logo/logo.png
  6. 5
    2
      src/views/caseManagement/components/mediation.vue
  7. 6
    6
      src/views/login.vue

二進制
public/favicon.ico 查看文件


二進制
public/favicon1.ico 查看文件


二進制
src/assets/images/logo.png 查看文件


二進制
src/assets/images/logos.png 查看文件


二進制
src/assets/logo/logo.png 查看文件


+ 5
- 2
src/views/caseManagement/components/mediation.vue 查看文件

188
         this.caseApplicationSelectByIdFn({
188
         this.caseApplicationSelectByIdFn({
189
           id: this.mediationData.id
189
           id: this.mediationData.id
190
         });
190
         });
191
-        this.getUser();
191
+        this.getUser(); 
192
       }
192
       }
193
     }
193
     }
194
   },
194
   },
199
       secretaryRoleByUserId({
199
       secretaryRoleByUserId({
200
         userId: this.userId
200
         userId: this.userId
201
       }).then(res => {
201
       }).then(res => {
202
-        this.isSecretaryRole = res.data.isSecretaryRole;
202
+         this.isSecretaryRole = res.data.isSecretaryRole;
203
+         if(this.recordArrMediate){
204
+          this.isSecretaryRole = false
205
+        }
203
       })
206
       })
204
     },
207
     },
205
     /**上传地址*/
208
     /**上传地址*/

+ 6
- 6
src/views/login.vue 查看文件

177
     width: 50%;
177
     width: 50%;
178
     height: 90%;
178
     height: 90%;
179
     .leftIcon {
179
     .leftIcon {
180
-      height: 10%;
180
+      height: 20%;
181
       width: 100%;
181
       width: 100%;
182
-      margin: 5% 10% 1% 15%;
182
+      margin: 0% 10% 1% 15%;
183
       .Icon {
183
       .Icon {
184
-        width: 45px;
185
-        height: 45px;
186
-        background-image: url("../assets/images/mediate.svg");
184
+        width: 100px;
185
+        height: 105px;
186
+        background-image: url("../assets/images/logos.png");
187
         background-size: cover;
187
         background-size: cover;
188
       }
188
       }
189
       div {
189
       div {
190
-        font-size: 17px;
190
+        font-size: 18px;
191
       }
191
       }
192
     }
192
     }
193
     .leftImage {
193
     .leftImage {