jufubao-mall 2.0.72 → 2.0.74-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.72",
+  "version": "2.0.74-beta1",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallHomeProductList/JfbMallHomeProductList.vue

@@ -97,7 +97,7 @@
             :style="[{marginRight:(column_num ===1 && columnOneLayout ==='H' ? 0:(columnSpacing + 'rpx'))}]"
           >
             <view
-              v-for="(item,idx) in getItemData(index,prodList)"
+              v-for="(item,idx) in columnedProdList[index]"
               :key="item.product_id"
               :style="[item.is_poster ==='Y'?posterProductStyles:contProductStyles]"
             >
@@ -185,7 +185,7 @@
         closeMask: true,
         isPreview: false,
         prodList: null, //数据
-        nextPagesData:{}, //上一次数据
+        _columnedCache: null,
         allPagesData:{}, //所有页面数据
         curCategoryId:0,//当前分类ID
         delayDelCurOtherTimeer:null,
@@ -297,6 +297,20 @@
         stateCity: state => state.cityLocation.city
       }),
 
+      columnedProdList() {
+        const list = this.prodList;
+        const cols = this.column_num;
+        if (list === null) {
+          return this._columnedCache || [];
+        }
+        const result = [];
+        for (let i = 0; i < cols; i++) {
+          result[i] = list.filter((_, idx) => idx % cols === i);
+        }
+        this._columnedCache = result;
+        return result;
+      },
+
       bodyStyleComp(){
         return {
           padding: this.getMarginAndPadding(this.bodyPadding,0),
@@ -640,19 +654,6 @@
         })
       },
 
-      delayDelCurOther(){
-        if(this.delayDelCurOtherTimeer) clearTimeout(this.delayDelCurOtherTimeer);
-        this.delayDelCurOtherTimeer = setTimeout(()=>{
-          console.log('allPagesData',this.$xdUniHelper.cloneDeep(this.allPagesData));
-          Object.keys(this.allPagesData).map(key=>{
-            if(this.curCategoryId + '' !== key) {
-              delete this.allPagesData[key];
-            }
-          })
-          console.warn(`删除当前分类以外的分类：curID=${this.curCategoryId}`);
-          console.log(this.allPagesData)
-        }, 10000);
-      },
 
       getList(isTabLoading=false){
         const { navList, navIndex, page_token = 1, page_size, sort } = this;
@@ -793,19 +794,6 @@
             else this.prodList = (this.prodList||[]).concat(list);
           }
 
-          //保存所以列表数据
-          this.allPagesData[category_id] = (this.allPagesData[category_id]||[]).concat(list);
-
-          //#ifdef H5
-          window['allPagesData'] = this.allPagesData;
-          //#endif
-
-
-          //延期删除当前组件意外的数据
-          console.log('allPagesData',this.$xdUniHelper.cloneDeep(this.allPagesData));
-          this.delayDelCurOther();
-
-
           this.page_token = res.next_page_token;
           this.hasNext = !!res.next_page_token;
 
@@ -834,22 +822,11 @@
 					})
 
         }).catch(err => {
-          console.log("err", err);
           this.$xdHideLoading();
           this.$xdLog.catch(err);
         })
       },
 
