jufubao-mall 2.0.93-beta2 → 2.0.93

package/get.package.path.js

@@ -0,0 +1,22 @@
+'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/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
+  }
+
+  if (packname === 'gxd-uni-library-editx') {
+    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
+  }
+
+};
+
+module.exports = {
+  getPackagePath
+}

package/package.json

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

package/src/components/CusCouponChose/CusCouponChose.vue

@@ -38,8 +38,8 @@
           </view>
           <view class="column-item">
             <view class="column_label">
-              仍需支付
-              <view class="label_sub">（可使用多张优惠券支付）</view>
+              仍需
+              <view class="label_sub">（可使用多张优惠券兑换）</view>
             </view>
             <view class="column_value text-primary">
               <xd-unit
@@ -100,7 +100,7 @@
             type="primary"
             radius="50rpx"
             @click="doTicketPay"
-            >确认支付</xd-button
+            >确认兑换</xd-button
           >
         </view>
       </view>

package/src/components/JfbMallCart/JfbMallCart.vue

@@ -138,9 +138,14 @@
                               @change="(num) => handleCartNumSet(num, prod, i)"
                             ></xd-number>
                           </view>
-                          <view v-if="prod.tip" :style="{color: activityPriceTextColor,fontSize:'24rpx',marginTop:'4rpx'}">{{ prod.tip }}</view>
+                          <view v-if="prod.tip" :style="{color: activityPriceTextColor,fontSize:'24rpx',marginTop:'4rpx'}">
+                            <text v-html="prod.tip"></text>
+                          </view>
                           <view v-else-if="showActivityPrice==='Y'&&prod.is_activity==='Y'"
                             :style="{color: activityPriceTextColor,fontSize:'24rpx',marginTop:'4rpx'}">活动价</view>
+                          <view v-if="showOrderSource==='Y'&&prod.source_from_tip" :style="{color: activityPriceTextColor,fontSize:'24rpx',marginTop:'4rpx'}">
+                            <text v-html="prod.source_from_tip"></text>
+                          </view>
                         </view>
                       </view>
                     </uni-swipe-action-item>
@@ -276,6 +281,7 @@ export default {
       is_border_w: 0,
       is_border_c: "",
       showActivityPrice: 'N',
+      showOrderSource: 'N',
 
       listMargin: {},
       listItemBorder: "",
@@ -485,6 +491,7 @@ export default {
       // this.showActivityPrice = getContainerPropsValue(container, 'content.showActivityPrice', 'N');
       console.log(this.mainColor,'mainColor')
       this.showActivityPrice = gCPVal(container, 'showActivityPrice', 'N');
+      this.showOrderSource = gCPVal(container, 'showOrderSource', 'N');
       //下间距
       // this.padding = getContainerPropsValue(container, "content.padding", 0);
       this.padding = gCPVal(container,'padding', 0, {sKey:'paddingStatus',fields:['padding']});
@@ -759,7 +766,12 @@ export default {
             };
           }),
         },
-      }).then((res) => {});
+      }).then((res) => {
+        if(res.is_refresh) {
+          this.p_getCartList()
+        }
+        this.$xdRoot.$emit("restFooterNumber");
+      });
     },
 
     //全选固定商铺

package/src/components/JfbMallCart/Mock.js

