jufubao-third 1.0.5 → 1.0.6-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-third",
-  "version": "1.0.5",
+  "version": "1.0.6-beta2",
   "private": false,
   "description": "聚福宝业务组件第三方购物平台包",
   "main": "index.js",

package/src/components/JfbThirdPay/Attr.js

@@ -9,6 +9,7 @@ export default {
       ele: "xd-choose-namespace",
       valueKey: "xnamespace",
       value: "",
+      groupKey: "advanced",
       handleCustom: (cb) => {
         XdBus.getParentApi('getOptionsNamespaces')()
           .then(res => {
@@ -23,6 +24,7 @@ export default {
       valueKey: 'orderSuccessPath', //form[valueKey]
       placeholder: '请选择核销成功路径',
       value: null,
+      groupKey: "advanced",
       setting: {
         router: XdBus.getParentApi('getPagesTree'),
 
@@ -35,6 +37,7 @@ export default {
       valueKey: 'thirdPayPath', //form[valueKey]
       placeholder: '请选择支付路径',
       value: null,
+      groupKey: "advanced",
       setting: {
         router: XdBus.getParentApi('getPagesTree'),
 

package/src/components/JfbThirdPay/JfbThirdPay.vue

@@ -166,6 +166,7 @@
         :getUserWalletList="getUserWalletList"
         :useBindedWallet="p_useBindedWallet"
         @onChose="handleWalletChose"
+        @onAlert="() => hasAlertCardChose = true"
       ></xd-wallet-chose>
     </template>
 
@@ -467,7 +468,13 @@
         const { main_order_id, submitCardList, needPayPrice } = this;
 
         if(!submitCardList.length){
-          await this.handleConfirmAllWxPay();
+          //支持补差, 提示是否使用补差
+          if(this.payThird){
+            await this.handleConfirmAllWxPay();
+          }else{
+            //不支持补差，仅提示
+            return this.$xdAlert({content: "请选择兑换方式"})
+          }
         }
 
         this.createSettleOrder({
@@ -558,7 +565,7 @@
           vm: this,
           data: {
             ...cardForm,
-            selected_card_list: submitCardList,
+            selected_card_list_json: JSON.stringify(submitCardList),
             total_price,
             namespace: this.xnamespace,
             ...options,
@@ -670,7 +677,7 @@
             data: {
               total_price,
               card_number: ticket.card_number,
-              selected_card_list: submitCardList,
+              selected_card_list_json: JSON.stringify(submitCardList),
               namespace: this.xnamespace,
               ...options,
               ...this.options,

package/src/components/JfbThirdPay/WalletMix.js

@@ -21,6 +21,10 @@ export default {
     payCard(){
       return this.otherPayMethod.find(item => item.method === 'card')
     },
+    //是否支持三方支付、补差
+    payThird(){
+      return this.otherPayMethod.find(item => item.method === 'third')
+    },
     orderNeedPayPrice(){
       let choseCardPay = this.choseCard ? this.choseCard.cardPayPrice : 0;
       let choseWalletPay = this.choseWallet ? this.choseWallet.walletPayPrice : 0;
@@ -174,10 +178,20 @@ export default {
         //票券跟钱包都未选择，给用户提示
         if(selected_card_list.length == 0 && selected_wallet_list.length == 0){
           if(!this.hasAlertCardChose){
-            this.showCardPayChose = true;
+            if(this.payCard){
+              this.showCardPayChose = true;
+            }else{
+              this.showWalletChose = true;
+            }
             return false;
           }else{
-            await this.handleConfirmAllWxPay();
+            //支持补差, 提示是否使用补差
+            if(this.payThird){
+              await this.handleConfirmAllWxPay();
+            }else{
+              //不支持补差，仅提示
+              return this.$xdAlert({content: "请选择兑换方式"})
+            }
           }
         }
         this.useTickAndWalletPay(selected_card_list, selected_wallet_list);
@@ -224,9 +238,19 @@ export default {
             url: this.orderSuccessPath + `?order_id=${res.order_id}`
           })
         }else{
-          this.$xdUniHelper.redirectTo({
-            url: this.thirdPayPath + `?order_id=${res.pay_order_id}&main_order_id=${res.order_id}`
-          })
+          //支持补差， 跳转补差页
+          if(this.payThird){
+            this.$xdUniHelper.redirectTo({
+              url: this.thirdPayPath + `?order_id=${res.pay_order_id}&main_order_id=${res.order_id}`
+            })
+          }else{
+            this.$xdAlert({
+              content: '余额不足，请选择其他票券',
+              time: 1500,
+              isClose: false,
+              zIndex: 5000
+            });
+          }
         }
       })
     }