-      getItemData(cellIndex,data){
-        let list = this.$xdUniHelper.cloneDeep(data);
-        if(list === null) return this.$xdUniHelper.cloneDeep(this.nextPagesData[cellIndex]);
-        let listData = list.filter((it,index) => {
-          return index % this.column_num === cellIndex;
-        });
-        this.nextPagesData[cellIndex] =  this.$xdUniHelper.cloneDeep(listData);
-        return listData;
-      },
-
       toProductInfo({isCart,...prod}){
         if(this.$configProject['isPreview']) return;
         toProductDetail(this, prod, this.productInfoPath,isCart ==='Y');
@@ -864,9 +841,9 @@
       },
 
       onJfbScroll({e, options}){
-        if(this.isPreview || this.loading === false) return;
+        if(this.isPreview || this.isNextLoading === true) return;
         //调用子组件方法
-			  this.$refs.VT.topData(e.scrollTop);
+        this.$refs.VT.topData(e.scrollTop);
         this.scrollTop = e.scrollTop;
         this.$xdUniHelper.getWindowHeight(['.jfb-mall-home-product-list__body'], this)
           .then(res => {

package/src/components/JfbMallProductType/JfbMallProductType.vue

@@ -21,7 +21,8 @@
     <view
       class="jfb-mall-product-type__body"
       :style="{
-        minHeight: layoutInfo.bodyMinHeightRpx + 'rpx'
+        minHeight: layoutInfo.bodyMinHeightRpx + 'rpx',
+        '--main-color': mainColor
       }"
     >
       <view v-if="loadingList" class="skeleton-wrap">
@@ -94,26 +95,53 @@
               {{item.category_name}}
             </view>
           </scroll-view>
-          <scroll-view :scroll-top="scrollTop" @scroll="handleScroll" @scrolltolower="handleScrolltolower" :style="{height:'100%'}" scroll-y="true" class="jfb-mall-product-type__body_type2_content_product">
-            <view :key="productKey" v-if="productList&&productList.length">
-              <view v-for="(item,index) in productList" :key="index" :style="[contProductStyles]">
-                <cus-product
-                :image-radius="imageRadius"
-                :brand-color="brandColor"
-                :height="contProductImageHeight"
-                :cell="column_num"
-                :name-font="itemFontStyle"
-                :product-config="productConfig"
-                :isPlus="is_plus_site"
-                :item="item"
-                :row-spacing="rowSpacing"
-                :cell-spacing="itemSpacing"
-                @on-product-detail="toProductInfo"
-              ></cus-product>
+          <view class="jfb-mall-product-type__body_type2_content_right">
+            <view class="jfb-mall-product-type__body_type2_content_sort">
+              <view class="sort_item" :class="{active: sortType === 'default'}" @click="handleSort('default')">综合</view>
+              <view class="sort_item sort_item_with_icon" :class="{active: sortType === 'price_asc' || sortType === 'price_desc'}" @click="handleSort('price')">
+                <view>价格</view>
+                <view class="sort_icon_wrap">
+                  <view class="sort_icon_item" :class="{highlight: sortType === 'price_asc'}">
+                    <xd-font-icon icon="iconrepository-xialaxuanxiangup" :color="sortType === 'price_asc' ? mainColor : '#ccc'" size="18"></xd-font-icon>
+                  </view>
+                  <view class="sort_icon_item" :class="{highlight: sortType === 'price_desc'}">
+                    <xd-font-icon icon="iconrepository-xialaxuanxiangdown" :color="sortType === 'price_desc' ? mainColor : '#ccc'" size="18"></xd-font-icon>
+                  </view>
+                </view>
+              </view>
+              <view class="sort_item sort_item_with_icon" :class="{active: sortType === 'sale_num_asc' || sortType === 'sale_num_desc'}" @click="handleSort('sale_num')">
+                <view>销量</view>
+                <view class="sort_icon_wrap">
+                  <view class="sort_icon_item" :class="{highlight: sortType === 'sale_num_asc'}">
+                    <xd-font-icon icon="iconrepository-xialaxuanxiangup" :color="sortType === 'sale_num_asc' ? mainColor : '#ccc'" size="18"></xd-font-icon>
+                  </view>
+                  <view class="sort_icon_item" :class="{highlight: sortType === 'sale_num_desc'}">
+                    <xd-font-icon icon="iconrepository-xialaxuanxiangdown" :color="sortType === 'sale_num_desc' ? mainColor : '#ccc'" size="18"></xd-font-icon>
+                  </view>
+                </view>
               </view>
-              <view v-if="!hasNext" class="noMore">—— 我是有底线的 ——</view>
             </view>
-          </scroll-view>
+            <scroll-view :scroll-top="scrollTop" @scroll="handleScroll" @scrolltolower="handleScrolltolower" :style="{height:'calc(100% - 80rpx)'}" scroll-y="true" class="jfb-mall-product-type__body_type2_content_product">
+              <view :key="productKey" v-if="productList&&productList.length">
+                <view v-for="(item,index) in productList" :key="index" :style="[contProductStyles]">
+                  <cus-product
+                  :image-radius="imageRadius"
+                  :brand-color="brandColor"
+                  :height="contProductImageHeight"
+                  :cell="column_num"
+                  :name-font="itemFontStyle"
+                  :product-config="productConfig"
+                  :isPlus="is_plus_site"
+                  :item="item"
+                  :row-spacing="rowSpacing"
+                  :cell-spacing="itemSpacing"
+                  @on-product-detail="toProductInfo"
+                ></cus-product>
+                </view>
+                <view v-if="!hasNext" class="noMore">—— 我是有底线的 ——</view>
+              </view>
+            </scroll-view>
+          </view>
         </view>
         <xd-no-data v-else height="300rpx">{{noData}}</xd-no-data>
       </view>
@@ -188,6 +216,10 @@
         is_plus_site: false,
         productKey: 'productKey',
         curParentIndex: 0,
+        hideMask: true,
+        
+        // 排序功能
+        sortType: 'default', // default, price_desc, price_asc, sale_num_desc, sale_num_asc
       }
     },
     computed: {
@@ -316,7 +348,7 @@
           random_score_seed: this.random_score_seed,
           page_token: this.page_token,
           page_size: this.page_size,
-          sort: "default",
+          sort: this.sortType,
           custom_category_id: this.selectNav.category_id,
         }
         if(this.productConfig.isShowDiscount==='Y'){
@@ -518,6 +550,7 @@
       handleChoseParentNav(data, index) {
         this.navChildrenList = data.children;
         this.curParentIndex = index;
+        this.sortType = 'default';
         if(data.children.length){
           this.selectNav = this.navChildrenList[0]
           this.selectNavIndex = 0;
@@ -532,6 +565,31 @@
       handleChoseNav(data,index) {
         this.selectNav = data;
         this.selectNavIndex = index;
+        this.sortType = 'default';
+      },
+
+      handleSort(type) {
+        if (type === 'default') {
+          this.sortType = 'default';
+        } else if (type === 'price') {
+          if (this.sortType === 'price_asc') {
+            this.sortType = 'price_desc';
+          } else if (this.sortType === 'price_desc') {
+            this.sortType = 'price_asc';
+          } else {
+            this.sortType = 'price_asc';
+          }
+        } else if (type === 'sale_num') {
+          if (this.sortType === 'sale_num_asc') {
+            this.sortType = 'sale_num_desc';
+          } else if (this.sortType === 'sale_num_desc') {
+            this.sortType = 'sale_num_asc';
+          } else {
+            this.sortType = 'sale_num_desc';
+          }
+        }
+        this.page_token = '1';
+        this.getProductList();
       },
 
       /**
@@ -831,6 +889,51 @@
             padding: 20rpx 0;
           }
         }
+        &_content_right {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          overflow: hidden;
+        }
+        &_content_sort {
+          height: 80rpx;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          padding: 0 24rpx;
+          background-color: #fff;
+          border-bottom: 1rpx solid #f5f5f5;
+          flex-shrink: 0;
+          .sort_item {
+            font-size: 26rpx;
+            color: #333;
+            display: flex;
+            align-items: center;
+            &.active {
+              color: var(--main-color);
+              font-weight: 500;
+            }
+            &.sort_item_with_icon {
+              justify-content: center;
+              align-items: center;
+              .sort_icon_wrap {
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                margin-left: 6rpx;
+                .sort_icon_item {
+                  line-height: 1;
+                  &.highlight {
+                    color: var(--main-color);
+                  }
+                  & + .sort_icon_item {
+                    margin-top: 2rpx;
+                  }
+                }
+              }
+            }
+          }
+        }
       }
     }
   }

package/get.package.path.js

@@ -1,22 +0,0 @@
-'use strict';
-
-/**
- * @description 第三方库
- * @param threePackagePath {String} 第三方库所在项目路径存放路径路
- * @param packname {String} 包名字
- * @returns {string|*}
- */
-const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
-  if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
-  }
-
-  if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
-  }
-
-};
-
-module.exports = {
-  getPackagePath
-}