更新优化

src/App.vue

@@ -67,6 +67,9 @@ body {
 .el-checkbox__input.is-checked + .el-checkbox__label {
   color: #606266;
 }
+.el-tabs__item {
+  font-size: 16px !important;
+}
 </style>
 <style lang="scss">
 .el-table {

src/components/ImageCropper/index.vue

@@ -50,6 +50,10 @@ export default {
       type: String,
       default: '.png,.jpg,.jpeg'
     },
+    acceptArray: {
+      type: Array,
+      default: ['image/jpeg', 'image/png', 'image/jpg']
+    },
     disabled: {
       type: Boolean,
       default: false
@@ -88,10 +92,10 @@ export default {
         this.isStopRun = true
         return false
       }
-      const isJpgOrPng =
-        file.type === 'image/jpeg' ||
-        file.type === 'image/png' ||
-        file.type === 'image/jpg'
+      const isJpgOrPng = this.acceptArray.includes(file.type)
+        // file.type === 'image/jpeg' ||
+        // file.type === 'image/png' ||
+        // file.type === 'image/jpg'
       if (!isJpgOrPng) {
         this.$message.error('你上传图片格式不正确!')
         this.isStopRun = true
@@ -148,6 +152,7 @@ export default {
 ::v-deep .avatar-uploader.uploadDisabled {
   .el-upload--text {
     cursor: not-allowed;
+    background-color: #f7f7f7;
   }
   .el-upload:hover {
     border-color: #d9d9d9;

src/store/modules/selects.js

@@ -197,7 +197,7 @@ export default {
               }
             }
           }
-          console.log(tempArr, 'tempArr')
+          // console.log(tempArr, 'tempArr')
           commit('commit_roles', tempArr)
         } catch (error) {}
         loadings.commit_roles = false

src/utils/request2.js

@@ -73,12 +73,11 @@ const service = axios.create({
 // request interceptor
 service.interceptors.request.use(
  async config => {
-  await  showFullScreenLoading(store)
     // do something before request is sent
-    // let hideLoading = config.hideLoading || false
-    // if(!hideLoading) {
-
-    // }
+    let hideLoading = config.hideLoading || false
+    if(!hideLoading) {
+      await showFullScreenLoading(store)
+    }
     if (store.getters.token) {
       // let each request carry token
       // ['X-Token'] is a custom headers key

src/views/organManager/components/organInfo.vue

@@ -41,7 +41,7 @@
               <img v-if="form.logo" :src="form.logo" class="avatar" />
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload> -->
-            <image-cropper :options="cropperOptions" :disabled="isDisabled" :imgSize="2" :accept="acceptUpload" :imageUrl="form.logo" @crop-upload-close="cropClose" @crop-upload-success="cropSuccess" />
+            <image-cropper :options="cropperOptions" :disabled="isDisabled" :imgSize="2" accept=".png" :acceptArray="['image/png']" :imageUrl="form.logo" @crop-upload-close="cropClose" @crop-upload-success="cropSuccess" />
             <div
               class="tips"
               v-show="!isDisabled"
@@ -426,7 +426,6 @@ export default {
         previewsCircle: false, //预览图是否是圆形
         title: '上传机构LOGO', //模态框上显示的标题
       },
-      acceptUpload: '.png', // 上传支持格式
     };
   },
   async mounted() {
@@ -630,6 +629,7 @@ export default {
 ::v-deep .avatar-uploader.uploadDisabled {
   .el-upload--text {
     cursor: not-allowed;
+    background-color: #f7f7f7;
   }
   .el-upload:hover {
     border-color: #d9d9d9;

src/views/tenantSetting/tenantInfo.vue

@@ -41,8 +41,8 @@ export default {
         const res = await tenantInfoInfo({ id: this.$helpers.tenantId })
         this.status = true
         const { config, productInfo, ...other } = res.data
-        const { theme, themeColor, id, ...con } = config
-        this.info = { ...other, theme, themeColor, configId: id }
+        const { theme, themeColor, corporateChops, corporateFinanceChops, id, ...con } = config
+        this.info = { ...other, theme, themeColor, corporateChops, corporateFinanceChops, configId: id }
       } catch (e) {}
     },
     async onNext() {