jufubao-base 1.0.175 → 1.0.176-beta1

package/package.json

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

package/src/components/JfbBasePosterType/Attr.js

@@ -432,6 +432,19 @@ export default {
         inline: false,
         notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span> 像素',
       },
+      {
+        label: '内容设置填充:',
+        ele: 'xd-margin-padding',
+        valueKey: 'contentPadding',
+        groupKey:'style',
+        value: params.contentPadding || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '内容设置填充',
+        inline: false,
+        notice: '设置外填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span> 像素',
+      },
     ].filter(i=>i)
   },
   advanced: [

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

@@ -19,6 +19,7 @@
         class="jfb-base-poster-cont"
         :style="{
           margin: margin,
+          padding:contentPaddingOut,
           backgroundColor: bgColor,
           borderRadius: bgRadius + 'rpx'
         }"
@@ -55,6 +56,7 @@
     mixins: [componentsMixins,extsMixins,JfbBasePosterTypeMixin],
     data() {
       return {
+        hideMask: true,
         params: {},
 				//Swiper 配置
         posterPosition: null,
@@ -73,6 +75,7 @@
 				info: [],
         mS: {},
         iconPadding:{},
+        contentPadding:{},
 				isPreview: false,
 				noData:false,
 
@@ -84,7 +87,10 @@
     },
 		computed: {
       getConfig(){
-        let width = uni.getSystemInfoSync().safeArea.width - ((this.mS.right||0) + (this.mS.left || 0))*this.$rpxNum;
+        let width = uni.getSystemInfoSync().safeArea.width -
+          (this.checkValue(this.mS.left, 0) + this.checkValue(this.mS.right, 0)) * this.$rpxNum;
+        width = width -
+          (this.checkValue(this.contentPadding.left, 0) + this.checkValue(this.contentPadding.right, 0)) * this.$rpxNum;
         return {
           mode: 'normal',
           dotStyleData: this.dotStyleData,
@@ -120,6 +126,13 @@
         str = `${str} ${this.checkValue(this.mS.left, 0)}rpx`;
         return str
 			},
+      contentPaddingOut(){
+        let str = `${this.checkValue(this.contentPadding.top, 0)}rpx`;
+        str = `${str} ${this.checkValue(this.contentPadding.right, 0)}rpx`;
+        str = `${str} ${this.checkValue(this.contentPadding.bottom, 0)}rpx`;
+        str = `${str} ${this.checkValue(this.contentPadding.left, 0)}rpx`;
+        return str
+      },
       dotStyleData() {
       	return {}
       }
@@ -176,6 +189,7 @@
         this.shadowColor = getContainerPropsValue(container, 'content.shadowColor', 'rgba(0,0,0,.3)');
         this.mS = getContainerPropsValue(container, 'content.margin', {});
         this.iconPadding = getContainerPropsValue(container, 'content.iconPadding', {});
+        this.contentPadding = getContainerPropsValue(container, 'content.contentPadding', {});
 
         //样式设置
         this.textColor = getContainerPropsValue(container, 'content.textColor', '#333');

package/src/components/JfbBaseTfkSearch/ContentShop.vue

@@ -2,7 +2,7 @@
   <view  class="content-item" @click="handleDetail(item)">
     <view class="content-item-image" :style="{marginRight:outSpacing+'rpx',borderRadius:borderRadius+'rpx'}">
       <image v-if="errorStatus" :src="errorImage" :alt="item['resource_shop_name']" ></image>
-      <image v-if="!errorStatus" :src="imageUrl+1" :alt="item['resource_shop_name']" @error="handleError()"></image>
+      <image v-if="!errorStatus" :src="imageUrl" :alt="item['resource_shop_name']" @error="handleError()"></image>
     </view>
     <view class="content-item-cont">
       <view class="title">