Просмотр исходного кода

fix:背景图片类名与字体图标类名冲突

yangfeng 3 лет назад
Родитель
Сommit
0218930eee
30 измененных файлов с 52 добавлено и 58 удалено
  1. 2 2
      src/components/article-item/ArticleItem.vue
  2. 1 1
      src/components/collect-info/CollectInfo.vue
  3. 1 1
      src/components/common/SpecCard.vue
  4. 1 1
      src/components/forecast/ForeCast.vue
  5. 2 2
      src/components/home/FloatSide.vue
  6. 1 1
      src/components/medical/FollowList.vue
  7. 1 1
      src/components/push-list/DistributorSearch.vue
  8. 1 1
      src/components/push-list/MedicalList.vue
  9. 1 1
      src/components/push-list/PotentialList.vue
  10. 1 1
      src/components/push-list/ProjectList.vue
  11. 1 1
      src/components/push-list/ProjectProgressList.vue
  12. 7 7
      src/components/push-list/PushList.vue
  13. 1 1
      src/components/scope/components/Edit.vue
  14. 1 1
      src/components/scope/components/List.vue
  15. 1 1
      src/components/selector/BuyerclassSelectorContent.vue
  16. 0 0
      src/components/selector/InfoTypeSelectorContent.vue
  17. 0 0
      src/components/selector/MedicalSelectorContent.vue
  18. 1 1
      src/components/subscribe-manager/KeyConfig.vue
  19. 1 1
      src/components/subscribe-manager/components/Edit.vue
  20. 1 1
      src/components/subscribe-manager/components/List.vue
  21. 4 10
      src/components/work-desktop/CommonUse.vue
  22. 1 1
      src/views/analysisReport/components/MarketOverview.vue
  23. 7 7
      src/views/portrayal/components/DynamicList.vue
  24. 2 2
      src/views/portrayal/components/DynamicListItem.vue
  25. 1 1
      src/views/subscribe/components/key/Edit.vue
  26. 1 1
      src/views/subscribe/components/key/KeyConfig.vue
  27. 1 1
      src/views/subscribe/components/key/List.vue
  28. 1 1
      src/views/subscribe/components/scope/Edit.vue
  29. 1 1
      src/views/subscribe/components/scope/List.vue
  30. 7 7
      src/views/workspace/components/CommonUse.vue

+ 2 - 2
src/components/article-item/ArticleItem.vue

@@ -161,14 +161,14 @@ export default {
         cursor: pointer;
         vertical-align: sub;
         ::before{
-          content: ''
+          content: ''!important;
         }
       }
       .icon-collect.checked{
         background: transparent url(https://cdn-ali.jianyu360.com/images/collected.png) center no-repeat;
         background-size: contain;
         ::before{
-          content: ''
+          content: ''!important;
         }
       }
 

+ 1 - 1
src/components/collect-info/CollectInfo.vue

@@ -1023,7 +1023,7 @@ export default {
         background: url('../../assets/images/icon/icon-warning1.png') no-repeat;
         background-size: contain;
         ::before{
-          content: ''
+          content: ''!important;
         }
     }
     .warm-text{

+ 1 - 1
src/components/common/SpecCard.vue

@@ -88,7 +88,7 @@ export default {
       background: url('~@/assets/images/icon/icon-crown.png') no-repeat center;
       background-size: cover;
       ::before{
-        content: ''
+        content: ''!important;
       }
     }
   }

+ 1 - 1
src/components/forecast/ForeCast.vue

@@ -799,7 +799,7 @@ export default {
       background-size: contain;
       cursor: pointer;
       ::before{
-        content: ''
+        content: ''!important;
       }
     }
   }

+ 2 - 2
src/components/home/FloatSide.vue

@@ -143,7 +143,7 @@ export default {
       border-radius: 50%;
       margin-left: 8px;
       ::before{
-        content: ''
+        content: ''!important;
       }
     }
 
@@ -184,7 +184,7 @@ export default {
       border-radius: 50%;
       margin-left: 4px;
       ::before{
-        content: ''
+        content: ''!important;
       }
     }
     .color {

+ 1 - 1
src/components/medical/FollowList.vue

@@ -389,7 +389,7 @@ export default {
       cursor: pointer;
 
       ::before {
-        content: ''
+        content: ''!important;
       }
     }
   }

+ 1 - 1
src/components/push-list/DistributorSearch.vue

