jufubao-movie 1.0.60 → 1.0.61-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-movie",
-  "version": "1.0.60",
+  "version": "1.0.61-beta1",
   "private": false,
   "description": "聚福宝在线选座业务组件插件包",
   "main": "index.js",

package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue

@@ -359,6 +359,7 @@
         is_use_jfb_pay: "",   //是否使用聚福宝支付
         res_total_price: 0,
         origin_total_price: 0,
+        hasPreNotice: false,
 
         is_show_vip_card_list: "",
         vipCardList: [],
@@ -755,76 +756,87 @@
         })
         console.log(options, '999999')
       },
-      handlePayBtnClick(){
-        this.$xdConfirm({
-          title: '在线订座提醒',
-          showClose: true,
-          confirmText: '我知道了',
-          cancel: false,
-          isHtml: true,
-          isTitle: true,
-          styles: this.styles,
-          content: '<span style="color:red;font-size: 16px">提示:影票一旦售出，将不支持退换!购票成功不再发送短信通知，部分影院不提供3D眼镜，儿童身高免购票以影院实际情况为准。</span>',
-          success: async (res) => {
-            if(this.is_use_jfb_pay === "Y" && this.is_first_use_card === "Y"){
-              /**
-               * 有任一新版支付都用新版支付， 仅卡支付也用新版选卡支付
-               */
-              if(this.payWallet || this.payCard || this.payCoupon){  //已选卡
-                let selected_card_list = [];
-
-                if(this.choseCard) {
-                  selected_card_list = this.choseCard ? this.choseCard.selectedCardList : [];
-                } else if(this.choseCoupon) {
-                  selected_card_list = this.choseCoupon ? this.choseCoupon.selectedCardList : [];
-                }
+      handlePreNotice(){
+        return new Promise((resolve, reject) => {
+          this.$xdConfirm({
+            title: '在线订座提醒',
+            showClose: true,
+            confirmText: '我知道了',
+            cancel: false,
+            isHtml: true,
+            isTitle: true,
+            styles: this.styles,
+            content: '<span style="color:red;font-size: 16px">提示:影票一旦售出，将不支持退换!购票成功不再发送短信通知，部分影院不提供3D眼镜，儿童身高免购票以影院实际情况为准。</span>',
+            success: async (res) => {
+              this.hasPreNotice = true;
+              resolve(res)
+            },
+            fail: (res) => {
+              reject(res)
+            }
+          })
+        })
+      },
+      async handlePayBtnClick(){
+        if(!this.hasPreNotice){
+          await this.handlePreNotice();
+        }
+        if(this.is_use_jfb_pay === "Y" && this.is_first_use_card === "Y"){
+          /**
+           * 有任一新版支付都用新版支付， 仅卡支付也用新版选卡支付
+           */
+          if(this.payWallet || this.payCard || this.payCoupon){  //已选卡
+            let selected_card_list = [];
+
+            if(this.choseCard) {
+              selected_card_list = this.choseCard ? this.choseCard.selectedCardList : [];
+            } else if(this.choseCoupon) {
+              selected_card_list = this.choseCoupon ? this.choseCoupon.selectedCardList : [];
+            }
 
-                let selected_wallet_list = this.choseWallet ? this.choseWallet.selectedWalletList : []
-                //票券跟钱包都未选择，给用户提示
-                if(selected_card_list.length === 0 && selected_wallet_list.length === 0){
-                  if(!this.hasAlertCardChose){
-                    if(this.payCard){
-                      this.showCardPayChose = true;
-                    }else{
-                      this.showWalletChose = true;
-                    }
-                    // this.showCardPayChose = true;
-                    return false;
-                  }else{
-                    //支持补差, 提示是否使用补差
-                    if(this.payThird){
-                      if(this.skipTip === 'N'){
-                        await this.handleConfirmAllWxPay();
-                      }
-                    }else{
-                      //不支持补差，仅提示
-                      return this.$xdAlert({content: "请选择兑换方式"})
-                    }
-                  }
+            let selected_wallet_list = this.choseWallet ? this.choseWallet.selectedWalletList : []
+            //票券跟钱包都未选择，给用户提示
+            if(selected_card_list.length === 0 && selected_wallet_list.length === 0){
+              if(!this.hasAlertCardChose){
+                if(this.payCard){
+                  this.showCardPayChose = true;
+                }else{
+                  this.showWalletChose = true;
                 }
-                this.useTickAndWalletPay(selected_card_list, selected_wallet_list);
+                // this.showCardPayChose = true;
+                return false;
               }else{
-                if(this.skipToPay === 'N'){
-                  this.showCardPay = true;
+                //支持补差, 提示是否使用补差
+                if(this.payThird){
+                  if(this.skipTip === 'N'){
+                    await this.handleConfirmAllWxPay();
+                  }
                 }else{
-                  this.useTickAndWalletPay([], []);
+                  //不支持补差，仅提示
+                  return this.$xdAlert({content: "请选择兑换方式"})
                 }
               }
+            }
+            this.useTickAndWalletPay(selected_card_list, selected_wallet_list);
+          }else{
+            if(this.skipToPay === 'N'){
+              this.showCardPay = true;
             }else{
-              this.createSettleOrder({
-                need_pay_price: this.res_total_price,
-                total_price: this.res_total_price,
-                selected_card_list_json: "[]"
-              }, (res1) => {
-                this.handleToPay(res1);
-                // this.$xdUniHelper.redirectTo({
-                //   url: this.payPath + `?order_id=${res1['pay_order_id']}&main_order_id=${res1['order_id']}`
-                // }, false, true)
-              })
+              this.useTickAndWalletPay([], []);
             }
           }
-        });
-
+        }else{
+          this.createSettleOrder({
+            need_pay_price: this.res_total_price,
+            total_price: this.res_total_price,
+            selected_card_list_json: "[]"
+          }, (res1) => {
+            this.handleToPay(res1);
+            // this.$xdUniHelper.redirectTo({
+            //   url: this.payPath + `?order_id=${res1['pay_order_id']}&main_order_id=${res1['order_id']}`
+            // }, false, true)
+          })
+        }
       },
       handleConfirmAllWxPay(){
         return new Promise((resolve, reject) => {