@@ -21,7 +21,8 @@ module.exports = {
         is_select: "N",
         promo_price: 1800,
         is_activity: 'Y',
-        tip: ''
+        tip: '',
+        source_from_tip: '产品来源：文字+背景测试新功能（商品V2） 专题'
       },
       {
         product_id: 60008817,
@@ -39,7 +40,8 @@ module.exports = {
         shop_name: "",
         is_select: "N",
         is_activity: 'Y',
-        tip: '已超活动限购数量，将按原价购买'
+        tip: '已超活动限购数量，将按原价购买',
+        source_from_tip: '产品来源：文字+背景测试新功能（商品V2） 专题'
       },
       {
         product_id: 60007091,
@@ -58,7 +60,8 @@ module.exports = {
         shop_name: "",
         is_select: "N",
         is_activity: 'Y',
-        tip: '已超活动限购数量，将按原价购买'
+        tip: '已超活动限购数量，将按原价购买',
+        source_from_tip: '产品来源：文字+背景测试新功能（商品V2） 专题'
       },
       {
         product_id: 60008820,

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

@@ -144,6 +144,24 @@ export default (data, gValue, gColor, oldData) => {
         ele:'xd-line',
         groupKey:'content'
       },
+      {
+        label: '订单来源',
+        ele: 'xd-cus-switch',
+        valueKey: 'showOrderSource',
+        value: dataVal({data, key:'showOrderSource', dValue:"N", gValue}),
+        className: 'input100',
+        groupKey:'content',
+        labelInline:true,
+        cusStyle:{marginBottom: '10px'},
+        setting: {
+          tips:['显示','不显示'],
+          isBackType: 'string'
+        },
+      },
+      {
+        ele:'xd-line',
+        groupKey:'content'
+      },
       {
         label: '随便逛逛',
         ele: 'xd-cus-switch',

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"){
@@ -964,7 +969,7 @@
         this.bottomPadding = gCPVal(container, 'bottomPadding', [16], {sKey: "bottomPaddingStatus", fields: ['bottomPadding']});
         this.bottomBtnRadius = gCPVal(container, 'bottomBtnRadius', [40], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
         this.bottomBtnHeight = gCPVal(container, 'bottomBtnHeight', [60], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
-        this.bottomPayText = gCPVal(container, 'bottomPayText', ["支付"], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
+        this.bottomPayText = gCPVal(container, 'bottomPayText', ["兑换"], {sKey: "btnStyleStatus", fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText']});
         this.bottomPricePosition = gCPVal(container, 'bottomPricePosition', ['flex-start'], {sKey: "btnPriceStatus", fields: ['bottomPricePosition']});
 
         //优惠券样式升级为不在面板设置
@@ -1348,7 +1353,7 @@
         return new Promise((resolve, reject) => {
           this.$xdConfirm({
             title: '提示',
-            content: '您当前未使用票券，您将全部用微信支付',
+            content: '您当前未使用票券，您将全部用微信兑换',
             confirmText: '我知道了',
             width: '85%',
             isTitle: true,
@@ -1356,7 +1361,7 @@
               if (res.confirm) {
                 resolve();
               } else if (res.cancel) {
-                reject("取消支付");
+                reject("取消兑换");
               }
             }
           });
@@ -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/src/components/JfbMallConfirm/cusAttr/style.js

@@ -473,7 +473,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       value: dataVal({data, key:'bottomPayText', dValue: '', gValue}),
       hidden: !statusShow({data, key: 'btnStyleStatus', fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText'], gValue}),
       labelInline: true,
-      placeholder: '支付按钮文字，默认“支付”',
+      placeholder: '兑换按钮文字，默认“兑换”',
       className: 'input80',
     },
     {ele: "group_end"},

package/src/components/JfbMallConfirm/orderMixin.js

@@ -105,14 +105,12 @@ export default {
         this.showShopList = false;
         return;
       }
+
       jfbRootExec("getShopTakeTime", {
         vm: this,
         data: {
           resource_shop_id: shop.resource_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
+          shop_id: shop.shop_id
         }
       }).then(res => {
         this.shopList = this.shopList.map((item, index) => {
@@ -452,7 +450,7 @@ export default {
           this.handleToPay(val);
         }else{
           this.$xdAlert({
-            content: '余额不足，请选择其他票券',
+            content: '积分不足，请选择其他票券',
             time: 3000,
             isClose: true,
             zIndex: 5000

package/src/components/JfbMallProductInfo/JfbMallProductInfo.vue

@@ -264,7 +264,7 @@
               width="220rpx" fontSize="28"
               @click="addCartAndBuy"
               :plain="btnStyle==='border'"
-            >立即购买</xd-button>
+            >立即兑换</xd-button>
             <view v-if="btnNoBuy" style="font-size:32rpx;color:#666666;">
               {{btnNoBuy.text}}
             </view>

package/src/components/JfbMallProductInfo/XdSku.vue

@@ -181,7 +181,7 @@
                 type="subPrimary"
                 size="small"
                 @click="onConfirm('buy')"
-                >立即购买</xd-button
+                >立即兑换</xd-button
               >
             </template>
           </view>

package/src/components/JfbMallProductInfo/XdSkuJd.vue

@@ -150,7 +150,7 @@
                 ]"
                 :bg-color="buyButtonStyle.buyBtnBgColor"
                 :radius="otherButtonStyle.bottomBtnRadius + 'rpx'"
-              type="subPrimary" style="width:250rpx;margin:0 20rpx" size="small" @click="onConfirm('buy')">立即购买</xd-button>
+              type="subPrimary" style="width:250rpx;margin:0 20rpx" size="small" @click="onConfirm('buy')">立即兑换</xd-button>
           </template>
           </view>
         </view>

package/src/components/JfbMallProductInfo/XdSkuNew.vue

@@ -140,7 +140,7 @@
             style="width: 250rpx;margin:0 20rpx"
             size="small"
             @click="onConfirm('buy')"
-            >立即购买</xd-button
+            >立即兑换</xd-button
           >
         </template>
       </view>

package/src/components/JfbMallProductInfo/cusAttr/style.js

@@ -839,7 +839,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     { ele: 'group_end' },
     {
-      label: '立即购买',
+      label: '立即兑换',
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'buyBtnStatus',

package/src/components/JfbMallProductInfoV2/JfbMallProductInfoV2.vue

@@ -105,7 +105,7 @@
             class="btn" type="subPrimary" size="small"
             width="200rpx" fontSize="28"
             @click="addCartAndBuy"
-          >立即购买</xd-button>
+          >立即兑换</xd-button>
           <view v-if="btnNoBuy" style="font-size:32rpx;color:#666666;">
             {{btnNoBuy.text}}
           </view>

package/src/components/JfbMallProductInfoV2/XdSku.vue

@@ -46,7 +46,7 @@
             <xd-button
               v-if="btnBuyNow"
               :disabled="!btnBuyNow.enabled"
-              type="subPrimary" style="width:250rpx" size="small" @click="onConfirm('buy')">立即购买</xd-button>
+              type="subPrimary" style="width:250rpx" size="small" @click="onConfirm('buy')">立即兑换</xd-button>
           </template>
         </view>
       </view>

package/src/components/JfbMallResourceShopList/Mock.js

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

package/src/components/JfbMallShop/ShowQp.vue

@@ -365,7 +365,7 @@
           }else if(hand_status === 'F'){
             this.handlerOderFail();
             this.$xdAlert({
-              content: hand_status_msg || '支付失败',
+              content: hand_status_msg || '兑换失败',
               time: 3000,
               isClose: false,
               zIndex: 5000
@@ -493,7 +493,7 @@
           success: (res) => {
             this.$xdLog.setARMSInfo({options:this.options, res}, 'pay_success');
             this.$xdAlert({
-              content: '支付成功',
+              content: '兑换成功',
               time: 2500,
               isClose: false,
               zIndex: 5000
@@ -504,7 +504,7 @@
             this.onRefreshPage();
             this.$xdLog.setARMSInfo(this.options, 'cancel_pay');
             this.$xdAlert({
-              content: '取消支付',
+              content: '取消兑换',
               time: 2500,
               isClose: false,
               zIndex: 5000
@@ -516,7 +516,7 @@
             if (window['jwxJfbSDKParams']) error = Object.assign(error, paySignData, window['jwxJfbSDKParams'])
             this.$xdLog.setARMSError(error)
             this.$xdAlert({
-              content: '支付失败',
+              content: '兑换失败',
               time: 2500,
               isClose: false,
               zIndex: 5000
@@ -530,7 +530,7 @@
           success: (res) => {
             this.$xdLog.setARMSInfo({options: this.options, res}, 'pay_success');
             this.$xdAlert({
-              content: '支付成功',
+              content: '兑换成功',
               time: 2500,
               isClose: false,
               zIndex: 5000
@@ -544,7 +544,7 @@
               error: JSON.stringify(err)
             });
             this.$xdAlert({
-              content: '支付失败',
+              content: '兑换失败',
               time: 2500,
               isClose: false,
               zIndex: 5000

package/.claude/settings.local.json

@@ -1,12 +0,0 @@
-{
-  "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 *)"
-    ]
-  }
-}