jufubao-base 1.0.63-beta203 → 1.0.63-beta204

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.63-beta203",
+  "version": "1.0.63-beta204",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBasePosterType/Attr.js

@@ -285,7 +285,7 @@ export default {
         list: [
           {"label": "一行", "value": 1},
           {"label": "两行", "value": 2},
-          {"label": "两行", "value": 3},
+          {"label": "三行", "value": 3},
         ]
       },
       {

package/src/components/JfbBaseVideo/Attr.js

@@ -8,22 +8,21 @@ import console from "@dcloudio/uni-h5/src/core/helpers/console";
 export default {
   style:[],
   content:(params)=>{
-    if(!params['isCarousel']) params['isCarousel'] = 1;
     return [
       {
-        label: '广告位置配置:', //label
+        label: '视频位置配置:', //label
         ele: 'xd-site-poster', //package 名称
-        valueKey: 'poster', //form[valueKey]
+        valueKey: 'video', //form[valueKey]
         className: 'input80',
-        value: params.poster || {},
+        value: params.video || {},
         setting: {
           count: 1,
-          scene: {label: '广告', value: 'normal'}
+          scene: {label: '视频', value: 'video'}
         },
         handleCustom({action, data}) {
           //设置场景参数
           if(data) {
-            data.params = Object.assign({}, {scene: 'normal'}, data.params || {})
+            data.params = Object.assign({}, {scene: 'video'}, data.params || {})
           }
 
           //获取显示内容
@@ -216,30 +215,34 @@ export default {
         inline: false,
         notice: '',
         rules: [
-          {required: true, message: '请选择广告位置', trigger: 'change'},
+          {required: true, message: '请选择视频位置', trigger: 'change'},
         ],
       },
-      params.poster && params.poster['type'] !== '1' && {
-        label: '广告位内容间距设置:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'padding',
-        value: params.padding || 0,
-        className: 'input40',
-        placeholder: '请广告位内容间距设置',
-        notice: '在使用通屏显示类型广告位之外的样式时，该属性生效，单位：像素（px）',
-        inline: false,
+      {
+        label: '视频位边距设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        value: params.margin || null,
+        disabled: false,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置视频位边距设置',
+
       },
       {
-        label: '广告圆角设置:',
+        label: '内容圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'radius',
-        value: params['radius'] || '20',
-        placeholder: '请选择广告圆角设置',
+        value: params['radius'] || '0',
+        placeholder: '请选择内容圆角设置',
         multiple: false,
         className: 'input80',
         handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
             .then(res => {
               data.cb(res.list)
             })
@@ -248,96 +251,6 @@ export default {
             });
         },
       },
-      {
-        label: '广告位边距设置:',
-        ele: 'xd-margin-padding',
-        valueKey: 'margin',
-        value: params.margin || null,
-        disabled: false,
-        setting: {
-          type: 'margin',
-        },
-        placeholder: '请设置广告位边距设置',
-
-      },
-      {
-        label: '广告位置使用张数:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'number',
-        value: params.number || 1,
-        placeholder: '请输入广告位置使用张数',
-        className: 'input40',
-        unit: '张',
-        rules: [
-          {
-            required: true,
-            message: '请输入广告位置使用张数',
-            trigger: 'blur'
-          },
-        ]
-      },
-      {
-        label: '广告位显示方式:',
-        ele: 'xd-radio',
-        valueKey: 'isCarousel',
-        value: params['isCarousel'] || 1,
-        rules: [
-          {required: true, message: '请选择广告位显示方式', trigger: ['blur', 'change']}
-        ],
-        list: [
-          {"label": "焦点图显示", "value": 1},
-          {"label": "轮播图显示", "value": 2},
-        ]
-      },
-      params['isCarousel'] === 2 && {
-        label: '广告位轮播周期:',
-        ele: 'el-input',
-        type: 'number',
-        isKey: true,
-        valueKey: 'carouselTime',
-        value: params.carouselTime || 5,
-        placeholder: '请输入广告位轮播周期，单位秒',
-        className: 'input40',
-        unit: '秒',
-        rules: [
-          {
-            required: true,
-            message: '请输入广告位置高度',
-            trigger: 'blur'
-          },
-        ]
-      },
-      params['isCarousel'] === 2 && {
-        label: '广告显示dot类型:', //label
-        ele: 'xd-select-list', //package 名称
-        valueKey: 'dot_type', //form[valueKey]
-        value: params['dot_type'] || 'dot', //v-model
-        placeholder: '请选择广告显示dot类型',
-        multiple: false,
-        className: 'input80',
-        list:[
-          {label: '显示圆点', value: 'dot'},
-          {label: '显示长方形', value: 'default'},
-          {label: '显示圆点+长条', value: 'round'},
-          {label: '显示索引+标题', value: 'nav'},
-          {label: '显示索引', value: 'indexes'},
-        ],
-        notice: '在使用非通屏显示类型广告位之外的样式时，<span style="color: red">(显示索引+标题|显示索引)</span>使用"<span style="color: red">显示圆点</span>"',
-        inline: false,
-      },
-      params['isCarousel'] === 2 && {
-        label: '广告位内容显示行数:',
-        ele: 'xd-radio',
-        valueKey: 'rows',
-        value: params.rows || 1,
-        list: [
-          {"label": "一行", "value": 1},
-          {"label": "两行", "value": 2},
-        ]
-      },
-
-
     ].filter(i=>i)
   },
   advanced: [

package/src/components/JfbBaseVideo/JfbBaseVideo.vue

@@ -1,87 +1,56 @@
 <template>
   <view
-    class="jfb-base-poster"
+    class="jfb-base-video"
     @click="handleEditxSelect"
     :class="{ editx : isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
-      class="jfb-base-poster__edit"
+      class="jfb-base-video__edit"
       :class="{ editx : isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-poster__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-base-video__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view
-			class="jfb-base-poster__body"
-			v-if="noData"
-			:style="{
-				margin: margin
-			}
-		">
-			<!--一分屏-->
-			<template v-if="posterType === '1'">
-				<view
-					v-if="isCarousel === false"
-					class="jfb-base-poster__one notCarousel"
-					:style="{
-						width: width + 'rpx',
-						height: height + 'rpx',
-						borderRadius: (posterType === '1' ? radius: 0) + 'rpx',
-					}"
-				>
-					<view @click="handleClick(info[0])">
-						<image
-							:style="{
-								width: width + 'rpx',
-								height: height + 'rpx'
-							}"
-							:src="info[0].image_url"
-							mode="aspectFill"
-						></image>
-					</view>
-				</view>
-				<view
-					v-else
-					class="jfb-base-poster__one carousel"
-					:style="{
-						width: width + 'rpx',
-						height: height + 'rpx',
-						borderRadius: (posterType === '1' ? radius: 0) + 'rpx',
-					}"
-				>
-					<xd-swiper-dot
-						:current="current"
-						:info="info"
-						field="content_name"
-						:mode="mode"
-						:dots-styles="dotStyleData"
-					>
-						<xd-swiper
-							:indicator-dots="false"
-							:list="info"
-							:current="current"
-							:width=" width + 'rpx'"
-							:height="height + 'rpx'"
-							@onClickItem="handleClick"
-							@animationfinish="handleAnimationfinish"
-						>
-							<template slot-scope="{ item, index}">
-								<image :src="item['image_url']" mode="aspectFill"></image>
-							</template>
-						</xd-swiper>
-					</xd-swiper-dot>
+    <view class="jfb-base-video__body">
+      <view class="float"></view>
+      <view
+        class="video-box"
+        :style="{
+          width: contentWidth + 'rpx',
+          height:contentHeight + 'rpx',
+          margin: outMargin
+        }"
+      >
+        <view
+          class="thumb"
+          v-if="!playStatus"
+          :style="{borderRadius: radius + 'rpx'}"
+        >
+          <image :src="imageUrl" />
+          <view @click="handlePlay()">
+            <xd-font-icon
+              :icon="iconFont"
+              size="100"
+              color="#fff"
+            ></xd-font-icon>
 
