jufubao-mall 2.0.93 → 2.0.95

package/get.package.path.js

@@ -8,11 +8,11 @@
  */
 const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
   if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
   }
 
   if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
+    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
   }
 
 };

package/package.json

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

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -54,8 +54,11 @@
                       <view style="display:flex;align-items:center">
                         <!-- <xd-unit :price="prod.sale_price" :isOld="false" color="#333" :iconSize="0.3" :fontSize="32"/> -->
                          <CusPrice :isPlus="is_plus_site" :type="order" :showPrice="prod.show_prices"></CusPrice>
+                         <view style="font-size: 28rpx;color:#999;margin-left: 16rpx;">{{prod['product_num'] ? 'x': ''}} {{prod['product_num']}}</view>
+                      </view>
+                      <view v-if="prod['paid_amount'] && prod['paid_amount'] > 0" class="coupon_paid">
+                        实付: <xd-unit :price="prod['paid_amount']" :isOld="false" color="#333" :iconSize="0.3" :fontSize="32"/>
                       </view>
-                      <view style="font-size: 28rpx;color:#999">{{prod['product_num'] ? 'x': ''}} {{prod['product_num']}}</view>
                     </view>
                     <view v-if="prod.error_message" :style="{color:priceTextColor,fontSize:'24rpx'}">{{prod.error_message}}</view>
                     <view v-else-if="showActivityPrice==='Y'&&prod.is_activity==='Y'"
@@ -1070,11 +1073,46 @@
         if(!this.canUseCoupon) return;
         this.showCouponChose = true;
       },
