jufubao-movie 1.0.32-beta1 → 1.0.32-beta2

package/package.json

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

package/src/components/JfbMovieCode/JfbMovieCode.vue

@@ -104,7 +104,7 @@
         }
 
         this.$xdConfirm({
-          $vm: this,
+          styles: this.styles,
           title:'系统提醒',
           content: '尊敬的用户，电子码一经兑出，不支持退换，建议您使用前再进行兑换。',
           contentColor:'#999999'

package/src/components/JfbMovieCodeChoose/JfbMovieCodeChoose.vue

@@ -13,9 +13,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-movie-code-choose__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-movie-code-choose__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view
@@ -41,8 +39,7 @@
             <view class="jfb-movie-code-choose__body-info-name-distance" :style="{color:subTextColor}">{{cinemaInfo.distance }}</view>
           </view>
         </view>
-        <view class="jfb-movie-code-choose__body-info-detail" v-html="cinemaInfo.about">
-        </view>
+        <view class="jfb-movie-code-choose__body-info-detail" v-html="cinemaInfo.about"></view>
         <view :style="{margin:(padding + 'rpx 0'),height: '1px', backgroundColor: textLineColor}"></view>
         <view class="jfb-movie-code-choose__body-info-shop">
           <view style="align-items: center;" class="jfb-movie-code-choose__body-info-shop-item">
@@ -238,6 +235,30 @@ export default {
       this.list_is_border_w = getContainerPropsValue(container, "content.list_is_border_w", 2);
     },
 
+    handleAboat(cinemaInfo){
+     cinemaInfo.about = cinemaInfo.about.replace(/<img[^>]*>/gi, function(match, capture) {
+        match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+        match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+        match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+        return match;
+      });
+      cinemaInfo.about =  cinemaInfo.about.replace(/style="[^"]+"/gi, function(match, capture) {
+        match = match
+          .replace(/<p>/gi, '<p class="p_class">')
+          .replace(/width:[^;]+;/gi, 'max-width:100%;')
+          .replace(/width:[^;]+;/gi, 'max-width:100%;');
+        return match;
+      });
+      cinemaInfo.about =  cinemaInfo.about.replace(/<br[^>]*\/>/gi, "");
+      cinemaInfo.about =  cinemaInfo.about.replace(/<a>/gi, '<a class="a_class "');
+      cinemaInfo.about =  cinemaInfo.about.replace(/<li>/gi, '<li class="li_class "');
+      cinemaInfo.about =  cinemaInfo.about.replace(/\<p/gi, '<p class="p_class "');
+      cinemaInfo.about =  cinemaInfo.about.replace(/\<span/gi, '<span class="span_class "');
+      cinemaInfo.about =  cinemaInfo.about.replace(/<div/gi, '<div class="div_class "');
+      cinemaInfo.about =  cinemaInfo.about.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;margin-top:0;margin-bottom:0;"');
+      return cinemaInfo;
+    },
+
     p_getCinemaInfo() {
       return new Promise((resolve, reject) => {
         let location = this.cityLocation.location || {};
@@ -251,8 +272,10 @@ export default {
         })
           .then((res) => {
             const { cinema_data } = res;
-
             cinema_data['cinema_logo'] = getServiceUrl(cinema_data.cinema_logo);
+            //#ifdef MP-WEIXIN
+            this.cinemaInfo = this.handleAboat(cinema_data);
+            //#endif
             this.cinemaInfo = cinema_data;
             resolve();
           })
@@ -342,13 +365,21 @@ export default {
       }
 
       &-detail {
-        ::v-deep img {
+        margin-top: 20rpx;
+        width:100%;
+        /deep/ .tinymce-image {
           max-width: 100% !important;
           height: auto !important;
         }
-
-        ::v-deep p {
+        /deep/ img {
+          max-width: 100% !important;
+          height: auto !important;
+        }
+        /deep/ .p_class {
           font-size: unit(28, rpx);
+          margin: 0;
+          border: 0;
+          padding: 0 0 1rem;
         }
       }
 

package/src/components/JfbMovieConfirm/JfbMovieConfirm.vue

@@ -90,18 +90,14 @@
             </view>
           </view>
           <view class="jfb-movie-confirm__body-movie-total-right">
-            共{{order_info.seat_number}}张
-            <template v-if="is_not_show_price !== 'Y'">
-              :
-              <xd-unit
-                :color="mainColor"
-                :isOld="false"
-                :iocnSize="0.32"
-                :fontSize="24"
-                :price="order_info.total_price"
-              ></xd-unit>
-            </template>
-            
+            共{{order_info.seat_number}}张：
+            <xd-unit
+              :color="mainColor"
+              :isOld="false"
+              :iocnSize="0.32"
+              :fontSize="24"
+              :price="order_info.total_price"
+            ></xd-unit>
           </view>
         </view>
       </view>
@@ -130,7 +126,7 @@
           <xd-content-xss style="color: #999" :html="notice"></xd-content-xss>
         </view>
       </view>
-      
+
       <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="0rpx" size="small" showRight @click="toChoseCard">
@@ -146,7 +142,7 @@
       </view>
       <view class="jfb-movie-confirm__body-btn-height" :style="bottomFixedStylePlaceholder"></view>
       <view class="jfb-movie-confirm__body-btn" :style="bottomFixedStyle">
-        <view v-if="is_not_show_price !== 'Y'" style="display: flex;align-items:center;">
+        <view style="display: flex;align-items:center;">
           <view style="margin-right: 8rpx;">应付:</view>
           <xd-unit
             :price="orderNeedPayPrice"
@@ -155,7 +151,6 @@
             :iocn-size=".45"
           ></xd-unit>
         </view>
-        <view v-else></view>
         <view>
           <xd-button
             :disabled="payBtnDisabled"
@@ -173,7 +168,6 @@
           :show.sync="showCardPay"
           :payThird="!!payThird"
           :bindCard="bindCard"
-          :is_not_show_price="is_not_show_price"
           :payChannels="payChannels"
           :jwxSDK="jwxSDK"
           :validImageAPIUrl="validImageAPIUrl"
@@ -192,7 +186,6 @@
           :layoutInfo="layoutInfo"
           :show.sync="showCardPayChose"
           :bindCard="bindCard"
-          :is_not_show_price="is_not_show_price"
           :hadChoseCard="choseCard && choseCard.selectedCardList"
           :jwxSDK="jwxSDK"
           :selected_wallet_list="choseWallet ? choseWallet.selectedWalletList : []"
@@ -288,7 +281,6 @@
         choseWallet: null,
 
         xnamespace: "",
-        is_not_show_price: "",
 
         //提示
         notice: '',
@@ -396,7 +388,6 @@
           .then(res => {
             console.log(res, '8888888')
             this.$xdHideLoading()
-            this.is_not_show_price = res.is_not_show_price;
             this.is_first_use_card = res.is_first_use_card;
             this.is_use_jfb_pay = res.is_use_jfb_pay;
             this.res_total_price = res.total_price;
@@ -591,7 +582,7 @@
           cancel: false,
           isHtml: true,
           isTitle: true,
-          $vm: this,
+          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"){
@@ -718,7 +709,7 @@
               content: '订单已超时',
               cancel: false,
               confirmText: '我知道了',
-              $vm: this,
+              styles: this.styles,
             });
             return
           }

package/src/components/JfbMovieLineLineSeat/JfbMovieLineLineSeat.vue

@@ -43,7 +43,6 @@
         :cinema-id="cinemaId"
         :seat-id="scheduleId"
         :layout-info='layoutInfo'
-        :is_not_show_price="is_not_show_price"
         @onGetFilm="handleGetFilm"
         @onGetSeatList="handleGetSeatList"
         @onBuy="handleBuy"></xd-online-seat>
@@ -79,7 +78,6 @@
         seatTime: 0,
         isPop: false,
         paiQiData: [],
-        is_not_show_price: "",
 
         //面板
         payPath: "", //三方支付路径
@@ -165,7 +163,6 @@
         ]).then(([res, res1]) => {
           this.loadingList = false;
           this.$xdHideLoading();
-          this.is_not_show_price = res.is_not_show_price;
           let paiqi_data = res.schedule_data.map(item => {
             item['name'] = item['date_name'];
             item['paiqi_data'] = item['paiqi'].map(pp => {
@@ -238,7 +235,7 @@
       handleToPay(res){
         const { temp_order_id, oms_order_id, pay_order_id } = res;
         this.$xdConfirm({
-          $vm: this,
+          styles: this.styles,
           width: '90%',
           content: '有未完成的订单',
           confirmText: '去支付',

package/src/components/JfbMovieLineLineSeat/XdOnlineSeat.vue

@@ -112,7 +112,7 @@
                   ><text>({{ itemc["show_version"] }})</text></view
                 >
                 <view>{{ itemc["hall_name"] }}</view>
-                <view v-if="is_not_show_price !== 'Y'">
+                <view>
                   <xd-unit
                     font-weight="normal"
                     :price="itemc['price']"
@@ -152,7 +152,7 @@
         <xd-button @click="handleBuy" type="primary" radius="10rpx">
           <view class="xd-seat__footer-buy-box">
             <xd-unit
-              v-if="getPrice > 0 && is_not_show_price !== 'Y'"
+              v-if="getPrice > 0"
               :price="getPrice"
               :font-size="36"
               :iocn-size="0.45"
@@ -244,10 +244,6 @@ export default {
       type: Number | String,
       required: true,
     },
-    is_not_show_price: {
-      type: String,
-      default: ""
-    },
 
     layoutInfo: {
       type: Object,
@@ -374,10 +370,10 @@ export default {
   },
   methods: {
     handleBuy() {
-      
+
       //未选座位
       if(this.userSelectedSeatInfo === null) return;
-      
+
       //选中座位有隔座
       if (this.userSelectedSeatInfo["seatError"].length > 0) {
         this.openNotice();
@@ -505,7 +501,7 @@ export default {
           .catch();
       });
     },
-    
+
     getFirst(data = []){
       let first = {};
       let len = data.length;
@@ -546,14 +542,14 @@ export default {
       });
       this.scheduleTabList = tab;
       this.scheduleList = list;
-      
+
       //未找到传入排期
       if (!selectPaiqi){
         this.$xdConfirm({
           content:'当前排期已过期，请您手动切换或由系统自动切换到下一排期。',
           confirmText:'自动切换',
           cancelText:'手动切换',
-          $vm: this.$parent.$parent.$parent,
+          styles: this.$parent.$parent.$parent.styles,
           success:(status)=>{
             if(status.confirm) {
               this.replaceParams(this.getFirst(list));
@@ -562,7 +558,7 @@ export default {
         });
         return
       }
-      
+
       this.scheduleListSelectedItem = selectPaiqi;
       setTimeout(() => {
         this.scheduleListinto = `content-index-${this.scheduleListIndex}`;
@@ -650,7 +646,7 @@ export default {
     justify-content: center;
     align-items: center;
     flex-direction: column;
-	
+
 
     &-icon {
 			padding-top: unit(30, rpx);
@@ -680,7 +676,7 @@ export default {
         }
       }
     }
-		
+
 		&-text {
 			color: #fff;
 			font-size: unit(32, rpx);

package/src/components/JfbMovieLineSchedule/JfbMovieLineSchedule.vue

@@ -142,7 +142,7 @@
                 <view class="_main">{{item.show_version}}</view>
                 <view class="_sub">{{item.hall_name}}</view>
               </view>
-              <view v-if="is_not_show_price !== 'Y'" class="flex-sub">
+              <view class="flex-sub">
                 <view class="_main" style="color: red;">
                   <xd-unit class="xd-unit"
                     :price="item.sale_price"
@@ -217,7 +217,6 @@
         timer: null,
         cinema_id: "",
         renderSwiper: "renderSwiper",
-        is_not_show_price: "",
 
         //面板值
         seatChoosePath: "",
@@ -328,7 +327,6 @@
         }).then(res => {
           this.loadingList = false;
           this.$xdHideLoading();
-          this.is_not_show_price = res.is_not_show_price;
           this.scheduleTabList = res.schedule_data.filter(item => item.date_name).map((item, index) => {
             let date_name = item.date_name;
             let week = date_name.match(/星期./)[0];

package/src/components/JfbMoviePay/JfbMoviePay.vue

@@ -166,7 +166,7 @@
         }
 
         this.$xdConfirm({
-          $vm: this,
+          styles: this.styles,
           title: '系统提醒',
           content: '尊敬的用户，电子码一经兑出，不支持退换，建议您使用前再进行兑换。',
           contentColor: '#999999'