jufubao-movie 1.0.56-beta4 → 1.0.56-beta7

package/package.json

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

package/src/components/JfbMovieConfirm/Attr.js

@@ -5,6 +5,17 @@ export default {
   advanced: [],
   content: (data)=>{
     return [
+      {
+        label: "无其他支付时直接跳到支付页面:",
+        ele: "xd-radio",
+        valueKey: "skipToPay",
+        value: data['skipToPay'] || 'N',
+        groupKey: "content",
+        list: [
+          {label: '是', value: 'Y'},
+          {label: '否', value: 'N'},
+        ]
+      },
       {
         label: '去支付路径:',
         ele: 'xd-select-pages-path',

package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue

@@ -132,7 +132,7 @@
           <xd-content-xss style="color: #999" :html="notice"></xd-content-xss>
         </view>
       </view>
-      
+
       <view v-if="is_show_vip_card_list==='Y'" class="vip_list_wrap">
         <cus-vip-list :list="vipCardList"
           :vip_card_id="vip_card_id"
@@ -140,16 +140,16 @@
           @choseVipCard="handleChoseVipCard"></cus-vip-list>
       </view>
 
-      <view v-if="is_show_vip_card_list==='Y'" class="vip_pay_info">
+      <view v-if="isShowPlusSavingMoneyPrice" class="vip_pay_info">
         <view class="good_vip_price">
           <xd-list-item label="商品价格" paddingLR="40rpx" size="small" showBottom>
             <!-- <view style="color: #999999;">145.00</view> -->
-            <xd-unit :price="origin_total_price" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+            <xd-unit :isShowIcon="isShowIcon" :price="origin_total_price" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
           </xd-list-item>
-          <xd-list-item v-if="isShowPlusSavingMoney" label="PLUS专项立减" size="small" paddingLR="40rpx" >
-            <view slot="label" style="color: #86541E;">PLUS专项立减</view>
+          <xd-list-item v-if="isShowPlusSavingMoney" label="PLUS专享立减" size="small" paddingLR="40rpx" >
+            <view slot="label" style="color: #86541E;">PLUS专享立减</view>
             <!-- <view style="color: #FF7070;">-5.00</view> -->
-            <xd-unit :price="plus_saving_money" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+            <xd-unit :isShowIcon="isShowIcon" :largeZero="false" :price="-plus_saving_money" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
           </xd-list-item>
         </view>
         <!-- <view class="vip_remain">
@@ -161,7 +161,7 @@
 
       <view v-if="otherPayMethod.length" class="jfb-movie-confirm__body-card">
         <template v-for="item in otherPayMethod">
-           <xd-list-item v-if="item.method === 'card'" :key="item.method" :label="item.show_name" paddingLR="60rpx" size="small" :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseCard">
+           <xd-list-item v-if="item.method === 'card'" :key="item.method" :label="item.show_name" paddingLR="0" size="small" :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseCard">
               <view v-if="(choseCoupon && choseCoupon.cardPayPrice)">
                 <view style="color:#CCCCCC;font-size: 20rpx">已使用其他票券，不可用</view>
               </view>
@@ -174,7 +174,7 @@
               <view v-else>请选择</view>
               </view>
             </xd-list-item>
-           <xd-list-item v-if="item.method === 'wallet'" :key="item.method" :label="item.show_name" paddingLR="60rpx" size="small" :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseWallet">
+           <xd-list-item v-if="item.method === 'wallet'" :key="item.method" :label="item.show_name" paddingLR="0" size="small" :showRight="!(choseCoupon && choseCoupon.cardPayPrice)" @click="toChoseWallet">
               <view v-if="(choseCoupon && choseCoupon.cardPayPrice)">
                 <view style="color:#CCCCCC;font-size: 20rpx">已使用其他票券，不可用</view>
               </view>
@@ -183,7 +183,7 @@
                 <view v-else>请选择</view>
               </view>
             </xd-list-item>
-            <xd-list-item v-if="item.method === 'coupon'" :key="item.method" :label="item.show_name" paddingLR="60rpx" size="small" :showRight="!(choseCard && choseCard.cardPayPrice)" @click="toChoseCoupon">
+            <xd-list-item v-if="item.method === 'coupon'" :key="item.method" :label="item.show_name" paddingLR="0" size="small" :showRight="!(choseCard && choseCard.cardPayPrice)" @click="toChoseCoupon">
               <view v-if="(choseCoupon && choseCoupon.cardPayPrice)" slot="label">
                 {{item.show_name}} <text style="color:red;margin-left: 4px;">(已选{{ choseCoupon.selectedCardList.length }}张)</text>
               </view>
@@ -401,7 +401,7 @@
         couponUseBtnPadding: {},
         couponImageUrl: "",
         is_plus_site: false,
-     
+        skipToPay: "",
       }
     },
     watch: {
@@ -415,7 +415,8 @@
         brandInfo: state => state.brandInfo,
         siteInfo: state => state.siteInfo,
       }),
-      isShowIcon() {        
+      isShowIcon() {
+        if(this.$configProject.isPreview) return true;
         return this.siteInfo.mapping.is_show_coin_icon==='Y'
       },
       bottomFixedStyle(){
@@ -438,6 +439,15 @@
         return true;  //都开启补差
         // return this.otherPayMethod.find(item => item.method === 'third')
       },
+      //实付展示plus立减的商品价格
+      isShowPlusSavingMoneyPrice(){
+        //如果是会员
+        if(this.isVip) return true;
+        else{
+          if(this.is_show_vip_card_list === 'Y') return true;
+        }
+        return false;
+      },
       //是否展示plus立减
       isShowPlusSavingMoney(){
         if(this.is_show_vip_card_list === 'Y') return this.vip_card_id;
@@ -465,6 +475,9 @@
         return false;
       }
     },
+    destroyed() {
+      if(this.timer) clearInterval(this.timer);
+    },
     created() {
       this.init(this.container);
       this.xnamespace =this.projectAttr.business_code;
@@ -781,7 +794,11 @@
                 }
                 this.useTickAndWalletPay(selected_card_list, selected_wallet_list);
               }else{
-                this.showCardPay = true;
+                if(this.skipToPay === 'N'){
+                  this.showCardPay = true;
+                }else{
+                  this.useTickAndWalletPay([], []);
+                }
               }
             }else{
               this.createSettleOrder({
@@ -913,6 +930,7 @@
        */
       init(container) {
         this.bgColor = this.$colorChange(this.mainColor).alpha(0.1).toString();
+        this.skipToPay = getContainerPropsValue(container, 'content.skipToPay', '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");
@@ -977,68 +995,71 @@
 
       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();
+          uni.showToast({
+            title: "添加成功",
+            icon: "none"
+          });
+          successCb(res);
+        }).catch(err => {
+          console.log(err, 'err')
+          this.$xdHideLoading();
+          if(errCb) errCb();
+          this.$xdLog.catch(err);
+        })
     },
-    getSettleListCoupons(cb) {
+      getSettleListCoupons(cb) {
 
-      jfbRootExec('movieCardList', {
-        vm: this,
-        data: {
-          show_type: 'coupon'
-        }
-      }).then(res => {
-        cb(res.list)
-        this.cardList = res.list
-      }).catch(this.$xdLog.catch)
-    },
-    setSettleSelectCoupon(options, successCb, errCb) {
-
-      this.$xdShowLoading({})
-      let cart_order_id = this.tempOrderId;
-      jfbRootExec('movieSelectCard', {
-        vm: this,
-        data: {
-          cart_order_id: cart_order_id,
-          select_content: 1,
-          ...options,
-        }
-      }).then(res => {
-        successCb(res)
-        this.$xdHideLoading()
-      }).catch(err => {
-        if(errCb) errCb(err)
-        this.$xdHideLoading()
-        this.$xdLog.catch(err);
-      })
-    },
+        jfbRootExec('movieCardList', {
+          vm: this,
+          data: {
+            show_type: 'coupon'
+          }
+        }).then(res => {
+          cb(res.list)
+          this.cardList = res.list
+        }).catch(this.$xdLog.catch)
+      },
+      setSettleSelectCoupon(options, successCb, errCb) {
+
+        this.$xdShowLoading({})
+        let cart_order_id = this.tempOrderId;
+        jfbRootExec('movieSelectCard', {
+          vm: this,
+          data: {
+            cart_order_id: cart_order_id,
+            select_content: 1,
+            ...options,
+          }
+        }).then(res => {
+          successCb(res)
+          this.$xdHideLoading()
+        }).catch(err => {
+          if(errCb) errCb(err)
+          this.$xdHideLoading()
+          this.$xdLog.catch(err);
+        })
+      },
 
       onJfbBack(options) {
         this.$xdUniHelper.navigateBack()
       },
 
       onJfbShow(options) {
-        if(this.timer) clearTimeout(this.timer);
+        if(this.timer) clearInterval(this.timer);
         this.onJfbLoad(options)
+      },
+      onJfbUnload(){
+        if(this.timer) clearInterval(this.timer);
       }
     }
   }