jufubao-movie 1.0.56-beta8 → 1.0.57-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-movie",
-  "version": "1.0.56-beta8",
+  "version": "1.0.57-beta1",
   "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 :isShowIcon="isShowIcon" :isVip="is_plus_site" :showPrice="order_info.show_prices" type="order" ></CusPrice>
+              <CusPrice :isVip="is_plus_site" :showPrice="order_info.show_prices" type="order" ></CusPrice>
             </template>
 
           </view>
@@ -144,12 +144,12 @@
         <view class="good_vip_price">
           <xd-list-item label="商品价格" paddingLR="40rpx" size="small" showBottom>
             <!-- <view style="color: #999999;">145.00</view> -->
-            <xd-unit :isShowIcon="isShowIcon" :price="origin_total_price" colorNew="#999" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+            <xd-unit :price="origin_total_price" colorNew="#999" :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>
             <!-- <view style="color: #FF7070;">-5.00</view> -->
-            <xd-unit :isShowIcon="isShowIcon" :largeZero="false" :price="-plus_saving_money" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+            <xd-unit :largeZero="false" :price="-plus_saving_money" :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
           </xd-list-item>
         </view>
         <!-- <view class="vip_remain">
@@ -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 :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>
+              <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>
                 </template>
               <view v-else>请选择</view>
               </view>
@@ -179,7 +179,7 @@
                 <view style="color:#CCCCCC;font-size: 20rpx">已使用其他票券，不可用</view>
               </view>
               <view v-else>
-                <xd-unit :isShowIcon="isShowIcon" v-if="choseWallet && choseWallet.walletPayPrice" :price='choseWallet.walletPayPrice' :isOld="false" :fontSize="24" :iconSize="0.3"></xd-unit>
+                <xd-unit 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,7 +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"
@@ -317,9 +317,6 @@
   import CusPrice from '@/components/CusPrice/CusPrice'
   import CusVipList from "@/components/CusVipList/CusVipList"
 
-  // #ifdef H5
-  import cookie from "@/common/cookie";
-  //#endif
   import {Base64} from "js-base64";
 
   export default {
@@ -411,14 +408,8 @@
       },
     },
     computed: {
-      ...mapState({
-        brandInfo: state => state.brandInfo,
-        siteInfo: state => state.siteInfo,
-      }),
-      isShowIcon() {
-        if(this.$configProject.isPreview) return true;
-        return this.siteInfo.mapping.is_show_coin_icon==='Y'
-      },
+      ...mapState(['jfbAuthorize','brandInfo','siteInfo']),
+
       bottomFixedStyle(){
         return this.fixedStyle({paddingBottom: 10, zIndex: 100});
       },
@@ -551,6 +542,7 @@
             res.seat_name = JSON.parse(res.seat_name).join(' | ')
             // res.total_price = this.$xdUniHelper.divisionFloatNumber(res.total_price, 100)
             res.total_price = res.total_price;
+            let priceChange = this.order_info && this.order_info.total_price != res.total_price;
             this.order_info = res
             this.times = Number(this.order_info['count_down']);
             let minutes = Math.floor(this.times / 60);
@@ -572,6 +564,10 @@
               res.pay_methods.push('coupon')
               this.p_getPayMethod(res.pay_methods);
             }
+            //确认订单价格改变，清空选择
+            if(priceChange){
+              this.clearCheckedWhenPriceChange();
+            }
             if(res.vip_card_item){
               if(res.vip_card_item.is_can_buy === 'Y'){
                 this.vip_card_id = res.vip_card_item.vip_card_id;
@@ -591,6 +587,11 @@
             // }
           });
       },
+      //确认订单价格改变，清空选择
+      clearCheckedWhenPriceChange(){
+        this.$refs['xdCardPayChose'].clearChecked();
+        this.$refs['xdWalletChose'].clearChecked();
+      },
       handleChoseVipCard(vip_card_id){
         this.vip_card_id = vip_card_id;
         this.p_getConfirmOrder();
@@ -877,6 +878,13 @@
       getCountDown() {
         this.show = true;
         this.timer = setInterval(() => {
+          let pages = getCurrentPages();
+          let curPage = pages[pages.length - 1];
+          if(this.pageAttr["page_id"] !== curPage.page_id){
+            clearInterval(this.timer);
+            return;
+          }
+
           let minutes = Math.floor(this.times / 60);
           let seconds = Math.floor(this.times % 60);
           if (minutes < 10) {
@@ -953,7 +961,7 @@
         let payPath = '';
         let isMp = false;
         // #ifdef H5
-        payPath = cookie.get(`jfb-pay-path-${this.brandInfo.site_id}`);
+        payPath = this.jfbAuthorize.getMpKey('paySetting');
         if(navigator.userAgent.match(/miniprogram/i)) isMp = true;
         //#endif
         if(payPath && isMp) {

package/src/components/JfbMovieLineSchedule/JfbMovieLineSchedule.vue

@@ -168,7 +168,7 @@
                     :isShowIcon="false"
                     :font-size="24"/> -->
                   <!-- {{item.sale_price}} -->
-                   <CusPrice :isShowIcon="isShowIcon" :isPlus="is_plus_site" :showPrice="item.show_prices" range="起" type="schedule"></CusPrice>
+                   <CusPrice :isShowIcon="false" :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>
@@ -259,9 +259,6 @@
         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']