+      //选择完优惠券，需要在商品上展示实付款信息（商品价格-优惠券优惠价格）
+      handleCouponChoseResult(data){
+        //data.total_coupon_parts: [{"card_number":"10001000008865","part_id":"60031172_0_0","sale_amount":8000,"coupon_amount":5000,"coupon_split":"[{\"card_number\":\"10001000008865\",\"coupon_amount\":5000,\"coupon_point\":5000}]","coupon_point":5000}]
+        if(!data || !this.shopList) return;
+        // total_coupon_parts 为空字符串或空数组代表取消选择优惠券，清除已展示的实付金额
+        if(!data.total_coupon_parts || data.total_coupon_parts.length === 0){
+          this.shopList.forEach(shop => {
+            if(!shop.product) return;
+            shop.product.forEach(prod => {
+              delete prod.paid_amount;
+            });
+          });
+          return;
+        }
+        // 按 part_id 建立映射，快速查找
+        const couponMap = {};
+        data.total_coupon_parts.forEach(item => {
+          couponMap[item.part_id] = item;
+        });
+        // 遍历 shopList 下每个商品的 product，匹配 part_id 计算实付金额
+        this.shopList.forEach(shop => {
+          if(!shop.product) return;
+          shop.product.forEach(prod => {
+            const partId = prod.part_id;
+            const couponItem = couponMap[partId];
+            if(couponItem) {
+              // sale_price、coupon_point 均为分，实付金额 = 商品价格 x 数量 - 优惠券优惠价格
+              prod.paid_amount = (prod.sale_price || 0) * (prod.product_num || 1) - (couponItem.coupon_point || 0);
+            } else {
+              prod.paid_amount = (prod.sale_price || 0) * (prod.product_num || 1);
+            }
+          });
+        });
+      },
       //only选择满减券结果
       handleCouponChose(data){
         console.log(data,'alalalal')
         this.choseCoupon = data;
         this.showCouponChose = false;
+        this.handleCouponChoseResult(data);
         //共同使用模式：优惠券 + 积分 + 钱包可叠加
         //串行逻辑：先选积分 → 积分选完后检查 orderNeedPayPrice > 0 才选钱包
         if(this.is_wallet_use_with_coupon === "Y"){
@@ -2036,6 +2074,12 @@
             align-items: flex-end;
             justify-content: space-between;
           }
+          .coupon_paid{
+            font-size: 28rpx;
+            color:#999;
+            display:flex;
+            align-items: center;
+          }
         }
         .postage_tip{
           color: rgb(229, 116, 112);

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

@@ -58,78 +58,9 @@ export default (data, gValue,gColor,oldData)=>{
 
   let categoryParentType = dataVal({data, key:'categoryParentType', dValue:'root', gValue});
 
-
-  return[
-    {
-      ele: 'title',
-      label: '基础',
-      size: 'small',
-      groupKey:'content',
-    },
-    {
-      label: "业务线",
-      ele: "xd-choose-namespace",
-      valueKey: "xnamespace",
-      groupKey:'content',
-      placeholder: '请选择业务线',
-      notice:'空继承上级业务线',
-      inline: false,
-      labelInline:true,
-      value:  dataVal({data, key:'xnamespace', dValue:null, gValue}),
-      className: 'input100',
-      handleCustom: (cb) => {
-        XdBus.getParentApi('getOptionsNamespaces')()
-          .then(res => {
-            cb(res.list)
-          })
-          .catch();
-      }
-    },
-    {
-      label: "商品排序",
-      ele: "xd-select-list",
-      valueKey: "sort",
-      labelInline: true,
-      value: dataVal({data, key:'sort', dValue:'default', gValue}),
-      groupKey:'content',
-      className: 'input100',
-      list: [
-        {label: "综合排序",notice:'默认排序，多维度综合计算后的排序', value: "default"},
-        {label: "销量由高到低", value: "sale_num_desc"},
-        {label: "价格由高到低", value: "price_desc"},
-        {label: "价格由低到高", value: "price_asc"},
-      ]
-    },
-    {
-      ele: 'title',
-      label: '组件布局',
-      size: 'small',
-      groupKey:'content',
-    },
-    {
-      label: "分类布局",
-      ele: "xd-style-image",
-      groupKey: 'content',
-      valueKey: "category",
-      value: category,
-      labelInline:true,
-      isTplRef:true,
-      className: 'input100',
-      handleCustom(cusRes) {
-        XdBus.getParentApi('getCompStylesOptions')({
-          layout_ids: '25g7ZD0RxIFu0oaAbPYQ5',
-          key: Date.now(),
-          filter: false
-        })
-          .then(res => {
-            cusRes.data.cb(res)
-          })
-          .catch(error => {
-            console.error(error);
-          });
-      },
-    },
-    data.category !== 'none' && [
+  let allItem = [];
+  if(data.category !== 'none') {
+    allItem = [
       {ele: 'group_start'},
       {
         label: "全部名称",
@@ -237,8 +168,81 @@ export default (data, gValue,gColor,oldData)=>{
         ],
       },
       {ele: 'group_end'},
-    ],
-    
+    ]
+  }
+
+
+  return[
+    {
+      ele: 'title',
+      label: '基础',
+      size: 'small',
+      groupKey:'content',
+    },
+    {
+      label: "业务线",
+      ele: "xd-choose-namespace",
+      valueKey: "xnamespace",
+      groupKey:'content',
+      placeholder: '请选择业务线',
+      notice:'空继承上级业务线',
+      inline: false,
+      labelInline:true,
+      value:  dataVal({data, key:'xnamespace', dValue:null, gValue}),
+      className: 'input100',
+      handleCustom: (cb) => {
+        XdBus.getParentApi('getOptionsNamespaces')()
+          .then(res => {
+            cb(res.list)
+          })
+          .catch();
+      }
+    },
+    {
+      label: "商品排序",
+      ele: "xd-select-list",
+      valueKey: "sort",
+      labelInline: true,
+      value: dataVal({data, key:'sort', dValue:'default', gValue}),
+      groupKey:'content',
+      className: 'input100',
+      list: [
+        {label: "综合排序",notice:'默认排序，多维度综合计算后的排序', value: "default"},
+        {label: "销量由高到低", value: "sale_num_desc"},
+        {label: "价格由高到低", value: "price_desc"},
+        {label: "价格由低到高", value: "price_asc"},
+      ]
+    },
+    {
+      ele: 'title',
+      label: '组件布局',
+      size: 'small',
+      groupKey:'content',
+    },
+    {
+      label: "分类布局",
+      ele: "xd-style-image",
+      groupKey: 'content',
+      valueKey: "category",
+      value: category,
+      labelInline:true,
+      isTplRef:true,
+      className: 'input100',
+      handleCustom(cusRes) {
+        XdBus.getParentApi('getCompStylesOptions')({
+          layout_ids: '25g7ZD0RxIFu0oaAbPYQ5',
+          key: Date.now(),
+          filter: false
+        })
+          .then(res => {
+            cusRes.data.cb(res)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    ...allItem,
     {
       label: "分类样式",
       ele: "xd-style-image",
@@ -266,19 +270,19 @@ export default (data, gValue,gColor,oldData)=>{
           });
       },
     },
-    {ele: 'group_start'},
-    0&&{
-      label: '底部距离',
-      ele: 'el-input',
-      type: 'number',
-      labelInline: true,
-      valueKey: 'lineBottom',
-      value: dataVal({data, key:'lineBottom', dValue:'10', gValue}),
-      groupKey:'content',
-      className: 'input100',
-      hidden: !['v1','v5'].includes(category) || ['desc','none','center','triangle'].includes(data['navStyle']),
-    },
-    {ele: 'group_end'},
+    // {ele: 'group_start'},
+    // 0&&{
+    //   label: '底部距离',
+    //   ele: 'el-input',
+    //   type: 'number',
+    //   labelInline: true,
+    //   valueKey: 'lineBottom',
+    //   value: dataVal({data, key:'lineBottom', dValue:'10', gValue}),
+    //   groupKey:'content',
+    //   className: 'input100',
+    //   hidden: !['v1','v5'].includes(category) || ['desc','none','center','triangle'].includes(data['navStyle']),
+    // },
+    // {ele: 'group_end'},
     {
       label: "商品布局",
       ele: "xd-style-image",

package/src/components/JfbMallShop/JfbMallShop.vue

@@ -133,7 +133,15 @@
       </view>
       <!-- 二维码 -->
       <view class="qrcode_box" v-if="shopInfo&&shopInfo.show_qrcode&&!is_plus_site&&showTake==='Y'">
-        <qrcode-show :show_qrcode="shopInfo.show_qrcode" :shop_id="shopInfo.shop_id" :layoutInfo="layoutInfo" :xnamespace="xnamespace" :brandLogo="brandLogo" :successPath="successPath"></qrcode-show>
+        <qrcode-show
+          :show_qrcode="shopInfo.show_qrcode"
+          :shop_id="shopInfo.shop_id"
+          :layoutInfo="layoutInfo"
+          :xnamespace="xnamespace"
+          :brandLogo="brandLogo"
+          :successPath="successPath"
+          :take-title-name="takeTitleName"
+        ></qrcode-show>
       </view>
       <!-- 二维码 -->
       <view v-if="isShowCodeProduct && productList.length" class="code_product_wrap">
@@ -299,6 +307,7 @@
         showTake: "",
         takeBtnName: "",
         takeName: "",
+        takeTitleName:'本店支持「展码」买单',
         takeRemark: "",
         takePath: "",
         showMovie: "",
@@ -577,6 +586,8 @@
         this.scanBtnName = gCPVal(container, 'scanBtnName', '扫一扫')
         this.scanRemark = getContainerPropsValue(container, 'content.scanRemark', '');
         this.scanPath = getContainerPropsValue(container, 'content.scanPath', {value: ""}).value;
+        this.takeTitleName = gCPVal(container, 'takeTitleName', '本店支持「展码」买单');
+        debugger
         if(this.is_plus_site){
           this.showTake = oldShowCashier || gCPVal(container, 'showTake', 'Y');
           this.takeBtnName = gCPVal(container, 'takeBtnName', '去提货');
@@ -677,30 +688,30 @@
       checkTextOverflow() {
         // 创建选择器查询
         const query = uni.createSelectorQuery().in(this)
-        
+
         // 获取元素位置信息
         query.select('#textRef').fields({
           rect: true,
-          size: true, 
+          size: true,
         }, (res) => {
           if (!res) return;
             const hiddenQuery = uni.createSelectorQuery().in(this)
             hiddenQuery.select('#textRefHidden').fields({
               rect: true,
-              size: true, 
+              size: true,
             }, (hiddenRes) => {
               if (!hiddenRes) return;
               console.log('元素尺寸：', res);
-          
+
               this.isTextOverflow = hiddenRes.height > res.height;
               console.log('文字是否超出3行：', this.isTextOverflow);
               console.log('展示容器高度：', res.height);
               console.log('文本实际高度：', hiddenRes.height);
             })
-            .exec(); 
+            .exec();
         })
-        .exec(); 
-    
+        .exec();
+
       },
       getShowBrandTip(shopInfo){
         jfbRootExec("showBrandTip", {

package/src/components/JfbMallShop/QrcodeShow.vue

@@ -1,7 +1,14 @@
 <template>
   <view class="body-qrcode">
     <show-qp v-if="show_qrcode==='QP'" :shop_id="shop_id" :layoutInfo="layoutInfo" :xnamespace="xnamespace" :successPath="successPath"></show-qp>
-    <show-card v-if="show_qrcode==='CARD'" :shop_id="shop_id" :layoutInfo="layoutInfo" :xnamespace="xnamespace" :brandLogo="brandLogo"></show-card>
+    <show-card
+      v-if="show_qrcode==='CARD'"
+      :shop_id="shop_id"
+      :layoutInfo="layoutInfo"
+      :xnamespace="xnamespace"
+      :brandLogo="brandLogo"
+      :take-title-name="takeTitleName"
+    ></show-card>
   </view>
 </template>
 
@@ -44,6 +51,10 @@
       successPath: {
         type: String,
         default: ''
+      },
+      takeTitleName: {
+        type: String,
+        default: ''
       }
     },
     data(){
@@ -59,7 +70,7 @@
       console.log(this.layoutInfo,this.brandLogo,'layoutInfo')
     },
     methods:{
-    
+
     }
   }
 </script>

package/src/components/JfbMallShop/ShowCard.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="body-qrcode">
-    <view class="barcode_title">本店支持「展码」买单</view>
+    <view class="barcode_title">{{takeTitleName}}</view>
     <view v-if="info">
     <view class="barcode_wrap">
       <view>
@@ -180,6 +180,10 @@
         type: String,
         default: ''
       },
+      takeTitleName:{
+        type:String,
+        default: '本店支持「展码」买单'
+      }
     },
     computed:{
       activityType(){

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

@@ -188,13 +188,25 @@ export default function (data, gValue,gColor,oldData){
       },
     },
     { ele: 'group_start' },
+    {
+      label: '消费标题',
+      ele: 'el-input',
+      valueKey: 'takeTitleName',
+      labelInline: true,
+      value: dataVal({ data, key: 'takeTitleName', dValue: '', gValue }),
+      hidden: data.showTake !== 'Y',
+      groupKey: 'content',
+      className: 'input80',
+      inline: false,
+      placeholder: "输入消费标题"
+    },
     {
       label: '按钮',
       ele: 'el-input',
       valueKey: 'takeBtnName',
       labelInline: true,
       value: dataVal({ data, key: 'takeBtnName', dValue: '', gValue }),
-      hidden: data.showTake !== 'Y'||!is_plus_site,
+      hidden: data.showTake !== 'Y' || !is_plus_site,
       groupKey: 'content',
       className: 'input80',
       placeholder: "去提货",
@@ -207,7 +219,7 @@ export default function (data, gValue,gColor,oldData){
       valueKey: 'takeName',
       labelInline: true,
       value: dataVal({ data, key: 'takeName', dValue: '', gValue }),
-      hidden: data.showTake !== 'Y'||!is_plus_site,
+      hidden: data.showTake !== 'Y' || !is_plus_site,
       groupKey: 'content',
       className: 'input80',
       inline: false,
@@ -215,6 +227,7 @@ export default function (data, gValue,gColor,oldData){
       placeholder: "快捷提货"
     },
     { ele: 'group_end' },
+
     { ele: "xd-line",groupKey:'content' },
 
     {
@@ -478,4 +491,4 @@ export default function (data, gValue,gColor,oldData){
     data.showPrice === 'Y' && { ele: 'group_end' },
 
   ].filter(i=>i)
-}
+}