jufubao-mall 2.0.61 → 2.0.62-beta2

package/package.json

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

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -145,9 +145,9 @@
             </template>
 
             <template v-for="item in otherPayMethod">
-              <xd-list-item v-if="item.method === 'card'" :key="item.method" :label="item.show_name" :paddingLR="isCardLayout ? '32rpx' : '48rpx'" showBottom :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseCard">
+              <xd-list-item v-if="item.method === 'card'" :key="item.method" :label="item.show_name" :paddingLR="isCardLayout ? '32rpx' : '48rpx'" showBottom :showRight="canUseCard" @click="toChoseCard">
                 <view slot="label">{{item.show_name}} <text v-if="choseCard && choseCard.cardPayPrice" style="color:red;margin-left: 4px;">(已选{{ choseCard.selectedCardList.length }}张)</text></view>
-                <view v-if="(choseCoupon && choseCoupon.cardPayPrice)">
+                <view v-if="!canUseCard">
                   <view style="color:#CCCCCC;font-size: 24rpx">已使用其他票券，不可用</view>
                 </view>
                 <view v-else>
@@ -156,11 +156,11 @@
                   <view v-else>{{cardList.length}}张可用</view>
                 </view>
               </xd-list-item>
-              <xd-list-item v-if="item.method === 'wallet'" :key="item.method" :label="item.show_name" :paddingLR="isCardLayout ? '32rpx' : '48rpx'" showBottom :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseWallet">
+              <xd-list-item v-if="item.method === 'wallet'" :key="item.method" :label="item.show_name" :paddingLR="isCardLayout ? '32rpx' : '48rpx'" showBottom :showRight="canUseWallet" @click="toChoseWallet">
                 <view slot="label">
                   {{ item.show_name }}<text :style="{color:mainColor}" style="margin-left: 8px;font-size: 24rpx;">(剩余{{ wallet_total_amount }})</text>
                 </view>
-                <view v-if="(choseCoupon && choseCoupon.cardPayPrice)">
+                <view v-if="!canUseWallet">
                   <view style="color:#CCCCCC;font-size: 24rpx">已使用其他票券，不可用</view>
                 </view>
                 <view v-else>
@@ -168,13 +168,16 @@
                   <view v-else>请选择</view>
                 </view>
               </xd-list-item>
-              <xd-list-item v-if="item.method === 'coupon'" :key="item.method" :label="item.show_name" :paddingLR="isCardLayout ? '32rpx' : '48rpx'" showBottom :showRight="!(choseCard && choseCard.cardPayPrice)" @click="toChoseCoupon">
+              <xd-list-item v-if="item.method === 'coupon'" :key="item.method" :label="item.show_name" :paddingLR="isCardLayout ? '32rpx' : '48rpx'" showBottom :showRight="canUseCoupon" @click="toChoseCoupon">
                 <view v-if="(choseCoupon && choseCoupon.cardPayPrice)" slot="label">
                   {{item.show_name}} <text style="color:red;margin-left: 4px;">(已选{{ choseCoupon.selectedCardList.length }}张)</text>
                 </view>
-                <view v-else>
-                  <view style="color:#CCCCCC;font-size: 24rpx" v-if="(choseWallet && choseWallet.walletPayPrice)||(choseCard && choseCard.cardPayPrice)">已使用其他票券，不可用</view>
-                  <view v-else>{{couponList.length}}张可用</view>
+                <view>
+                  <view v-if="!canUseCoupon" style="color:#CCCCCC;font-size: 24rpx" >已使用其他票券，不可用</view>
+                  <view v-else>
+                    <xd-unit v-if="choseCoupon && choseCoupon.cardPayPrice" :price="choseCoupon.cardPayPrice" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
+                    <view v-else>{{couponList.length}}张可用</view>
+                  </view>
                 </view>
               </xd-list-item>
             </template>
@@ -271,6 +274,7 @@
         <cus-coupon-chose
           v-if="payCoupon"
           ref="xdCouponChose"
+          :defaultUseFirst="defaultUseCouponFirst"
           :hadChoseCoupon="choseCoupon && choseCoupon.selectedCardList"
           :layoutInfo="layoutInfo"
           :show.sync="showCouponChose"
@@ -467,6 +471,7 @@
         choseCoupon: null,
         showCouponChose: false,
         couponList: [],
+        is_wallet_use_with_coupon: "",  //是否钱包与优惠券同时使用
 
         fixedBottomBodyHeight: 0,
 
@@ -673,10 +678,15 @@
         let choseWalletPay = this.choseWallet ? this.choseWallet.walletPayPrice : 0;
         let choseCouponPay = this.choseCoupon ? this.choseCoupon.cardPayPrice : 0
         let total = 0
