Merge branch 'dev/v1.0.62_zsy' of jianyu/web into feature/v1.0.62

apps/mobile/src/components/cell/filter-cell/index.vue

@@ -7,6 +7,7 @@
     <div class="filter-cell-title">
       <div style="flex-shrink: 0">
         <span class="cell-title-left">{{ title }}</span>
+        <span v-if="isVip" class="v-vip-icon"></span>
         <span v-if="isTag" class="jy-tag">
           <slot name="tag">开通</slot>
         </span>
@@ -59,6 +60,10 @@ export default {
     isLink: {
       type: Boolean,
       default: false
+    },
+    isVip: {
+      type: Boolean,
+      default: false
     }
   },
   methods: {
@@ -99,5 +104,14 @@ export default {
   .filter-cell-label {
     margin-top: 2px;
   }
+  .v-vip-icon{
+    display: inline-block;
+    width: 14px;
+    height: 14px;
+    margin-left: 2px;
+    background: url(@/assets/image/icon/vip/v_icon.png) no-repeat center;
+    background-size: contain;
+    margin-bottom: 1px;
+  }
 }
 </style>

apps/mobile/src/components/search/bidding/filters.vue

@@ -25,7 +25,7 @@
         >
           <template #default="{ item }">
             <van-tag
-              class="scope-tag"
+              class=""
               round
               type="primary"
               v-if="item.labelTag"
@@ -173,7 +173,7 @@
           >
             <template #title v-if="noLoginOrFree">
               <span class="mr-6">采购单位类型</span>
-              <van-tag plain round type="danger">开通</van-tag>
+              <span class="v-vip-icon"></span>
             </template>
           </van-cell>
           <JCell
@@ -183,9 +183,7 @@
           >
             <template #title v-if="noLoginOrFree">
               <span class="mr-6">中标企业联系方式</span>
-              <van-tag plain round type="danger" @click="onNoPower"
-                >开通</van-tag
-              >
+              <span class="v-vip-icon" @click="onNoPower"></span>
             </template>
             <template #label>
               <CheckboxGroup
@@ -203,9 +201,7 @@
           >
             <template #title v-if="noLoginOrFree">
               <span class="mr-6">采购单位联系方式</span>
-              <van-tag plain round type="danger" @click="onNoPower"
-                >开通</van-tag
-              >
+              <span class="v-vip-icon" @click="onNoPower"></span>
             </template>
             <template #label>
               <CheckboxGroup
@@ -224,9 +220,7 @@
           >
             <template #title v-if="noLoginOrFree">
               <span class="mr-6">排除词</span>
-              <van-tag plain round type="danger" @click="onNoPower"
-                >开通</van-tag
-              >
+              <span class="v-vip-icon" @click="onNoPower"></span>
             </template>
             <template #label>
               <KeywordsInputGroup
@@ -245,9 +239,7 @@
           >
             <template #title v-if="noLoginOrFree">
               <span class="mr-6">采购单位</span>
-              <van-tag plain round type="danger" @click="onNoPower">
-                开通
-              </van-tag>
+              <span class="v-vip-icon" @click="onNoPower"></span>
             </template>
             <template #label>
               <KeywordsInputGroup
@@ -268,9 +260,7 @@
           >
             <template #title v-if="noLoginOrFree">
               <span class="mr-6">中标企业</span>
-              <van-tag plain round type="danger" @click="onNoPower">
-                开通
-              </van-tag>
+              <span class="v-vip-icon" @click="onNoPower"></span>
             </template>
             <template #label>
               <KeywordsInputGroup
@@ -291,9 +281,7 @@
           >
             <template #title v-if="noLoginOrFree">
               <span class="mr-6">招标代理机构</span>
-              <van-tag plain round type="danger" @click="onNoPower">
-                开通
-              </van-tag>
+              <span class="v-vip-icon" @click="onNoPower"></span>
             </template>
             <template #label>
               <KeywordsInputGroup
@@ -599,10 +587,10 @@ export default {
         if (item.needPower) {
           if (this.noLoginOrFree && !oldUserExclusive) {
             this.$set(item, 'disabled', true)
-            this.$set(item, 'tag', '开通')
+            this.$set(item, 'vip', true)
           } else {
             this.$set(item, 'disabled', false)
-            this.$set(item, 'tag', '')
+            this.$set(item, 'vip', false)
             if (oldUserExclusive) {
               this.$set(item, 'labelTag', '老用户免费专享')
             }
@@ -621,14 +609,14 @@ export default {
         list.forEach((item) => {
           if (item.needPower) {
             this.$set(item, 'disabled', true)
-            this.$set(item, 'tag', '开通')
+            this.$set(item, 'vip', true)
           }
         })
       } else {
         list.forEach((item) => {
           if (item.needPower) {
             this.$set(item, 'disabled', false)
-            this.$set(item, 'tag', '')
+            this.$set(item, 'vip', false)
           }
         })
       }
@@ -1240,4 +1228,13 @@ export default {
 .price-input-group {
   margin-top: 6px;
 }
+.v-vip-icon{
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  margin-left: 2px;
+  background: url(@/assets/image/icon/vip/v_icon.png) no-repeat center;
+  background-size: contain;
+  margin-bottom: 1px;
+}
 </style>

apps/mobile/src/components/search/company-search/MoreSelectorContent.vue

@@ -36,14 +36,14 @@
     <FilterCell
       title="中标区域"
       isLink
-      :isTag="openTag"
+      :isVip="showVip"
       :value="formatAreaVal"
       @onClick="onCellClick(entBidArea)"
       v-if="isLogin"
     ></FilterCell>
     <FilterCell
       title="单位类型"
-      :isTag="openTag"
+      :isVip="showVip"
       :value="unitType.value"
       @onClick="onCellClick(unitType)"
       v-if="isLogin"
@@ -61,7 +61,7 @@
     </FilterCell>
     <FilterCell
       title="联系方式"
-      :isTag="openTag"
+      :isVip="showVip"
       :value="entContact.value"
       @onClick="onCellClick(entContact)"
       v-if="isLogin"
@@ -196,7 +196,7 @@ export default {
   },
   computed: {
     ...mapGetters('user', ['isLogin']),
-    openTag() {
+    showVip () {
       return this.freeUser
     },
     formatAreaVal() {

apps/mobile/src/components/selector/scope/index.vue

@@ -9,6 +9,7 @@
     >
       <div class="scope-item-label">
         <span class="item-label">{{ item.label }}</span>
+        <span v-if="item.vip && item.disabled" class="v-vip-icon"></span>
         <slot :item="item"></slot>
       </div>
       <div class="scope-item-action">
@@ -205,12 +206,10 @@ export default {
     font-weight: 500;
     color: $gray_7;
     line-height: 20px;
+    box-sizing: border-box;
     &.active {
       color: $main;
     }
-    &.disabled {
-      color: $gray_5;
-    }
     &:not(:last-child)::after {
       position: absolute;
       content: '';
@@ -220,6 +219,15 @@ export default {
       height: 1px;
       background: $border_color_3;
     }
+    .v-vip-icon{
+      display: inline-block;
+      width: 14px;
+      height: 14px;
+      margin-left: 4px;
+      background: url(@/assets/image/icon/vip/v_icon.png) no-repeat center;
+      background-size: contain;
+      margin-bottom: 2px;
+    }
   }
 
   ::v-deep {

apps/mobile/src/data/company.js

@@ -52,13 +52,13 @@ export const entScopeData = [
   {
     label: '经营范围',
     key: 'F',
-    tag: '开通',
+    vip: true,
     disabled: true
   },
   {
     label: '中标项目/标的物',
     key: 'E',
-    tag: '开通',
+    vip: true,
     disabled: true
   }
 ]

apps/mobile/src/ui/checkbox-group/index.vue

@@ -22,6 +22,7 @@
         :$index="index"
       ></slot>
       <slot v-else :item="item">{{ item[getConfig.findLabel] }}</slot>
+      <span v-if="item.vip" class="v-vip-icon"></span>
       <span v-if="item.tag" class="jy-tag">{{ item.tag }}</span>
     </CheckBox>
   </div>
@@ -251,5 +252,14 @@ export default {
       margin-right: 0;
     }
   }
+  .v-vip-icon{
+    display: inline-block;
+    width: 14px;
+    height: 14px;
+    margin-left: 2px;
+    background: url(@/assets/image/icon/vip/v_icon.png) no-repeat center;
+    background-size: contain;
+    margin-bottom: 1px;
+  }
 }
 </style>

apps/mobile/src/views/search/middle/bidding/index.vue

@@ -111,7 +111,7 @@ export default {
         {
           id: '2',
           label: '超前项目',
-          badge: '推荐'
+          // badge: '推荐'
         },
         {
           id: '4',

apps/mobile/src/views/search/result/bidding/index.vue

@@ -523,7 +523,7 @@ export default {
             id: '2',
             title: '超前项目',
             name: 'advanced',
-            recommendTipText: '推荐'
+            // recommendTipText: '推荐'
           },
           {
             id: '3',
@@ -1704,7 +1704,7 @@ export default {
         item?.buyerClass && item?.buyerClass !== '其它'
           ? item?.buyerClass
           : undefined
-      
+
       // 标签
       item.tagList = [
         region || '',

apps/mobile/src/views/search/result/company/index.vue

@@ -244,7 +244,7 @@ export default {
         return list.filter((item) => !item.disabled)
       }
       list.forEach((v) => {
-        if (this.freeUser && v.tag) {
+        if (this.freeUser && v.vip) {
           v.disabled = true
         } else {
           v.disabled = false