jufubao-mall 2.0.67-beta21 → 2.0.67-beta3

package/package.json

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

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -993,8 +993,16 @@
         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();
+        if(this.is_wallet_use_with_coupon === "Y" && this.defaultUseWallet){
+          //自动选择卡券
+          if(data.isAutoTrigger){
+            if(this.$refs['xdWalletChose']) this.$refs['xdWalletChose'].handleChoseDefault();
+          }
+          //重新选择卡券，则需清空钱包,重新选第一个钱包
+          if(data.reChoseCoupon){
+            if(this.$refs['xdWalletChose']) this.$refs['xdWalletChose'].clearChecked();
+            if(this.$refs['xdWalletChose']) this.$refs['xdWalletChose'].handleChoseDefault();
+          }
         }
       },
       handleCouponInit(coupList){
@@ -1045,12 +1053,13 @@
       },
       useBindedWallet(options, successCb, errCb){
         console.log("this.choseCard", this.choseCard)
-        const { choseCard } = this;
+        const { choseCard, choseCoupon } = this;
         let selected_card_list = choseCard ?  choseCard.selectedCardList : [];
         //苏州交投：优惠券跟钱包可同时支持
         //问题：票券跟优惠券同时存在的话，暂时都放到selected_card_list中，后续再做区分处理
         if(this.choseCoupon){
-          selected_card_list = selected_card_list.concat(this.choseCoupon.selectedCardList);
+          // selected_card_list = selected_card_list.concat(this.choseCoupon.selectedCardList);
+          selected_card_list = choseCoupon ? choseCoupon.selectedCardList : [];
         }
         let otherOptions = {};
         let fnName = "useBindedWallet";

package/src/components/JfbMallConfirm/Mock.js

@@ -129,6 +129,24 @@ module.exports = {
       "eyJhcHBJZCI6Ind4YWQ3MGY2NTEyN2Y5NDcxYyIsInRpbWVTdGFtcCI6IjE2NzQ5ODg2ODkiLCJub25jZVN0ciI6Ijk0ZDExODZkY2M1OGQ4NTc4NGNjOGNmMjdjOGZmYjFiIiwicGFja2FnZSI6InByZXBheV9pZD13eDI5MTgzODA5ODI2MDY5Zjk0NTY4ZTE1ZTVmYjJjMDAwMDAiLCJwYXlTaWduIjoiM2NyRmdiOWFtM1hzS1RkeGVRMkxFdDFocGhDb2FqM1ZDN2lzeUNpN2YyZEJrXC8rNUdYV0dLNnJkZk1NTEdvSk9lTllpQ0ttdW50YnY2VHR1ZkVlNE1qZkM2RENFZTBIdWR4YzJ2Yk1Dbk1wWnNuYXRQZlhuSWN4ekpKRUdnelJsbFROMEhob3FabUl3WEdvcFM3SlNKMU1QQVUyTnJHZmlXa0JUMHljWWJuQjRWYlhJalE3Vm1qcVkzOUhaZ09wZ3RoUGMxU2RyQUk5MGhzcDhBd2xKajdib2dLNjVSRmVwV0lDa0UzOTNQOXBoMDg4YjRPQzd3S0RIOXY0N3diXC9NczJ3TGljSXBMcmlaNTVTUXMxaENTeEpnWEZNUk1aM3dLaUU5ampXRlBIZTZncnFwallqd0hsdG1cL0RBT05OM05JMm9oa2d2U2xRXC8yY2pEanZxaXY5Zz09Iiwic2lnblR5cGUiOiJSU0EiLCJwYXJ0bmVySWQiOiIxNjE0OTIxNjczIiwicHJlcGF5SWQiOiJ3eDI5MTgzODA5ODI2MDY5Zjk0NTY4ZTE1ZTVmYjJjMDAwMDAifQ==",
     request_id: "ac2bc4dca53674f2"
   },
+  selectCard: {
+    selected_card_list: [
+      {
+        card_number: "101001000006989",
+        card_use_point: 3600,
+        card_use_price: 3600,
+        card_cert: "AdOaERZDp34--SgdmRUlu",
+        is_bind_card: true
+      }
+    ],
+    need_pay_price: 6000,
+    is_need_pop: false,
+    pop_message: "",
+    pop_type: "",
+    cancel_text: "",
+    confirm_text: "",
+    request_id: "e9c56b87d4d8346e"
+  },
   createOrder: {
     order_id: "478270984734121984",
     pay_order_id: "478270986643316736",

package/src/components/JfbMallConfirm/orderMixin.js

@@ -11,12 +11,6 @@ export default {
   },
   computed:{
     ...mapState(['jfbAuthorize','brandInfo']),
-
-    // #ifdef H5
-    isMpInH5Comp(){
-      return navigator.userAgent.match(/miniprogram/i)
-    },
-    //#endif
   },
 
   methods: {
@@ -220,15 +214,6 @@ export default {
         }
       }
 
-
-      // #ifdef H5
-      //（小程序套嵌模式下单时候需要设置支付成功页面地址）
-      if(this.isMpInH5Comp) {
-        const {host, deploy_dir} = this.brandInfo;
-        otherOptions['success_url'] = `https://${host}/${deploy_dir}${this.paySuccessPath}?order_id=@order_id@`;
-      }
-      //#endif
-
       this.$xdShowLoading({})
       jfbRootExec(createOrderFn, {
         vm: this,
@@ -266,17 +251,16 @@ export default {
           this.$xdHideLoading();
           if(res['pay_url']){
             let url = res['pay_url'];
-
+            //let url = `/system/system/pay?${res['pay_url'].split('?')[1]}`;
             // #ifdef H5
             //判断是否为微信小程序宿主
-            if(this.isMpInH5Comp && res['pay_jump_type'] === 'wx_mini'){
-              //未设置success_url参数时候自己拼接
-              if(res['pay_url'].indexOf('success_url') === -1) {
-                const {host, deploy_dir} = this.brandInfo;
-                const success_url = `https://${host}/${deploy_dir}${this.paySuccessPath}?order_id=${res['main_order_id']}`;
-                if(res['pay_url'].indexOf('?') > -1) url += `&success_url=${Base64.encodeURI(success_url)}`;
-                else url += `?success_url=${Base64.encodeURI(success_url)}`;
-              }
+            if(navigator.userAgent.match(/miniprogram/i)
+              && res['pay_jump_type'] === 'wx_mini'
+            ){
+              const {host, deploy_dir} = this.brandInfo;
+              const success_url = `https://${host}/${deploy_dir}${this.paySuccessPath}?order_id=${res['main_order_id']}`;
+              if(res['pay_url'].indexOf('?') > -1) url += `&success_url=${Base64.encodeURI(success_url)}&callback_url=${encodeURIComponent(success_url)}`;
+              else url += `?success_url=${Base64.encodeURI(success_url)}&callback_url=${encodeURIComponent(success_url)}`;
               url = `/pages/jumptomp/jumptomp?callback=${Base64.encodeURI(url)}&isThird=1`;
             }
             //#endif
@@ -369,7 +353,7 @@ export default {
       let isMp = false;
       // #ifdef H5
       payPath = this.jfbAuthorize.getMpKey('paySetting');
-      if(this.isMpInH5Comp) isMp = true;
+      if(navigator.userAgent.match(/miniprogram/i)) isMp = true;
       this.isMpEnv = document.cookie;
       this.mpPayPath = payPath;
       //#endif

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