jufubao-movie 1.0.59 → 1.0.61-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-movie",
-  "version": "1.0.59",
+  "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: [],
@@ -701,9 +702,11 @@
           }
         }).then(res => {
           this.$xdHideLoading()
-          uni.showToast({
-            title: "添加成功",
-            icon: "none"
+          this.$xdAlert({
+            content: '添加成功',
+            time: 2500,
+            isClose: false,
+            zIndex: 5000
           });
           successCb(res);
         }).catch(err => {
@@ -753,84 +756,97 @@
         })
         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) => {
-          uni.showModal({
+          this.$xdConfirm({
             title: '提示',
-            content: `您当前未使用票券，您将全部用微信支付`,
-            confirmText: "我知道了",
-            success: function (res) {
+            content: '您当前未使用票券，您将全部用微信支付',
+            confirmText: '我知道了',
+            width: '85%',
+            isTitle: true,
+            success: (res) => {
               if (res.confirm) {
                 resolve();
               } else if (res.cancel) {
@@ -1011,27 +1027,29 @@
 
       addSettleCoupon(options, successCb, errCb) {
 
-        this.$xdShowLoading({})
-        jfbRootExec('movieAddCard', {
-          vm: this,
-          data: {
-            ...options,
-            cart_order_id: this.tempOrderId,
-            show_type: 'coupon'
-          }
-        }).then(res => {
-          this.$xdHideLoading();
-          uni.showToast({
-            title: "添加成功",
-            icon: "none"
-          });
-          successCb(res);
-        }).catch(err => {
-          console.log(err, 'err')
-          this.$xdHideLoading();
-          if(errCb) errCb();
-          this.$xdLog.catch(err);
-        })
+      this.$xdShowLoading({})
+      jfbRootExec('movieAddCard', {
+        vm: this,
+        data: {
+          ...options,
+          cart_order_id: this.tempOrderId,
+          show_type: 'coupon'
+        }
+      }).then(res => {
+        this.$xdHideLoading();
+        this.$xdAlert({
+          content: '添加成功',
+          time: 2500,
+          isClose: false,
+          zIndex: 5000
+        });
+        successCb(res);
+      }).catch(err => {
+        console.log(err, 'err')
+        this.$xdHideLoading();
+        if(errCb) errCb();
+        this.$xdLog.catch(err);
+      })
     },
       getSettleListCoupons(cb) {
 

package/src/components/JfbMovieLineLineSeat/XdOnlineSeatMove.vue

@@ -851,11 +851,13 @@
         if (!message) {
           message = `每次最多可以购买：${this.seatMaxBuyNumber}个座位。`;
         }
-        uni.showModal({
+        this.$xdConfirm({
           title: '提示',
           content: message,
-          showCancel: false,
-          success: function (res) {
+          cancel: false,
+          width: '85%',
+          isTitle: true,
+          success: (res) => {
             if (typeof callback === 'function') {
               callback()
             }

package/src/components/JfbMovieLineSchedule/JfbMovieLineSchedule.vue

@@ -411,10 +411,12 @@
             this.loadingFilm = false;
             const { cinema_data, film_data, pop_notice,is_pop} = res;
             if(!film_data.length){
-              uni.showToast({
-                title: "暂无影片排期数据",
-                icon: "error"
-              })
+              this.$xdAlert({
+                content: '暂无影片排期数据',
+                time: 2500,
+                isClose: false,
+                zIndex: 5000
+              });
             }
             this.cinemaInfo = cinema_data;
             this.filmList = film_data;