jufubao-base 1.0.169-beta12 → 1.0.169-beta13

package/package.json

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

package/src/components/JfbBaseTfkCardDetail/Attr.js

@@ -333,7 +333,7 @@ export default {
         label: "票券高度",
         ele: "el-input",
         valueKey: 'cardHeight',
-        value: data.cardHeight || 260,
+        value: data.cardHeight || 340,
         type: 'number',
         groupKey:'style',
         placeholder: "请输入票券高度",

package/src/components/JfbBaseTfkCardDetail/JfbBaseTfkCardDetail.vue

@@ -147,7 +147,7 @@
         cardInfoMargin: {},
         cardInfoPadding: {},
         cardImageUrl: "",
-        cardHeight: 260,
+        cardHeight: 340,
         cardRadius: 10,
         bussPadding: {},
         bussMargin: {},
@@ -346,7 +346,7 @@
         this.cardInfoMargin = getContainerPropsValue(value, 'content.cardInfoMargin', {top: 20, left: 20, right: 20, bottom: 20});
         this.cardInfoPadding = getContainerPropsValue(value, 'content.cardInfoPadding', {top: 20, left: 20, right: 20, bottom: 20});
         this.cardImageUrl = getContainerPropsValue(value, 'content.cardImageUrl', '');
-        this.cardHeight = getContainerPropsValue(value, 'content.cardHeight', 260);
+        this.cardHeight = getContainerPropsValue(value, 'content.cardHeight', 340);
         this.cardRadius = getContainerPropsValue(value, 'content.cardRadius', 16);
         this.bussPadding = getContainerPropsValue(value, 'content.bussPadding', {top: 20, left: 20, right: 20, bottom: 20});
         this.bussMargin = getContainerPropsValue(value, 'content.bussMargin', {top: 20, left: 20, right: 20, bottom: 20});
@@ -572,6 +572,7 @@
         flex-direction: column;
         justify-content: space-between;
         font-size: 26rpx;
+        box-sizing: border-box;
         .card_top{
           display: flex;
           flex-direction: column;

package/src/components/JfbBaseTfkSearch/AllList.vue

@@ -5,7 +5,10 @@
     >
       <view class="module_title" :style="moduleItemTitleStyle">{{ parent.name }}</view>
       <view v-if="parent.type !== 'product'" class="module_cont">
-        <view v-for="(item, i) in parent.items" :key="i">
+        <view v-for="(item, i) in parent.items" :key="item.key"
+          class="module_cont_inner"
+          :style="moduleItemContStyle"
+        >
           <content-cinema v-if="parent.type === 'cinema'"
             style="width: 100%; height: 100%"
             :keyword="keyword"
@@ -48,11 +51,11 @@
         </view>
       </view>
       <view v-else class="module_cont product_wrap">
-        <view v-for="(item, i) in parent.items" :key="i"
-          :style="{
-            width: getProductCell(parent.tab) == 2 ? (outItemProduct + 'rpx'): '100%',
-            marginBottom: $parentVm.outSpacing + 'rpx',
-          }"
+        <view v-for="(item, i) in parent.items" :key="item.key"
+          class="module_cont_inner"
+          :style="[moduleItemContStyle, {
+            width: getProductCell(parent.tab) == 2 ? `calc(50% - ${$parentVm.allModuleItemContMargin/2}rpx)`: '100%',
+          }]"
         >
           <content-product v-if="parent.type === 'product'"
             style="width: 100%; height: 100%"
@@ -109,6 +112,7 @@
         return str
       },
       moduleItemStyle(){
+        const { allModuleRadius } = this.$parentVm;
         let padding = `${this.$parentVm.checkValue(this.$parentVm.allModulePadding.top, 20)}rpx`;
         padding = `${padding} ${this.$parentVm.checkValue(this.$parentVm.allModulePadding.right, 20)}rpx`;
         padding = `${padding} ${this.$parentVm.checkValue(this.$parentVm.allModulePadding.bottom, 20)}rpx`;
@@ -117,7 +121,8 @@
         return this.styleObjectToString({
           background: this.$parentVm.allListBgColor,
           padding: padding,
-          marginBottom: this.$parentVm.allModuleMargin + 'rpx'
+          marginBottom: this.$parentVm.allModuleMargin + 'rpx',
+          borderRadius: allModuleRadius + 'rpx',
         })
       },
       moduleItemTitleStyle(){
@@ -136,6 +141,35 @@
 
         return this.styleObjectToString(style);
       },
