jufubao-movie 1.0.56-beta3 → 1.0.56-beta6

package/package.json

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

package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue

@@ -101,7 +101,7 @@
                 :fontSize="24"
                 :price="order_info.total_price"
               ></xd-unit> -->
-              <CusPrice :isVip="is_plus_site" :showPrice="order_info.show_prices" type="order" ></CusPrice>
+              <CusPrice :isShowIcon="isShowIcon" :isVip="is_plus_site" :showPrice="order_info.show_prices" type="order" ></CusPrice>
             </template>
 
           </view>
@@ -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"
@@ -168,8 +168,8 @@
               <view v-else>
                 <view v-if="choseCard && choseCard.cardPayPrice" slot="label">{{item.show_name}} <text style="color:red;margin-left: 4px;">(已选{{ choseCard.selectedCardList.length }}张)</text></view>
                 <template v-if="choseCard && choseCard.cardPayPrice">
-              <xd-unit v-if="choseCard.unit == '次'" :price="choseCard.cardPayPoint" :isOld="false" :fontSize="24" :iconSize="0.3" :unit="choseCard.unit"></xd-unit>
-              <xd-unit v-else :price="choseCard.cardPayPrice" :isOld="false" :fontSize="24" :iconSize="0.3" :unit="choseCard.unit || ''"></xd-unit>
+              <xd-unit :isShowIcon="isShowIcon" v-if="choseCard.unit == '次'" :price="choseCard.cardPayPoint" :isOld="false" :fontSize="24" :iconSize="0.3" :unit="choseCard.unit"></xd-unit>
+              <xd-unit :isShowIcon="isShowIcon" v-else :price="choseCard.cardPayPrice" :isOld="false" :fontSize="24" :iconSize="0.3" :unit="choseCard.unit || ''"></xd-unit>
                 </template>
               <view v-else>请选择</view>
               </view>
@@ -179,7 +179,7 @@
                 <view style="color:#CCCCCC;font-size: 20rpx">已使用其他票券，不可用</view>
               </view>
               <view v-else>
-                <xd-unit v-if="choseWallet && choseWallet.walletPayPrice" :price='choseWallet.walletPayPrice' :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+                <xd-unit :isShowIcon="isShowIcon" v-if="choseWallet && choseWallet.walletPayPrice" :price='choseWallet.walletPayPrice' :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
                 <view v-else>请选择</view>
               </view>
             </xd-list-item>
@@ -199,6 +199,7 @@
         <view v-if="is_not_show_price !== 'Y'" style="display: flex;align-items:center;">
           <view style="margin-right: 8rpx;">应付:</view>
           <xd-unit
+            :isShowIcon="isShowIcon"
             :price="orderNeedPayPrice"
             :isOld="false"
             :font-size="36"
@@ -400,7 +401,7 @@
         couponUseBtnPadding: {},
         couponImageUrl: "",
         is_plus_site: false,
-     
+
       }
     },
     watch: {
@@ -411,8 +412,12 @@
     },
     computed: {
       ...mapState({
-        brandInfo: state => state.brandInfo
+        brandInfo: state => state.brandInfo,
+        siteInfo: state => state.siteInfo,
       }),
+      isShowIcon() {
+        return this.siteInfo.mapping.is_show_coin_icon==='Y'
+      },
       bottomFixedStyle(){
         return this.fixedStyle({paddingBottom: 10, zIndex: 100});
       },
@@ -460,6 +465,9 @@
         return false;
       }
     },
+    destroyed() {
+      if(this.timer) clearInterval(this.timer);
+    },
     created() {
       this.init(this.container);
       this.xnamespace =this.projectAttr.business_code;
@@ -972,68 +980,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);
       }
     }
   }

package/src/components/JfbMovieLineSchedule/JfbMovieLineSchedule.vue

@@ -168,7 +168,7 @@
                     :isShowIcon="false"
                     :font-size="24"/> -->
                   <!-- {{item.sale_price}} -->
-                   <CusPrice :isPlus="is_plus_site" :showPrice="item.show_prices" range="起" type="schedule"></CusPrice>
+                   <CusPrice :isShowIcon="isShowIcon" :isPlus="is_plus_site" :showPrice="item.show_prices" range="起" type="schedule"></CusPrice>
                 </view>
                 <!-- <view class="_sub"> <xd-coins class="xd-coins" :size="0.2"></xd-coins> 起</view> -->
               </view>
@@ -257,7 +257,11 @@
     computed: {
       ...mapState({
         siteMap: state => state.siteInfo.mapping,
+        siteInfo: state => state.siteInfo,
       }),
+      isShowIcon() {        
+        return this.siteInfo.mapping.is_show_coin_icon==='Y'
+      },
       film_id(){
         if(!this.filmInfo) return "";
         return this.filmInfo['film_id']