jufubao-base 1.0.105-beta9 → 1.0.106-beta1

package/package.json

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

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -236,6 +236,7 @@ export default {
         data: {
           namespace: this.pageBusinessCode,
           distribution_method: this.distribution_method,
+          ...this.dispatchData
         },
       })
         .then((res) => {

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

@@ -108,7 +108,7 @@ export default{
       background-color: #fff;
       background-size: 100% auto;
       background-repeat: no-repeat;
-      padding-top: 100rpx;
+      padding-top: 200rpx;
       border-radius: 20rpx;
       box-sizing: border-box;
       padding-bottom: 20rpx;

package/src/components/JfbBasePoster/Attr.js

@@ -221,27 +221,27 @@ export default {
           {required: true, message: '请选择广告位置', trigger: 'change'},
         ],
       },
-      params.poster && params.poster['type']&& params.poster['type'] !== '1' && {
-        label: '广告背景图:',
-        ele: 'xd-upload',
-        valueKey: 'background',
-        value: params.background || {},
-        defaultValue: params.background || null,
-        slot: true,
-        oneWidth: 100,
-        oneHeight: 100,
-        elinputClassName: 'input40',
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
-        type: ['jpg', 'png', 'jpeg'],
-        styleType: 'one',
-        uploadType: 'aliyun',
-        size: 5,
-        action: 'action',
-        sort: true,
-        maxlen: 100,
+      {
+        ele: 'title',
+        label: '广告位轮廓设置',
+        size: 'small', //default/mini/small
+      },
+      {
+        label: '广告位边距设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'margin',
+        value: params.margin || null,
+        disabled: false,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置广告位边距设置',
+        inline: false,
+        notice: '设置边距充，<span style="color: red">单位：像素（px）</span>。默认值：<span style="color: red">0</span>像素',
+
       },
       params.poster && params.poster['type']&& params.poster['type'] !== '1' &&{
-        label: '填充设置:',
+        label: '广告位填充设置:',
         ele: 'xd-margin-padding',
         valueKey: 'bgImagePadding',
         value: params['bgImagePadding'] || null,
@@ -251,17 +251,17 @@ export default {
         },
         placeholder: '请填充设置',
         inline: false,
-        notice: '设置内填充，<span style="color: red">单位：像素</span>。默认值：0像素',
+        notice: '设置内填充，<span style="color: red">单位：像素（px）</span>。无背景时候默认值：<span style="color: red">20</span>像素。有背景时候默认值：<span style="color: red">20</span>像素。',
       },
-      params.poster &&  params.poster['type']&& params.poster['type'] !== '1' && {
-        label: '广告位内容间距设置:',
+      params.poster &&  params.poster['type'] &&params.number > 1 && {
+        label: '广告内容之间间距设置:',
         ele: 'el-input',
         type: 'number',
         valueKey: 'padding',
         value: params.padding || 0,
         className: 'input40',
-        placeholder: '请广告位内容间距设置',
-        notice: '在使用通屏显示类型广告位之外的样式时，该属性生效，单位：像素（px）',
+        placeholder: '请广告内容之间间距设置',
+        notice: '请广告内容之间间距设置。<span style="color: red">单位：像素（px）</span>。默认值：<span style="color: red">0</span>像素',
         inline: false,
       },
       {
@@ -283,16 +283,28 @@ export default {
         },
       },
       {
-        label: '广告位边距设置:',
-        ele: 'xd-margin-padding',
-        valueKey: 'margin',
-        value: params.margin || null,
-        disabled: false,
-        setting: {
-          type: 'margin',
-        },
-        placeholder: '请设置广告位边距设置',
-
+        ele: 'title',
+        label: '广告位参数配置',
+        size: 'small', //default/mini/small
+      },
+      params.poster && params.poster['type']&& params.poster['type'] !== '1' && {
+        label: '广告背景图:',
+        ele: 'xd-upload',
+        valueKey: 'background',
+        value: params.background || {},
+        defaultValue: params.background || null,
+        slot: true,
+        oneWidth: 100,
+        oneHeight: 100,
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one',
+        uploadType: 'aliyun',
+        size: 5,
+        action: 'action',
+        sort: true,
+        maxlen: 100,
       },
       {
         label: '广告位置使用张数:',
@@ -360,7 +372,7 @@ export default {
         notice: '在使用非通屏显示类型广告位之外的样式时，<span style="color: red">(显示索引+标题|显示索引)</span>使用"<span style="color: red">显示圆点</span>"',
         inline: false,
       },
-      params['isCarousel'] === 2 && {
+      params.poster['type'] !== '1' && params['isCarousel'] === 2 && {
         label: '广告位内容显示行数:',
         ele: 'xd-radio',
         valueKey: 'rows',
@@ -370,7 +382,7 @@ export default {
           {"label": "两行", "value": 2},
         ]
       },
-      params['isCarousel']===2&&params['rows']===1&&{
+      params['isCarousel']===2 && params['rows'] === 1 && {
         label: '是否启用配套背景:',
         ele: 'xd-radio',
         valueKey: 'isSupport',
@@ -380,7 +392,6 @@ export default {
           {"label": "禁用", "value": 'N'},
         ]
       },
-
     ].filter(i=>i)
   },
   advanced: [

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -31,19 +31,21 @@
 					class="jfb-base-poster__one notCarousel"
 					:style="{
 						width: width + 'rpx',
-						height: height + 'rpx',
-						borderRadius: (posterType === '1' ? radius: 0) + 'rpx',
+						height: outOneHeight + 'rpx',
 					}"
 				>
-					<view @click="handleClick(info[0])">
-						<image
-							:style="{
-								width: width + 'rpx',
-								height: height + 'rpx'
-							}"
-							:src="info[0].image_url"
-							mode="aspectFill"
-						></image>
+					<view
+            :style="{
+            	width: width + 'rpx',
+              height: height + 'rpx',
+              borderRadius: (posterType === '1' ? radius: 0) + 'rpx',
+              marginBottom: padding + 'rpx'
+            }"
+            @click="handleClick(item)"
+            v-for="(item,index) in info"
+            :key="index"
+          >
+						<image :src="item.image_url" mode="aspectFill"></image>
 					</view>
 				</view>
 				<view
@@ -137,6 +139,7 @@
         carouselTime: 5,//轮播图轮播周期
 				useNumber: null, //广告使用张数
         height: 0, //广告高度
+        outOneHeight:0,//焦点图显示高度
         width: 0, //广告高度
 				padding: 0, //广告内容之间间距
         rows: 1, //四分屏起作用
@@ -177,9 +180,13 @@
     },
 		computed: {
       getConfig(){
-        let cell = this.posterType === '2' ? 2: (this.posterType === '3' ? 3: 4);
+        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;
+        let padding = 0;
+        if(this.$xdUniHelper.isEmpty(this.background)) padding = 20;
+        let addPadding = ((this.bgImagePadding.right !== null? this.bgImagePadding.right:padding) +
+          (this.bgImagePadding.left !== null? this.bgImagePadding.left : padding)) * this.$rpxNum;
+        let viewWidth = uni.getSystemInfoSync().safeArea.width - ((this.mS.right || 0) + (this.mS.left || 0)) * this.$rpxNum - addPadding - spacing;
         if(this.$configProject.isPreview) viewWidth -= 2;
         let width = Math.floor(viewWidth / cell);
         let height = this.height * width / this.width;
@@ -288,7 +295,7 @@
         } catch (error) {
           console.log(error,'amamamam');
         }
-        
+
       },
 		},
     watch: {
@@ -381,7 +388,6 @@
           this.current = e.detail.current;
         }
       },
