Merge branch 'dev/v1.0.63_yf' of jianyu/web into feature/v1.0.63

apps/bigmember_pc/src/components/filter-items/ZhiMaBidSelector.vue

@@ -1113,7 +1113,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 8px 8px 4px;
+    padding: 8px;
     font-size: 14px;
     line-height: 22px;
     .dropdown-content--hd-left {

apps/mobile/src/assets/style/pic-icon.scss

@@ -26,17 +26,20 @@
     background-size: 100% 100%;
     &[disabled] {
       border: 0;
-      background: url(@/assets/image/icon/checkbox-disabled.png) no-repeat center;
+      background: url(@/assets/image/icon/checkbox-disabled.png) no-repeat
+        center;
       background-size: 100% 100%;
     }
   }
 
   &.half {
     border: 0;
-    background: url(@/assets/image/icon/checkbox-checked-half.png) no-repeat center;
+    background: url(@/assets/image/icon/checkbox-checked-half.png) no-repeat
+      center;
     background-size: 100% 100%;
     &[disabled] {
-      background: url(@/assets/image/icon/checkbox-checked-half-disabled.png) no-repeat center;
+      background: url(@/assets/image/icon/checkbox-checked-half-disabled.png)
+        no-repeat center;
     }
   }
 
@@ -44,59 +47,70 @@
     &:checked,
     &.checked {
       border: 0;
-      background: url(@/assets/image/icon/checkbox-transparent-checked.png) no-repeat center;
+      background: url(@/assets/image/icon/checkbox-transparent-checked.png)
+        no-repeat center;
       background-size: 100% 100%;
     }
   }
 }
 
 .icon-logo-mini {
-  background: transparent url(@/assets/image/icon/icon-logo-mini.png) no-repeat center;
+  background: transparent url(@/assets/image/icon/icon-logo-mini.png) no-repeat
+    center;
   background-size: contain;
 }
 
 .icon-check {
-  background: transparent url(@/assets/image/icon/icon-check.png) no-repeat center;
+  background: transparent url(@/assets/image/icon/icon-check.png) no-repeat
+    center;
   background-size: contain;
 }
 
 .icon-points {
-  background: transparent url(@/assets/image/icon/jy-points.png) no-repeat center;
+  background: transparent url(@/assets/image/icon/jy-points.png) no-repeat
+    center;
   background-size: contain;
 }
 
 .icon-root {
-  background: transparent url(@/assets/image/icon/icon-root.png) no-repeat center;
+  background: transparent url(@/assets/image/icon/icon-root.png) no-repeat
+    center;
   background-size: contain;
 }
 
 .icon-phone-gray {
-  background: transparent url(@/assets/image/icon/icon-phone-gray.png) no-repeat center;
+  background: transparent url(@/assets/image/icon/icon-phone-gray.png) no-repeat
+    center;
   background-size: contain;
 }
 
 .icon-phone-orange {
-  background: transparent url(@/assets/image/icon/icon-phone-orange.png) no-repeat center;
+  background: transparent url(@/assets/image/icon/icon-phone-orange.png)
+    no-repeat center;
   background-size: contain;
 }
 
 .icon-phone-blue {
-  background: transparent url(@/assets/image/icon/icon-phone-blue.png) no-repeat center;
+  background: transparent url(@/assets/image/icon/icon-phone-blue.png) no-repeat
+    center;
   background-size: contain;
 }
 
 .icon-talk-gray {
-  background: transparent url(@/assets/image/icon/icon-talk-gray.png) no-repeat center;
+  background: transparent url(@/assets/image/icon/icon-talk-gray.png) no-repeat
+    center;
   background-size: contain;
 }
 
 .icon-red-close {
-  background: transparent url(@/assets/image/icon/icon-red-close.png) no-repeat center;
+  background: transparent url(@/assets/image/icon/icon-red-close.png) no-repeat
+    center;
   background-size: contain;
 }
 
 .icon-earth {
-  background: transparent url(@/assets/image/icon/icon-earth.png) no-repeat center;
+  background: transparent url(@/assets/image/icon/icon-earth.png) no-repeat
+    center;
   background-size: contain;
 }
 
@@ -200,3 +214,8 @@
   background-image: url(@/assets/image/icon/icon-zhima-logo.png);
   background-size: contain;
 }
+
+.icon-big-search {
+  background-image: url(@/assets/image/icon/icon-big-search.png);
+  background-size: contain;
+}

apps/mobile/src/components/selector/zhima-three-sidebar/index.vue

@@ -12,6 +12,9 @@
         @clear="onSearchClear"
         @input="onSearch"
       >
+        <template #left-icon>
+          <i class="j-icon j-base-icon icon-big-search"></i>
+        </template>
         <template #action>
           <div @click="onSearch">搜索</div>
         </template>
@@ -975,6 +978,7 @@ export default {
     .van-field {
       height: 30px;
       line-height: 22px;
+      font-size: 14px;
     }
     .van-field__control::placeholder {
       font-size: 14px;
@@ -1032,8 +1036,9 @@ export default {
       .van-tag {
         display: inline-block;
         font-size: 10px;
-        padding: 1px 4px;
-        min-width: 18px;
+        padding: 0 4px;
+        line-height: 14px;
+        min-width: 14px;
         text-align: center;
       }
       .title-name {
@@ -1067,7 +1072,7 @@ export default {
     }
     &.first-sidebar {
       .van-tab {
-        width: 106px;
+        width: 111px;
         .title-text {
           margin-left: 2px;
         }
@@ -1075,7 +1080,7 @@ export default {
     }
     &.second-sidebar {
       .van-tab {
-        width: 132px;
+        width: 111px;
         .title-text {
           margin-left: 5px;
         }

apps/mobile/src/views/article/components/AbstractEnt.vue

@@ -15,12 +15,9 @@
         {{ title }}
       </p>
     </div>
-    <div class="sesame-container" v-if="entType === 'winner' && zhiMa">
-      <div class="sesame-logo">
-        <i class="j-icon j-base-icon icon-zhima-logo"></i>
-      </div>
-      <span class="ellipsis">{{ zhiMa }}</span>
-    </div>
+    <template v-if="entType === 'winner' && zhiMa">
+      <ZhiMaMarkInList :text="zhiMa" />
+    </template>
     <div
       class="abstract-ent-info-list flex flex-(items-center justify-between)"
     >
@@ -53,11 +50,13 @@
 </template>
 <script>
 import { Icon } from 'vant'
+import ZhiMaMarkInList from '@/components/zhima/mark-in-list.vue'
 
 export default {
   name: 'AbstractEnt',
   components: {
-    [Icon.name]: Icon
+    [Icon.name]: Icon,
+    ZhiMaMarkInList
   },
   props: {
     entType: {
@@ -127,24 +126,6 @@ export default {
   border-width: 0.5px;
 }
 .sesame-container {
-  display: flex;
-  align-items: center;
-  margin-top: 8px;
-  background: rgba(236, 244, 255, 1);
-  border-radius: 5px;
-  .sesame-logo {
-    padding: 4px 6px;
-    height: 24px;
-    flex-shrink: 0;
-    background: rgba(223, 237, 255, 1);
-    border-radius: 5px;
-  }
-  span {
-    flex: 1;
-    padding: 5px 12px 5px 10px;
-    font-size: 10px;
-    line-height: 14px;
-    color: #0987ff;
-  }
+  max-width: 336px;
 }
 </style>