jufubao-mall 2.0.64-beta2 → 2.0.64-beta4

package/package.json

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

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -279,6 +279,7 @@
           :layoutInfo="layoutInfo"
           :show.sync="showCouponChose"
           :jwxSDK="jwxSDK"
+          :selected_wallet_list="choseWallet ? choseWallet.selectedWalletList : []"
           :validImageAPIUrl="validImageAPIUrl"
           :mainColor="mainColor"
           :addSettleCoupon="addSettleCoupon"
@@ -751,7 +752,9 @@
           //支持优惠券，并且优惠券不为空
           let hasCoupon = this.otherPayMethod.find(p => p.method === 'coupon')
           //钱包使用依赖于优惠券(支付方式是否支持， 是否有优惠券可用（异步）， 所以钱包需延迟加载（获取优惠券之后）)
-          if(hasCoupon && this.couponList.length > 0){
+          //不是优惠券列表，而是可用优惠券列表
+          let activeCouponList = this.couponList.filter(coupon => coupon.is_valid === 'Y')
+          if(hasCoupon && activeCouponList.length > 0){
             return false;
           }
         }
@@ -933,7 +936,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,

package/src/components/JfbMallConfirm/Mock.js

@@ -782,4 +782,6 @@ module.exports = {
     request_id: "823e7aa78fa32fa9"
   },
   getVipList:{"total_size":3,"next_page_token":"","list":[{"vip_card_id":3,"product_id":60038520,"product_name":"体验卡","sale_price":10000000,"vip_card_icon":""},{"vip_card_id":2,"product_id":60038519,"product_name":"月卡","sale_price":10000000,"vip_card_icon":""},{"vip_card_id":1,"product_id":60038515,"product_name":"测1","sale_price":10000000,"vip_card_icon":""}],"request_id":"c5cf58415cffdc30"},
+  useBindedWallet: {"need_pay_price":0,"wallet_total_use_price":34444,"selected_card_list":[{"card_number":"110101000000050","card_use_price":500,"card_use_point":500,"need_pay_price":34444,"card_use_certificate":"PPCBY5vhY2rWbjtCxus1O","card_type_name":"满减券100减20","end_time":1814371199,"card_point":500,"is_need_pop":false,"pop_message":"","pop_type":"","confirm_text":"","cancel_text":"","card_total_use_price":500,"card_total_use_point":500,"unit":"点","card_use_rule":"可凭本票券到电影(勿改)、商城(对应百货)(勿改)、蛋糕(勿改)、图书(勿改)、网络视听(勿改)、演出(勿改)、体检(勿改)、旅游(勿改)、餐饮(勿改)使用","card_show_name":"","card_origin_use_point":500,"card_use_discount":0,"card_model":"d","show_card_number":"","customer_id":"","real_card_point":500,"price":100,"login_type":"bind"}],"selected_wallet_list":[{"partner_id":161,"site_id":"1efce09784b33c4a","owner_id":"5001511","wallet_type":"UB","wallet_type_name":"福利元宝","wallet_use_price":34444,"wallet_virtual_number":"1000000000013573","customer_id":"","wallet_nnid":"EYsXAROKBYqRB4hhNbtVB","wallet_amount":961400}],"request_id":"1a3cd5a74f37201a"},
+  selectCard: {"is_need_pop":false,"pop_message":"","pop_type":"","cancel_text":"","confirm_text":"","need_pay_price":34444,"card_total_use_price":500,"selected_card_list":[{"card_number":"110101000000050","card_use_price":500,"card_use_point":500,"need_pay_price":34444,"card_use_certificate":"PPCBY5vhY2rWbjtCxus1O","card_type_name":"满减券100减20","end_time":1814371199,"card_point":500,"is_need_pop":false,"pop_message":"","pop_type":"","confirm_text":"","cancel_text":"","card_total_use_price":500,"card_total_use_point":500,"unit":"点","card_use_rule":"可凭本票券到电影(勿改)、商城(对应百货)(勿改)、蛋糕(勿改)、图书(勿改)、网络视听(勿改)、演出(勿改)、体检(勿改)、旅游(勿改)、餐饮(勿改)使用","card_show_name":"","card_origin_use_point":500,"card_use_discount":0,"card_model":"d","show_card_number":"","customer_id":"","real_card_point":500,"price":100,"login_type":"bind"}],"selected_wallet_list":[],"request_id":"77dd288075a4cd00"},
 };