jufubao-movie 1.0.39-beta1 → 1.0.39-beta11

package/src/components/JfbMovieTfkFilmList/PosterAttr.js

@@ -0,0 +1,257 @@
+'use strict';
+
+export default (data,outSpacing)=>{
+  let size = {width:750 - outSpacing*2,height:null};
+  if(data.poster && data.poster.size && data.poster.size.height) {
+    size['height'] = data.poster.size.height
+  }
+  let poster = {
+    size: size,
+    type:'1',
+    position: Object.assign({},data.poster && data.poster.position)
+  };
+
+  return [
+    {
+      ele: 'title',
+      label: '广告设置',
+      size: 'small',
+      groupKey:'content',
+    },
+
+    {
+      label: '广告位置配置:',
+      ele: 'xd-site-poster',
+      valueKey: 'poster',
+      className: 'input80',
+      value: poster,
+      groupKey:'content',
+      setting: {
+        count: 1,
+        scene: {label: '广告', value: 'normal'},
+        sizeDisabled: {
+          wDisabled:true,
+          hDisabled: false,
+        },
+        typeDisabled: true
+      },
+      handleCustom({action, data}) {
+        //设置场景参数
+        if(data) {
+          data.params = Object.assign({}, {scene: 'normal'}, data.params || {})
+        }
+        console.log(action,data,'hjhjhjhjhj');
+
+        //获取显示内容
+        if (action === 'screenList') {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'editx_base_ad_split_screen'})
+            .then(res => {
+              data.cb(res['list'])
+            })
+            .catch(error => {
+              console.error(error);
+            });
+          return
+        }
+
+        //获取返回参数(广告位高度必选项)
+        if (action === 'getPosterInfo') {
+          XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
+            .then(res => {
+              data.cb({list: res.list, selectId: res.selected})
+            })
+            .catch(error => {
+              console.error(error);
+            });
+          return
+        }
+
+        //使用内容分类
+        if (action === 'cmsPublishEditxContent') {
+          XdBus.getParentApi('cmsPublishEditxContent')(data.params)
+            .then(res => {
+              data.cb(res)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+          return
+        }
+
+        let loading = XdBus.getParentApi('loading')({});
+        //位置列表
+        if (action === 'getListPostion') {
+          XdBus.getParentApi('getListPosterPosition')(data.params)
+            .then(res => {
+              loading.close();
+              data.cb(res)
+            })
+            .catch(error => {
+              loading.close();
+              console.error(error);
+            });
+        }
+
+        //位置创建
+        if (action === 'addPostion') {
+          XdBus.getParentApi('addPosterPosition')(data.params)
+            .then(res => {
+              loading.close();
+              data.cb(true)
+            })
+            .catch(error => {
+              console.error(error);
+              loading.close();
+              data.cb(false)
+            });
+        }
+
+        //位置编辑
+        if (action === 'editPostion') {
+          XdBus.getParentApi('updatePosterPosition')(data.params)
+            .then(res => {
+              loading.close();
+              data.cb(true)
+            })
+            .catch(error => {
+              console.error(error);
+              loading.close();
+              data.cb(false)
+            });
+        }
+
+        //位置删除
+        if (action === 'deleltePostion') {
+          XdBus.getParentApi('deletePosterPosition')(data.params)
+            .then(res => {
+              loading.close();
+              data.cb(true)
+            })
+            .catch(error => {
+              console.error(error);
+              loading.close();
+              data.cb(false)
+            });
+        }
+
+        //获取广告位内容列表
+        if (action === 'getListContent') {
+          XdBus.getParentApi('getListPosterContent')(data.params)
+            .then(res => {
+              loading.close();
+              data.cb(res)
+            })
+            .catch(error => {
+              loading.close();
+              console.error(error);
+            });
+        }
+
+        //广告内容创建
+        if (action === 'addContent') {
+          XdBus.getParentApi('addPosterContent')(data.params)
+            .then(res => {
+              loading.close();
+              data.cb(true)
+            })
+            .catch(error => {
+              console.error(error);
+              loading.close();
+              data.cb(false)
+            });
+        }
+
+        //广告内容编辑
+        if (action === 'editContent') {
+          XdBus.getParentApi('updatePosterContent')(data.params)
+            .then(res => {
+              loading.close();
+              data.cb(true)
+            })
+            .catch(error => {
+              console.error(error);
+              loading.close();
+              data.cb(false)
+            });
+        }
+
+        //广告内容删除
+        if (action === 'deleteContent') {
+          XdBus.getParentApi('deletePosterContent')(data.params)
+            .then(res => {
+              loading.close();
+              data.cb(true)
+            })
+            .catch(error => {
+              console.error(error);
+              loading.close();
+              data.cb(false)
+            });
+        }
+
+        //获取广告内容跳转地址类型
+        if (action === 'jumpPosterContentType') {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: "cms_setting"})
+            .then(res => {
+              loading.close();
+              data.cb(res['redirect_type'])
+            })
+            .catch(error => {
+              loading.close();
+              console.error(error);
+            });
+        }
+
+        //发布
+        if (action === 'publish') {
+          console.log('publish', data.params)
+          XdBus.getParentApi('cmsPublishContent')(data.params)
+            .then(res => {
+              loading.close();
+              data.cb(res)
+            })
+            .catch(error => {
+              loading.close();
+              console.error(error);
+            });
+        }
+
+        //获取站内页面地址
+        if (action === 'router') {
+          loading.close()
+          return XdBus.getParentApi('getPagesTree');
+
+        }
+
+        //通知页面进行刷新
+        if(action === 'update') {
+          XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
+          loading.close()
+        }
+      },
+    },
+    {
+      label: '广告位置使用张数:',
+      ele: 'el-input',
+      type: 'number',
+      valueKey: 'posterNum',
+      groupKey:'content',
+      value: data.posterNum || 1,
+      placeholder: '请输入广告位置使用张数',
+      className: 'input40',
+      unit: '张',
+    },
+    {
+      label: '广告轮播周期:',
+      ele: 'el-input',
+      type: 'number',
+      valueKey: 'carouselTime',
+      groupKey:'content',
+      value: data.carouselTime || 5,
+      placeholder: '广告轮播周期，默认5秒',
+      className: 'input40',
+      unit: '秒',
+    },
+  ]
+}
+