@@ -444,7 +444,7 @@ export default {
       &:before,
       &:after {
         position: absolute;
-        content: '';
+        content: ''!important;
         background-color: #fff;
         top: 50%;
         left: 50%;

+ 1 - 1
src/components/push-list/MedicalList.vue

@@ -414,7 +414,7 @@ export default {
       &:before,
       &:after {
         position: absolute;
-        content: '';
+        content: ''!important;
         background-color: #fff;
         top: 50%;
         left: 50%;

+ 1 - 1
src/components/push-list/PotentialList.vue

@@ -453,7 +453,7 @@ export default {
       &:before,
       &:after {
         position: absolute;
-        content: '';
+        content: ''!important;
         background-color: #fff;
         top: 50%;
         left: 50%;

+ 1 - 1
src/components/push-list/ProjectList.vue

@@ -284,7 +284,7 @@ export default {
       &:before,
       &:after {
         position: absolute;
-        content: '';
+        content: ''!important;
         background-color: #fff;
         top: 50%;
         left: 50%;

+ 1 - 1
src/components/push-list/ProjectProgressList.vue

@@ -508,7 +508,7 @@ export default {
       &:before,
       &:after {
         position: absolute;
-        content: '';
+        content: ''!important;
         background-color: #fff;
         top: 50%;
         left: 50%;

Разница между файлами не показана из-за своего большого размера
+ 7 - 7
src/components/push-list/PushList.vue


+ 1 - 1
src/components/scope/components/Edit.vue

@@ -342,7 +342,7 @@ export default {
       background-position: center center;
       cursor: pointer;
       &::before{
-        content: '';
+        content: ''!important;
       }
     }
     .icon-edit{

+ 1 - 1
src/components/scope/components/List.vue

@@ -409,7 +409,7 @@ export default {
       background-position: center center;
       cursor: pointer;
       &::before{
-        content: '';
+        content: ''!important;
       }
     }
     .icon-edit{

+ 1 - 1
src/components/selector/BuyerclassSelectorContent.vue

@@ -315,7 +315,7 @@ export default {
       margin-left: 2px;
       cursor: pointer;
       ::before{
-        content: ''
+        content: ''!important;
       }
     }
   }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/components/selector/InfoTypeSelectorContent.vue


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/components/selector/MedicalSelectorContent.vue


+ 1 - 1
src/components/subscribe-manager/KeyConfig.vue

@@ -183,7 +183,7 @@ export default {
         background-position: center center;
         cursor: pointer;
         &::before{
-          content: '';
+          content: ''!important;
         }
       }
       .icon-edit{

+ 1 - 1
src/components/subscribe-manager/components/Edit.vue

@@ -375,7 +375,7 @@ export default {
       background-position: center center;
       cursor: pointer;
       &::before{
-        content: '';
+        content: ''!important;
       }
     }
     .icon-edit{

+ 1 - 1
src/components/subscribe-manager/components/List.vue

@@ -569,7 +569,7 @@ export default {
     background-position: center center;
     cursor: pointer;
     &::before{
-      content: '';
+      content: ''!important;
     }
   }
   .icon-edit{

+ 4 - 10
src/components/work-desktop/CommonUse.vue

@@ -2,7 +2,7 @@
   <div class="work-common">
     <div class="common-title">
       <span>常用功能</span>
-      <span class="set" @click="setFunctions"><i class="icon-set"></i> 设置</span>
+      <span class="set" @click="setFunctions"><i class="icon-set-img"></i> 设置</span>
     </div>
     <div class="common-lists">
       <div class="list-item" v-for="(item, index) in commonList" :key="index" @click="openRouter(item.url)">
@@ -10,7 +10,7 @@
         <span v-html="item.name" class="item-name"></span>
       </div>
       <div v-if="commonList && commonList.length < 8" class="list-add" @click="setFunctions">
-        <span class="icon-add"></span>
+        <span class="icon-add-img"></span>
         <span class="add-text">添加常用功能</span>
       </div>
     </div>
@@ -182,16 +182,13 @@ export default {
       font-size: 14px;
       cursor: pointer;
     }
-    .icon-set{
+    .icon-set-img{
       display: inline-block;
       width: 18px;
       height: 18px;
       margin-right: 6px;
       background: url('~@/assets/images/icon/icon-set.png') no-repeat center center;
       background-size: contain;
-      ::before{
-        content: ''
-      }
     }
   }
   .common-lists{
@@ -225,15 +222,12 @@ export default {
       width: 44px;
       height: 44px;
     }
-    .icon-add{
+    .icon-add-img{
       display: inline-block;
       width: 44px;
       height: 44px;
       background: url('~@/assets/images/icon/icon-add.png') no-repeat center center;
       background-size: contain;
-      ::before{
-        content: ''
-      }
     }
     .add-text{
       color: #686868;

+ 1 - 1
src/views/analysisReport/components/MarketOverview.vue

@@ -122,7 +122,7 @@ export default {
   }
   .icon-reverse {
     ::before{
-      content: ''
+      content: ''!important;
     }
     .el-icon-top {
       transform: rotate(180deg);

Разница между файлами не показана из-за своего большого размера
+ 7 - 7
src/views/portrayal/components/DynamicList.vue


+ 2 - 2
src/views/portrayal/components/DynamicListItem.vue

@@ -145,7 +145,7 @@ $border-color: #ECECEC;
     cursor: pointer;
     vertical-align: sub;
     ::before{
-      content: ''
+      content: ''!important;
     }
   }
 
@@ -153,7 +153,7 @@ $border-color: #ECECEC;
     background: transparent url(https://cdn-ali.jianyu360.com/images/collected.png) center no-repeat;
     background-size: contain;
     ::before{
-      content: ''
+      content: ''!important;
     }
   }
 

+ 1 - 1
src/views/subscribe/components/key/Edit.vue

@@ -377,7 +377,7 @@ export default {
       background-position: center center;
       cursor: pointer;
       &::before{
-        content: '';
+        content: ''!important;
       }
     }
     .icon-edit{

+ 1 - 1
src/views/subscribe/components/key/KeyConfig.vue

@@ -195,7 +195,7 @@ export default {
         background-position: center center;
         cursor: pointer;
         &::before{
-          content: '';
+          content: ''!important;
         }
       }
       .icon-edit{

+ 1 - 1
src/views/subscribe/components/key/List.vue

@@ -662,7 +662,7 @@ export default {
     background-position: center center;
     cursor: pointer;
     &::before{
-      content: '';
+      content: ''!important;
     }
   }
   .icon-edit{

+ 1 - 1
src/views/subscribe/components/scope/Edit.vue

@@ -325,7 +325,7 @@ export default {
       background-position: center center;
       cursor: pointer;
       &::before{
-        content: '';
+        content: ''!important;
       }
     }
     .icon-edit{

+ 1 - 1
src/views/subscribe/components/scope/List.vue

@@ -396,7 +396,7 @@ export default {
       background-position: center center;
       cursor: pointer;
       &::before{
-        content: '';
+        content: ''!important;
       }
     }
     .icon-edit{

+ 7 - 7
src/views/workspace/components/CommonUse.vue

@@ -1,12 +1,12 @@
 <template>
   <WorkspaceCard class="work-common" title="常用功能">
-    <span slot="header-right" class="header-right-set" @click="changeDialogState(true)"><i class="icon-set"></i> 设置</span>
+    <span slot="header-right" class="header-right-set" @click="changeDialogState(true)"><i class="icon-set-img"></i> 设置</span>
     <div class="common-lists">
       <div class="list-item" v-for="item in commonList" :key="item.id" @click="openLink(item)">
-        <div class="icon-box" v-if="item.icon && item.icon.indexOf('icon-') === 0">
+        <div class="icon-box-container" v-if="item.icon && item.icon.indexOf('icon-') === 0">
           <JyIcon :name="item.icon" classPrefix=""></JyIcon>
         </div>
-        <div v-else class="icon-box">
+        <div v-else class="icon-box-container">
           <el-image :src="item.icon" alt="常用功能">
             <img slot="error" src="https://www.jianyu360.cn/common-module/public/image/auto.png" />
           </el-image>
@@ -14,7 +14,7 @@
         <span v-html="item.name" class="item-name"></span>
       </div>
       <div v-if="commonList && commonList.length < maxCount" class="list-add" @click="changeDialogState(true)">
-        <span class="icon-add"></span>
+        <span class="icon-add-img"></span>
         <span class="add-text">添加常用功能</span>
       </div>
     </div>
@@ -149,7 +149,7 @@ $main: #2cb7ca;
     color: #686868;
   }
 }
-.icon-box {
+.icon-box-container {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -170,7 +170,7 @@ $main: #2cb7ca;
   }
 }
 
-.icon-set{
+.icon-set-img{
   display: inline-block;
   width: 18px;
   height: 18px;
@@ -178,7 +178,7 @@ $main: #2cb7ca;
   background: url('~@/assets/images/icon/icon-set.png') no-repeat center center;
   background-size: contain;
 }
-.icon-add{
+.icon-add-img{
   display: inline-block;
   width: 44px;
   height: 44px;

Некоторые файлы не были показаны из-за большого количества измененных файлов