-					<view v-if="isPreview" class="carousel-mask"></view>
-				</view>
-			</template>
-			<!--一分屏-->
-			<more-screen
-				v-if="posterType !== '1'"
-				:config="getConfig"
-				:content="info"
-			></more-screen>
+          </view>
+        </view>
+        <view
+          class="video"
+          :style="{borderRadius: radius + 'rpx'}"
+          v-else
+        >
+          <video
+            :src="videoUrl"
+            :autoplay="autoplay === 'Y'"
+            @ended="handleEnd()"
+            @error="handleError"
+          ></video>
+        </view>
+      </view>
     </view>
   </view>
 </template>
@@ -95,317 +64,144 @@
   import extsMixins from "@/mixins/extsMixins"
   import { getContainerPropsValue } from "@/utils/xd.base";
   import getServiceUrl from '@/common/getServiceUrl'
-	import XdImage from "@/components/XdImage/XdImage";
-  import XdSwiper from "@/components/XdSwiper/XdSwiper";
-  import MoreScreen from "./MoreScreen";
-  import XdSwiperDot from "./XdSwiperDot";
+
 
   export default {
     name: "JfbBaseVideo",
     components: {
       XdFontIcon,
-      XdImage,
-      XdSwiper,
-      MoreScreen,
-      XdSwiperDot
     },
     mixins: [componentsMixins,extsMixins,JfbBaseVideoMixin],
     data() {
       return {
         selfMask: true,
-        params: {},
+        page_size: 1,
+        options:{},
 
-				//Swiper 配置
-        mode:'round', //default 、round 、nav 、dot, indexes
-        current: 0,
-				poster: null,
-        posterPosition: null,
-        posterType: '1',//分屏模式
-				showType: '', //广告显示方式
-				isCarousel: true, //是否轮播图
-        carouselTime: 5,//轮播图轮播周期
-				useNumber: null, //广告使用张数
-        height: 0, //广告高度
-        width: 0, //广告高度
-				padding: 0, //广告内容之间间距
-        rows: 1, //四分屏起作用
-        radius: 0,
-				timer: null,
-				info: [],
-        mS: {
-          top: 0,
-					bottom: 0,
-					left: 0,
-					right: 0
-				},
-				isPreview: false,
-				noData:false,
+        //css
+        width: 0,
+        height: 0,
+        video: {},
+        margin: {},
+        radius:0,
+
+        //play
+        imageUrl: '//img.jufubao.cn/vedio/700.gif',
+        videoUrl: '//img.jufubao.cn/vedio/bg.mp4',
+        playStatus: false,
+        autoplay: 'N',
 
-				test: {
-          "content_id": "KpBbUKdj4aBejwe7Fh1ki",
-          "position_id": "QCk3PmoyQmOWRP1SxnYR3",
-          "partner_id": 0,
-          "site_id": "",
-          "content_name": "测试.",
-          "image_url": "//dummyimage.com/200x200",
-          "redirect_type": "EMP",
-          "redirect_type_name": "无链接",
-          "redirect_data": "",
-          "sort": "",
-          "status": "",
-          "start_time": "",
-          "end_time": "",
-          "op_user_id": "",
-          "created_time": 0,
-          "updated_time": 0
-        }
       }
     },
 		computed: {
-      getConfig(){
-        let cell = this.posterType === '2' ? 2: (this.posterType === '3' ? 3: 4);
-        let spacing = Math.floor((cell - 1) * this.padding * this.$rpxNum);
-        let viewWidth = uni.getSystemInfoSync().safeArea.width - ((this.mS.right || 0) + (this.mS.left || 0)) * this.$rpxNum - spacing;
-        if(this.$configProject.isPreview) viewWidth -= 2;
-        let width = Math.floor(viewWidth / cell);
-        let height = this.height * width / this.width;
-        return {
-          mode: this.getMode,
-          dotStyleData: this.dotStyleData,
-          poster: this.poster,
-          showType: this.showType,
-          isCarousel: this.isCarousel,
-          carouselTime: this.carouselTime,
-          radius: this.radius,
-          padding: this.padding,
-          rows: this.rows,
-          cell,
-          height,
-          width
-				}
-			},
-      margin(){
-        return `${this.mS.top||0}rpx ${this.mS.right||0}rpx ${this.mS.bottom||0}rpx ${this.mS.left||0}rpx`
-			},
-			getMode(){
-        let mode = this.mode;
-        if (this.posterType !== '1') {
-          if (this.mode === 'nav'
-            || this.mode === 'indexes') {
-            mode = 'dot'
-          }
-        }
-        return mode;
-			},
-      dotStyleData(){
-        let alpha = 1;
-        if(this.posterType === '1') alpha = 0.6;
+      iconFont(){
+        if(this.autoplay === 'N') return 'iconplayright'
+        if(this.autoplay === 'E') return 'iconshibai';
+        if(this.autoplay === 'R') return 'iconplayreplay';
+      },
+      contentWidth(){
+        let border = 0;
+        if(this.isPreview) border = 2;
+        return 750 - (this.margin.left + this.margin.right + border);
+      },
+      contentHeight(){
+        let border = 0;
+        if(this.isPreview) border = 2;
+        let winWidth = 750 - ((this.margin.left||0) + (this.margin.right||0) + border);
+        return winWidth * this.height/this.width;
+      },
 
-				let selectedColor = `rgba(${color(this.mainColor).alpha(alpha).array().join(',')})`;
-				console.log('selectedColor',selectedColor, this.mode, this.posterType);
-        let style = {
-          dot: {
-            backgroundColor: 'rgba(166,166,166,.5)',
-            border: '0px rgba(166,166,166,.5) solid',
-            color: '#fff',
-            selectedBackgroundColor: selectedColor,
-            selectedBorder: `0px this.mainColor solid`
-          },
-          default: {
-            width: 16,
-            backgroundColor: 'rgba(200,200,200,.45)',
-            border: '1px rgba(200,200,200,.45) solid',
-            color: '#fff',
-            selectedBackgroundColor: selectedColor,
-            selectedBorder: `1px this.mainColor solid`
-          },
-          round: {
-            backgroundColor: 'rgba(166,166,166,.5)',
-            border: '0px rgba(166,166,166,.5) solid',
-            color: '#fff',
-            selectedBackgroundColor: selectedColor,
-            selectedBorder: `0px this.mainColor solid`
-          },
-          nav: {
-            backgroundColor: 'rgba(0,0,0,.5)',
-            border: '1px rgba(0,0,0,.5) solid',
-            color: '#fff',
-            selectedBackgroundColor: 'rgba(255, 255, 255, 1)',
-            selectedBorder: '1px rgba(255, 255, 255 1) solid'
-          },
-          indexes: {
-            backgroundColor: 'rgba(0,0,0,.5)',
-            border: '0px rgba(0,0,0,.5) solid',
-            color: '#aaa',
-            selectedBackgroundColor: 'rgba(0,0,0,.8)',
-            selectedBorder: '0px rgba(0,0,0,.8) solid',
-            selectedColor: '#fff',
-          }
-        }
-        if(this.posterType !== '1') {
-          if(this.mode === 'nav'
-						|| this.mode === 'indexes') {
-            this.mode = 'dot'
-					}
-        }
-        return style[this.mode]
-			},
+      outMargin(){
+        let margin = `${this.margin.top !== null ? this.margin.top : 0}rpx`;
+        margin = `${margin} ${this.margin.right !== null ? this.margin.right : 0}rpx`;
+        margin = `${margin} ${this.margin.bottom !== null ? this.margin.bottom :0}rpx`;
+        margin = `${margin} ${this.margin.left !== null ? this.margin.left : 0}rpx`;
+        return margin;
+      }
 		},
     watch: {
       container(value) {
         this.init(value);
         if(this.timer) clearTimeout(this.timer);
         this.timer = setTimeout(()=>{
-          if (this.$configProject['isPreview']) this.onJfbLoad()
+          if (this.$configProject['isPreview']) this.onJfbLoad(this.options)
 				}, 400)
       }
     },
     created() {
-      this.init(this.container);
       this.isPreview = this.$configProject.isPreview;
+      this.init(this.container);
+
     },
     methods: {
-      getTestData(){
-        let temp = [];
-        for (let i = 0; i< this.useNumber; i++) {
-          let item = this.$xdUniHelper.cloneDeep(this.test);
-          item.content_id = i;
-          item.content_name = item.content_name + i;
-          item.image_url = `//dummyimage.com/${this.width}x${this.height}`;
-          temp.push(item)
-				}
-        return temp
-			},
-      handleAnimationfinish(e) {
-        this.current = e.detail.current;
-      },
-      handleClick(item) {
-        //内部链接跳转地址
-        if (item.redirect_type === 'INN') {
-          try {
-            let url = JSON.parse(item.redirect_data);
-            let params = '';
-            if (item['redirect_params']) params = `?${item['redirect_params']}`;
-            this.$xdUniHelper.navigateTo({
-              url: url.page + params
-            })
-          } catch (e) {
-            console.error(e)
-          }
-        }
-
-        //外部链接
-        if (item.redirect_type === 'URL') {
-          let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
-          //#ifdef MP-WEIXIN
-          try {
-            let url = JSON.parse(item.redirect_data);
-            if (reg.test(url.url) && this.$configProject.extras.webview) {
-              console.warn(`广告跳转外站: ${url.url}`)
-              this.$xdUniHelper.navigateTo({
-                url: `${this.$configProject.extras.webview}?seatUrl=${Base64.encodeURI(url.url)}`
-              });
-            } else {
-              throw Error('地址错误')
-            }
-          } catch (e) {
-            console.error(e)
-          }
-          //#endif
-          //#ifdef H5
-          try {
-            let url = JSON.parse(item.redirect_data);
-            if (reg.test(url.url)) {
-              console.warn(`广告跳转外站: ${url.url}`);
-              window.location.href = url.url;
-            } else {
-              throw Error('地址错误')
-            }
-          } catch (e) {
-            console.error(e)
-          }
-          //#endif
-
-        }
-      },
-      handleImage(list){
-      	return list.map(item => {
-          return {
-            ...item,
-            image_url: getServiceUrl(item.image_url)
-          }
-        })
-			},
-      handleOne(list){
-        this.info = this.handleImage(list);
-			},
-
-			getDefualtValue(key){
-        if (key === 'margin') {
-          return {top: 0, bottom: 0, left: 0, right: 0}
-        }
-			},
 
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.poster = getContainerPropsValue(container, 'content.poster', {size:{width: 750, height: 160}, type: '1'});
-        if (this.poster.type) {
-          this.posterType = this.poster.type
-        }
-        if(this.poster.position) {
-          this.posterPosition = this.poster.position
-				}
+        this.video = getContainerPropsValue(container, 'content.video', {size:{width: 400, height: 300}, type: '1'});
+        this.margin = getContainerPropsValue(container, 'content.margin', {top:0, bottom:0, right:0, left: 0});
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
-        this.padding = getContainerPropsValue(container, 'content.padding', 0);
-        this.rows = getContainerPropsValue(container, 'content.rows', 1);
-        this.mS = getContainerPropsValue(container, 'content.margin', this.getDefualtValue('margin'));
-
-        //content
-        this.mode = getContainerPropsValue(container, 'content.dot_type', 'dot');
-        this.isCarousel = getContainerPropsValue(container, 'content.isCarousel', 1) === 2;
-        this.carouselTime = Number(getContainerPropsValue(container, 'content.carouselTime', 5)) * 1000;
-        this.useNumber = getContainerPropsValue(container, 'content.number', 1);
-
-        if(this.poster.size) {
-          this.width = this.poster.size.width;
-          this.height = this.poster.size.height;
+        if(this.video.size) {
+          this.width = this.video.size.width;
+          this.height = this.video.size.height;
 				}
       },
 
       onJfbLoad(options) {
-        this.params = options;
+        this.options = options;
         jfbRootExec('getListPosterContent', {
           vm: this,
           data: {
             page_id: this.pageAttr['page_id'], //页面ID
             container_id: this.containerId, //组件ID
-            page_size: this.useNumber //可以不传
+            page_size: this.page_size //可以不传
           },
         })
           .then(res => {
-            if(res.list.length === 0 && this.isPreview) {
-              res.list = this.getTestData();
-						}
-
-            if (this.posterType === '1') this.handleOne(res.list);
-            if (this.posterType === '2') this.handleOne(res.list);
-            if (this.posterType === '3') this.handleOne(res.list);
-            if (this.posterType === '4') this.handleOne(res.list);
-            if(this.$configProject.isPreview) this.noData = true;
-            else  this.noData = res.list.length > 0;
+            if(res && res.list &&  res.list.length > 0) {
+              let {image_url, thumb} = res.list[0];
+              if(image_url) this.videoUrl = getServiceUrl(image_url);
+              if(thumb) this.imageUrl = getServiceUrl(thumb);
+            }
           })
           .catch(error => {
             console.error(error)
           })
       },
 
-      onJfbUpdate(data) {
-        this.onJfbLoad(this.params);
-      }
+      onJfbUpdate() {
+        this.onJfbLoad(this.options);
+      },
 
+      handlePlay(){
+        if(this.autoplay === 'E') return;
+        this.playStatus = !this.playStatus;
+        this.autoplay = "Y";
+      },
+
+      handleEnd(){
+        setTimeout(()=>{
+          this.playStatus = !this.playStatus;
+          this.autoplay = "R";
+        }, 1000)
+      },
+
+      handleError(){
+        this.$xdConfirm({
+          title: '温馨提示',
+          content:'当前视频资源无法播放',
+          cancel: false,
+          confirmText:'我知道了',
+          zIndex:10000,
+          success:()=>{
+            this.playStatus = !this.playStatus;
+            this.autoplay = "R";
+          }
+        })
+
+      }
 
     }
   }
