jufubao-base 1.0.289-beta2 → 1.0.290-beta1

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -34,41 +34,7 @@
               >{{ item.label }}</view>
             </view>
           </view>
-          <view class="menu_filter" v-if="(tabId!=='all'&&filterTab.length)||(tabId!=='all'&&showComprehensive)||(tabId!=='all'&&showSort)">
-            <view @click="handleGetFilterItem({value:'comprehensive'})" v-if="showComprehensive" class="menu_filter_item" >
-              <view>{{sortData.label || '综合'}}</view>
-              <xd-font-icon size="24" icon="iconxia_down" color="#333"></xd-font-icon>
-            </view>
-            <view @click="handleGetFilterItem({value:'sort'})" v-if="showSort" class="menu_filter_item" >
-              <view>{{sortData.label || '排序'}}</view>
-              <xd-font-icon size="24" icon="iconxia_down" color="#333"></xd-font-icon>
-            </view>
-            <view class="menu_filter_item" @click="handleGetFilterItem(item)" v-for="(item,index) in filterTab" :key="index">
-              <view>
-                {{ item.label }}
-              </view>
-              <xd-font-icon v-if="item.icon" :size="item.size" :icon="item.icon" color="#333"></xd-font-icon>
-            </view>
-          </view>
-          <view class="query_modal">
-            <xd-query-filter
-              v-if="showMoreFilterType.includes(curQueryTab)&&searchFilterList.length"
-              :key="curQueryTab"
-              :list="searchFilterList"
-              :filter-type="curQueryTab"
-              :collapse-num="6"
-              :filter-selected="selectFilterParams"
-              @onConfirm="handleQueryFilter"></xd-query-filter>
-              <xd-query-sort
-                v-if="(curQueryTab === 'comprehensive' || curQueryTab === 'sort')"
-                :list="sortList"
-                :filter-style="filterStyle"
-                :sort="sort"
-                @onConfirm="handleQuerySort"
-              ></xd-query-sort>
-          </view>
         </view>
-
         <view v-if="!isPreview" :style="{height: menuHeight}"></view>
         <view class="tfk-search" :style="{padding: outSpacing + 'rpx'}">
           <all-list v-if="tabId === 'all'"
@@ -84,7 +50,6 @@
             v-else
             :tab-id="tabId"
             :keyword="keyword"
-            :refresh="refresh"
             :list-item-style="listItemStyle"
             :product-config="productConfig"
             ref="customList"
@@ -109,8 +74,6 @@
   import CustomList from "./CustomList.vue";
   import AllList from "./AllList.vue";
   import { mapState } from 'vuex';
-  import XdQueryFilter from "./XdQueryFilter"
-  import XdQuerySort from "./XdQuerySort"
 
   class EmitParent {
     constructor(options) {
@@ -125,8 +88,6 @@
       XdFontIcon,
       AllList,
       XdSearchHistory,
-      XdQueryFilter,
-      XdQuerySort
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseTfkSearchMixin,listMixins
@@ -167,42 +128,15 @@
         allModuleItemContRadius: 16,
         allModuleItemContBgColor: "#FFFFFF",
         emitParent:{},
-        is_plus_site: false,
-        closeMask: true,
-        filterTab: [],
-        filterTabIcon: [
-          { value: 'area', label: '区域',icon: 'icondizhitubiao', size: 24 },
-          { value: 'brand', label: '品牌',icon: 'iconxia_down', size: 18 },
-          { value: 'shop', label: '门店分类',icon: 'iconxia_down', size: 18 },
-          { value: 'filter', label: '筛选', icon: 'iconshaixuanbiaoji_mian', size: 24 },
-          { value: 'comprehensive', label: '综合', icon: 'iconxia_down', size: 18 },
-          { value: 'sort', label: '排序', icon: 'iconxia_down', size: 18 },
-          { value: 'business_line', label: '业务线', icon: 'iconxia_down', size: 18 },
-        ],
-        curQueryTab: "",//刷新KEY（切换标签）
-        searchFilterList: [],
-        searchFilterParams: {},
-        selectFilterParams: {},
-        filterType: '',
-        sort: "",
-        sortData: {},
-        filterStyle: {},
-        showMoreFilterType: ['filter', 'shop', 'brand', 'area', 'delivery_method', 'shop_category', 'business_line','namespace'],
-        refresh: new Date().getTime(),
-        showComprehensive: false,
-        showSort:false,
-        brands: [],
-        namespace: '',
-        sortList: []
+        is_plus_site: false
       }
     },
     computed: {
       ...mapState({
         siteInfo: state => state.siteInfo,
-        stateCity: state => state.cityLocation.city,
       }),
       showMenuList(){
-        return [{ label: "全部", value: "all" }, ...this.menuList]
+        return [{label: "全部", value: "all"}, ...this.menuList]
       },
       menuWrapBoxStyle(){
         let padding = `${this.checkValue(this.menuMargin.top, 20)}rpx`;
@@ -252,9 +186,6 @@
         let height = this.checkValue(menuMargin.top, 20) + this.checkValue(menuMargin.bottom, 20) +
           this.checkValue(menuPadding.top, 20) + this.checkValue(menuPadding.bottom, 20) +
           this.checkValue(menuItemPadding.top, 20) + this.checkValue(menuItemPadding.bottom, 20);
-        if (this.filterTab.length > 0) {
-          height += 90
-        }
         return (height + 40) + 'rpx';
       },
       menuItemActiveStyle(){
@@ -298,7 +229,8 @@
         }
       },
     },
