jufubao-movie 1.0.39-beta9 → 1.0.40

package/package.json

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

package/src/components/JfbMovieLineCinemaChoose/Api.js

@@ -12,7 +12,7 @@
  */
 module.exports = [
   {
-    mapFnName: 'getCinemaList', //自定义方法名字（必选）
+    mapFnName: 'getCinemaChooseList', //自定义方法名字（必选）
     title: '获取影院列表',
     path: '/movie/v1/cinema/list',
     isRule: false,
@@ -25,7 +25,7 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: 'getFilmInfo',
+    mapFnName: 'getFilmChooseInfo',
     title: '获取影片详情',
     path: '/movie/v1/film/get',
     isRule: false,
@@ -37,7 +37,7 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: "getCitySub",
+    mapFnName: "getCityChooseSub",
     title: "获取城市的区位列表",
     path: "/common/v1/region/city/getsub-lv",
     isRule: false,

package/src/components/JfbMovieLineCinemaChoose/JfbMovieLineCinemaChoose.vue

@@ -13,22 +13,20 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-movie-line-cinema-choose__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-movie-line-cinema-choose__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-movie-line-cinema-choose__body">
       <view class="film_base_wrap-top"></view>
       <view class="film_base_wrap">
-        <view class="film_info">
+        <view class="film_info" v-if="film.show_name">
           <view class="film_post">
             <image :src="film.poster" />
           </view>
           <view class="film_other">
             <view class="film_name_score">
               <view class="film_name">{{ film.show_name }}</view>
-              <view class="film_score">{{ film.remark }}</view>
+              <view class="film_score" v-if="film.remark">{{ film.remark }}</view>
             </view>
             <view class="film_type">{{ film.type }}</view>
             <view class="film_sub">导演：{{ film.director }}</view>
@@ -206,7 +204,7 @@ export default {
       const { film_id } = options;
       this.film_id = film_id;
       const { stateCity } = this;
-      jfbRootExec("getFilmInfo", {
+      jfbRootExec("getFilmChooseInfo", {
         vm: this,
         data: {
           film_id,
@@ -246,7 +244,7 @@ export default {
       });
     },
     handleGetCitySub(city_code) {
-      jfbRootExec("getCitySub", {
+      jfbRootExec("getCityChooseSub", {
         vm: this,
         data: {
           city_code,
@@ -260,7 +258,7 @@ export default {
       // let region = citySubs[subIndex] || {};
       console.log(stateCity, stateLocation, "p_getCinemaList");
       this.$xdShowLoading({});
-      jfbRootExec("getCinemaList", {
+      jfbRootExec("getCinemaChooseList", {
         vm: this,
         data: {
           city_code: stateCity.city_code,
@@ -356,14 +354,20 @@ view {
           .film_name_score {
             display: flex;
             justify-content: space-between;
-            align-items: center;
+            align-items: flex-start;
             font-size: 36rpx;
             font-weight: 700;
             .film_name {
               color: #000;
+              flex: 1;
+              line-height: 46rpx;
             }
             .film_score {
               color: #ff5733;
+              flex-shrink: 0;
+              margin-left: 6rpx;
+              font-size: 32rpx;
+              line-height: 46rpx;
             }
           }
           .film_type {

package/src/components/JfbMovieLineCinemaChoose/Mock.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-  getFilmInfo: {
+  getFilmChooseInfo: {
     "id": 155,
     "city_code": "",
     "show_name_en": "我的遗憾和你有关",
@@ -27,7 +27,7 @@ module.exports = {
     "deleted_time": 0,
     "request_id": "9aefdeb726bc8644"
   },
-  getCinemaList: {
+  getCinemaChooseList: {
     list: [
       {
         cinema_id: 6780394,

package/src/components/JfbMovieLineFilm/JfbMovieLineFilm.vue

@@ -43,7 +43,6 @@
           }"
         >即将上映</view>
       </view>
-
       <view v-if="loadingList" class="switch_section skeleton-wrap">
         <view class="film_item" v-for="i in 6" :key="i">
           <view class="film_post"></view>
@@ -134,8 +133,6 @@
           </view>
         </view>
       </template>
-
-
     </view>
   </view>
 </template>
@@ -211,6 +208,22 @@
       }
     },
     created() {
+      let mapType = {
+        hot:0,
+        rightnow: 1,
+      }
+      let tab_id = '';
+      // #ifdef H5
+      tab_id = this.$xdUniHelper.getParmater('tab_id') ? this.$xdUniHelper.getParmater('tab_id'):'';
+      // #endif
+      // #ifdef MP-WEIXIN
+      let pages = this.$xdUniHelper.parseURL(this.$root.$scope.$page.fullPath);
+      tab_id  = (pages.params && pages.params['tab_id']) ? pages.params['tab_id'] :'';
+      // #endif
+      if(['hot', 'rightnow'].includes(tab_id)) {
+        this.activeIndex = mapType[tab_id];
+      }
+
       this.init(this.container);
       this.getList();
     },

package/src/components/JfbMovieLineFilmInfo/JfbMovieLineFilmInfo.vue

@@ -13,15 +13,13 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-movie-line-film-info__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-movie-line-film-info__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-movie-line-film-info__body">
       <view class="film_base_wrap-top"></view>
       <view class="film_base_wrap">
-        <view class="film_info">
+        <view class="film_info" v-if="film.poster">
           <view class="film_post">
             <image :src="film.poster"></image>
           </view>

package/src/components/JfbMovieLineFilmInfo/Mock.js

@@ -5,7 +5,7 @@ module.exports = {
     "id": 3671,
     "city_code": "",
     "show_name_en": "",
-    "remark": "",
+    "remark": "9.7分",
     "highlight": "",
     "country": "",
     "show_name": "八角笼中",

package/src/components/JfbMovieLineLineSeat/JfbMovieLineLineSeat.vue

@@ -44,10 +44,9 @@
         <view class="seat_btn"></view>
       </view>
       <xd-online-seat
-        v-if="filmId"
+        v-if="isReload && filmId"
         ref="xdOnlineSeat"
         :is-show-title="isShowTitle"
-        :key="cinemaSeatKey"
         :is-old="false"
         :film-id="filmId"
         :cinema-id="cinemaId"
@@ -56,6 +55,7 @@
         :is_not_show_price="is_not_show_price"
         @onGetFilm="handleGetFilm"
         @onGetSeatList="handleGetSeatList"
+        @onGetFilmPaiqi="handleGetFilmPaiqi"
         @onBuy="handleBuy"></xd-online-seat>
     </view>
   </view>
@@ -99,6 +99,8 @@
         time: 0,
         xItem: 10,
         yItem: 7,
+
+        isReload: true,//控制重新加载（onJfbShow）
       }
     },
     watch: {
@@ -125,6 +127,37 @@
         }
       },
 
+      /**
+       * @description 获取排期数据
+       * @param resolve
+       */
+      handleGetFilmPaiqi(resolve){
+        const {filmId, cinemaId} = this;
+        this.$xdShowLoading({});
+        jfbRootExec("getCinemaSchedule", {
+          vm: this,
+          data: {cinema_id: cinemaId, film_id: filmId}
+        }).then(res=>{
+          this.paiQiData = res.schedule_data.map(item => {
+            item['name'] = item['date_name'];
+            item['paiqi_data'] = item['paiqi'].map(pp => {
+              pp['price'] = pp['sale_price'];
+              pp['jfb_film_id'] = pp['film_id'];
+              pp['jfb_cinema_id'] = pp['cinema_id'];
+              pp['data_id'] = pp['schedule_id'];
+              return pp;
+            });
+            return item;
+          });
+          resolve(this.paiQiData);
+          this.$xdHideLoading();
+        })
+          .catch(err=>{
+            console.error(err);
+            this.$xdHideLoading();
+          })
+      },
+
       getSeatStatus(request_seat_id) {
         this.$xdShowLoading({});
         jfbRootExec("getCinemaSeatsStatus", {
@@ -133,6 +166,10 @@
             request_seat_id: request_seat_id
           }
         }).then(res => {
+          // res['seat_code'] = 'P0007';
+          // res['seat_message'] = '当前场次有误，请您重新选择影片';
+          // res['seat_status'] = 'N'
+
           if (res.seat_status === 'Y') {
             this.$xdHideLoading()
             clearTimeout(this.timer)
@@ -140,17 +177,21 @@
               url: this.moviePayPath + `?order_id=${res.temp_order_id}`
             },true);
             return
-          } else if (res.seat_status === 'N') {
+          }
+
+          //有错处理res.seat_status
+          else if (res.seat_status === 'N') {
             clearTimeout(this.timer)
             this.$xdHideLoading();
-            this.$xdAlert({
-              content: res.seat_message,
-              time: 2500,
-              isClose: false,
-              zIndex: 5000
-            })
-            return
-          }else{
+
+            if(res['seat_message']) res['error_msg'] = res['error_msg'] || res['seat_message'];
+            if(res['seat_code']) res['error_code'] = res['error_code'] || res['seat_code']
+
+            //检查是否报错
+            this.handleCheckStatusIsError(res);
+            return;
+          }
+          else{
             this.timer = setTimeout(() => {
               this.getSeatStatus(request_seat_id);
             }, ++this.time > 5 ? (Math.pow(2, (this.time - 4)) * 1000) : 3000)
@@ -160,6 +201,7 @@
           this.$xdHideLoading()
         })
       },
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -171,8 +213,12 @@
         if(this.isShowTitle === 'Y') this.yItem = 7;
         else this.yItem = 10;
       },
+
+      /**
+       * @description 获取排期与影片基础信息数据
+       * @param resolve
+       */
       handleGetFilm(resolve) {
-        // console.log('11111', paiqi.result);
         const {filmId, cinemaId} = this;
         this.$xdShowLoading({});
         Promise.all([
@@ -182,6 +228,15 @@
         ]).then(([res, res1]) => {
           this.loadingList = false;
           this.$xdHideLoading();
+
+          //错误异常
+          if(res1['error_code']) {
+            this.handleCheckStatusIsError(res1, ()=>{
+              this.handleGetFilm(resolve)
+            });
+            return
+          }
+
           this.is_not_show_price = res.is_not_show_price;
           let paiqi_data = res.schedule_data.map(item => {
             item['name'] = item['date_name'];
@@ -195,7 +250,6 @@
             return item;
           });
           this.paiQiData = paiqi_data;
-          // const {cinema_data, film_data} = res1;
           resolve({
             paiqi_data: paiqi_data,
             film_data: [{
@@ -225,6 +279,10 @@
             request_ident: this.request_ident
           }
         }).then(res => {
+          // res['error_code'] = 'P0002';
+          // res['error_msg'] = '当前场次有更新 <br/> 请您手动切换或由系统自动切换到下一场次。';
+          // res['status'] = 'E'
+
           if(res.status === "P"){
             if(!this.$root.$isShow) return;
             this.request_ident = res.request_ident;
@@ -234,32 +292,36 @@
             },  ++this.seatTime > 5 ? (Math.pow(2, (this.seatTime - 4)) * 1000) : 2000)
             return;
           }
+
           if(res.status === "E"){
-            uni.showToast({
-              title: res.error_message,
-              icon: "none"
-            })
+            this.handleCheckStatusIsError(res, ()=>{
+              resolve(null);
+            });
             this.$xdHideLoading();
             return;
           }
+
           let seatData = Object.assign({}, res, {
             seat: res.seat_data.map(item => {
               return item.seat_columns;
             })
-          })
+          });
+
           resolve(seatData);
           this.$xdHideLoading();
         })
       },
+
       //去支付未完成订单
       handleToPay(res){
         const { temp_order_id, oms_order_id, pay_order_id } = res;
         this.$xdConfirm({
           styles: this.styles,
           width: '90%',
-          content: '有未完成的订单',
-          confirmText: '去支付',
-          cancelText: '继续选座',
+          content: '您当前有一笔未付款订单，<br/>请先处理！',
+          confirmText: '立即付款',
+          isHtml: true,
+          cancelText: '取消订单',
           showClose: false,
           success: (res) => {
             if (res.confirm) {
@@ -288,6 +350,60 @@
         })
       },
 
+      handleCheckStatusIsError({error_msg,error_message,error_code}, cb=null){
+        let msg = error_message || error_msg;
+        if(!msg) return false;
+
+        //是否切换场次
+        if(error_code === 'P0002') {
+          this.$xdConfirm({
+            content: msg,
+            zIndex: 5000,
+            isHtml: true,
+            isTitle:false,
+            cancelText:'手动切换',
+            confirmText:'自动切换',
+            msgIcon:'iconinformation',
+            success:(res)=>{
+              if(res.confirm) {
+                if(typeof cb === 'function') cb();
+              }
+            }
+          })
+          return true
+        }
+
+        //当前场次有误，请您重新选择影片
+        if(error_code === 'P0007') {
+          this.$xdConfirm({
+            content: msg,
+            zIndex: 5000,
+            cancel:false,
+            isHtml: true,
+            isTitle:false,
+            confirmText:'返回首页',
+            msgIcon:'iconinformation',
+            success:(res)=>{
+              if(res.confirm) {
+                this.$xdUniHelper.redirectTo({
+                  url: this.$settings.index
+                })
+              }
+            }
+          })
+          return  true
+        }
+
+        this.$xdAlert({
+          content: msg,
+          type: 'error',
+          time: 3000,
+          zIndex: 5000
+        })
+        this.$xdHideLoading({})
+        return true;
+      },
+
       handleBuy(item) {
         let postData = {
           schedule_id: this.scheduleId,
@@ -301,16 +417,28 @@
           vm: this,
           data: postData
         }).then(res => {
-          console.log("锁座成功", res);
+          //检查是否有错误信息并且弹层
+          if(this.handleCheckStatusIsError(res)){
+            this.$xdHideLoading()
+            return;
+          }
+
+          //未获取到锁座ID
+          if(!res.request_seat_id) {
+            this.$xdHideLoading();
+            this.$xdAlert({
+              content: '未获取到锁座ID',
+              type: 'error',
+              time: 3000
+            })
+            return;
+          }
+
           this.timer = setTimeout(() => {
             this.getSeatStatus(res.request_seat_id);
           }, 2000)
         }).catch(error=>{
           console.error(error);
-          uni.showToast({
-            title: '锁座失败！',
-            icon: "none"
-          })
           this.$xdHideLoading()
         })
       },
@@ -318,17 +446,23 @@
       onJfbBack(options){
         this.$xdUniHelper.navigateBack();
       },
+
       onJfbShow(options) {
-        console.log('onJfbShow', options)
-        this.onJfbLoad(options);
-        this.cinemaSeatKey = Date.now()
+        this.isReload = false;
+        setTimeout(()=>{
+          this.isReload = true;
+          this.onJfbLoad(options);
+        },100)
       },
+
       onJfbUnload(){
         this.unmount();
       },
+
       onJfbHide(){
         this.unmount();
       },
+
       unmount(){
         if(this.seatTimer) clearTimeout(this.seatTimer);
         if(this.timer) clearTimeout(this.timer);

package/src/components/JfbMovieLineLineSeat/XdOnlineSeat.vue

@@ -37,6 +37,7 @@
           >{{ item }}</view>
         </xd-notice-bar>
       </view>
+      <view class="xd-seat__footer-name">{{filmInfo.film_name}}</view>
       <view class="xd-seat__footer-paiqi">
         <view class="xd-seat__footer-paiqi-tab">
           <view>
@@ -256,6 +257,7 @@ export default {
       mainColorToArray: null,
       paiqiStatus: false, //影院信息与排期信息状态
       cinemaInfo: null, //影院信息
+      paiqiData:null, //排期数据
       filmInfo: null, //电影信息
       height: null, //内容区域高度
       show: false, //是否显示返回
@@ -453,6 +455,21 @@ export default {
      */
     getSeat(item) {
       this.$emit("onGetSeatList", item, (seat) => {
+
+        //排期有更新自动选中下一场
+        if(seat === null) {
+          this.$emit('onGetFilmPaiqi',(paiqiData)=>{
+            let list = [];
+            paiqiData.map(item => {
+              list.push(item["paiqi_data"]);
+            });
+            this.replaceParams(this.getFirst(list));
+          });
+          return;
+        }
+
+        //正常数据
+        this.selectedSeatInfo = seat;
         this.selectedSeatList = seat["seat"];
         this.areaPrices = (seat['area_price'] || []).map(item=>{
           return {
@@ -466,13 +483,13 @@ export default {
     },
 
     /**
-     * @description 获取排期数据
+     * @description 获取排期与影院信息数据
      */
     getFilm() {
       this.$emit("onGetFilm", (film) => {
         this.cinemaInfo = film["cinema_data"];
+        this.paiqiData = film["paiqi_data"];
         this.filmInfo = this.getFilmInfo(film["film_data"]);
-        debugger
         this.getScheduleList(film["paiqi_data"]);
         console.log("getFilm", film);
         this.paiqiStatus = true;
@@ -558,9 +575,13 @@ export default {
         console.warn(`params.seatId:${this.seatId}`);
         console.warn(`all.seatId:${JSON.stringify(allPaiqiId)}`);
         this.$xdConfirm({
-          content:'当前排期已过期，请您手动切换或由系统自动切换到下一排期。',
+          content:'当前场次有更新<br/>请您手动切换或由系统自动切换到下一场次。',
           confirmText:'自动切换',
           cancelText:'手动切换',
+          msgIcon:'iconinformation',
+          zIndex:5000,
+          isHtml: true,
+          isTitle:false,
           styles: this.$parent.$parent.$parent.styles,
           success:(status)=>{
             if(status.confirm) {
@@ -584,9 +605,16 @@ export default {
         this.scheduleListIndex
       );
     },
+
     replaceParams(selectPaiqi) {
-      let parseUrl = this.$xdUniHelper.parseURL();
-      let { params, path } = parseUrl;
+      let { params, path } = this.$xdUniHelper.parseURL();
+
+      //#ifdef H5
+      let pathArr = path.split("/");
+      pathArr.splice(0,2)
+      path = `/${pathArr.join('/')}`
+      //#endif
+
       params["scheduleId"] = selectPaiqi["data_id"];
       let searchParams = this.$xdUniHelper.jsonToParams(params);
       this.$xdUniHelper.redirectTo({
@@ -755,6 +783,15 @@ export default {
     z-index: 101;
     background: #fff;
 
+    &-name {
+      line-height: 40rpx;
+      font-size: 36rpx;
+      .uni-cut(1,40);
+      padding: 0 20rpx;
+      font-weight: 600;
+      color: #333;
+    }
+
     &-paiqi {
       &-content {
         height: unit(134, rpx);
@@ -925,6 +962,7 @@ export default {
 
         & .tab-show {
           font-size: @xd-font-size-base;
+          color:#999
         }
 
         & > view {