@@ -417,49 +213,50 @@
 
   .jfb-base-video {
     &__body{
-			box-sizing: border-box;
-			overflow: hidden;
-			justify-content: center;
-			align-items: center;
-			display: flex;
+
+
     }
-		&__one.notCarousel {
-			position: relative;
-			box-sizing: border-box;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			overflow: hidden;
 
+  }
 
-			& > view {
-				width: 100%;
-				height: 100%;
-				box-sizing: border-box;
+  .float {
+    height: 1px;
+    width: 100%;
+    overflow: hidden;
+  }
 
-				& > image {
+  .video-box {
+    view.thumb {
+      height: 100%;
+      width: 100%;
+      position: relative;
+      overflow: hidden;
 
-				}
-			}
-		}
+      & > view {
+        width: 120rpx;
+        height: 120rpx;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        margin-top: -60rpx;
+        margin-left:-60rpx;
+      }
 
-		&__one.carousel {
-			position: relative;
-			box-sizing: border-box;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			overflow: hidden;
+      & > image {
+        height: 100%;
+        width: 100%;
+      }
+    }
 
-			& .carousel-mask {
-				position: absolute;
-				left: 0;
-				right: 0;
-				top: 0;
-				bottom: 0;
-				background: rgba(0,0,0,0);
-			}
-		}
+    view.video {
+      overflow: hidden;
+      height: 100%;
+      width: 100%;
 
+      & video {
+        height: 100%;
+        width: 100%;
+      }
+    }
   }
 </style>

