jufubao-movie 1.0.39-beta14 → 1.0.39-beta16

package/package.json

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

package/src/components/JfbMovieLineLineSeat/JfbMovieLineLineSeat.vue

@@ -56,6 +56,7 @@
         :is_not_show_price="is_not_show_price"
         @onGetFilm="handleGetFilm"
         @onGetSeatList="handleGetSeatList"
+        @onGetFilmPaiqi="handleGetFilmPaiqi"
         @onBuy="handleBuy"></xd-online-seat>
     </view>
   </view>
@@ -125,6 +126,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 +165,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 +176,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 +200,7 @@
           this.$xdHideLoading()
         })
       },
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -171,8 +212,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([
@@ -195,7 +240,6 @@
             return item;
           });
           this.paiQiData = paiqi_data;
-          // const {cinema_data, film_data} = res1;
           resolve({
             paiqi_data: paiqi_data,
             film_data: [{
@@ -225,6 +269,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 +282,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 +340,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 +407,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()
         })
       },
@@ -319,16 +437,18 @@
         this.$xdUniHelper.navigateBack();
       },
       onJfbShow(options) {
-        console.log('onJfbShow', options)
         this.onJfbLoad(options);
         this.cinemaSeatKey = Date.now()
       },
+
       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

@@ -257,6 +257,7 @@ export default {
       mainColorToArray: null,
       paiqiStatus: false, //影院信息与排期信息状态
       cinemaInfo: null, //影院信息
+      paiqiData:null, //排期数据
       filmInfo: null, //电影信息
       height: null, //内容区域高度
       show: false, //是否显示返回
@@ -454,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 {
@@ -467,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;
@@ -559,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) {
@@ -585,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({