+      moduleItemContStyle(){
+        let { 
+          allModuleItemContBorder, allModuleItemContShadow, allModuleItemContPadding, allModuleItemContMargin,
+          allModuleItemContRadius, allModuleItemContBgColor
+        } = this.$parentVm;
+        let border = "none";
+        let boxShadow = "none";
+        if(allModuleItemContBorder && allModuleItemContBorder.type === 'Y'){
+          let { width, color } = allModuleItemContBorder.value;
+          border = `${width}rpx solid ${color}`;
+        }
+        if(allModuleItemContShadow && allModuleItemContShadow.type === 'Y'){
+          let { width, color } = allModuleItemContShadow.value;
+          boxShadow = `0 0 ${width}rpx ${color}`;
+        }
+        let padding = `${this.$parentVm.checkValue(allModuleItemContPadding.top, 20)}rpx`;
+        padding = `${padding} ${this.$parentVm.checkValue(allModuleItemContPadding.right, 20)}rpx`;
+        padding = `${padding} ${this.$parentVm.checkValue(allModuleItemContPadding.bottom, 20)}rpx`;
+        padding = `${padding} ${this.$parentVm.checkValue(allModuleItemContPadding.left, 20)}rpx`;
+        console.log("allModuleItemContShadow", allModuleItemContShadow)
+        return this.styleObjectToString({
+          padding: padding,
+          border: border,
+          borderRadius: allModuleItemContRadius + 'rpx',
+          boxShadow: boxShadow,
+          marginBottom: allModuleItemContMargin + 'rpx',
+          background: allModuleItemContBgColor,
+        })
+      },
       moduleMoreStyle(){
         let allModuleMoreStyle = this.$parentVm.allModuleMoreStyle;
         let style = {};
@@ -150,6 +184,7 @@
       },
       outItemProduct(){
         //获取每列元素最大宽度
+        // return 300;
         let num = (750 - 3 * Number(this.$parentVm.outSpacing))/2;
         num = num - this.$parentVm.checkValue(this.$parentVm.contMargin.right, 20) - this.$parentVm.checkValue(this.$parentVm.contMargin.left, 20);
         return num - this.$parentVm.contBorderWidth * 2
@@ -178,7 +213,7 @@
       this.getList();
     },
     methods: {
-      getProductCell(str){
+      getProductCell(str = ''){
         let cellNum = str.split("@")[3] || 1;
         return Number(cellNum);
       },
@@ -207,7 +242,13 @@
         this.$emit('on-list', {
           params: params,
           cb:(list)=>{
-            this.list = list || [];
+            this.list = (list || []).map(parent => {
+              parent.items = parent.items.map(item => {
+                item['key'] = item.product_id || item.resource_shop_id || item.cinema_id || item.film_id;
+                return item;
+              })
+              return parent;
+            });
             this.$xdHideLoading();
           }
         })
@@ -237,6 +278,10 @@
         justify-content: space-between;
         flex-wrap: wrap;
       }
+
+      .module_cont_inner{
+        box-sizing: border-box;
+      }
     }
     .module_more{
       display: flex;
@@ -249,7 +294,7 @@
         display: flex;
         justify-content: center;
         align-items: center;
-        height: 80rpx;
+        height: 70rpx;
         width: 200rpx;
         border-radius: 80rpx;
       }

package/src/components/JfbBaseTfkSearch/Attr.js

