jufubao-mall 2.0.92 → 2.0.93-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.92",
+  "version": "2.0.93-beta2",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -62,9 +62,6 @@
                       :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"
@@ -110,8 +107,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' && logisticsTipType === 'shop' && shop.deliveryPickValue === 'logistics'" class="logistics_tip">
-              {{shop.postage_tip || logisticsTipText}}
+            <view v-if="showLogisticsTip === 'Y' && shop.deliveryPickValue === 'logistics'" class="logistics_tip">
+              {{logisticsTipText}}
             </view>
             <view v-if="shop.is_support_delivery == 'N'" :style="{background:bgColor,color:warningColor}" class="err_message">
               {{shop.message}}
@@ -583,7 +580,6 @@
         guidePay: "",
         showLogisticsTip: "Y",
         logisticsTipText: "",
-        logisticsTipType: "",  //shop:拆单， prod： 商品
         checkPayMethod: [],
         ticketPositionStatus: "N",
         openVipBtnBgImg: "",
@@ -946,7 +942,6 @@
         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"){
@@ -1957,11 +1952,6 @@
           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;
@@ -2037,12 +2027,6 @@
             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,7 +163,6 @@ 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: [],
@@ -208,7 +207,6 @@ 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,19 +339,6 @@ 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/src/components/JfbMallConfirm/orderMixin.js

@@ -105,12 +105,14 @@ export default {
         this.showShopList = false;
         return;
       }
-
       jfbRootExec("getShopTakeTime", {
         vm: this,
         data: {
           resource_shop_id: shop.resource_shop_id,
-          shop_id: shop.shop_id
+          shop_id: shop.shop_id,
+          cart_order_id: this.order_id,
+          address_nnid: this.curAddr ? this.curAddr.address_nnid : "",
+          delivery_method: curShop.deliveryPickValue
         }
       }).then(res => {
         this.shopList = this.shopList.map((item, index) => {

package/src/components/JfbMallResourceShopList/Mock.js

@@ -361,7 +361,7 @@ module.exports = {
                 "a": "",
               },
             ],
-            desc:'请到店出示电子券核验',
+            desc:'到店消费任意金额可用',
             consume_mode:'JHD'
           },
           {

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