jufubao-base 1.0.103 → 1.0.104

package/package.json

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

package/src/components/JfbBasePoster/Attr.js

@@ -240,6 +240,19 @@ export default {
         sort: true,
         maxlen: 100,
       },
+      params.poster && params.poster['type']&& params.poster['type'] !== '1' &&{
+        label: '填充设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'bgImagePadding',
+        value: params['bgImagePadding'] || null,
+        disabled: false,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请填充设置',
+        inline: false,
+        notice: '设置内填充，<span style="color: red">单位：像素</span>。默认值：0像素',
+      },
       params.poster &&  params.poster['type']&& params.poster['type'] !== '1' && {
         label: '广告位内容间距设置:',
         ele: 'el-input',

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -18,9 +18,10 @@
 			v-if="noData"
 			:style="{
 				margin: margin,
-        background: `url(${background})`,
-        backgroundSize: '100% 100%',
+        backgroundImage: background?`url(${getBgImage})`:'none',
+        backgroundSize: '100%',
         backgroundRepeat: 'no-repeat',
+        padding: outPadding
 			}
 		">
 			<!--一分屏-->
@@ -263,6 +264,32 @@
         }
         return style[this.mode]
 			},
+      getBgImage(){
+        let bg = '';
+        if(this.$xdUniHelper.checkVarType(this.background) === 'object'
+          || this.$xdUniHelper.checkVarType(this.background) === 'array'
+        ) {
+          if(!this.$xdUniHelper.isEmpty(this.background)) {
+            return getServiceUrl(this.background.url)
+          }
+        }
+        return bg
+      },
+      outPadding(){
+        try {
+          let defaultvalue = 0;
+        if(this.$xdUniHelper.isEmpty(this.background)) defaultvalue = 20
+        console.log(this.bgImagePadding,'this.paddingthis.paddingthis.padding');
+        let padding = `${this.bgImagePadding.top !== null ? this.bgImagePadding.top : defaultvalue}rpx`;
+        padding = `${padding} ${this.bgImagePadding.right !== null ? this.bgImagePadding.right : defaultvalue}rpx`;
+        padding = `${padding} ${this.bgImagePadding.bottom !== null ? this.bgImagePadding.bottom : defaultvalue}rpx`;
+        padding = `${padding} ${this.bgImagePadding.left !== null ? this.bgImagePadding.left : defaultvalue}rpx`;
+        return padding;
+        } catch (error) {
+          console.log(error,'amamamam');
+        }
+        
+      },
 		},
     watch: {
       container(value) {
@@ -447,8 +474,8 @@
         this.rows = getContainerPropsValue(container, 'content.rows', 1);
         this.isSupport = getContainerPropsValue(container, 'content.isSupport', 'Y');
         this.mS = getContainerPropsValue(container, 'content.margin', this.getDefualtValue('margin'));
-        this.background = getContainerPropsValue(container, "content.background", {path: "",}).path;
-
+        this.background = getContainerPropsValue(container, "content.background", 'none');
+        this.bgImagePadding = getContainerPropsValue(container, 'content.bgImagePadding', {top: 20, left: 20, right: 20, bottom: 20});
         //content
 
         this.mode = getContainerPropsValue(container, 'content.dot_type', 'dot');

package/src/components/JfbBasePosterBigSmall/Api.js

@@ -12,47 +12,15 @@
  */
 module.exports = [
   {
-    mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getListPosterContent', //自定义方法名字（必选）
+    title: '获取内容',
+    path: '/cms/v1/ad-content',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'updateFilmPaiqiDate', //自定义方法名字（必选）
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'removeFilmAddress', //自定义方法名字（必选）
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'addFilmcart',  //自定义方法名字（必选）
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+      scene: ['使用场景', 'String', '选填'],
+      container_id: ['插件ID', 'String', '必填'],
+      page_id: ['页面ID', 'String', '必填'],
+      page_size: ['记录条数', 'Number', '必填'],
     },
     isConsole: true,
     disabled: true,