jufubao-base 1.0.169-beta9 → 1.0.170

package/src/components/JfbBaseTfkSearch/Attr.js

@@ -141,6 +141,205 @@ export default {
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
+        label: "全部-业务板块样式配置",
+        ele: "title",
+        groupKey:'style',
+        size: "small",
+      },
+      {
+        label: "业务板块背景色",
+        ele: "xd-color",
+        valueKey: 'allListBgColor',
+        value: data['allListBgColor'] || '#FFFFFF',
+        groupKey:'style',
+        placeholder: '请选择列表背景色',
+      },
+      {
+        label: "业务板块内边距",
+        ele: "xd-margin-padding",
+        valueKey: "allModulePadding",
+        value: data['allModulePadding'] || null,
+        groupKey:'style',
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置内边距',
+        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",
+        valueKey: "allModuleTitleStyle",
+        value: data['allModuleTitleStyle'] || 'underline',
+        groupKey:'style',
+        placeholder: '请选择标题展示样式',
+        list: [
+          {label: "底线", value: 'underline'},
+          {label: "背景", value: 'background'},
+        ],
+      },
+      data.allModuleTitleStyle === 'background' &&{
+        label: "业务板块标题背景色",
+        ele: "xd-color",
+        valueKey: 'allModuleTitleBgColor',
+        value: data['allModuleTitleBgColor'] || '#FFFFFF',
+        groupKey:'style',
+        placeholder: '请选择业务板块背景色',
+      },
+      {
+        label: "业务板块标题内边距",
+        ele: "xd-margin-padding",
+        valueKey: "allModuleTitlePadding",
+        value: data['allModuleTitlePadding'] || null,
+        groupKey:'style',
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置内边距',
+        inline: false,
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。',
+      },
+      {
+        label: "业务板块查看更多展示样式",
+        ele: "xd-radio",
+        valueKey: "allModuleMoreStyle",
+        value: data['allModuleMoreStyle'] || 'text',
+        groupKey:'style',
+        placeholder: '请选择查看更多展示样式',
+        list: [
+          {label: "文案", value: 'text'},
+          {label: "按钮", value: 'button'},
+        ],
+      },
+      {
+        label: "业务板块间距设置",
+        ele: "el-input",
+        valueKey: "allModuleMargin",
+        value: data.allModuleMargin || 20,
+        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',
@@ -149,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

@@ -4,70 +4,69 @@
       class="image"
       :style="{marginRight: outSpacing + 'rpx',borderRadius:borderRadius+'rpx'}"
     >
-      <image :src="imageUrl"  :alt="item['show_name']"></image>
+      <image v-if="errorStatus" :src="errorImage" :alt="item['show_name']" ></image>
+      <image v-if="!errorStatus" :src="item['poster']" :alt="item['show_name']" @error="handleError()" ></image>
     </view>
     <view class="middle">
-      <view class="name" v-html="name"></view>
-      <view class="other">类型：{{item['type']}}</view>
-      <view class="other">导演：{{item['director']}}</view>
-      <view class="other">主演：{{item['leading_role']}}</view>
-    </view>
-    <view class="right">
-      <view class="score">
-        <template v-if="item['remark']">
-          <text>评分：</text><text :style="{color:color}">{{item['remark']}}</text>
-        </template>
+      <view class="top">
+        <view class="name">{{item['show_name']}}</view>
+        <view class="score">
+          <template v-if="item['remark']">
+            <text>评分：</text><text :style="{color:color}">{{item['remark']}}</text>
+          </template>
+        </view>
       </view>
-      <view class="btn">
-        <template v-if="type === 'hot'">
-          <xd-button
-            v-if="item['show_button'] === '1'"
-            type="primary"
-            style="display:block;"
-            size="small"
-            @click.stop="handleBuy(item)">购票</xd-button>
-          <xd-button
-            v-else-if="item['show_button'] === '2'"
-            type="subPrimary"
-            style="display:block;"
-            size="small"
-            @click="handleBuy(item)">预售</xd-button>
-        </template>
-        <template v-if="type === 'rightnow'">
-          <xd-button
-            v-if="item['show_button'] === '3'"
-            type="success"
-            style="display:block;"
-            size="small"
-            @click.stop="handleDetail(item)"
-          >想看</xd-button>
-          <xd-button
-            v-else-if="item['show_button'] === '2'"
-            type="subPrimary"
-            style="display:block;"
-            size="small"
-            @click.stop="handleBuy(item)">预售</xd-button>
-        </template>
+      <view class="bottom">
+        <view>
+          <view class="other">类型：{{item['type']}}</view>
+          <view class="other">导演：{{item['director']}}</view>
+          <view class="other">主演：{{item['leading_role']}}</view>
+        </view>
+        <view class="btn">
+          <template v-if="type === 'hot'">
+            <xd-button
+              v-if="item['show_button'] === '1'"
+              type="primary"
+              style="display:block;"
+              size="small"
+              @click.stop="handleBuy(item)">购票</xd-button>
+            <xd-button
+              v-else-if="item['show_button'] === '2'"
+              type="subPrimary"
+              style="display:block;"
+              size="small"
+              @click="handleBuy(item)">预售</xd-button>
+          </template>
+          <template v-if="type === 'rightnow'">
+            <xd-button
+              v-if="item['show_button'] === '3'"
+              type="success"
+              style="display:block;"
+              size="small"
+              @click.stop="handleDetail(item)"
+            >想看</xd-button>
+            <xd-button
+              v-else-if="item['show_button'] === '2'"
+              type="subPrimary"
+              style="display:block;"
+              size="small"
+              @click.stop="handleBuy(item)">预售</xd-button>
+          </template>
+        </view>
       </view>
+
     </view>
   </view>
 </template>
 
 <script>
   import XdButton from "@/components/XdButton/XdButton.vue";
-  import getServiceUrl from "@/common/getServiceUrl";
-  import handleKeyword from "./handleKeyword";
-
   export default {
     name:'ContentItem',
     components:{
       XdButton
     },
     props:{
-      keyword:{
-        type:String,
-        default:''
-      },
       item:Object,
       outSpacing: {
         type: Number|String,
@@ -87,18 +86,19 @@
       }
 
     },
-    computed:{
-      imageUrl(){
-        return getServiceUrl(this.item['poster'])
-      },
-      name(){
-       return  handleKeyword(this, this.item.show_name, this.keyword);
+    data(){
+      return {
+        errorImage: 'https://img.jufubao.cn/common/error_movie.png?v20',
+        errorStatus: false,
       }
     },
     created() {
 
     },
     methods:{
+      handleError(){
+        this.errorStatus = true;
+      },
       handleDetail(item){
         console.log('handleDetail.item',item,item.id);
         this.$emit('on-film-detail',item.id);
@@ -130,50 +130,89 @@
   }
   .middle {
     flex: 1;
-    & .name {
-      font-size: 30rpx;
-      font-weight: 500;
+
+    & .top {
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-end;
       margin-bottom: 20rpx;
-      .uni-max-cut(2, 90);
-      line-height: 45rpx;
-    }
 
-    & .other {
-      font-size: 25rpx;
-      color: #999;
-      .uni-max-cut(1,36);
-      line-height: 36rpx;
-      margin-bottom: 10rpx;
-      &:last-child {
-        margin-bottom: 0!important;
+      & > view:first-child{
+        flex: 1;
+        font-size: 36rpx;
+        font-weight: 600;
+        .uni-max-cut(2, 90);
+        line-height: 45rpx;
+      }
+      & >view:nth-child(2) {
+        flex-shrink: 0;
+        height: 45rpx;
+        line-height: 45rpx;
+        margin-left: 20rpx;
+        text-align: right;
+        & > text:nth-child(1) {
+          font-size: 20rpx;
+        }
+        & > text:nth-child(2) {
+          font-size: 28rpx;
+        }
       }
     }
-  }
 
-  .right {
-    flex-shrink: 0;
-    display: flex;
-    align-content: space-between;
-    align-items: flex-end;
-    justify-content: flex-end;
-    flex-flow: wrap;
-    height: 100%;
-    box-sizing: border-box;
-    width: 160rpx;
+    & .bottom {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
 
-    & .score {
-      height: 40rpx;
-      width:100%;
-      text-align: right;
-      & > text:nth-child(1) {
-        font-size: 20rpx;
-      }
-      & > text:nth-child(2) {
-        font-size: 28rpx;
+      & > view:first-child {
+        flex: 1;
+        & > view {
+          font-size: 25rpx;
+          color: #999;
+          .uni-max-cut(1,36);
+          line-height: 36rpx;
+          margin-bottom: 10rpx;
+          &:last-child {
+            margin-bottom: 0!important;
+          }
+        }
       }
 
+      & .btn {
+        width: 140rpx;
+        flex-shrink: 0;
+        margin-left: 20rpx;
+      }
     }
+    //& .name {
+    //  font-size: 36rpx;
+    //  font-weight: 600;
+    //  margin-bottom: 20rpx;
+    //  .uni-max-cut(2, 90);
+    //  line-height: 45rpx;
+    //}
+    //
+    //& .other {
 
+    //}
   }
+
+  //.right {
+  //  flex-shrink: 0;
+  //  display: flex;
+  //  align-content: space-between;
+  //  align-items: flex-end;
+  //  justify-content: flex-end;
+  //  flex-flow: wrap;
+  //  box-sizing: border-box;
+  //  width: 160rpx;
+  //  height: 200rpx;
+  //
+  //  & .score {
+
+  //
+  //  }
+  //
+  //}
 }
 </style>

package/src/components/JfbBaseTfkSearch/ContentProduct.vue

@@ -10,7 +10,7 @@
         borderRadius: borderRadius + 'rpx',
       }"
     >
-      <image :src="imageUrl" :alt="item['product_name']" mode="aspectFit"></image>
+      <image :src="imageUrl" :alt="item['product_name']"></image>
     </view>
     <view class="prodcut-content" :style="{marginTop:cell === 1? 0: (outSpacing + 'rpx') }">
       <view class="prodcut-content-info">
@@ -75,7 +75,7 @@ export default {
   props:{
     keyword:{
       type:String,
-      default:'北京'
+      default:''
     },
 
     height:{
@@ -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);
+      }
     }
   }
 }
@@ -195,6 +197,13 @@ export default {
     &.tow {
       .prodcut-image {
         width: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        & > image {
+          height: 100%;
+          width: 100%;
+        }
       }
 
     }
@@ -202,8 +211,8 @@ export default {
     &-image {
       overflow: hidden;
       & > image {
-        max-height: 100%;
-        max-width: 100%;
+        height: 100%;
+        width: 100%;
       }
     }
 

package/src/components/JfbBaseTfkSearch/ContentShop.vue

@@ -147,11 +147,13 @@ export default {
         justify-content: flex-start;
         align-items: flex-start;
         font-size: 22rpx;
+        line-height: 40rpx;
         color: #999;
 
         & > view:first-child {
           width: 40rpx;
           height: 40rpx;
+          line-height: 40rpx;
           margin-right: 10rpx;
           display: flex;
           justify-content: center;

package/src/components/JfbBaseTfkSearch/CusAttr.js

@@ -102,6 +102,16 @@ export default (data)=>{
       size: 'small',
       groupKey:'style',
     },
+    {
+      label: '商品的品牌文字颜色:',
+      ele: 'xd-color',
+      valueKey: 'brandColor',
+      value: data['brandColor'] || '',
+      placeholder: '请选择商品的品牌文字颜色',
+      classNmae: 'input80',
+      groupKey:'style',
+    },
+
     {
       label: '填充设置:',
       ele: 'xd-margin-padding',