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

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

@@ -55,14 +55,11 @@ $gold: #c98f37;
   position: relative;
   display: flex;
   align-items: center;
-  padding: 0 12px 0 6px;
   border-radius: 4px;
 }
-.default-module {
-  margin-right: 8px;
-}
 .vip-module {
   border: 1px dashed $gold;
+  padding: 1px 12px 1px 8px;
   background: linear-gradient(90deg, #fff7dC 0%, rgba(255, 247, 220, 0) 100%);
   &::after {
     content: '';

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

@@ -6,9 +6,9 @@
         :key="index"
         @click="onClick(item)"
       >
-        <span class="j-checkbox checkbox-item-icon" :class="{checked: value.includes(item.value)}"></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.value"></slot>
+        <slot name="tips" :prop="item"></slot>
       </div>
       <slot name="endOther"></slot>
     </div>

apps/bigmember_pc/src/components/selector/SearchTimeScopeSelector.vue

@@ -143,7 +143,7 @@ export default {
       border-radius: 4px;
       font-size: 14px;
       text-align: center;
-      background-color: #fff;
+      background-color: transparent;
       cursor: pointer;
       &:first-child {
         margin-left: 0;

apps/bigmember_pc/src/views/search/bidding/components/search-bid-filter.vue

@@ -131,7 +131,7 @@ function doChangeFilter() {
             v-model="filterState"
             vipMaskShow
             :baseMaskShow="!isLogin"
-            :vipModuleShow="isInApp && isVip"
+            :vipModuleShow="isInApp "
             @clickVipMask="noPower"
             @clickBaseMask="toLogin"
             @change="doChangeFilter"
@@ -148,7 +148,7 @@ function doChangeFilter() {
     .wrap-line {
       ::v-deep {
         .vip-module {
-          margin-left: 0;
+          margin-left: 10px;
         }
       }
     }
@@ -159,8 +159,11 @@ function doChangeFilter() {
   padding: 16px 32px;
   .wrap-line {
     ::v-deep {
+      .filter-layout .select-prefix {
+        background: transparent;
+      }
       .vip-module {
-        margin-left: 105px;
+        margin-left: 92px;
       }
     }
   }

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

@@ -104,6 +104,7 @@ function createSearchBidBaseSchema(conf = {}) {
       component: SearchScopeSelector,
       options: defaultScopeOptions,
       freeConf: {
+        isOld: oldUser && !vipUser,
         beforeChange($event) {
           return beforeChangeHandle($event, 'selectType', isLogin)
         },
@@ -122,7 +123,9 @@ function createSearchBidBaseSchema(conf = {}) {
   }
   const searchScopeExpandVip = {
     component: SearchScopeSelector,
-    props: {},
+    props: {
+      isOld: oldUser && !vipUser
+    },
     hooks: {}
   }
 

apps/bigmember_pc/src/views/search/bidding/index.vue

@@ -134,11 +134,11 @@ const articleRef = ref({
               :match-keys="inputKeywordsState.matchKeys"
               :article="item"
               :index="index"
-              :tag-can-click='true'
+              :tag-can-click="true"
               @onClick="toDetail(item)"
-              @tag-click='tagToDetail(item, $event)'
-              @onCollect='onClickSingleCollect'
-              @onJoinBid='onJoinBid'
+              @tag-click="tagToDetail(item, $event)"
+              @onCollect="onClickSingleCollect"
+              @onJoinBid="onJoinBid"
               :config="articleRef"
             >
               <template #right-handle-container>

apps/bigmember_pc/src/views/search/components/search-schema-filter.vue

@@ -57,43 +57,45 @@ const getPrefix = {
         <slot name="row-label-text">{{ rowLabelText }}</slot>
       </div>
     </slot>
-    <div
-      class="search-schema-filter-item flex flex-row"
-      v-for="(item, index) in schema"
-      :key="getPrefix.item + index"
-      :class="{
+    <div class="search-schema-filter-box">
+      <div
+        class="search-schema-filter-item flex flex-row"
+        v-for="(item, index) in schema"
+        :key="getPrefix.item + index"
+        :class="{
         'flex-items-start': showLabel && item.label
       }"
-    >
-      <div class="search-schema-filter-label" v-if="showLabel && item.label">
-        <slot name="item-label">
-          {{ item.label }}
-        </slot>
-      </div>
-      <div class="flex-1">
-        <!-- @component 自定义组件  -->
-        <!-- @input @change 兼容不同组件的输出  -->
-        <Component
-          v-if="item._type === 'component'"
-          :is="item.expand.component"
-          :ref="getPrefix.component + item._name"
-          :value="props.value[item.key]"
-          @input="doChangeInput(item.key, $event)"
-          @change="doChangeInput(item.key, $event)"
-          v-bind="item.expand.props"
-          v-on="{
+      >
+        <div class="search-schema-filter-label" v-if="showLabel && item.label">
+          <slot name="item-label">
+            {{ item.label }}
+          </slot>
+        </div>
+        <div class="flex-1">
+          <!-- @component 自定义组件  -->
+          <!-- @input @change 兼容不同组件的输出  -->
+          <Component
+            v-if="item._type === 'component'"
+            :is="item.expand.component"
+            :ref="getPrefix.component + item._name"
+            :value="props.value[item.key]"
+            @input="doChangeInput(item.key, $event)"
+            @change="doChangeInput(item.key, $event)"
+            v-bind="item.expand.props"
+            v-on="{
             ...item.expand.hooks
           }"
-        >
-        </Component>
-        <!-- @slot 自定义插槽  -->
-        <slot
-          v-if="item._type === 'slot'"
-          :ref="getPrefix.slot + item._name"
-          :name="item.expand.slot"
-          :item="item"
-          :index="index"
-        ></slot>
+          >
+          </Component>
+          <!-- @slot 自定义插槽  -->
+          <slot
+            v-if="item._type === 'slot'"
+            :ref="getPrefix.slot + item._name"
+            :name="item.expand.slot"
+            :item="item"
+            :index="index"
+          ></slot>
+        </div>
       </div>
     </div>
   </div>
@@ -112,7 +114,13 @@ const getPrefix = {
   &.use-style-row {
     display: flex;
     flex-direction: row;
-    align-items: center;
+    .search-schema-filter-box{
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      flex-wrap: wrap;
+    }
+
   }
 
   .search-schema-filter-label {