jufubao-movie 1.0.69 → 1.0.70-beta1

package/package.json

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

package/src/components/JfbMovieLineSchedule/JfbMovieLineSchedule.vue

@@ -34,7 +34,10 @@
         </view>
       </view>
       <view v-if="loadingFilm" class="ticket_notice skeleton-wrap"></view>
-      <view v-else-if="notice" class="ticket_notice" :style="{
+      <view
+        v-else-if="notice"
+        class="ticket_notice"
+        :style="{
           background: noticeBgColor,
           color: mainColorview
         }">
@@ -101,6 +104,7 @@
         </view>
       </view>
       <view class="schedule_wrap">
+        <!--排期日期列表-->
         <view v-if="loadingList" class="schedule_date skeleton-wrap">
           <scroll-view class="tab-scroll" scroll-x>
             <view class="tab_box">
@@ -116,9 +120,13 @@
             :scroll-into-view="toView"
           >
             <view class="tab_box">
-              <view v-for="dd in scheduleTabList" :key="dd.value"
-                class="_date" :class="{active: curTab==dd.value}"
-                @click="curTab=dd.value"
+              <view
+                v-for="dd in scheduleTabList"
+                :key="dd.key"
+                class="_date"
+                :id="`toView-${dd.index}`"
+                :class="{active: curTab===dd.index}"
+                @click="handleTabDate(dd)"
               >
                 <view>{{dd.month}}</view>
                 <view>{{dd.week}}</view>
@@ -133,7 +141,8 @@
             :color="warningColor"
           >{{popNoticeReplace}}</xd-notice-bar>
         </view>
-
+        <!--排期日期列表-->
+        <!--排期列表-->
         <view v-if="loadingList" class="schedule_list skeleton-wrap">
           <view class="_item" v-for="ii in 5" :key="ii">
             <view class="flex-sub">
@@ -175,6 +184,7 @@
           </view>
           <view v-else class="empty_data">暂无排期</view>
         </template>
+        <!--排期列表-->
       </view>
     </view>
   </view>
@@ -234,12 +244,8 @@
         scheduleTabList: [],
         scheduleList: [],
         curTab: 0,
-        toView: null,
-        list: [
-          // {"film_id":581,"show_name_en":"聚福宝-万里归途1","remark":"9.6","show_name":"聚福宝-万里归途1","poster":"https:\/\/p0.pipi.cn\/mmdb\/25bfd6ddb53c7e5015d23c5bc24d876c03d41.jpg?imageMogr2\/thumbnail\/1246x1246%3E","type":"剧情|战争","open_time":1664532000,"show_version_list":"IMAX 2D","language":"汉语普通话","leading_role":"张译 王俊凯 殷桃 成泰燊 张子贤 陈昊宇 王迅 万茜","director":"饶晓志"},
-          // {"film_id":582,"show_name_en":"聚福宝-万里归途2","remark":"9.6","show_name":"聚福宝-万里归途2","poster":"https:\/\/p0.pipi.cn\/mmdb\/25bfd6ddb53c7e5015d23c5bc24d876c03d41.jpg?imageMogr2\/thumbnail\/1246x1246%3E","type":"剧情|战争","open_time":1664532000,"show_version_list":"IMAX 2D","language":"汉语普通话","leading_role":"张译 王俊凯 殷桃 成泰燊 张子贤 陈昊宇 王迅 万茜","director":"饶晓志"},
-          // {"film_id":583,"show_name_en":"聚福宝-万里归途2","remark":"9.6","show_name":"聚福宝-万里归途3","poster":"https:\/\/p0.pipi.cn\/mmdb\/25bfd6ddb53c7e5015d23c5bc24d876c03d41.jpg?imageMogr2\/thumbnail\/1246x1246%3E","type":"剧情|战争","open_time":1664532000,"show_version_list":"IMAX 2D","language":"汉语普通话","leading_role":"张译 王俊凯 殷桃 成泰燊 张子贤 陈昊宇 王迅 万茜","director":"饶晓志"}
-        ],
+        toView: null,//无功能
+        list: [],
         loading: true,
         timer: null,
         cinema_id: "",
@@ -266,11 +272,7 @@
         return this.filmInfo['film_id']
       },
       play_list(){
-        if(!this.scheduleList.length) return [];
-        return this.$xdUniHelper.cloneDeep(this.scheduleList)[this.curTab].map(item => {
-          // item['sale_price'] = this.$xdUniHelper.divisionFloatNumber(item['sale_price'], 100);
-          return item;
-        })
+        return this.scheduleList;
       },
       filmInfo(){
         if(!this.filmList.length) return {};
@@ -307,9 +309,8 @@
       },
     },
     created() {
-      // console.log("layoutInfo.", this.layoutInfo, this.siteMap)
       this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
-      this.is_vip = this.getTokenForKey('user_level')&&this.getTokenForKey('user_level')==='VIP'
+      this.is_vip = this['getTokenForKey']('user_level') && this['getTokenForKey']('user_level')==='VIP'
       this.init(this.container);
       this.noticeBackgroundColor = Color(this.warningColor).alpha(0.2).toString();
     },
