jufubao-movie 1.0.36-beta3 → 1.0.36-beta5

package/package.json

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

package/src/components/JfbMovieTfkFilmList/Api.js

@@ -38,14 +38,12 @@ module.exports = [
   {
     mapFnName: 'getTFKCinemaList',
     title: '获取即将上映影片列表',
-    path: '/movie/v1/film/list',
+    path: '/movie/v1/cinema/list',
     isRule: false,
     params: {
-      type: ['类型 hot rightnow', 'string', '必选'],
-      city_code: ['城市CODE', 'Number|string', '必选'],
-      page_size: ['page_size', 'Number|string', '必选', '20'],
-      page_token: ['page_token', 'Number|string', '必选'],
-      scene: ['应用场景', 'string', '可选', 'list'],
+      city_code: ['city_code', 'Number', '必选'],
+      latitude: ['latitude', 'Number', '必选'],
+      longitude: ['longitude', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,
@@ -64,4 +62,16 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+
+  {
+    mapFnName: 'getTFKSortList',
+    title: '获取内容',
+    path: '/movie/v1/film/options',
+    isRule: false,
+    params: {},
+    isConsole: true,
+    disabled: true,
+  },
+
+  //
 ];

package/src/components/JfbMovieTfkFilmList/Attr.js

@@ -85,6 +85,33 @@ export default {
         inline: false,
         className: 'input60',
       },
+      {
+        ele: 'title',
+        label: '影院列表设置',
+        size: 'small',
+        groupKey:'content',
+      },
+      {
+        label: '获取数据排序方式:',
+        ele: 'xd-site-select-list',
+        valueKey: 'sort_consume_mode',
+        value: data['sort_consume_mode'] || '',
+        groupKey:'content',
+        placeholder: '请选择获取数据排序方式',
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'sort_consume_mode',
+            key: Date.now()
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
       {
         ele: 'title',
         label: '广告设置',
@@ -542,6 +569,17 @@ export default {
         size: 'small',
         groupKey:'advanced',
       },
+      {
+        label: "组件用途",
+        ele: "xd-radio",
+        valueKey: "isList",
+        value: data['isList'] || "N",
+        groupKey: 'advanced',
+        list: [
+          {label: "用于内页", value: "Y"},
+          {label: "用于首页", value: "N"}
+        ]
+      },
       {
         label: '影片详情访问地址:',
         ele: 'xd-select-pages-path',

package/src/components/JfbMovieTfkFilmList/ContentCinema.vue

@@ -10,8 +10,10 @@
         </template>
       </view>
       <view class="btn">
+        <!--不展示核销类型【SELL】-->
         <view
           v-for="(name,index) in item['cinema_type_name']"
+          v-if="item['cinema_type'][index] !== 'SELL'"
           :key="index"
           @click.stop="handleBtn(item['cinema_type'][index])"
           :style="{

package/src/components/JfbMovieTfkFilmList/JfbMovieTfkFilmList.vue

@@ -73,7 +73,7 @@
                 circular
                 @animationfinish="handleAnimationfinish"
               >
-                <swiper-item v-for="(item,index) in posterList" :key="index" @click.stop="handleClick(item,index)">
+                <swiper-item v-for="(item,index) in posterList" :key="index" @click.stop="handlePosterClick(item,index)">
                   <image :style="{width: posterSize.width + 'rpx', height: posterSize.height + 'rpx' }" :src="item['image_url']" mode="aspectFill"></image>
                 </swiper-item>
               </swiper>
@@ -142,26 +142,28 @@
         </view>
         <!--film hot|rightnow-->
         <!--cinema-->
-        <view class="list-filter" :style="{marginTop:outSpacing + 'rpx'}">
+        <view v-if="type === 'list'" class="list-filter" :style="{marginTop:outSpacing + 'rpx'}">
           <view class="list-filter-block" :class="{hasFitler:!!curQueryTab}">
             <view @click="handleFilterTab('filter')">
               <xd-font-icon icon="iconrepository-xialaxuanxiangdown" size="24" color="#999"></xd-font-icon>
-              <text>区域筛选</text>
+              <text>{{areaName}}</text>
             </view>
             <view @click="handleFilterTab('sort')">
               <xd-font-icon icon="iconshaixuanbiaoji_mian" size="28" color="#999"></xd-font-icon>
-              <text>排序</text>
+              <text>{{sortName}}</text>
             </view>
           </view>
           <view class="list-filter-modal" v-if="curQueryTab">
             <xd-query-sort
+              key="sort"
               :sort="sort"
-              v-show="curQueryTab === 'sort'"
+              v-if="sortUserList !== null && curQueryTab === 'sort'"
               @onConfirm="handleQuerySort"
+              :list="sortUserList"
             ></xd-query-sort>
             <xd-query-filter
-              v-if="cinemaAreaList !== null"
-              v-show="curQueryTab === 'filter'"
+              key="filter"
+              v-if="cinemaAreaList !== null && curQueryTab === 'filter'"
               :list="cinemaAreaList"
               @onConfirm="handleQueryFilter"
             ></xd-query-filter>
@@ -229,6 +231,7 @@
           </template>
         </view>
         <!--cinema-->
+        <view class="hasNoData" v-if="dataList && dataList.length > 0 && pageToken === ''">已经到底没有更多数据了</view>
       </view>
       <template v-else>
         <view
@@ -250,6 +253,7 @@
   import getServiceUrl from '@/common/getServiceUrl'
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
+  import posterMixins from "@/mixins/posterMixins";
   import ContentItem from './ContentItem.vue'
   import ContentCinema from "./ContentCinema.vue";
   import XdQuerySort from "./XdQuerySort.vue";
@@ -268,29 +272,38 @@
       XdQueryFilter
     },
     mixins: [
-      componentsMixins, extsMixins, JfbMovieTfkFilmListMixin
+      componentsMixins, extsMixins, JfbMovieTfkFilmListMixin,posterMixins
     ],
     data() {
       return {
         options: {},
-        hideMask: true,
+        //hideMask: true,
         type:'', //hot rightnow
         typeList:{hot:{label: '热映影片', value: 'hot'},list:{label: '影院列表', value: 'list'}, rightnow:{label: '即将上映', value: 'rightnow'}},
         showTypeListData:null,
         backgroundColor:'',
         isPreview: false,
         pageToken:'1',
-        pageSize: '20',
+        pageSize: 20,
         total: null,
         isFirstLoadingData: false,
         dataList:null,
         cinemaOrgDataList:null,
         cinemaAreaList:null,
+        sort_consume_mode:'',//获取影院数据排序
+        sortUserList:null,
+
 
         //filter
         showQueryModal:false,
-        curQueryTab:'filter',
-        sort:'sort',
+        curQueryTab:'',
+        sort:'',
+        sortName:'排序',
+        sortCode:'default',
+
+        //区域
+        areaCode:'all',
+        areaName:'区域筛选',
 
         //广告
         posterList:null,
@@ -325,13 +338,23 @@
         contBorder:'0',
         contShadow:'0 0 10rpx rgba(0,0,0,.05)',
         contBgColor:'#fff',
-        imgRradius:'10'
+        imgRradius:'10',
+
+        //链接
+        onlinePath:'',
+        codePath:'',
+        cashierPath:'',
+
+        buyPath:'',
+        fimeDetailPath:'',
+
 
       }
     },
     computed:{
       ...mapState({
-        stateCity: state => state.cityLocation.city
+        stateCity: state => state.cityLocation.city,
+        stateLocation: (state) => state.cityLocation.location || {},
       }),
 
       dotStyleData(){
@@ -415,13 +438,13 @@
       },
       stateCity(n, o){
         if(n && JSON.stringify(n) !== JSON.stringify(o)){
+          this.clearDataVar()
           this.getList();
         }
       },
       showTypeListData(){
         if(this.type === '') return;
-        this.dataList = null;
-        this.pageToken = '1';
+        this.clearDataVar();
         this.getList();
       },
     },
@@ -431,36 +454,77 @@
       this.init(this.container);
     },
     methods: {
+      clearDataVar(){
+        this.dataList = null;
+        this.pageToken = '1';
+        this.areaCode = 'all'
+        this.areaName ='区域筛选';
+        this.sortName = '排序'
+        this.sortCode = 'default'
+        this.cinemaOrgDataList = null;
+      },
+      getSortList(){
+        jfbRootExec('getTFKSortList', {
+          vm: this,
+          data:{}
+        }).then(res => {
+          this.sortUserList = res['cinema_customer_sort'];
+        }).catch(err=>{
+          console.error(err);
+        })
+
+      },
+
       //影片列表
       handleFilmDetail(film_id){
+        console.warn(`toFilmInfo(影片详情).${film_id}`)
+        if(!this.fimeDetailPath) {
+          console.error('未配置链接');
+          return;
+        }
         if( this.isPreview) return;
         this.$xdUniHelper.navigateTo({
           url: this.fimeDetailPath + `?film_id=${film_id}`
         })
       },
       handleBuy(film_id){
+        console.warn(`toBuyChooseCinema(选择影院).${film_id}`)
+        if(!this.buyPath) {
+          console.error('未配置链接');
+          return;
+        }
         if( this.isPreview) return;
         this.$xdUniHelper.navigateTo({
           url: this.buyPath + `?film_id=${film_id}`
         })
       },
       //影片列表
+
       //影院列表
       handleSchedule(item){
-        debugger
+        console.warn(`handleSchedule(选择排期).${item.cinema_id}`)
+        if(!this.onlinePath) {
+          console.error('未配置链接');
+          return;
+        }
+        if( this.isPreview) return;
+        this.$xdUniHelper.navigateTo({
+          url: this.onlinePath + `?cinema_id=${item.cinema_id}`,
+        });
       },
       handleCodeDetail(item){
-        debugger
+        console.warn(`handleCodeDetail(选择电子码列表).${item.cinema_id}`)
+        if(!this.codePath) {
+          console.error('未配置链接');
+          return;
+        }
+        if( this.isPreview) return;
+        this.$xdUniHelper.navigateTo({
+          url: this.codePath + `?cinema_id=${item.cinema_id}`,
+        });
       },
       handleCashierDetail(item){
-        debugger
-      },
-      handleQuerySort(sortData){
-        console.log("handleQuerySort", sortData);
-        setTimeout(()=>{
-          this.curQueryTab = '';
-        },500)
-
+        //todo
       },
       handleFilterTab(tab){
         if(tab === this.curQueryTab ) {
@@ -468,11 +532,29 @@
         }
         else this.curQueryTab = tab
       },
+      handleQuerySort(sortData){
+        this.sortCode = sortData.value;
+        this.sortName = sortData.label;
+        this.pageToken = '1';
+        this.dataList = null;
+        this.cinemaOrgDataList = null;
+        this.getList();
+
+        //等待排序规则
+        setTimeout(()=>{
+          this.curQueryTab = '';
+        },200)
+
+      },
       handleQueryFilter(sortData){
-        console.log("handleQueryFilter", sortData);
+        this.areaCode = sortData.area_code;
+        this.areaName = sortData.area_name;
+        this.pageToken = '1';
+        this.dataList = null;
+        this.getList();
         setTimeout(()=>{
           this.curQueryTab = '';
-        },500)
+        },200)
 
       },
       handleClose(){
@@ -480,19 +562,60 @@
       },
       //影院列表
 
-
-
-      handleClick(){
-
-      },
       handleAnimationfinish(e){
         this.current = e.detail.current;
       },
+
       getCinemaOrgData(){
-        this.dataList = (this.dataList||[]).concat(this.$xdUniHelper.getLocalPaginationData(
-          this.cinemaOrgDataList, this.pageToken, this.pageSize
-        ));
+        let fitlerData = this.$xdUniHelper.cloneDeep(this.cinemaOrgDataList||[])
+
+        //非全域处理
+        if(this.areaCode !== 'all') {
+          fitlerData = fitlerData.filter(item=>{
+            return item.area_code === this.areaCode;
+          });
+        }
+
+        //添加测试数据
+        // "NODE_ENV": "development",
+        // #ifdef H5
+        if(window.location.href.indexOf('filter=1') !== -1
+          || this.$configProject.NODE_ENV === 'development'
+        ) {
+          fitlerData = fitlerData.map((item,index)=>{
+            return {
+              ...item,
+              cinema_name: `${item.cinema_name}-${index+1}`,
+            }
+          });
+        }
+        //#endif
+
+        console.log(`fitlerData：`,fitlerData)
+        console.warn(`fitlerData.length=${fitlerData.length}`)
+
+        //过滤之后不够分页直接返回值
+        if(fitlerData.length <= this.pageSize) {
+          this.dataList = this.$xdUniHelper.cloneDeep(fitlerData);
+          this.pageToken = ''
+          return;
+        }
+
+        let list = this.$xdUniHelper.getLocalPaginationData(
+          fitlerData, this.pageToken, this.pageSize
+        );
+
+        //分页完成的数据为0
+        if(list.length === 0) {
+          this.pageToken = ''
+          return;
+        }
+
+        this.dataList = (this.dataList||[]).concat(this.$xdUniHelper.cloneDeep(list));
+        if(this.pageSize < list.length) this.pageToken = '';
+        else this.pageToken = (Number(this.pageToken)+1) + '';
       },
+
       handleTab(value){
         if(value === this.type) return;
         this.type = value;
@@ -502,8 +625,8 @@
       },
 
       getList(){
-        let fName = 'getTFKRecFilmHotList';
-        if(this.type === 'rightnow') fName = 'getTFKRecFilmRightnowList';
+        let fName = 'getTFKListFilmHotList';
+        if(this.type === 'rightnow') fName = 'getTFKListFilmRightnowList';
         if(this.type === 'list') fName = 'getTFKCinemaList';
 
         if(this.isFirstLoadingData) this.$xdShowLoading({});
@@ -511,26 +634,64 @@
           this.isFirstLoadingData = true;
         }
 
-        jfbRootExec(fName, {
-          vm: this,
-          data: {
+        let params = {
+          city_code: this.stateCity.city_code,
+          type: this.type,
+          page_token: this.pageToken,
+          page_size: this.pageSize
+        }
+
+        //影院参数
+        if(this.type === 'list') {
+          //有数据直接进行数据分页
+          if(this.cinemaOrgDataList !== null) {
+            this.getCinemaOrgData();
+            this.$xdHideLoading({});
+            return
+          }
+
+          params = {
             city_code: this.stateCity.city_code,
-            type: this.type,
-            page_token: this.pageToken,
-            page_size: this.pageSize
+            latitude: this.stateLocation.latitude,
+            longitude: this.stateLocation.longitude,
+            sort_consume_mode: this.sort_consume_mode || '',
+            sort_custom:this.sortCode
           }
+        }
+
+
+
+        jfbRootExec(fName, {
+          vm: this,
+          data:params
         }).then(res => {
+          if(this.isFirstLoadingData) this.$xdHideLoading({});
+
           //影片列表处理
           if(this.type === 'rightnow' || this.type==='hot'){
             this.dataList = (this.dataList||[]).concat(res['list']);
+            this.pageToken = res.next_page_token;
+            return;
           }
+
           //影院列表处理
           if(this.type === 'list') {
+            //res['list'].splice(0, 31);
             this.cinemaOrgDataList = res['list'];
-            this.cinemaAreaList = res['area_list'];
+            this.cinemaAreaList = [{area_code:'all', area_name:'全城'}].concat(res['area_list']);
+
+
+            //小于数量页面显示记录
+            if(res['list'].length <= this.pageSize) {
+              this.dataList = res['list'];
+              this.pageToken = '';
+              return
+            }
+
+            //正常处理
             this.getCinemaOrgData();
           }
-          if(this.isFirstLoadingData) this.$xdHideLoading({});
+
         }).catch(e=>{
           console.error(e);
           this.$xdHideLoading({});
@@ -549,18 +710,21 @@
           },
         })
           .then(res => {
-            this.posterList = res.list.map((item,index) => {
+            let posterList = res.list.map((item,index) => {
               return {
                 ...item,
                 image_background_url: item.image_background_url?getServiceUrl(item.image_background_url):'',
                 image_url: item.image_url?getServiceUrl(item.image_url):''
               }
             });
+            this.posterList = this.posterFilterNoUseData(posterList);
           })
           .catch(err=>{
             console.error(err);
           })
 
+        this.getSortList();
+
       },
 
       /**
@@ -600,12 +764,25 @@
         this.showHotName = getContainerPropsValue(container, 'content.showHotName', '');
         this.showRightnowName = getContainerPropsValue(container, 'content.showRightnowName', '');
         this.showListName = getContainerPropsValue(container, 'content.showListName', '');
-        this.showTypeList();
+
 
         this.poster = getContainerPropsValue(container, 'content.poster',{});
         this.posterNum = getContainerPropsValue(container, 'content.posterNum',1);
+        this.sort_consume_mode = getContainerPropsValue(container, 'content.sort_consume_mode', '');
+        this.isList = getContainerPropsValue(container, 'content.isList', 'N');
+
+        //链接(影院)
+        this.onlinePath = getContainerPropsValue(container, 'content.onlinePath', {value:''}).value;
+
+        //链接(影片)
+        this.buyPath = getContainerPropsValue(container, 'content.buyPath', {value: ""}).value;
+        this.fimeDetailPath = getContainerPropsValue(container, 'content.fimeDetailPath', {value: ""}).value;
+
+        //初始化数据
+        this.setShowTypeList();
       },
-      showTypeList(){
+
+      setShowTypeList(){
         let list = [];
         if(this.showHot === 'Y') list.push(this.typeList["hot"]);
         if(this.showList === 'Y') list.push(this.typeList["list"]);
@@ -616,21 +793,19 @@
           if(item.value === 'rightnow') item.label = this.showRightnowName || item.label;
           return item
         })
-        if(list.length > 0) this.type = list[0].value;
-        else this.type = '';
+
+        //已有选中值不设置默认值
+        if(this.type === '' && list.length > 0) {
+          this.type = list[0].value;
+        }
         this.showTypeListData = list;
       },
 
       onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
+        if(!this.pageToken) return false;
+        this.getList();
       },
 
-      onJfbShow(options) {
-        this.getList()
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
-      },
       onJfbBack(options) {
         if(this.isList === 'Y') {
           this.$xdUniHelper.navigateBack();
@@ -806,6 +981,7 @@
           align-items: center;
           height: 100rpx;
           background: #fff;
+          font-size: 28rpx;
 
           & > view {
             flex: 1;
@@ -836,5 +1012,15 @@
       text-align: center;
       font-size: 26rpx;
     }
+
+    .hasNoData {
+      height: 80rpx;
+      line-height: 80rpx;
+      font-size: 24rpx;
+      text-align: center;
+      color: #ccc;
+      background-color: rgba(255, 255, 255, .05);
+      margin: 20rpx 0
+    }
   }
 </style>

package/src/components/JfbMovieTfkFilmList/XdQueryFilter.vue

@@ -3,7 +3,7 @@
     <view class="filter_wrap">
       <view v-for="item in list" @click.stop="onConfirm(item)" :key="item.area_code" class="filter_item">
         <view>{{item.area_name}}</view>
-        <view>{{item.cinema_count}}</view>
+        <view v-if="item.area_code !== 'all'">{{item.cinema_count}}</view>
       </view>
     </view>
   </view>
@@ -21,40 +21,7 @@ export default {
     list: {
       type: Array,
       default: function(){
-        return [
-          {
-            title: "品牌",
-            options: [
-              {label: "味多美", value: "1"},
-              {label: "好丽友", value: "2"},
-              {label: "达利园", value: "3"},
-              {label: "徐福记", value: "4"},
-              {label: "三只松鼠", value: "5"},
-              {label: "鸿一", value: "6"},
-              {label: "稻香村", value: "7"},
-              {label: "港荣", value: "8"},
-            ]
-          },
-          {
-            title: "尺寸",
-            options: [
-              {label: "≤4英寸", value: "size-1"},
-              {label: "6英寸", value: "size-2"},
-              {label: "8英寸", value: "size-3"},
-              {label: "10英寸", value: "size-4"},
-              {label: "12英寸", value: "size-5"},
-            ]
-          },
-          {
-            title: "适用场景",
-            options: [
-              {label: "生日", value: "scene-1"},
-              {label: "下午茶", value: "scene-2"},
-              {label: "聚会", value: "scene-3"},
-              {label: "婚庆", value: "scene-4"},
-            ]
-          }
-        ]
+        return []
       }
     },
   },
@@ -70,7 +37,6 @@ export default {
   },
 
   methods: {
-
     onConfirm(item){
       this.$emit("onConfirm", item);
     }

package/src/components/JfbMovieTfkFilmRecommend/JfbMovieTfkFilmRecommend.vue

@@ -17,7 +17,7 @@
       <view class="x-line"></view>
       <view
         class="tfk-recommend"
-        v-if="showTypeList.length > 0"
+        v-if="showTypeListData.length > 0"
         :style="{
           padding: outSpacing + 'rpx',
           backgroundImage:bgImageComp
@@ -41,7 +41,7 @@
             <view
               @click="handleTab(item.value)"
               :class="{active: type === item.value}"
-              v-for="(item,index) in showTypeList"
+              v-for="(item,index) in showTypeListData"
               :key="index"
             >{{item.label}}<text v-if="type === item.value" :style="{backgroundColor:mainColor}"></text></view>
           </view>
@@ -53,7 +53,7 @@
             <view
               @click="handleTab(item.value)"
               :class="{active: type === item.value}"
-              v-for="(item,index) in showTypeList"
+              v-for="(item,index) in showTypeListData"
               :key="index"
               :style="{
                 backgroundColor: type === item.value? titleTextActBgColor: titleTextBgColor,
@@ -103,9 +103,7 @@
               class="tfk-scroll-item"
               v-for="item in dataList"
               :key="item.id"
-              :style="{
-
-              }"
+              @click="toFilmInfo(item.id)"
             >
               <view class="tfk-scroll-item-image" :style="{borderRadius:contItemRradius + 'rpx'}">
                 <image :src="item.poster" :alt="item.show_name" mode="scaleToFill"></image>
@@ -118,13 +116,13 @@
                     type="primary"
                     style="display:block;"
                     size="mini"
-                    @click="toBuyChooseCinema(item.id)">购票</xd-button>
+                    @click.stop="toBuyChooseCinema(item.id)">购票</xd-button>
                   <xd-button
                     v-else-if="item.show_button === '2'"
                     type="subPrimary"
                     style="display:block;"
                     size="mini"
-                    @click="toBuyChooseCinema(item.id)">预售</xd-button>
+                    @click.stop="toBuyChooseCinema(item.id)">预售</xd-button>
                 </template>
                 <template v-else>
                   <xd-button
@@ -132,14 +130,14 @@
                     type="success"
                     style="display:block;"
                     size="mini"
-                    @click="toFilmInfo(item.id)"
+                    @click.stop="toFilmInfo(item.id)"
                   >想看</xd-button>
                   <xd-button
                     v-else-if="item.show_button === '2'"
                     type="subPrimary"
                     style="display:block;"
                     size="mini"
-                    @click="toBuyChooseCinema(item.id)">预售</xd-button>
+                    @click.stop="toBuyChooseCinema(item.id)">预售</xd-button>
                 </template>
                 </view>
             </view>
@@ -191,7 +189,7 @@
         pageSize: '20',
         total: null,
         dataList:null,
-        isFirstLoadingData: false,
+        showTypeListData:[],
 
         //基础配置
         outSpacing:'',
@@ -273,22 +271,6 @@
         else return '0 0 0 rgba(0,0,0,0)';
       },
 
-      showTypeList(){
-        let list = [];
-        if(this.showHot === 'Y') list.push(this.typeList["hot"]);
-        if(this.showRightnow === 'Y') list.push(this.typeList["rightnow"]);
-        list = this.$xdUniHelper.cloneDeep(list).map(item=>{
-          if(item.value === 'hot') item.label = this.showHotName ||item.label
-          if(item.value === 'rightnow') item.label = this.showRightnowName || item.label;
-          return item
-        })
-        if(list.length > 0){
-          this.type = list[0].value;
-        }
-        else this.type = '';
-        return list;
-      },
-
 
       titleMarginComp(){
         let str = `${this.checkValue(this.titleMargin.top, 20)}rpx`;
@@ -297,6 +279,7 @@
         str = `${str} ${this.checkValue(this.titleMargin.left, 20)}rpx`;
         return str
       },
+
       contPaddingComp(){
         let str = `${this.checkValue(this.contMargin.top, 20)}rpx`;
         str = `${str} ${this.checkValue(this.contMargin.right, 20)}rpx`;
@@ -312,6 +295,7 @@
       },
       stateCity(n, o){
         if(n && JSON.stringify(n) !== JSON.stringify(o)){
+          this.dataList = null;
           this.getList();
         }
       },
@@ -323,17 +307,27 @@
     created() {
       this.isPreview = this.$configProject.isPreview;
       this.backgroundColor = Color(this.warningColor).alpha(0.2).toString();
-      this.init(this.container);
+      this.init(this.container, true);
     },
     methods: {
       toFilmInfo(film_id){
+        console.warn(`toFilmInfo(影片详情).${film_id}`)
+        if(!this.fimeDetailPath) {
+          console.error('未配置链接');
+          return;
+        }
         if( this.isPreview) return;
         this.$xdUniHelper.navigateTo({
           url: this.fimeDetailPath + `?film_id=${film_id}`
         })
       },
       toBuyChooseCinema(film_id){
-        if( this.isPreview) return;
+        console.warn(`toBuyChooseCinema(选择影院).${film_id}`)
+        if(!this.buyPath) {
+          console.error('未配置链接');
+          return;
+        }
+        if(this.isPreview) return;
         this.$xdUniHelper.navigateTo({
           url: this.buyPath + `?film_id=${film_id}`
         })
@@ -346,6 +340,11 @@
       },
 
       handleMore(){
+        console.warn('handleMore')
+        if(!this.fimeListPath) {
+          console.error('未配置链接');
+          return;
+        }
         if( this.isPreview) return;
         this.$xdUniHelper.navigateTo({
           url: this.fimeListPath
@@ -362,7 +361,6 @@
         if(!this.isFirstLoadingData){
           this.isFirstLoadingData = true;
         }
-
         jfbRootExec(fName, {
           vm: this,
           data: {
@@ -430,21 +428,36 @@
         this.isContShadowColor =  getContainerPropsValue(container, 'content.isContShadowColor', '#eee');
 
         //链接
-        this.buyPath = getContainerPropsValue(container, 'content.buyPath', {value: ""});
-        this.fimeDetailPath = getContainerPropsValue(container, 'content.fimeDetailPath', {value: ""});
-        this.fimeListPath = getContainerPropsValue(container, 'content.fimeListPath', {value: ""});
+        this.buyPath = getContainerPropsValue(container, 'content.buyPath', {value: ""}).value;
+        this.fimeDetailPath = getContainerPropsValue(container, 'content.fimeDetailPath', {value: ""}).value;
+        this.fimeListPath = getContainerPropsValue(container, 'content.fimeListPath', {value: ""}).value;
 
-      },
+        //设置标签
+        this.setShowTypeList();
 
-      onJfbShow(options) {
-        this.getList();
       },
 
-      onJfbUpdate(...data) {
-      },
-      onJfbCustomEvent(options) {
+      setShowTypeList(){
+        let list = [];
+        if(this.showHot === 'Y') list.push(this.typeList["hot"]);
+        if(this.showRightnow === 'Y') list.push(this.typeList["rightnow"]);
+        list = this.$xdUniHelper.cloneDeep(list).map(item=>{
+          if(item.value === 'hot') item.label = this.showHotName ||item.label
+          if(item.value === 'rightnow') item.label = this.showRightnowName || item.label;
+          return item
+        });
 
+        //已有选中值不设置默认值
+        if(this.type === '') {
+          if(list.length > 0){
+            this.type = list[0].value;
+          }
+          else this.type = '';
+        }
+        this.showTypeListData = this.$xdUniHelper.cloneDeep(list);
+        this.getList();
       },
+
     }
   }
 
@@ -574,6 +587,7 @@
               margin-top: 16rpx;
               text-align: center;
               line-height: 40rpx;
+              font-size: 28rpx;
               .uni-one-cut(40)
             }
 

package/src/mixins/posterMixins.js

@@ -0,0 +1,125 @@
+'use strict';
+
+export default {
+  data(){
+
+  },
+  methods:{
+    /**
+     * @description 过滤不可以用
+     * 当前项目未H5时,过滤所有小程序应用
+     * 当前项目未小程序时,过滤所有非当前小程序应用
+     * 站外地址直接返回
+     * 站内地址未选值直接返回
+     * 预览模式全过
+     */
+    posterFilterNoUseData(list = []){
+      let content = this.$xdUniHelper.cloneDeep(list).filter(item=>{
+        //预览模式
+        if( this.$configProject.isPreview) return true;
+
+        //非内部应用
+        if(item.redirect_type !== 'INN') return true
+
+        //没有配置链接
+        if(!item.redirect_data) return true;
+
+        //内部应用
+        else {
+          let redirect_data;
+          try {
+            redirect_data = JSON.parse(item.redirect_data);
+            if(!item['app_type']) item['app_type']= 'h5';
+
+            //#ifdef H5
+            return item['app_type'] !== 'wxmp';
+            //#endif
+
+            //#ifdef MP-WEIXIN
+            let actDir = this.$parent['projectAttr']['deploy_dir'];
+            let dir = this.getPosterPathDir(redirect_data.page);
+            if(item['app_type'] === 'wxmp'){
+              return actDir === dir;
+            }
+            else if(item['app_type'] === 'h5') return true;
+            else return true
+            //#endif
+          }
+          catch (e) {
+            return true
+          }
+        }
+      });
+      console.warn(`PostersList:${JSON.stringify(content.map(item=>`${item.app_type}:${item.content_name}:${item.redirect_data}`), null,2)}`)
+      return content;
+
+    },
+
+    getPosterPathDir(pathDir){
+      if(pathDir.indexOf('@site_domain@/') === 0) {
+        return pathDir.replace('@site_domain@/','').split('/')[0]
+      }
+      return ''
+    },
+
+    handlePosterClick(item) {
+      if(!item.redirect_data) {
+        console.warn(`未配置链接地址: ${item.redirect_data}`);
+        console.error(`未配置链接地址: ${item.redirect_data}`);
+        return
+      }
+
+      //内部链接跳转地址
+      if (item.redirect_type === 'INN') {
+        try {
+          let url = JSON.parse(item.redirect_data);
+          let params = '';
+          if(url.page) {
+            if (item['redirect_params']) params = `?${item['redirect_params']}`;
+            this.$xdUniHelper.navigateTo({url: url.page + params})
+          }
+          else {
+            console.error(`应用链接配置错误: ${url.page}`)
+          }
+        } catch (e) {
+          console.error(`应用链接配置错误: ${item.redirect_data}`)
+        }
+      }
+
+      //外部链接
+      if (item.redirect_type === 'URL') {
+        let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
+        let spReg = /(-apiuri\/v)/;
+        //#ifdef MP-WEIXIN
+        try {
+          let url = JSON.parse(item.redirect_data);
+          if (reg.test(url.url) || spReg.test(url.url)) {
+            console.warn(`广告跳转外站: ${url.url}`)
+            this.$xdUniHelper.navigateTo(url);
+          } else {
+            console.error(`广告跳转外站配置错误: ${url.url}`)
+          }
+        } catch (e) {
+          console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
+        }
+        //#endif
+        //#ifdef H5
+        try {
+          let url = JSON.parse(item.redirect_data);
+          console.warn(`广告跳转外站: ${url.url}`);
+          this.$xdUniHelper.redirectTo(url, false)
+        } catch (e) {
+          console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
+        }
+        //#endif
+
+      }
+
+      //无跳转地址
+      if(item.redirect_type === 'EMP') {
+        console.warn(`无跳转地址`);
+      }
+    },
+  },
+}
+