package/src/components/JfbBaseVideo/Mock.js

@@ -1,5 +1,3 @@
 'use strict';
 
-module.exports = {
-  aaaa: {}
-}
+module.exports = {}

package/src/components/JfbBaseVideo/MoreScreen.vue

@@ -1,281 +0,0 @@
-<template>
-	<view class="sreen">
-		<view
-			class="sreen__box notCarousel"
-			v-if="config.isCarousel === false"
-		>
-			<view
-				v-for="(item,index) in list"
-				:key="item['content_id']"
-				:style="{
-					borderRadius: config.radius  + 'rpx',
-					marginTop: index < config.cell ? 0 : config.padding + 'rpx',
-					width: config.width + 'px',
-					height: config.height + 'px',
-					marginRight: (index+1) % config.cell === 0 ? 0: config.padding + 'rpx'
-				}"
-				@click="handleClick(item)"
-			>
-				<image
-					:style="{
-						width: width + 'px',
-						height: height + 'px'
-					}"
-					:src="item.image_url"
-					mode="widthFix"
-				></image>
-			</view>
-		</view>
-		<view class="sreen__box carousel" v-if="config.isCarousel === true">
-			<xd-swiper-dot
-				:current="current"
-				:info="list"
-				field="content_name"
-				:mode="config.mode"
-				:dots-styles="config.dotStyleData"
-				:style="{height:(getHeight + 46 * $rpxNum) + 'px'}"
-			>
-				<xd-swiper
-					:indicator-dots="false"
-					:interval="config.carouselTime"
-					:list="list"
-					:current="current"
-					width="100%"
-					:height="getHeight + 'px'"
-					@onClickItem="handleClick"
-					@animationfinish="handleAnimationfinish"
-				>
-					<template slot-scope="{ item, index}">
-						<view
-							class="sreen__box-list"
-							:style="{
-								height: getHeight + 'px'
-							}"
-						>
-							<view
-								v-for="(it, indext) in item"
-								:key="it['content_id']"
-								:style="{
-								borderRadius: config.radius  + 'rpx',
-								width: config.width + 'px',
-					      height: config.height + 'px',
-								marginRight: (indext+1) % config.cell === 0 ? 0: config.padding + 'rpx',
-								marginTop: indext < config.cell ? 0 : config.padding + 'rpx',
-							}"
-								@click="handleClick(it)"
-							>
-								<image :style="{ width: width + 'px', height: height + 'px'}" :src="it.image_url" mode="widthFix"></image>
-							</view>
-						</view>
-					</template>
-				</xd-swiper>
-			</xd-swiper-dot>
-		</view>
-		<view v-if="isPreview" class="carousel-mask"></view>
-	</view>
-</template>
-
-<script>
-  import XdSwiperDot from "./XdSwiperDot";
-  import XdSwiper from "@/components/XdSwiper/XdSwiper";
-  
-  export default {
-    components:{
-      XdSwiperDot,
-      XdSwiper
-		},
-    name: "MoreScreen",
-    props: {
-      config: {
-        type: Object,
-        required: true
-      },
-      content: {
-        type: Array,
-        required: true
-      }
-    },
-    data() {
-      return {
-        timer: null,
-        width: 0,
-        height: 0,
-        padding: 0,
-        status: false,
-				list: [],
-        isPreview: false,
-        current: 0,
-      }
-    },
-		computed:{
-      getHeight() {
-        let height = this.height * this.config.rows;
-        let padding = 0;
-        if (this.config.rows === 2) padding = Number(this.config.padding) * this.$rpxNum;
-        return height + padding;
-      },
-		},
-    watch: {
-      config() {
-        this.init()
-      },
-      content() {
-        this.init();
-      },
-			
-    },
-    created() {
-      this.isPreview = this.$configProject.isPreview;
-      this.init();
-    },
-    methods: {
-      handleAnimationfinish(e) {
-        this.current = e.detail.current;
-      },
-      init() {
-        if (this.timer) clearTimeout(this.timer);
-        this.timer = setTimeout(() => {
-          this.width = Number(this.config.width);
-          this.height = Number(this.config.height);
-          this.padding = Number(this.config.padding);
-          
-          //静态图显示
-          if(this.config.isCarousel === false) {
-            this.list = this.content
-					}
-          //轮播图显示
-          else {
-            let num = 4 * this.config.rows;
-            let maxPage = Math.ceil(this.content.length / num);
-            let arr = [];
-            for(let i =1 ; i <= maxPage; i++) {
-              arr.push(this.$xdUniHelper.getLocalPaginationData(this.content, i, num))
-						}
-            this.list = arr;
-					}
-        
-        
-        }, 100)
-      },
-      handleClick(item) {
-        //内部链接跳转地址
-        if (item.redirect_type === 'INN') {
-          try {
-            let url = JSON.parse(item.redirect_data);
-            let params = '';
-            if (item['redirect_params']) params = `?${item['redirect_params']}`;
-            this.$xdUniHelper.navigateTo({
-              url: url.page + params
-            })
-          } catch (e) {
-            console.error(e)
-          }
-        }
-
-        //外部链接
-        if (item.redirect_type === 'URL') {
-          let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
-          //#ifdef MP-WEIXIN
-          try {
-            let url = JSON.parse(item.redirect_data);
-            if (reg.test(url.url) && this.$configProject.extras.webview) {
-              console.warn(`广告跳转外站: ${url.url}`)
-              this.$xdUniHelper.navigateTo({
-                url: `${this.$configProject.extras.webview}?seatUrl=${Base64.encodeURI(url.url)}`
-              });
-            } else {
-              throw Error('地址错误')
-            }
-          } catch (e) {
-            console.error(e)
-          }
-          //#endif
-          //#ifdef H5
-          try {
-            let url = JSON.parse(item.redirect_data);
-            if (reg.test(url.url)) {
-              console.warn(`广告跳转外站: ${url.url}`);
-              window.location.href = url.url;
-            } else {
-              throw Error('地址错误')
-            }
-          } catch (e) {
-            console.error(e)
-          }
-          //#endif
-
-        }
-      },
-    }
-  }
-</script>
-
-<style scoped lang="less">
-	.sreen {
-		width: calc(100% + 4px); /**防止宽度不够问**/
-		position: relative;
-		
-		& .carousel-mask {
-			position: absolute;
-			left: 0;
-			right: 0;
-			top: 0;
-			bottom: 0;
-			background: rgba(0, 0, 0, 0);
-		}
-		
-		&__box.notCarousel {
-			display: flex;
-			justify-content: flex-start;
-			align-items: flex-start;
-			flex-wrap: wrap;
-			overflow: hidden;
-			width: calc(100% + 20px); /**防止宽度不够问**/
-			
-			& > view {
-				display: flex;
-				justify-content: center;
-				align-items: flex-start;
-				flex-shrink: 0;
-				box-sizing: border-box;
-				overflow: hidden;
-			}
-		}
-		
-		&__box.carousel {
-			display: flex;
-			justify-content: flex-start;
-			align-items: flex-start;
-			flex-wrap: wrap;
-			overflow: hidden;
-		}
-		
-		& .sreen__box-list {
-			width: calc(100% + 20px); /**防止宽度不够问**/
-			display: flex;
-			justify-content: flex-start;
-			align-items: flex-start;
-			flex-wrap: wrap;
-			overflow: hidden;
-			
-			& view {
-				display: flex;
-				justify-content: center;
-				align-items: flex-start;
-				flex-shrink: 0;
-				box-sizing: border-box;
-				overflow: hidden;
-				
-				&:nth-child(4n) {
-					margin-right: 0 !important;
-				}
-				
-				& > image {
-				
-				}
-			}
-		}
-	}
-	
-	
-</style>