@@ -317,15 +318,16 @@
       async onJfbLoad(options) {
         const { cinema_id, film_id } = options;
         this.cinema_id = cinema_id;
-        await this.p_getCinemaInfo();
+        await this.getCinemaInfo();
 
         //根据options.film_id选中当前的影片
         if(film_id){
-          let curIndex = this.list.findIndex(item => item.film_id==film_id);
-          this.curFilmIndex = curIndex == -1 ? 0 : curIndex;
+          let curIndex = this.list.findIndex(item => item.film_id === Number(film_id));
+          this.curFilmIndex = curIndex === -1 ? 0 : curIndex;
         }
+
         this.loading = false;
-        this.p_getCinemaSchedule();
+        this.getCinemaScheduleData();
       },
       /**
        * @description 监听事件变化
@@ -346,13 +348,12 @@
       toMapNav(){
         const { latitude, longitude, address,cinema_name } = this.cinemaInfo;
         console.warn(`toMapNav: ${JSON.stringify({latitude,longitude,address,cinema_name})}`);
-
         this.handleOpenLocation({
           latitude: latitude,
           longitude: longitude,
           name: cinema_name || address,
           address: address
-        })
+        },()=>{})
       },
       toChooseSeat(scheduleId){
         this.$xdUniHelper.navigateTo({
@@ -362,23 +363,38 @@
       touchStart(index){
         this.$refs.zSwiper.swiper.slideTo(index, 300, false);
       },
+      /**
+       * @description 切换排期日期菜单
+       */
+      handleTabDate(item){
+        if(item.index === this.curTab) return;
+        this.getCinemaScheduleData(item.value,item.index);
+      },
+      // #ifdef H5
       onChange(swiper){
-        console.log("onChange", swiper.activeIndex)
         this.curFilmIndex = swiper.activeIndex;
-        this.p_getCinemaSchedule();
+        this.getCinemaScheduleData();
       },
+      //#endif
+
+      // #ifdef MP-WEIXIN
       handleChange(e){
         this.curFilmIndex = e.detail.current;
-        this.p_getCinemaSchedule();
+        this.getCinemaScheduleData();
       },
-      p_getCinemaSchedule(){
-        console.log(this.$configProject.isPreview, '1111')
+      //#endif
+
+      /**
+       * @description 获取影片排期
+       * @param search_date {string} now=>为首次加载排期接口（此时获取排期时间列表） !now=>值获取影片排期
+       * @param tabIndex {number} 选择排期索引值
+       * @return {boolean}
+       */
+      getCinemaScheduleData(search_date='now',tabIndex = 0){
         const { film_id,cinema_id, un_show_seconds,is_show_overtime_schedule } = this;
-        console.log(this.$configProject.isPreview, film_id, '1111')
         if(!this.$configProject.isPreview){
           if(!film_id) return false;
         }
-        console.log(this.$configProject.isPreview)
         this.$xdShowLoading({});
         jfbRootExec("getCinemaSchedule", {
           vm: this,
@@ -386,32 +402,55 @@
             film_id,
             cinema_id,
             un_show_seconds,
-            is_show_overtime_schedule
+            is_show_overtime_schedule,
+            search_date: search_date
           }
         }).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];
-            let month = date_name.match(/\d+月\d+日/)[0];
-            return {
-              label: item.date_name,
-              name: item.date_name,
-              value: index,
-              week, month
+
+          //首次生产排期日期
+          if(search_date === 'now') {
+            this.toView = '';
+            this.scheduleTabList = res['schedule_date_list'].map((item, index) => {
+              let date_name = item.label;
+              let week = date_name.match(/星期./)[0];
+              let month = date_name.match(/\d+月\d+日/)[0];
+              return {
+                label: item.label,
+                name: item.label,
+                value: item.value,
+                index,
+                week,
+                month,
+                key: this.$xdUniHelper.randomChar(20)
+              }
+            });
+            if(this.scheduleTabList.length > 0) {
+              setTimeout(()=>{
+                this.toView = `toView-${tabIndex}`
+              },50)
             }
-          });
-          this.scheduleList = res.schedule_data.map(item => item.paiqi)
-          this.curTab = 0;
+          }
+          //设置数据
+          if(res.schedule_data.length > 0) this.scheduleList = res.schedule_data[0].paiqi;
+          else this.scheduleList = [];
+          this.curTab = tabIndex;
+
         }).catch(err => {
           this.$xdHideLoading();
           this.scheduleTabList = [];
           this.scheduleList = [];
+          this.curTab = tabIndex;
         })
       },
-      p_getCinemaInfo(){
+
+      /**
+       * @description 获取影片列表信息
+       * @return {Promise<unknown>}
+       */
+      getCinemaInfo(){
         return new Promise((resolve, reject) => {
           jfbRootExec("getCinemaFilm", {
             vm: this,