-  created() {
+    created() {
+
       this.emitParent = new EmitParent({
         getParent: ()=>{
           return this;
@@ -316,8 +248,8 @@
        * @param cb {Function}
        */
       handleList({params, cb}){
-        let data = { ...params, sort: this.sort, ...this.searchFilterParams };
-         if(this.tabId === 'all'){
+        let data = {...params};
+        if(this.tabId === 'all'){
           data['search_range'] = this.searchScope.map(item => item.value.split("@")[0]).join(',');
         }
         if(this.productConfig.isShowDiscount==='Y'){
@@ -381,170 +313,19 @@
         this.allModuleItemContPadding = getContainerPropsValue(container, 'content.allModuleItemContPadding', {});
         this.allModuleItemContRadius = getContainerPropsValue(container, 'content.allModuleItemContRadius', 16);
         this.allModuleItemContBgColor = getContainerPropsValue(container, 'content.allModuleItemContBgColor', '#FFFFFF');
+
         if(this.$configProject['isPreview']){
           this.menuList = this.searchScope;
           this.isPreview = true;
         }
-        this.filterStyle = {
-          filterPadding: this.getMarginAndPadding({},20),
-          filterRowSpacing:20,
-          filterListColor:'#f9f9f9',
-          filterFontStyle: this.getFontAndBgcStyle({},{
-            fontSize: '26px',
-            color: '#333',
-            fontWeight: 'normal',
-            bgColor: 'rgba(0,0,0,0)'
-          }),
-          filterActFontStyle: this.getFontAndBgcStyle({},{
-            fontSize: '26px',
-            color: this.mainColor,
-            fontWeight: 'normal',
-            bgColor: 'rgba(0,0,0,0)'
-          },'act')
-        };    
       },
       handleSwitchMenu(item){
         this.tabId = item.value;
-        this.namespace = item.namespace;
-        this.filterType = item.type
-        this.curQueryTab = '';
-        this.searchFilterParams = {};
-        this.sortData = {};
-        this.sort = '';
-        if (item.filter_item && item.filter_item.tab_filter) {
-          // 综合和排序的显示状态，当选中综合或排序时，下拉菜单取本地数据
-          this.showComprehensive = item.filter_item.tab_filter.find(item => item.value === 'comprehensive')
-          this.showSort = item.filter_item.tab_filter.find(item => item.value === 'sort')
-          let filter_item = item.filter_item.tab_filter.filter(item => {
-            return (item.value !== 'comprehensive'&&item.value !== 'sort')
-          })
-          this.filterTab = filter_item.map(item => {
-            let temp = this.filterTabIcon.find(Sitem => item.value === Sitem.value);
-            return {
-              ...item,
-              icon: temp ? temp.icon : '',
-              size: temp ? temp.size : ''
-            }
-          })
-        } else {
-          this.filterTab = []
-        }
         uni.pageScrollTo({
           scrollTop: 0,
           duration: 0
         });
       },
-      handleGetFilterItem(item) {
-        //设置城市
-        let city_code = ''
-        if(this.stateCity && this.stateCity.city_code) {
-          city_code = this.stateCity.city_code;
-        }
-        let data = {
-          type: this.filterType,
-          namespace: this.namespace,
-          filter_item: item.value,
-          city_code
-        }
-        if(item.value === this.curQueryTab){
-          this.curQueryTab = '';
-          return
-        }
-        else {
-          this.curQueryTab = item.value;
-        }
-        if (this.curQueryTab === 'sort') {
-          this.sortList = [{
-            label: "排序",
-            key: "default",
-            value: "default"
-          }]
-        } else if (this.curQueryTab === 'comprehensive') {
-          this.sortList = [
-          {
-            label: "综合",
-            key: "default",
-            value: "default"
-          },
-          {
-            label: "销量",
-            key: "sale_num",
-            children: [
-              {label: "由高到低", value: 'sale_num_desc'},
-              {label: "由低到高", value: 'sale_num_asc'}
-            ]
-          },
-          {
-            label: "价格",
-            key: "price",
-            children: [
-              {label: "由高到低", value: 'price_desc'},
-              {label: "由低到高", value: 'price_asc'}
-            ]
-          }
-        ]
-         }
-        const sortMap = {
-          'sales_volume': 'sale_num_desc',
-          'price': 'price_desc',
-          default: 'default'
-        };
-
-        if (sortMap[item.value]) {
-          this.sort = sortMap[item.value];
-          this.refresh = new Date().getTime();
-          return;
-        }
-  
-        jfbRootExec("getTfkSearchFilterItems", {
-          vm: this,
-          data: data
-        }).then(res => {
-          this.searchFilterList = res.items || [];
-        }).catch(err => {
-          this.$xdLog.catch(err);
-        })
-      },
-      handleQueryFilter({ items, ids, labels }) {
-        const maps = {
-          'brand': 'brands',
-          'area': 'area_codes',
-          'delivery_method': 'delivery_methods',
-          'shop_category': 'category_ids',
-          'business_line': 'business_lines'
-        };
-        Object.keys(items).map(key => {
-          let keys = Object.keys(maps);
-          if (keys.indexOf(key) > -1) {
-            this.searchFilterParams[maps[key]] = ids[key]
-          }
-          // if (key === 'brand') {
-          //   this.searchFilterParams.brands = ids[key]
-          // }
-          // if (key === 'area') {
-          //   this.searchFilterParams.area_codes = ids[key]
-          // }
-          // if (key === 'delivery_method') {
-          //   this.searchFilterParams.delivery_methods = ids[key]
-          // }
-          // if (key === 'shop_category') {
-          //   this.searchFilterParams.category_ids = ids[key]
-          // }
-          // if (key === 'business_line') {
-          //   this.searchFilterParams.business_lines = ids[key]
-          // }
-          this.selectFilterParams[key] = ids[key] 
-        })
-        this.curQueryTab = '';
-        this.refresh = new Date().getTime();
-      },
-      handleQuerySort(sortData){
-        if(this.sort === sortData.value) return false;
-        this.sortData = sortData;
-        this.sort = sortData.value;
-        this.curQueryTab = '';
-        this.refresh = new Date().getTime();
-      },
       handleToSearch(item){
         this.keyword = item;
         jfbRootFnExec(this, 'onCustomEvent')("baseTfkSearch@keyword", item);
@@ -599,27 +380,6 @@
           }
         }
       }
-      .menu_filter {
-        background:#fff;
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-        padding: 26rpx 0;
-        border-top: 1px solid #f8f8f8;
-        &_item {
-          color: #333;
-          font-size: 28rpx;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          & > view:first-child{
-            margin-right: 14rpx;
-          }
-        }
-      }
-      .query_modal {
-        background-color: #fff;
-      }
     }
   }
 </style>

package/src/components/JfbBaseUserInfo/Attr.js

@@ -696,18 +696,6 @@ export default {
         },
         inline: false,
       },
-      data['is_plus_site'] === 'Y' && {
-        label: '已省金额路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'savePath',
-        groupKey: 'advanced',
-        placeholder: '请选择已省金额路径',
-        value: data['savePath'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
       {
         label: '',
         ele: 'slot',

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -25,7 +25,7 @@
                   <view v-else>普通用户</view>
                 </view>
                 <view>
-                  <view @click="handleToSave" v-if="is_vip==='Y'">
+                  <view v-if="is_vip==='Y'">
                     <text style="color:#D19E6B;">已省</text><text style="color: #FEE9CC;">￥{{ $xdUniHelper.divisionFloatNumber(save_amount, 100) }}</text>
                   </view>
                   <!-- <view v-else>
@@ -316,7 +316,6 @@
         plusPageBgImg: "",
         normalBgImg: "",
         normalPageBgImg: "",
-        savePath: ''
       }
     },
     watch: {
@@ -463,7 +462,7 @@
         this.profilePath = getContainerPropsValue(container, 'content.profilePath', { value: "" }).value;
         this.plusNickStyle = getContainerPropsValue(container, 'content.plusNickStyle', {});
         this.normalNickStyle = getContainerPropsValue(container, 'content.normalNickStyle', {});
-        this.savePath = getContainerPropsValue(container, 'content.savePath', { value: "" }).value;
+
         if(this.is_plus_site === 'Y'){
           let bg = this.is_vip === 'Y' ? this.plusPageBgImg : this.normalPageBgImg;
           if(this.$configProject['isPreview']){
@@ -505,11 +504,6 @@
           url: this.codePath
         })
       },
-      handleToSave() {
-        this.$xdUniHelper.navigateTo({
-          url: this.savePath
-        })
-      },
       onJfbShow(options) {
         this.onJfbLoad(options);
       },