jufubao-mall 2.0.91 → 2.0.92-beta2

package/.claude/settings.local.json

@@ -0,0 +1,12 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(git checkout *)",
+      "Bash(npx lessc *)",
+      "Bash(python3 *)",
+      "Bash(sips -g pixelWidth -g pixelHeight \"/Users/zxd/Workspaces/jufubao-mall/temp_screenshot.jpg\")",
+      "Bash(identify \"/Users/zxd/Workspaces/jufubao-mall/temp_screenshot.jpg\")",
+      "Bash(sips *)"
+    ]
+  }
+}

package/package.json

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

package/src/components/JfbMallCategoryProduct/JfbMallCategoryProduct.vue

@@ -306,8 +306,6 @@
         is_plus_site: false,
         productKey: 'productKey',
         curParentIndex: 0,
-        pid: '',
-        cateId: '',
 
         // 排序功能
         sortType: 'default',
@@ -451,9 +449,6 @@
       selectNav: {
         deep: true,
         handler(n, o) {
-          // 切换分类时清空已选品牌，避免筛选条件残留到新分类
-          this.selectedBrandIds = [];
-          this.showBrandAll = false;
           this.page_token = '1';
           this.getProductList()
           // 获取品牌列表
@@ -471,13 +466,6 @@
       onJfbLoad(options) {
         this.setNameSpace(options);
         this.onLoadStatus = true;
-        // 路由参数：pid 一级分类、cateId 二级分类，用于定位对应分类
-        if (options.pid) {
-          this.pid = Number(options.pid);
-        }
-        if (options.cateId) {
-          this.cateId = Number(options.cateId);
-        }
         this.getType2Nav()
       },
       init(container) {
@@ -676,10 +664,6 @@
             return item;
           });
           this.allNavList = items;
-          // 路由带分类id时，定位到对应分类
-          if ((this.pid || this.cateId) && this.locateCategory(items)) {
-            return;
-          }
           // layoutStyle=2: 无顶部导航，左侧直接显示一级导航
           if (this.layoutStyle === '2') {
             this.navChildrenList = this.allNavList;
@@ -695,41 +679,6 @@
         })
       },
 
-      // 根据路由参数定位分类（pid 一级分类、cateId 二级分类），命中则选中对应分类并返回true
-      locateCategory(items) {
-        // 1. 定位一级分类 index：优先 pid 直接匹配，否则用 cateId 反查父级
-        let parentIndex = -1;
-        if (this.pid) {
-          parentIndex = items.findIndex(item => Number(item.category_id) === this.pid);
-        }
-        if (parentIndex === -1 && this.cateId) {
-          parentIndex = items.findIndex(item =>
-            (item.children || []).some(child => Number(child.category_id) === this.cateId)
-          );
-        }
-        if (parentIndex === -1) return false;
-
-        // 2. 定位二级分类 index：用 cateId 匹配父级下子分类，未命中或未传则选中第一个
-        let childIndex = 0;
-        if (this.cateId) {
-          const cIndex = (items[parentIndex].children || []).findIndex(child => Number(child.category_id) === this.cateId);
-          if (cIndex > -1) childIndex = cIndex;
-        }
-
-        this.curParentIndex = parentIndex;
-        if (this.layoutStyle === '2') {
-          // 无顶部导航：左侧保持一级列表并高亮一级分类；有 cateId 时选中二级分类
-          this.navChildrenList = this.allNavList;
-          this.selectNavIndex = parentIndex;
-          this.selectNav = this.cateId ? items[parentIndex].children[childIndex] : items[parentIndex];
-        } else {
-          this.navChildrenList = items[parentIndex].children;
-          this.selectNav = this.navChildrenList[childIndex];
-          this.selectNavIndex = childIndex;
-        }
-        return true;
-      },
-
       getContentStyle(type = 'cont') {
         let outerWidth = (uni.getSystemInfoSync().safeArea.width * this.$pxNum) - 180;
 

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -62,6 +62,9 @@
                       :style="{color:priceTextColor,fontSize:'24rpx'}">活动价</view>
                   </view>
                 </view>
+                <view v-if="showLogisticsTip === 'Y' &&
+                            logisticsTipType === 'prod' &&
+                            shop.deliveryPickValue === 'logistics'" class="postage_tip">{{ prod.postage_tip || logisticsTipText }}</view>
                 <view v-if="prod.blessingKey" class="wish_comment">
                   <input :maxlength="prod.blessingData.struct.maxlength||16" v-model="prod.blessing" :placeholder="prod.blessingData.value" />
                   <view class="bless_tip"
@@ -107,8 +110,8 @@
               </template>
             </view>
             <!-- <xd-list-item v-if="shop.delivery_message" :label="shop.delivery_message" paddingLR="48rpx" size="large"></xd-list-item> -->
-            <view v-if="showLogisticsTip === 'Y' && shop.deliveryPickValue === 'logistics'" class="logistics_tip">
-              {{logisticsTipText}}
+            <view v-if="showLogisticsTip === 'Y' && logisticsTipType === 'shop' && shop.deliveryPickValue === 'logistics'" class="logistics_tip">
+              {{shop.postage_tip || logisticsTipText}}
             </view>
             <view v-if="shop.is_support_delivery == 'N'" :style="{background:bgColor,color:warningColor}" class="err_message">
               {{shop.message}}
@@ -580,6 +583,7 @@
         guidePay: "",
         showLogisticsTip: "Y",
         logisticsTipText: "",
+        logisticsTipType: "",  //shop:拆单， prod： 商品
         checkPayMethod: [],
         ticketPositionStatus: "N",
         openVipBtnBgImg: "",
@@ -942,6 +946,7 @@
         this.guidePay = getContainerPropsValue(container, "content.guidePay", "");
         this.showLogisticsTip = gCPVal(container, 'showLogisticsTip', "Y");
         this.logisticsTipText = gCPVal(container, 'logisticsTipText', '订单生成后72小时发货，如遇节假日发货顺延');
+        this.logisticsTipType = gCPVal(container, 'logisticsTipType', "shop");
         this.ticketPositionStatus = gCPVal(container, 'ticketPositionStatus', "N")
         console.log("this.showLogisticsTip", this.showLogisticsTip);
         if(this.useMode === "market"){
@@ -1952,6 +1957,11 @@
           font-size: 24rpx;
           color: var(--g-theme-dangerColor);
         }
+        .shop_postage{
+          padding: 0 var(--cont-lr-padding) 24rpx;
+          font-size: 24rpx;
+          color: var(--g-theme-dangerColor);
+        }
         .err_message{
           padding: 20rpx var(--cont-lr-padding);
           font-size: 24rpx;
@@ -2027,6 +2037,12 @@
             justify-content: space-between;
           }
         }