package/src/components/JfbBaseVideo/XdSwiperDot.vue

@@ -1,234 +0,0 @@
-<template>
-	<view class="uni-swiper__warp">
-		<slot />
-		<view v-if="mode === 'default'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='default'>
-			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
-        'width': (index === current? dots.width*1.7: dots.width ) + 'px','height':dots.width*(2/5) +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border-radius':'0px'}"
-			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-bar" />
-		</view>
-		<view v-if="mode === 'dot'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='dot'>
-			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
-        'width': dots.width + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item" />
-		</view>
-		<view v-if="mode === 'round'" :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box" key='round'>
-			<view v-for="(item,index) in info" @click="clickItem(index)" :class="[index === current&&'uni-swiper__dots-long']" :style="{
-		    'width':(index === current? dots.width*3:dots.width ) + 'px','height':dots.height +'px' ,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item " />
-		</view>
-		<view v-if="mode === 'nav'" key='nav' :style="{'background-color':dotsStyles.backgroundColor,'bottom':'0'}" class="uni-swiper__dots-box uni-swiper__dots-nav">
-			<text :style="{'color':dotsStyles.color}" class="uni-swiper__dots-nav-item">{{ (current+1)+"/"+info.length }}</text>
-		</view>
-		<view v-if="mode === 'indexes'" key='indexes' :style="{'bottom':dots.bottom + 'px'}" class="uni-swiper__dots-box">
-			<view v-for="(item,index) in info" @click="clickItem(index)" :style="{
-        'width':dots.width + 'rpx','height':dots.height +'rpx' ,'color':index === current?dots.selectedColor:dots.color,'background-color':index !== current?dots.backgroundColor:dots.selectedBackgroundColor,'border':index !==current ? dots.border:dots.selectedBorder}"
-			 :key="index" class="uni-swiper__dots-item uni-swiper__dots-indexes"><text class="uni-swiper__dots-indexes-text">{{ index+1 }}</text></view>
-		</view>
-	</view>
-</template>
-
-<script>
-
-	/**
-	 * XdSwiperDot 轮播图指示点
-	 * @description 自定义轮播图指示点
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=284
-	 * @property {Number} current 当前指示点索引，必须是通过 `swiper` 的 `change` 事件获取到的 `e.detail.current`
-	 * @property {String} mode = [default|round|nav|indexes] 指示点的类型
-	 * 	@value defualt 默认指示点
-	 * 	@value round 圆形指示点
-	 * 	@value nav 条形指示点
-	 * 	@value indexes 索引指示点
-	 * @property {String} field mode 为 nav 时，显示的内容字段（mode = nav 时必填）
-	 * @property {String} info 轮播图的数据，通过数组长度决定指示点个数
-	 * @property {Object} dotsStyles 指示点样式
-	 * @event {Function} clickItem 组件触发点击事件时触发，e={currentIndex}
-	 */
-
-	export default {
-		name: 'XdSwiperDot',
-		emits:['clickItem'],
-		props: {
-			info: {
-				type: Array,
-				default () {
-					return []
-				}
-			},
-			current: {
-				type: Number,
-				default: 0
-			},
-			dotsStyles: {
-				type: Object,
-				default () {
-					return {}
-				}
-			},
-			// 类型 ：default(默认) indexes long nav
-			mode: {
-				type: String,
-				default: 'default'
-			},
-			// 只在 nav 模式下生效，变量名称
-			field: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-        dotsSource: {
-          width: 8,
-          height: 8,
-          bottom: 7,
-          color: '#fff',
-          backgroundColor: 'rgba(0, 0, 0, .3)',
-          border: '1px rgba(0, 0, 0, .3) solid',
-          selectedBackgroundColor: '#333',
-          selectedBorder: '1px rgba(0, 0, 0, .9) solid'
-				},
-				dots: {	}
-			}
-		},
-		watch: {
-			dotsStyles(newVal) {
-			  this.init(newVal)
-			},
-			mode() {
-        this.init(this.dotsStyles)
-			}
-
-		},
-		created() {
-      this.init(this.dotsStyles)
-		},
-		methods: {
-			clickItem(index) {
-				this.$emit('clickItem', index)
-			},
-			
-			init(value){
-        let dot = {};
-        if (this.mode === 'indexes') {
-          dot = {
-            width: 34,
-            height: 34,
-          }
-        }
-        this.dots = Object.assign(
-          JSON.parse(JSON.stringify(this.dotsSource)),
-          JSON.parse(JSON.stringify(value)),
-          dot
-        )
-			}
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.uni-swiper__warp {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: column;
-		position: relative;
-		overflow: hidden;
-	}
-
-	.uni-swiper__dots-box {
-		position: absolute;
-		bottom: 10px;
-		left: 0;
-		right: 0;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.uni-swiper__dots-item {
-		width: 8px;
-		border-radius: 100px;
-		margin-left: 6px;
-		background-color: $uni-bg-color-mask;
-		/* #ifndef APP-NVUE */
-		cursor: pointer;
-		/* #endif */
-		/* #ifdef H5 */
-		// border-width: 5px 0;
-		// border-style: solid;
-		// border-color: transparent;
-		// background-clip: padding-box;
-		/* #endif */
-		// transition: width 0.2s linear;  不要取消注释，不然会不能变色
-	}
-
-	.uni-swiper__dots-item:first-child {
-		margin: 0;
-	}
-
-	.uni-swiper__dots-default {
-		border-radius: 100px;
-	}
-
-	.uni-swiper__dots-long {
-		border-radius: 50px;
-	}
-
-	.uni-swiper__dots-bar {
-		border-radius: 50px;
-	}
-
-	.uni-swiper__dots-nav {
-		bottom: 20rpx!important;
-		height: 38rpx;
-		line-height: 38rpx;
-		position: absolute;
-		right: 0;
-		left: initial;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex: 1;
-		flex-direction: row;
-		justify-content: flex-start;
-		align-items: center;
-		background-color: rgba(0, 0, 0, 0.5);
-		border-radius: 6rpx 0 0 6rpx;
-		
-		& > text {
-			font-size: 20rpx;
-			padding: 0 10px!important;
-			margin: 0;
-			text-align: center;
-		}
-	}
-
-	.uni-swiper__dots-nav-item {
-		/* overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap; */
-		font-size: $uni-font-size-base;
-		color: #fff;
-		margin: 0 15px;
-	}
-
-	.uni-swiper__dots-indexes {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		// flex: 1;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.uni-swiper__dots-indexes-text {
-		font-size: $uni-font-size-sm;
-	}
-</style>