jufubao-movie 1.0.58 → 1.0.60

package/package.json

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

package/src/components/JfbMovieConfirm/Attr.js

@@ -16,6 +16,17 @@ export default {
           {label: '否', value: 'N'},
         ]
       },
+      {
+        label: "支付时是否跳过补差提示:",
+        ele: 'xd-radio',
+        valueKey: "skipTip",
+        value: data['skipTip'] || 'N',
+        groupKey:'content',
+        list: [
+          {label: '是', value: 'Y'},
+          {label: '否', value: 'N'},
+        ],
+      },
       {
         label: '去支付路径:',
         ele: 'xd-select-pages-path',

package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue

@@ -701,9 +701,11 @@
           }
         }).then(res => {
           this.$xdHideLoading()
-          uni.showToast({
-            title: "添加成功",
-            icon: "none"
+          this.$xdAlert({
+            content: '添加成功',
+            time: 2500,
+            isClose: false,
+            zIndex: 5000
           });
           successCb(res);
         }).catch(err => {
@@ -791,7 +793,9 @@
                   }else{
                     //支持补差, 提示是否使用补差
                     if(this.payThird){
-                      await this.handleConfirmAllWxPay();
+                      if(this.skipTip === 'N'){
+                        await this.handleConfirmAllWxPay();
+                      }
                     }else{
                       //不支持补差，仅提示
                       return this.$xdAlert({content: "请选择兑换方式"})
@@ -824,11 +828,13 @@
       },
       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) {
@@ -944,6 +950,7 @@
       init(container) {
         this.bgColor = this.$colorChange(this.mainColor).alpha(0.1).toString();
         this.skipToPay = getContainerPropsValue(container, 'content.skipToPay', 'N');
+        this.skipTip = getContainerPropsValue(container, "content.skipTip", "N");
         this.payPath = getContainerPropsValue(container, 'content.payPath', {value: ''}).value;
         this.paySuccessPath = getContainerPropsValue(container, 'content.paySuccessPath', {value: "/pages/order/success"}).value;
         this.bindCard = getContainerPropsValue(container,"content.bindCard","1");
@@ -1008,27 +1015,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;