jufubao-mall 2.0.63 → 2.0.64-beta1

package/package.json

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

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -259,7 +259,7 @@
           </xd-card-pay-chose>
         </template>
         <xd-wallet-chose
-          v-if="payWallet"
+          v-if="payWallet && canLoadWalletComp"
           ref="xdWalletChose"
           :defaultUseFirst="defaultUseWalletFirst"
           :hadChoseWallet="choseWallet && choseWallet.selectedWalletList"
@@ -466,6 +466,7 @@
         showWalletChose: false,
         choseWallet: null,
         wallet_total_amount: "",
+        canLoadWalletComp: false, //是否可以加载钱包组件
 
         //优惠券
         choseCoupon: null,
@@ -744,9 +745,16 @@
         return this.checkPayMethod.includes('wallet');
       },
       defaultUseWalletFirst(){
-        //钱包与优惠券可共同使用的情况下， 需要先选优惠券，再选钱包
-        //钱包会从被动触发变主动触发， is_wallet_use_with_coupon === 'Y'时，钱包默认不选中
-        if(this.is_wallet_use_with_coupon === "Y") return false;
+        //钱包与优惠券可共同使用的情况下(is_wallet_use_with_coupon === 'Y')， 需要先选优惠券，再选钱包
+        //钱包会从被动触发变主动触发， 此时钱包默认不选中
+        if(this.is_wallet_use_with_coupon === "Y") {
+          //支持优惠券，并且优惠券不为空
+          let hasCoupon = this.otherPayMethod.find(p => p.method === 'coupon')
+          //钱包使用依赖于优惠券(支付方式是否支持， 是否有优惠券可用（异步）， 所以钱包需延迟加载（获取优惠券之后）)
+          if(hasCoupon && this.couponList.length > 0){
+            return false;
+          }
+        }
         return this.defaultUseWallet;
       },
       defaultUseCouponFirst(){
@@ -925,7 +933,7 @@
         let addrShadow = gCPVal(container, 'addrShadow', ['none'], {sKey: "addrShadowStatus", fields: ['addrShadow']});
         this.addrShadow = addrShadow ? this.getBSStr(addrShadow, 'shadow') : 'none';
         this.coupon_layout = gCPVal(container, 'coupon_layout', ['1']);
-        this.checkPayMethod = gCPVal(container, 'checkPayMethod', []);
+        this.checkPayMethod = gCPVal(container, 'checkPayMethod', ['wallet']);
         console.log("this.checkPayMethod", this.checkPayMethod);
         this.openVipBgImg = getServiceUrl(
           getContainerPropsValue(container, "content.openVipBgImg", { url: "" }).url,
@@ -988,6 +996,9 @@
       },
       handleCouponInit(coupList){
         this.couponList = coupList;
+        //已获取优惠券
+        //参： computed: defaultUseWalletFirst
+        this.canLoadWalletComp = true;
       },
 
       //only选择卡片
@@ -1582,6 +1593,12 @@
           this.is_wallet_use_with_coupon = res.is_wallet_use_with_coupon;
           this.otherPayMethod = res.list;
           this.otherPayLoaded = true;
+
+          //如果不支持优惠券，则直接加载钱包支付 参： computed: defaultUseWalletFirst
+          let hasCoupon = this.otherPayMethod.find(item => item.method === 'coupon');
+          if(!(this.is_wallet_use_with_coupon === 'Y' && hasCoupon)){
+            this.canLoadWalletComp = true;
+          }
         })
       },
 

package/src/components/JfbMallSearch/JfbMallSearch.vue

@@ -243,7 +243,7 @@
         this.getSearchList();
       },
       handleToSearch(hot) {
-        if (hot === this.keyword) return;
+        // if (hot === this.keyword) return;
         this.keyword = hot;
         this.page_token = 1;
         this.getSearchList();

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