jufubao-movie 1.0.39-beta4 → 1.0.39-beta5

package/package.json

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

package/src/components/JfbMovieLineLineSeat/JfbMovieLineLineSeat.vue

@@ -79,6 +79,7 @@
     mixins: [componentsMixins,extsMixins,JfbMovieLineLineSeatMixin],
     data() {
       return {
+        hideMask: true,
         scheduleId: '',
         filmId: '',
         cinemaId: '',

package/src/components/JfbMovieLineLineSeat/Mock.js

@@ -3055,6 +3055,7 @@ module.exports = {
     film_id: "200",
     cinema_id: "7",
     cinema_name: "聚福宝测试影院聚福宝测试影院聚福宝测试影院聚福宝测试影院",
+    "cinema_address":"燕高路西侧实验小学南侧",
     film_name: "碧血锦衣卫",
     show_date: "2024-04-08(周一) 14:20",
     show_version: "英语 2D",

package/src/components/JfbMovieLineLineSeat/XdOnlineSeatMove.vue

@@ -1191,7 +1191,12 @@
 
 </script>
 <style lang="less">
-
+  .preloadIcon {
+    position: fixed;
+    top: -9999px;
+    left: -9999px;
+    z-index: 0;
+  }
   .xd-online-seat {
     height: 100%;
     box-sizing: border-box;

package/src/components/JfbMovieTfkFilmList/ContentItem.vue

@@ -4,7 +4,8 @@
       class="image"
       :style="{marginRight: outSpacing + 'rpx',borderRadius:borderRadius+'rpx'}"
     >
-      <image :src="item['poster']" :alt="item['show_name']" @error="handleError(item)"></image>
+      <image v-if="errorStatus" :src="errorImage" :alt="item['show_name']" ></image>
+      <image v-if="!errorStatus" :src="item['poster']" :alt="item['show_name']" @error="handleError()" ></image>
     </view>
     <view class="middle">
       <view class="name">{{item['show_name']}}</view>
@@ -80,12 +81,18 @@
       }
 
     },
+    data(){
+      return {
+        errorImage: 'https://img.jufubao.cn/common/error_movie.png?v20',
+        errorStatus: false,
+      }
+    },
     created() {
 
     },
     methods:{
-      handleError(item){
-        item['poster'] = 'https://img.jufubao.cn/common/error_movie.png?v20'
+      handleError(){
+        this.errorStatus = true;
       },
       handleDetail(item){
         console.log('handleDetail.item',item,item.id);

package/src/components/JfbMovieTfkFilmList/JfbMovieTfkFilmList.vue

@@ -716,8 +716,6 @@
           }
         }
 
-
-
         jfbRootExec(fName, {
           vm: this,
           data:params
@@ -727,9 +725,12 @@
 
           //影片列表处理
           if(this.type === 'rightnow' || this.type==='hot'){
-            //this.dataList = (this.dataList||[]).concat(res['list']);
-            this.virtualList.pushVirtualData(res['list']);
-            this.pageToken = res.next_page_token;
+            //预览模式
+            if(this.isPreview) this.dataList = (this.dataList||[]).concat(res['list']);
+            else {
+              this.virtualList.pushVirtualData(res['list']);
+              this.pageToken = res.next_page_token;
+            }
             return;
           }
 
@@ -739,7 +740,6 @@
             this.cinemaOrgDataList = res['list'];
             this.cinemaAreaList = [{area_code:'all', area_name:'全城'}].concat(res['area_list']);
 
-
             //小于数量页面显示记录
             if(res['list'].length <= this.pageSize) {
               this.dataList = res['list'];
@@ -748,8 +748,14 @@
               return
             }
 
-            //正常处理
-            this.getCinemaOrgData();
+            if(this.isPreview) {
+              this.dataList = (this.dataList||[]).concat(res['list'].slice(0, 20));
+            }
+            else {
+              //正常处理
+              this.getCinemaOrgData();
+            }
+
           }
 
         }).catch(e=>{
@@ -870,6 +876,7 @@
       },
 
       onJfbScroll(options){
+        if(!this.pageToken || this.dataList === null) return false;
         if(this.type === 'hot' || this.type === 'rightnow'){
           this.virtualList.onScrollEvent(options.e.scrollTop);
         }
@@ -895,7 +902,7 @@
       },
 
       onJfbReachBottom(options) {
-        if(!this.pageToken) return false;
+        if(!this.pageToken || this.dataList === null) return false;
         this.getList();
       },
 

package/src/components/JfbMovieTfkFilmRecommend/Attr.js

@@ -261,21 +261,49 @@ export default {
         groupKey:'style',
       },
       {
-        label: '数量文字颜色:',
+        label: '总数量文字颜色:',
         ele: 'xd-color',
         valueKey: 'totalColor',
         value: data['totalColor'] || '',
         groupKey:'style',
-        placeholder: '请输入背景颜色',
+        placeholder: '请输入总数量文字颜色',
+        classNmae: 'input60',
+      },
+
+
+      {
+        ele: 'title',
+        label: '标题显示样式：<span style="color:red">“下划线样式”</span> 设置',
+        size: 'small',
+        groupKey:'style',
+      },
+      {
+        label: '标题文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'titleLineTextColor',
+        value: data['titleLineTextColor'] || '',
+        groupKey:'style',
+        placeholder: '请输入标题文字颜色',
+        classNmae: 'input60',
+      },
+      {
+        label: '标题选中文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'titleLineActTextColor',
+        value: data['titleLineActTextColor'] || '',
+        groupKey:'style',
+        placeholder: '请输入选中文字颜色',
         classNmae: 'input60',
       },
 
       {
         ele: 'title',
-        label: '标题切换标签设置<span style="color:red">按钮样式</span>生效',
+        label: '标题显示样式：<span style="color:red">“按钮样式”</span> 设置',
         size: 'small',
         groupKey:'style',
       },
+
+
       {
         label: '标题背景颜色:',
         ele: 'xd-color',

package/src/components/JfbMovieTfkFilmRecommend/JfbMovieTfkFilmRecommend.vue

@@ -20,7 +20,8 @@
         v-if="showTypeListData.length > 0"
         :style="{
           padding: outSpacing + 'rpx',
-          backgroundImage:bgImageComp
+          backgroundImage:bgImageComp,
+          backgroundColor: bgColor
         }">
         <view
           class="tfk-recommend__tab"
@@ -43,6 +44,7 @@
               :class="{active: type === item.value}"
               v-for="(item,index) in showTypeListData"
               :key="index"
+              :style="{color: (type === item.value? titleLineActTextColor: titleLineTextColor)}"
             >{{item.label}}<text v-if="type === item.value" :style="{backgroundColor:mainColor}"></text></view>
           </view>
           <view
@@ -58,7 +60,8 @@
               :style="{
                 backgroundColor: type === item.value? titleTextActBgColor: titleTextBgColor,
                 color: type === item.value ? titleTextActColor: titleTextColor,
-                borderRadius:titleTextRradius+'rpx'
+                borderRadius:titleTextRradius+'rpx',
+                marginRight:outSpacing + 'rpx',
               }"
             >{{item.label}}</view>
           </view>
@@ -88,7 +91,7 @@
             backgroundColor:contBgColor,
             borderRadius: contRradius + 'rpx',
             border:contBorder,
-            boxShadow:contShadow,
+            boxShadow:contShadow
           }"
         >
           <view class="skeleton-wrap" v-if="dataList === null">
@@ -179,6 +182,7 @@
     ],
     data() {
       return {
+        hideMask: true,
         options: {},
         type:'', //hot rightnow
         typeList:{hot:{label: '热映影片', value: 'hot'},rightnow:{label: '即将上映', value: 'rightnow'}},
@@ -192,6 +196,7 @@
         showTypeListData:[],
 
         //基础配置
+        bgColor:'',
         outSpacing:'',
         showMoreBtn: 'Y',
         showTotal:'Y',
@@ -223,6 +228,10 @@
         moreRradius: '40',
         totalColor: '#999',
 
+        //line
+        titleLineTextColor:'',
+        titleLineActTextColor:'',
+
         //内容
         contMargin: {},
         contBgColor:'#fff',
@@ -388,6 +397,7 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        this.bgColor = getContainerPropsValue(container, 'content.bgColor', '');
         this.outSpacing =  getContainerPropsValue(container, 'content.outSpacing', '20');
         this.titleMargin = getContainerPropsValue(container, 'content.titleMargin', {});
         this.titleBgColor = getContainerPropsValue(container, 'content.titleBgColor', '#fff');
@@ -409,6 +419,10 @@
         this.showHotName = getContainerPropsValue(container, 'content.showHotName', '');
         this.showRightnowName = getContainerPropsValue(container, 'content.showRightnowName', '');
 
+        //line
+        this.titleLineTextColor = getContainerPropsValue(container, 'content.titleLineTextColor', '#333');
+        this.titleLineActTextColor= getContainerPropsValue(container, 'content.titleLineActTextColor', '#333');
+
         this.isTitleBorder = getContainerPropsValue(container, 'content.isTitleBorder', 'N');
         this.isTitleBorderColor =  getContainerPropsValue(container, 'content.isTitleBorderColor', '#eee');
         this.isTitleShadow =  getContainerPropsValue(container, 'content.isTitleShadow', 'N');
@@ -493,6 +507,10 @@
             }
             &.button > view {
               padding: 0 30rpx;
+              &:last-child {
+                margin-right: 0!important;
+              }
+
             }
 
             & > view {