@@ -141,13 +141,13 @@ export default {
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
-        label: "全部-列表样式配置",
+        label: "全部-业务板块样式配置",
         ele: "title",
         groupKey:'style',
         size: "small",
       },
       {
-        label: "列表背景色",
+        label: "业务板块背景色",
         ele: "xd-color",
         valueKey: 'allListBgColor',
         value: data['allListBgColor'] || '#FFFFFF',
@@ -167,6 +167,25 @@ export default {
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。',
       },
+      {
+        label: "业务板块圆角",
+        ele: 'xd-site-select-list',
+        valueKey: 'allModuleRadius',
+        value: data['allModuleRadius'] || 0,
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
       {
         label: "业务板块标题样式",
         ele: "xd-radio",
@@ -220,9 +239,107 @@ export default {
         groupKey: "style",
         type: "number",
       },
-
+      {
+        label: "全部 - 列表单个样式配置",
+        ele: "title",
+        groupKey:'style',
+        size: "small",
+      },
+      {
+        label: "业务板块列表单个背景色",
+        ele: "xd-color",
+        valueKey: 'allModuleItemContBgColor',
+        value: data['allModuleItemContBgColor'] || '#FFFFFF',
+        groupKey:'style',
+      },
+      {
+        label: "业务板块列表单个间距",
+        ele: "el-input",
+        valueKey: "allModuleItemContMargin",
+        value: data.allModuleItemContMargin || 20,
+        groupKey:'style',
+        type: "number",
+      },
+      {
+        label: "业务板块列表单个边框",
+        ele: "xd-border",
+        valueKey: 'allModuleItemContBorder',
+        value: data['allModuleItemContBorder'] || null,
+        groupKey:'style',
+      },
+      {
+        label: "业务板块列表单个阴影",
+        ele: "xd-shadow",
+        groupKey:'style',
+        valueKey: 'allModuleItemContShadow',
+        value: data['allModuleItemContShadow'] || null,
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        label: "业务板块列表单个内边距",
+        ele: "xd-margin-padding",
+        valueKey: "allModuleItemContPadding",
+        value: data['allModuleItemContPadding'] || null,
+        groupKey:'style',
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置内边距',
+        inline: false,
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+      },
+      {
+        label: "业务板块列表单个圆角",
+        ele: 'xd-site-select-list',
+        valueKey: 'allModuleItemContRadius',
+        value: data.allModuleItemContRadius || 16,
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
 
       {
+        label: '选择综合入口类型:',
+        ele: 'xd-site-select-list',
+        valueKey: 'entryGroupId',
+        value: data.entryGroupId || 'default',
+        placeholder: '请选择综合入口类型',
+        multiple: false,
+        groupKey:'content',
+        className: 'input50',
+        rules: [
+          {required: true, message: '请选择综合入口类型', trigger: ['blur', 'change']}
+        ],
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getEntryGroupOption')({key: Date.now()})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      data.entryGroupId && {
         label: "搜索范围",
         ele: "xd-search-setting-options",
         valueKey: 'searchScope',
@@ -231,8 +348,11 @@ export default {
         placeholder: '请选择内容圆角设置',
         multiple: false,
         className: 'input80',
+        setting: {
+          group_id: data.entryGroupId || 'default',
+        },
         handleCustom({ action, data }) {
-          XdBus.getParentApi('getSearchSettingOptions')()
+          XdBus.getParentApi('getSearchSettingOptions')({group_id: 'default', ...data.params})
             .then(res => {
               data.cb(res.list)
             })

package/src/components/JfbBaseTfkSearch/ContentFilm.vue

@@ -100,12 +100,10 @@
     },
     methods:{
       handleDetail(item){
-        console.log('handleDetail.item',item,item.id);
-        this.$emit('on-film-detail',item.id);
+        this.$emit('on-film-detail',item);
       },
       handleBuy(item){
-        console.log('handleDetail.item',item,item.id);
-        this.$emit('on-buy',item.id);
+        this.$emit('on-buy',item);
       }
     }
   }

package/src/components/JfbBaseTfkSearch/ContentProduct.vue

@@ -162,7 +162,9 @@ export default {
   },
   methods:{
     handleDetail(){
-      this.$emit('on-product-detail', this.item);
+      if(this.item.status === 'ok') {
+        this.$emit('on-product-detail', this.item);
+      }
     }
   }
 }

package/src/components/JfbBaseTfkSearch/CustomList.vue

@@ -34,15 +34,15 @@
           v-for="item in dataList"
           :key="item.id"
           :style="{
-          marginBottom:$parentVm.outSpacing + 'rpx',
-          padding:contMarginComp,
-          borderRadius:$parentVm.contRradius+ 'rpx',
-          border: $parentVm.contBorder,
-          boxShadow:$parentVm.contShadow,
-          width: (type_code === 'product' && type_other === 2) ? (outItemProduct + 'rpx'): 'auto',
-          height: heightRpx,
-          backgroundColor: $parentVm.contBgColor
-        }">
+            marginBottom:$parentVm.outSpacing + 'rpx',
+            padding:contMarginComp,
+            borderRadius:$parentVm.contRradius+ 'rpx',
+            border: $parentVm.contBorder,
+            boxShadow:$parentVm.contShadow,
+            width: (type_code === 'product' && type_other === 2) ? (outItemProduct + 'rpx'): 'auto',
+            height: heightRpx,
+            backgroundColor: $parentVm.contBgColor
+          }">
           <content-film
             type="hot"
             v-if="type_code === 'film'"
@@ -52,8 +52,8 @@
             :out-spacing="$parentVm.outSpacing"
             :color="$parentVm.mainColor"
             :border-radius="$parentVm.imgRradius"
-            @on-film-detail="(film_id)=>{$parentVm.handleFilmDetail(film_id, dataConfig)}"
-            @on-buy="(film_id)=>{$parentVm.handleBuy(film_id, dataConfig)}"
+            @on-film-detail="(film)=>{$parentVm.handleFilmDetail(film, dataConfig)}"
+            @on-buy="(film)=>{$parentVm.handleBuy(film, dataConfig)}"
           ></content-film>
           <content-cinema
             v-if="type_code === 'cinema'"
@@ -225,7 +225,7 @@ export default {
       hasNoData: false,
 
       page_token:'1',
-      page_size: 20,
+      page_size: 100,
 
       //参数
       type_code:'',
@@ -325,20 +325,20 @@ export default {
 
 
     getList(){
+
       //无关键字不搜索
       if(this.keyword === '') {
         return;
       }
-      //this.$xdShowLoading({});
+      this.$xdShowLoading({});
       this.$emit('on-list', {
         params:this.getParams,
         cb:(res)=>{
-
           //无数据处理
           if(res === null){
             this.hasNoData = true;
             this.dataList = [];
-            this.page_token = ''
+            this.page_token = '1'
             this.$xdHideLoading();
             return
           }
@@ -349,7 +349,7 @@ export default {
           //整理为统一ID
           res.items = res.items.map((item,index)=>{
             if(!item.id){
-              item.id = item.product_id || item.resource_shop_id || item.cinema_id
+              item.id = item.product_id || item.resource_shop_id || item.cinema_id || item.film_id
             }
             //item.list_title = `${index} - ${ item.list_title}`
             return item;

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -74,7 +74,6 @@
   import extsMixins from "@/mixins/extsMixins";
   import listMixins from "./listMixins";
   import CustomList from "./CustomList.vue";
-  import search from './search';
   import AllList from "./AllList.vue";
 
   export default {
@@ -110,11 +109,19 @@
         searchScope: [],
         allListBgColor: "",
         allModulePadding: {},
+        allModuleRadius: 0,
         allModuleTitleBgColor: {},
         allModuleTitlePadding: {},
         allModuleMoreStyle: "",
         allModuleMargin: 20,
         allModuleTitleStyle: "",
+        allModuleItemContBorder: {},
+        allModuleItemContMargin: 20,
+        allModuleItemContShadow: {},
+        allModuleItemContPadding: {},
+        allModuleItemContRadius: 16,
+        allModuleItemContBgColor: "#FFFFFF",
+
       }
     },
     computed: {
@@ -212,6 +219,9 @@
             }
             cb(res.list)
           }else{
+            if(this.isPreview){
+              return cb(res.list.find(item => item.type === this.tabId.split("@")[1]))
+            }
             if(res.list.length > 0)  cb(res.list[0])
             else cb(null)
           }
@@ -239,11 +249,18 @@
         this.searchScope = getContainerPropsValue(container, 'content.searchScope', []);
         this.allListBgColor = getContainerPropsValue(container, 'content.allListBgColor', '');
         this.allModulePadding = getContainerPropsValue(container, 'content.allModulePadding', {});
+        this.allModuleRadius = getContainerPropsValue(container, 'content.allModuleRadius', 0);
         this.allModuleTitleBgColor = getContainerPropsValue(container, 'content.allModuleTitleBgColor', '');
         this.allModuleTitlePadding = getContainerPropsValue(container, 'content.allModuleTitlePadding', {});
         this.allModuleMoreStyle = getContainerPropsValue(container, 'content.allModuleMoreStyle', "");
         this.allModuleMargin = getContainerPropsValue(container, 'content.allModuleMargin', 20);
         this.allModuleTitleStyle = getContainerPropsValue(container, 'content.allModuleTitleStyle', "");
+        this.allModuleItemContBorder = getContainerPropsValue(container, 'content.allModuleItemContBorder', {});
+        this.allModuleItemContMargin = getContainerPropsValue(container, 'content.allModuleItemContMargin', 20);
+        this.allModuleItemContShadow = getContainerPropsValue(container, 'content.allModuleItemContShadow', {});
+        this.allModuleItemContPadding = getContainerPropsValue(container, 'content.allModuleItemContPadding', {});
+        this.allModuleItemContRadius = getContainerPropsValue(container, 'content.allModuleItemContRadius', 16);
+        this.allModuleItemContBgColor = getContainerPropsValue(container, 'content.allModuleItemContBgColor', '#FFFFFF');
 
         if(this.$configProject['isPreview']){
           this.menuList = this.searchScope;