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

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

@@ -1,12 +1,16 @@
 <template>
   <div class="checkbox-group-selector">
     <div class="s-container">
-      <div class="checkbox-item"
+      <div
+        class="checkbox-item"
         v-for="(item, index) in options"
         :key="index"
         @click="onClick(item)"
       >
-        <span class="j-checkbox checkbox-item-icon" :class="{checked: value.includes(item.value), gold: item.power}"></span>
+        <span
+          class="j-checkbox checkbox-item-icon"
+          :class="{ checked: value.includes(item.value), gold: item.power }"
+        ></span>
         <span class="checkbox-item-label">{{ item.label }}</span>
         <slot name="tips" :prop="item"></slot>
       </div>
@@ -32,7 +36,7 @@
  *      return true
  *    }
  *  }
-*/
+ */
 export default {
   name: 'checkbox-group-selector-component',
   props: {
@@ -55,7 +59,7 @@ export default {
     event: 'change'
   },
   methods: {
-    onClick (item) {
+    onClick(item) {
       const beforeChange = this.beforeChange
       if (beforeChange) {
         const pass = beforeChange(item)
@@ -66,7 +70,7 @@ export default {
         this.onChange(item)
       }
     },
-    onChange (next) {
+    onChange(next) {
       if (this.value.includes(next.value)) {
         if (this.keepOne && this.value.length === 1) {
           this.$toast('至少选择一个')
@@ -84,32 +88,35 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.checkbox-group-selector{
+.checkbox-group-selector {
   display: flex;
   align-items: center;
-  .s-header{
+  .s-header {
     min-width: 120px;
     margin-right: 8px;
     font-size: 14px;
     line-height: 40px;
     text-align: right;
   }
-  .s-container{
+  .s-container {
     flex: 1;
     display: flex;
     align-items: center;
     min-width: 352px;
   }
-  .checkbox-item{
+  .checkbox-item {
     display: flex;
     align-items: center;
     margin-right: 10px;
     color: #1d1d1d;
     cursor: pointer;
-    &-icon{
+    &-icon {
       width: 16px;
       height: 16px;
       margin-right: 10px;
+      &.gold {
+        border: 1px solid #c98f37;
+      }
     }
     &-label {
       font-size: 14px;

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

@@ -1067,7 +1067,7 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss">
 .vip-module {
   .zhima-bid--icon {
     color: rgba(201, 143, 55, 1) !important;

apps/bigmember_pc/src/views/search/ent/constant/search-filters.js

@@ -1,23 +1,22 @@
+import {
+  contactList,
+  entPriceList,
+  entStateList,
+  entTypeList,
+  searchScopeEntData,
+  unitTypeList
+} from '../assets/options.js'
 import CheckboxGroupSelector from '@/components/filter-items/CheckboxGroupSelector.vue'
 import RegionSelector from '@/components/filter-items/RegionSelector.vue'
 import EntamountRangeData from '@/components/filter-items/EntamountRangeData.vue'
 import OnecascadeContent from '@/components/filter-items/OnecascadeContent.vue'
-import ZhiMaBidSelector from '@/components/filter-items/ZhiMaBidSelector'
 import EstablishTimeSelector from '@/components/filter-items/EstablishTimeSelector.vue'
 import SelectorWithBasePower from '@/components/filter-items/SelectorWithBasePower.vue'
 import SelectSelector from '@/components/filter-items/SelectSelector.vue'
 import $bus from '@/utils/bus'
-import {
-  searchScopeEntData,
-  entPriceList,
-  entTypeList,
-  entStateList,
-  unitTypeList,
-  contactList
-} from '../assets/options.js'
 import { provinceListMapExp } from '@/assets/js/selector.js'
 
-const provinces = [].concat(...Object.values(provinceListMapExp)).map(v => {
+const provinces = [].concat(...Object.values(provinceListMapExp)).map((v) => {
   return {
     label: v,
     value: v
@@ -33,11 +32,11 @@ const EntMoreFiltersNeedVipKeyList = [
   'biddingArea',
   'entClass',
   'entContact',
-  'zhimaBid',
+  'zhimaBid'
 ]
 
 function createSearchEntBaseSchema(conf = {}) {
-  const isLogin = conf.isLogin || false
+  // const isLogin = conf.isLogin || false
   const isInApp = conf.isInApp || false
   const vipUser = conf.vipUser || false
   const showVip = conf.showVip || false
@@ -66,12 +65,14 @@ function createSearchEntBaseSchema(conf = {}) {
           {
             label: '经营范围',
             needVip: true,
-            value: 'F'
+            value: 'F',
+            power: true
           },
           {
             label: '中标项目/标的物',
             needVip: true,
-            value: 'E'
+            value: 'E',
+            power: true
           }
         ],
         beforeChange() {
@@ -99,7 +100,7 @@ function createSearchEntBaseSchema(conf = {}) {
       defaultVal: ['A'],
       _name: 'matchType',
       _type: 'component',
-      expand: (vipUser && isInApp) ? searchScopeExpandVip : searchScopeExpandFree,
+      expand: vipUser && isInApp ? searchScopeExpandVip : searchScopeExpandFree
     }
   ]
   return SearchEntBaseSchema
@@ -158,7 +159,7 @@ function createSearchEntMoreSchema() {
       _type: 'component',
       expand: {
         component: OnecascadeContent,
-        props:{
+        props: {
           options: entTypeList,
           placeholder: '企业类型'
         },
@@ -173,7 +174,7 @@ function createSearchEntMoreSchema() {
       _type: 'component',
       expand: {
         component: OnecascadeContent,
-        props:{
+        props: {
           options: entStateList,
           placeholder: '企业状态'
         },
@@ -188,7 +189,7 @@ function createSearchEntMoreSchema() {
       _type: 'component',
       expand: {
         component: SelectSelector,
-        props:{
+        props: {
           options: provinces,
           placeholder: '中标区域'
         },
@@ -224,19 +225,19 @@ function createSearchEntMoreSchema() {
         },
         hooks: {}
       }
-    },
-    {
-      key: 'zhimaBid',
-      label: '芝麻实力标',
-      defaultVal: '',
-      _name: 'zhimaBidComponent',
-      _type: 'component',
-      expand: {
-        component: ZhiMaBidSelector,
-        props: {},
-        hooks: {}
-      }
     }
+    // {
+    //   key: 'zhimaBid',
+    //   label: '芝麻实力标',
+    //   defaultVal: '',
+    //   _name: 'zhimaBidComponent',
+    //   _type: 'component',
+    //   expand: {
+    //     component: ZhiMaBidSelector,
+    //     props: {},
+    //     hooks: {}
+    //   }
+    // }
   ]
 
   // VIP处理
@@ -250,6 +251,4 @@ function createSearchEntMoreSchema() {
   return SearchEntMoreSchema
 }
 
-
-
 export { createSearchEntBaseSchema, createSearchEntMoreSchema }

apps/bigmember_pc/src/views/search/ent/model/modules/filter.js

@@ -14,7 +14,7 @@ const filterState = ref({
   establish: '',
   biddingArea: '',
   entClass: '',
-  zhimaBid: {},
+  // zhimaBid: {},
   entContact: ''
 })
 

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

@@ -73,7 +73,7 @@
         />
       </template>
     </FilterCell>
-    <FilterCell
+    <!-- <FilterCell
       v-if="isLogin"
       title="芝麻实力标"
       is-link
@@ -82,7 +82,7 @@
       :value="formatZhiMaValue"
       @question="onZhiMaQuestion"
       @onClick="onZhiMaCellClick(zhimaBid)"
-    />
+    /> -->
     <van-popup
       v-model="areaPicker.show"
       round