-        if(choseCouponPay) {
-          total = choseCouponPay
-        } else {
-          total = this.$xdUniHelper.addFloatNumber(choseCardPay, choseWalletPay);
+        if(this.is_wallet_use_with_coupon === 'Y'){
+          total = this.$xdUniHelper.addFloatNumber(choseCouponPay, choseWalletPay);
+          total = this.$xdUniHelper.addFloatNumber(total, choseCardPay);
+        }else{
+          if(choseCouponPay) {
+            total = choseCouponPay
+          } else {
+            total = this.$xdUniHelper.addFloatNumber(choseCardPay, choseWalletPay);
+          }
         }
         let total_amount = this.orderFee.total_amount ? this.orderFee.total_amount : 0;
         let result = this.$xdUniHelper.cutFloatNumber(total_amount, total);
@@ -730,11 +740,34 @@
         }
         return style;
       },
-      defaultUseWalletFirst(){
+      defaultUseWallet(){
         return this.checkPayMethod.includes('wallet');
       },
+      defaultUseWalletFirst(){
+        //钱包与优惠券可共同使用的情况下， 需要先选优惠券，再选钱包
+        //钱包会从被动触发变主动触发， is_wallet_use_with_coupon === 'Y'时，钱包默认不选中
+        if(this.is_wallet_use_with_coupon === "Y") return false;
+        return this.defaultUseWallet;
+      },
+      defaultUseCouponFirst(){
+        //默认使用优惠券由面板属性 钱包是否默认选中决定
+        return this.defaultUseWallet;
+      },
       showOpenVipDialog(){
         return !this.isVip&&this.is_plus_site;
+      },
+      canUseCoupon(){
+        if(this.is_wallet_use_with_coupon === "Y") return true;
+        //默认当有钱包支付或者卡券支付时并且金额大于0，优惠券不可用
+        //(choseWallet && choseWallet.walletPayPrice)||(choseCard && choseCard.cardPayPrice)
+        return !((this.choseWallet && this.choseWallet.walletPayPrice) || (this.choseCard && this.choseCard.cardPayPrice));
+      },
+      canUseCard(){
+        return !(this.choseCoupon && this.choseCoupon.cardPayPrice);
+      },
+      canUseWallet(){
+        if(this.is_wallet_use_with_coupon === "Y") return true;
+        return !(this.choseCoupon && this.choseCoupon.cardPayPrice);
       }
     },
     watch: {
@@ -922,7 +955,7 @@
       },
       //选择元宝
       toChoseWallet(){
-        if(this.choseCoupon && this.choseCoupon.cardPayPrice) return
+        if(!this.canUseWallet) return;
         this.showWalletChose = true;
       },
       handleWalletChose({walletPayPrice, needPayPrice, selectedWalletList}){
@@ -940,7 +973,7 @@
 
       //only选择满减券
       toChoseCoupon(){
-        if(this.choseCard && this.choseCard.cardPayPrice) return
+        if(!this.canUseCoupon) return;
         this.showCouponChose = true;
       },
       //only选择满减券结果
@@ -948,6 +981,10 @@
         console.log(data,'alalalal')
         this.choseCoupon = data;
         this.showCouponChose = false;
+        //优惠券跟钱包同时使用，优惠券选完后，钱包默认选中第一张卡
+        if(this.is_wallet_use_with_coupon === "Y" && this.defaultUseWallet && data.isAutoTrigger){
+          if(this.$refs['xdWalletChose']) this.$refs['xdWalletChose'].handleChoseDefault();
+        }
       },
       handleCouponInit(coupList){
         this.couponList = coupList;
@@ -955,7 +992,7 @@
 
       //only选择卡片
       toChoseCard(){
-        if(this.choseCoupon && this.choseCoupon.cardPayPrice) return
+        if(!this.canUseCard) return;
         this.showCardPayChose = true;
         this.showCardPayChoseWay = 'chose_card';
       },
@@ -996,6 +1033,11 @@
         console.log("this.choseCard", this.choseCard)
         const { choseCard } = this;
         let selected_card_list = choseCard ?  choseCard.selectedCardList : [];
+        //苏州交投：优惠券跟钱包可同时支持
+        //问题：票券跟优惠券同时存在的话，暂时都放到selected_card_list中，后续再做区分处理
+        if(this.choseCoupon){
+          selected_card_list = selected_card_list.concat(this.choseCoupon.selectedCardList);
+        }
         let otherOptions = {};
         let fnName = "useBindedWallet";
         if(this.gift_id) {
@@ -1537,6 +1579,7 @@
             support_methods: JSON.stringify(support_methods)
           }
         }).then(res => {
+          this.is_wallet_use_with_coupon = res.is_wallet_use_with_coupon;
           this.otherPayMethod = res.list;
           this.otherPayLoaded = true;
         })

package/src/components/JfbMallConfirm/orderMixin.js

@@ -139,7 +139,7 @@ export default {
         data: {
           namespace,
           cart_order_id: order_id,
-          show_type: 'normal'
+          show_type: 'normal',
         }
       }).then(res => {
         cb(res.list)
@@ -369,7 +369,8 @@ export default {
         data: {
           namespace,
           cart_order_id: order_id,
-          show_type: 'coupon'
+          show_type: 'coupon',
+          total_price: this.orderFee.total_amount
         }
       }).then(res => {
         cb(res.list)

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