-
       handleClick(item) {
         //内部链接跳转地址
         if (item.redirect_type === 'INN') {
@@ -486,6 +492,7 @@
         if(this.poster.size) {
           this.width = this.poster.size.width;
           this.height = this.poster.size.height;
+          this.outOneHeight = this.height * Number(this.useNumber) + (Number(this.padding)  * (Number(this.useNumber) - 1));
 				}
       },
 
@@ -567,16 +574,19 @@
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			overflow: hidden;
-
+      flex-flow: wrap;
 
 			& > view {
-				width: 100%;
-				height: 100%;
 				box-sizing: border-box;
+        overflow: hidden;
 
-				& > image {
+        &:last-child {
+          margin-bottom: 0!important;
+        }
 
+				& > image {
+          width: 100%;
+          height: 100%;
 				}
 			}
 		}

package/src/components/JfbBasePoster/MoreScreen.vue

@@ -48,6 +48,7 @@
 					<template slot-scope="{ item, index}">
 						<view
 							class="sreen__box-list"
+              :class="{s3:config.cell === 3,s4:config.cell === 4}"
 							:style="{
 								height: getHeight + 'px'
 							}"
@@ -256,6 +257,14 @@
 			flex-wrap: wrap;
 			overflow: hidden;
 
+      &.s3 > view:nth-child(3n)  {
+        margin-right: 0 !important;
+      }
+
+      &.s4 > view:nth-child(4n)  {
+        margin-right: 0 !important;
+      }
+
 			& view {
 				display: flex;
 				justify-content: center;
@@ -264,10 +273,6 @@
 				box-sizing: border-box;
 				overflow: hidden;
 
-				&:nth-child(4n) {
-					margin-right: 0 !important;
-				}
-
 				& > image {
 
 				}

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -496,7 +496,7 @@ export default {
       })
         .then((res) => {
           if(res.status.status_type === 'success') {
-            jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {order_id: this.order_id});
+            jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {order_number: this.order_id});
           }
           this.handleOrderResolve(res);
         })