package/src/components/JfbMovieTfkFilmList/XdPoster.vue

@@ -0,0 +1,160 @@
+<template>
+  <view
+    class="list-poster a"
+    v-if="posterList !== null && posterList.length > 0"
+    :style="{marginTop:styleObj.outSpacing + 'rpx'}"
+  >
+    <view
+      :style="{width: styleObj.posterSize.width + 'rpx', height: styleObj.posterSize.height + 'rpx' }"
+      class="list-poster-one"
+      v-if="posterList.length === 1"
+    >
+      <image
+        @click.stop="handlePosterClick(posterList[0],0)"
+        :style="{width: styleObj.posterSize.width + 'rpx', height: styleObj.posterSize.height + 'rpx' }"
+        :src="posterList[0].image_url"
+        :alt="posterList[0].content_name"
+        mode="aspectFill"
+      ></image>
+    </view>
+    <view class="list-poster-more" v-else>
+      <xd-swiper-dot
+        :style="{width: styleObj.posterSize.width + 'rpx', height: styleObj.posterSize.height + 'rpx' }"
+        :current="current"
+        :info="posterList"
+        field="content_name"
+        :mode="mode"
+        :dots-styles="dotStyleData"
+      >
+        <swiper
+          class="swiper xd-swiper-content"
+          :style="{width: styleObj.posterSize.width + 'rpx', height: styleObj.posterSize.height + 'rpx' }"
+          :indicator-dots="false"
+          :autoplay="styleObj.carouselTime >0"
+          :interval="styleObj.carouselTime"
+          :duration="500"
+          :current="current"
+          circular
+          @animationfinish="handleAnimationfinish"
+        >
+          <swiper-item v-for="(item,index) in posterList" :key="index" @click.stop="handlePosterClick(item,index)">
+            <image
+              :style="{width: styleObj.posterSize.width + 'rpx', height: styleObj.posterSize.height + 'rpx' }"
+              :src="item['image_url']"
+              mode="aspectFill"
+            ></image>
+          </swiper-item>
+        </swiper>
+      </xd-swiper-dot>
+    </view>
+  </view>
+</template>
+
+<script>
+
+import XdSwiperDot from "./XdSwiperDot.vue";
+
+export default {
+  name: "XdPoster",
+  props:{
+    styleObj:{
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    posterList:{
+      type: Array|null,
+      default: null
+    },
+    dotStyleData:{
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    mode:{
+      type: String,
+      default:''
+    }
+  },
+  components: {
+    XdSwiperDot
+  },
+  data(){
+    return {
+      current:0
+    }
+  },
+  methods:{
+    handlePosterClick(item,index){
+      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(`无跳转地址`);
+      }
+    },
+
+    handleAnimationfinish(e){
+      this.current = e.detail.current;
+    },
+  }
+}
+
+</script>
+
+
+<style scoped lang="less">
+
+</style>

package/src/components/JfbMovieTfkFilmList/XdQueryFilter.vue

@@ -54,6 +54,7 @@ export default {
     min-height: 500rpx;
     max-height: 600rpx;
     overflow-y: auto;
+    padding: 0 20rpx;
 
     .filter_item {
       border-top: 6rpx dotted #F7F7F7;

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">
@@ -100,13 +103,14 @@
           </view>
           <scroll-view class="tfk-scroll" scroll-x enable-flex v-else>
             <view
+              v-if="dataList.length > 0"
               class="tfk-scroll-item"
               v-for="item in dataList"
               :key="item.id"
               @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>
+                <image :src="item.poster" :alt="item.show_name" mode="scaleToFill" @error="handleError(item)"></image>
               </view>
               <view class="tfk-scroll-item-title">{{item.show_name}}</view>
               <view class="tfk-scroll-item-btn">
@@ -141,6 +145,7 @@
                 </template>
                 </view>
             </view>
+            <xd-no-data v-if="dataList && dataList.length ===0" height="100%" icon-type="film">暂无影片数据</xd-no-data>
           </scroll-view>
         </view>
       </view>
@@ -158,6 +163,7 @@
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
   import XdButton from "@/components/XdButton/XdButton.vue";
+  import XdNoData from "@/components/XdNoData/XdNoData.vue";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbMovieTfkFilmRecommendMixin from "./JfbMovieTfkFilmRecommendMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -172,7 +178,8 @@
     name: "JfbMovieTfkFilmRecommend",
     components: {
       XdFontIcon,
-      XdButton
+      XdButton,
+      XdNoData
     },
     mixins: [
       componentsMixins, extsMixins, JfbMovieTfkFilmRecommendMixin
@@ -192,6 +199,7 @@
         showTypeListData:[],
 
         //基础配置
+        bgColor:'',
         outSpacing:'',
         showMoreBtn: 'Y',
         showTotal:'Y',
@@ -223,6 +231,10 @@
         moreRradius: '40',
         totalColor: '#999',
 
+        //line
+        titleLineTextColor:'',
+        titleLineActTextColor:'',
+
         //内容
         contMargin: {},
         contBgColor:'#fff',
@@ -310,6 +322,9 @@
       this.init(this.container);
     },
     methods: {
+      handleError(item){
+        item['poster'] = 'https://img.jufubao.cn/common/error_movie.png?v20'
+      },
       toFilmInfo(film_id){
         console.warn(`toFilmInfo(影片详情).${film_id}`)
         if(!this.fimeDetailPath) {
@@ -347,7 +362,7 @@
         }
         if( this.isPreview) return;
         this.$xdUniHelper.navigateTo({
-          url: this.fimeListPath
+          url: this.fimeListPath+'?tab_id=' + this.type
         })
       },
       onJfbLoad(options) {
@@ -385,6 +400,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');
@@ -406,6 +422,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');
@@ -490,6 +510,10 @@
             }
             &.button > view {
               padding: 0 30rpx;
+              &:last-child {
+                margin-right: 0!important;
+              }
+
             }
 
             & > view {