+        .postage_tip{
+          color: rgb(229, 116, 112);
+          font-size: 24rpx;
+          padding: 0 var(--cont-lr-padding);
+          margin: 10px 0;
+        }
         .wish_comment{
           padding: 0 var(--cont-lr-padding);
           input{

package/src/components/JfbMallConfirm/Mock.js

@@ -163,6 +163,7 @@ module.exports = {
         group_id: "61527_3_1_1_1_0_YLYO6_3-vLG2sP8ytvmHF",
         is_support_delivery: "Y",
         message: "可以配送.",
+        postage_tip: "订单将在活动结算后5个工作日内完成发货",
         user_logistics_amount_origin: "50",
         supplier_partner_id: 161,
         show_subscribe_time_list: [],
@@ -207,6 +208,7 @@ module.exports = {
               "https://sandbox-img.jufubao.cn/uploads/20230406/0b890cd5a947d9c5724b412d34cd4000.png",
             product_form_data:
               '[{"id":"blessing","type":"input","struct":{"title":"祝福语","explain":"请务必准确填写号码，号码错误将无法进行退还操作。","default":"","placeholder":"","required":true},"options":[],"value":"祝福语"}]',
+            postage_tip: "订单生成后72小时发货",
             brand_id: 3,
             brand_name: "北京味多美蛋糕叔叔/HEYTEA/喜茶/凯蒂猫/Quange/全格",
             aftersale_service: ",refund,exchange",

package/src/components/JfbMallConfirm/cusAttr/content.js

@@ -339,6 +339,19 @@ export default function (data, gValue,gColor,oldData){
       notice:'仅针对配送方式为快递的商品展示',
     },
     {ele: 'group_start'},
+    {
+      label: "展示方式",
+      ele: "xd-radio",
+      valueKey: "logisticsTipType",
+      value: dataVal({data, key:'logisticsTipType', dValue: 'shop', gValue}),
+      groupKey:'content',
+      list: [
+        { label: "按拆单展示", value: "shop"},
+        { label: "按商品展示", value: "prod"},
+      ],
+      hidden: data.showLogisticsTip === 'N',
+      labelInline: true,
+    },
     {
       label: "",
       ele: "el-input",

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