jufubao-movie 1.0.61-beta2 → 1.0.63-beta2

package/package.json

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

package/src/components/JfbMovieLineSchedule/Api.js

@@ -34,4 +34,19 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: 'getScheduleNewsContent', //自定义方法名字（必选）
+    title: '获取内容',
+    path: '/cms/v1/news-content',
+    isRule: false,
+    params: {
+      scene: ['使用场景', 'String', '选填'],
+      container_id: ['插件ID', 'String', '必填'],
+      page_id: ['页面ID', 'String', '必填'],
+      page_size: ['记录条数', 'Number', '必填', 1],
+      code: ['业务线id', 'String', '选填'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
 ];

package/src/components/JfbMovieLineSchedule/Attr.js

@@ -29,6 +29,18 @@ export default {
           {label: '禁用', value: 'N'},
         ]
       },
+      {
+        label: '温馨提示内容:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'warmNotice',
+        value: data.warmNotice || '温馨提示：电影开场前{超时时间}分钟停止售票',
+        placeholder: '请输入温馨提示内容',
+        className: 'input80',
+        groupKey:'content',
+        inline: false,
+        notice: '注：{超时时间}取设置的超时时间并转为分钟提示且必须按格式设置，否则将无法提示时间',
+      },
       {
         label: '排期超时时间(秒):',
         ele: 'el-input',
@@ -42,6 +54,21 @@ export default {
         inline: true,
         notice:'排期超时时间'
       },
+      {
+        label: '是否显示已超时排期:',
+        ele: 'xd-radio',
+        valueKey: 'is_show_overtime_schedule',
+        value: data['is_show_overtime_schedule'] || 'N',
+        placeholder: '请选择是否显示已超时排期',
+        multiple: false,
+        className: 'input80',
+        groupKey:'content',
+        labelInline:true,
+        list: [
+          {label: '显示', value: 'Y'},
+          {label: '隐藏', value: 'N'},
+        ]
+      },
       {
         label: '选择座位路径:',
         ele: 'xd-select-pages-path',

package/src/components/JfbMovieLineSchedule/JfbMovieLineSchedule.vue

@@ -34,10 +34,12 @@
         </view>
       </view>
       <view v-if="loadingFilm" class="ticket_notice skeleton-wrap"></view>
-      <view v-else-if="cinemaInfo.ticket_notice" class="ticket_notice" :style="{
+      <view v-else-if="notice" class="ticket_notice" :style="{
           background: noticeBgColor,
           color: mainColor,
-        }">{{cinemaInfo.ticket_notice}}</view>
+        }">
+        <div>{{notice}}</div>
+      </view>
       <view v-if="loadingFilm" class="film_data_wrap skeleton-wrap">
         <view class="film_list_swiper">
           <view class="film_list_item" v-for="i in 3" :key="i"></view>
@@ -162,17 +164,13 @@
               </view>
               <view v-if="is_not_show_price !== 'Y'" style="flex: 2;" class="flex-sub">
                 <view class="_main" style="color: red;">
-                  <!-- <xd-unit class="xd-unit"
-                    :price="item.sale_price"
-                    :isOld="false"
-                    :isShowIcon="false"
-                    :font-size="24"/> -->
-                  <!-- {{item.sale_price}} -->
-                   <CusPrice :isPlus="is_plus_site" :showPrice="item.show_prices" range="起" type="schedule"></CusPrice>
+                   <CusPrice v-if="item.is_expired==='N'" :isPlus="is_plus_site" :showPrice="item.show_prices" range="起" type="schedule"></CusPrice>
+                   <CusPrice v-else :isPlus="is_plus_site" salePriceColor="#000" :showPrice="item.show_prices" range="起" type="schedule"></CusPrice>
                 </view>
                 <!-- <view class="_sub"> <xd-coins class="xd-coins" :size="0.2"></xd-coins> 起</view> -->
               </view>
-              <xd-button type="primary" size="small" @click="toChooseSeat(item.schedule_id)">购买</xd-button>
+              <xd-button v-if="item.is_expired==='N'" type="primary" size="small" @click="toChooseSeat(item.schedule_id)">购买</xd-button>
+              <xd-button v-else type="info" color="#000" size="small" disabled>停售</xd-button>
             </view>
           </view>
           <view v-else class="empty_data">暂无排期</view>
@@ -187,6 +185,7 @@
   import XdButton from "@/components/XdButton/XdButton"
   import XdCoins from "@/components/XdCoins/XdCoins"
   import XdNoticeBar from "@/components/XdNoticeBar/XdNoticeBar"
+  import XdContentXss from '@/components/XdContentXss/XdContentXss';
   import XdUnit from "@/components/XdUnit/XdUnit"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbMovieLineScheduleMixin from "./JfbMovieLineScheduleMixin";
@@ -199,6 +198,7 @@
   import ZSwiper from "@zebra-ui/swiper/components/z-swiper/z-swiper.vue"
   import ZSwiperItem from "@zebra-ui/swiper/components/z-swiper-item/z-swiper-item.vue"
   //#endif
+  
 
   const Color = require('color');
   import { mapState } from "vuex"
@@ -211,6 +211,7 @@
       XdButton,
       XdCoins,
       XdNoticeBar,
+      XdContentXss,
       XdUnit,
       CusPrice,
       //#ifdef H5
@@ -251,7 +252,8 @@
         isMapNav:'Y',
         is_plus_site: false,
         is_vip: false,
-
+        is_show_overtime_schedule: 'N',
+        warmNotice: ''
       }
     },
     computed: {
@@ -290,6 +292,12 @@
       popNoticeReplace(){
         let { customer_phone = "" } = this.siteMap;
         return this.pop_notice.replace(/@tel@/g, customer_phone);
+      },
+      notice(){
+        let notice = ''
+        let minutes = Math.ceil(this.un_show_seconds / 60);
+        notice = this.warmNotice.replace(/\{超时时间\}/g, minutes)
+        return notice
       }
     },
     watch: {
@@ -327,6 +335,8 @@
         this.seatChoosePath = getContainerPropsValue(container, 'content.seat_choose_path').value;
         this.un_show_seconds = getContainerPropsValue(container, 'content.un_show_seconds', 15*60)
         this.isMapNav = getContainerPropsValue(container, 'content.isMapNav', 'Y');
+        this.is_show_overtime_schedule = getContainerPropsValue(container, 'content.is_show_overtime_schedule', 'Y');
+        this.warmNotice = getContainerPropsValue(container, 'content.warmNotice', '');
       },
       makePhoneCall(){
         uni.makePhoneCall({
@@ -363,7 +373,7 @@
       },
       p_getCinemaSchedule(){
         console.log(this.$configProject.isPreview, '1111')
-        const { film_id,cinema_id, un_show_seconds } = this;
+        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;
@@ -375,7 +385,8 @@
           data: {
             film_id,
             cinema_id,
-            un_show_seconds
+            un_show_seconds,
+            is_show_overtime_schedule
           }
         }).then(res => {
           this.loadingList = false;