jufubao-movie 1.0.33 → 1.0.34-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-movie",
-  "version": "1.0.33",
+  "version": "1.0.34-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

@@ -130,7 +130,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">
@@ -218,7 +218,7 @@
         :show.sync="showWalletChose"
         :hadChoseWallet="choseWallet && choseWallet.selectedWalletList"
         :getUserWalletList="getUserWalletList"
-        :useBindedWallet="p_useBindedWallet"
+        :useBindedWallet="useBindedWallet"
         @onChose="handleWalletChose"
         @onAlert="() => hasAlertCardChose = true"
       ></xd-wallet-chose>
@@ -333,6 +333,7 @@
       },
       //订单实际需要支付金额（减去各项已选，票券、钱包)
       orderNeedPayPrice(){
+        if(!this.order_info) return 0;
         let choseCardPay = this.choseCard ? this.choseCard.cardPayPrice : 0;
         let choseWalletPay = this.choseWallet ? this.choseWallet.walletPayPrice : 0;
         let total = this.$xdUniHelper.addFloatNumber(choseCardPay, choseWalletPay);
@@ -474,7 +475,7 @@
           this.otherPayLoaded = true;
         })
       },
-      p_useBindedWallet(options, successCb, errCb){
+      useBindedWallet(options, successCb, errCb){
         console.log("this.choseCard", this.choseCard)
         const { choseCard } = this;
         let selected_card_list = choseCard ?  choseCard.selectedCardList : [];
@@ -506,27 +507,7 @@
           cb(res);
         })
       },
-      p_useBindedWallet(options, successCb, errCb){
-        console.log("this.choseCard", this.choseCard)
-        const { choseCard } = this;
-        let selected_card_list = choseCard ?  choseCard.selectedCardList : [];
-        this.$xdShowLoading({})
-        jfbRootExec("useBindedWallet", {
-          vm: this,
-          data: {
-            ...options,
-            total_price: this.order_info.total_price,
-            selected_card_list_json: JSON.stringify(selected_card_list),
-            namespace: this.xnamespace,
-            cart_order_id: this.tempOrderId
-          }
-        }).then(res => {
-          successCb(res)
-          this.$xdHideLoading()
-        }).catch(err => {
-          if(errCb) errCb(err)
-        })
-      },
+      
       addSettleCard(options, successCb, errCb) {
         console.log(options, 'ioioioioi')
         this.$xdShowLoading({})
@@ -595,7 +576,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"){
@@ -722,7 +703,7 @@
               content: '订单已超时',
               cancel: false,
               confirmText: '我知道了',
-              $vm: this,
+              styles: this.styles,
             });
             return
           }
@@ -744,8 +725,9 @@
         // #ifndef H5
         uni.setClipboardData({
           data: text,
+          showToast: false,
           success: () => {
-            this.$xdAlert({content: '复制成功'})
+            //this.$xdAlert({content: '复制成功'})
           }
         })
         // #endif

package/src/components/JfbMovieLineLineSeat/JfbMovieLineLineSeat.vue

@@ -238,7 +238,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

@@ -35,6 +35,7 @@
         <xd-notice-bar
           class="xd-seat__footer-notice-icon"
           :scrollable="noticeList.length > 1"
+          style="width: 100%"
           showIcon
         >
           <view
@@ -104,7 +105,7 @@
                       ? mainColorToArray
                       : 'rgba(100,100,100,.05)',
                 }"
-                :key="itemc.id"
+                :key="itemc.data_id"
                 @click="handleChangeSchdule(itemc, indexc)"
               >
                 <view
@@ -328,6 +329,7 @@ export default {
           return !!flat;
         });
         let curTab = this.scheduleTabList[curScheduleIndex];
+        if(!curTab) return "";
         return `${curTab.name}/${temp.show_time_hour}/${temp.show_version}/${temp.hall_name}`;
       }
 
@@ -375,10 +377,10 @@ export default {
   },
   methods: {
     handleBuy() {
-      
+
       //未选座位
       if(this.userSelectedSeatInfo === null) return;
-      
+
       //选中座位有隔座
       if (this.userSelectedSeatInfo["seatError"].length > 0) {
         this.openNotice();
@@ -506,7 +508,7 @@ export default {
           .catch();
       });
     },
-    
+
     getFirst(data = []){
       let first = {};
       let len = data.length;
@@ -547,14 +549,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));
@@ -563,7 +565,7 @@ export default {
         });
         return
       }
-      
+
       this.scheduleListSelectedItem = selectPaiqi;
       setTimeout(() => {
         this.scheduleListinto = `content-index-${this.scheduleListIndex}`;
@@ -578,11 +580,12 @@ export default {
       );
     },
     replaceParams(selectPaiqi) {
-      let { params } = this.$xdUniHelper.parseURL();
+      let parseUrl = this.$xdUniHelper.parseURL();
+      let { params, path } = parseUrl;
       params["scheduleId"] = selectPaiqi["data_id"];
       let searchParams = this.$xdUniHelper.jsonToParams(params);
       this.$xdUniHelper.redirectTo({
-        url: `${location.pathname + "?" + searchParams}`,
+        url: `${path + "?" + searchParams}`,
       });
     },
 
@@ -651,7 +654,7 @@ export default {
     justify-content: center;
     align-items: center;
     flex-direction: column;
-	
+
 
     &-icon {
 			padding-top: unit(30, rpx);
@@ -681,7 +684,7 @@ export default {
         }
       }
     }
-		
+
 		&-text {
 			color: #fff;
 			font-size: unit(32, rpx);

package/src/components/JfbMovieLineSchedule/JfbMovieLineSchedule.vue

@@ -64,15 +64,21 @@
           </z-swiper>
           <!-- #endif -->
           <!-- #ifdef MP -->
-          <swiper class="swiper" previous-margin="200rpx" next-margin="200rpx" :current="curFilmIndex" @change="handleChange">
+          <swiper class="swiper" :display-multiple-items="3" :current="curFilmIndex" @change="handleChange">
+            <swiper-item>
+              <view></view>
+            </swiper-item>
             <swiper-item v-for="(item,index) in list" :key="index">
               <image class="image" :class="{swiper_active : curFilmIndex===index}" :src="item.poster" mode="aspectFit"></image>
             </swiper-item>
+            <swiper-item>
+              <view></view>
+            </swiper-item>
           </swiper>
           <!-- #endif -->
         </view>
         <view v-if="filmInfo" class="film_info">
-          <view class="film_name">{{filmInfo.show_name}} <view v-if="filmInfo.remark" class="film_score">评分：{{filmInfo.remark}}</view></view>
+          <view class="film_name">{{filmInfo.show_name || ""}} <view v-if="filmInfo.remark" class="film_score">评分：{{filmInfo.remark}}</view></view>
           <view class="film_type_score">
             <view class="film_type">
               {{filmTypeAll}}
@@ -535,7 +541,6 @@
 
           .image {
             width: 100%;
-            // #ifdef H5
             height: 300rpx;
             transform: scale(0.9);
             filter: contrast(0.5);
@@ -544,7 +549,6 @@
               transform: scale(1);
               filter: contrast(1);
             }
-            // #endif
           }
 
         }

package/src/components/JfbMoviePay/JfbMoviePay.vue

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