jufubao-mall 2.0.73 → 2.0.74-beta2

package/package.json

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

package/src/components/JfbMallProductType/Attr.js

@@ -255,7 +255,7 @@ export default {
         ele: 'xd-margin-padding',
         groupKey:'style',
         valueKey: 'itemPadding',
-        value: data['itemPadding'] || null,
+        value: data['itemPadding'] || { bottom: 24, left: 24, right: 24, top: 48 },
         setting: {
           type: 'margin',
         },

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
-}