jufubao-base 1.0.169-beta10 → 1.0.169-beta12

package/package.json

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

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -110,7 +110,7 @@
         partnerName: "",
         useSearch: "N",   //Y:用于搜索;  N:用于跳转搜索页面
         searchPagePath: "",
-        placeholder: "搜索商品名称",
+        placeholder: "请输入关键词",
         choseCityPath: "",  //选择城市i
 
 
@@ -166,7 +166,7 @@
         this.showBack = getContainerPropsValue(container, "content.showBack", "Y");
         this.showPartner = getContainerPropsValue(container, "content.showPartner", "N")
         this.showPartnerName = getContainerPropsValue(container, "content.showPartnerName", "N");
-        this.placeholder = getContainerPropsValue(container, "content.placeholder");
+        this.placeholder = getContainerPropsValue(container, "content.placeholder",'请输入关键词');
         this.useSearch = getContainerPropsValue(container, "content.useSearch", "Y");
         this.searchPagePath = getContainerPropsValue(container, "content.searchPagePath", {value:""}).value;
         this.choseCityPath = getContainerPropsValue(container, "content.choseCityPath", {value:""}).value;

package/src/components/JfbBaseTfkCardBind/Attr.js

@@ -631,7 +631,7 @@ export default {
         valueKey: 'my_card_url',
         groupKey: 'advanced',
         placeholder: '请选择我的票券跳转地址',
-        value: null,
+        value: data.my_card_url || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
@@ -643,7 +643,7 @@ export default {
         valueKey: 'back_url',
         groupKey: 'advanced',
         placeholder: '请选择卡绑定成功回跳地址',
-        value: null,
+        value: data.back_url || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseTfkCardDetail/JfbBaseTfkCardDetail.vue

@@ -248,12 +248,12 @@
         return bg
       },
       listColWrapBoxStyle(){
-        let margin = `${this.checkValue(this.listColMargin.top, 20)}rpx`;
-        margin = `${margin} ${this.checkValue(this.listColMargin.right, 20)}rpx`;
-        margin = `${margin} ${this.checkValue(this.listColMargin.bottom, 20)}rpx`;
-        margin = `${margin} ${this.checkValue(this.listColMargin.left, 20)}rpx`;
+        let padding = `${this.checkValue(this.listColMargin.top, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.listColMargin.right, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.listColMargin.bottom, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.listColMargin.left, 20)}rpx`;
         return this.styleObjectToString({
-          margin: margin,
+          padding: padding,
         })
       },
       listColItemStyle(){
@@ -652,7 +652,6 @@
         }
       }
       .list_col_wrap{
-        margin: 40rpx 0;
 
         .list_item{
           display: flex;

package/src/components/JfbBaseTfkSearch/AllList.vue

@@ -4,7 +4,7 @@
       :style="moduleItemStyle"
     >
       <view class="module_title" :style="moduleItemTitleStyle">{{ parent.name }}</view>
-      <view class="module_cont">
+      <view v-if="parent.type !== 'product'" class="module_cont">
         <view v-for="(item, i) in parent.items" :key="i">
           <content-cinema v-if="parent.type === 'cinema'"
             style="width: 100%; height: 100%"
@@ -45,16 +45,26 @@
             @on-shop-detail="(shop)=>{$parentVm.handleShopDetail(shop,parent)}"
           ></content-shop>
 
+        </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',
+          }"
+        >
           <content-product v-if="parent.type === 'product'"
             style="width: 100%; height: 100%"
             :keyword="keyword"
             :item="item"
+            :height="outItemProduct"
             :product-config="$parentVm.productConfig"
             :out-spacing="$parentVm.outSpacing"
             :color="$parentVm.mainColor"
             :brand-color="$parentVm.brandColor"
             :border-radius="$parentVm.imgRradius"
-            :cell="1"
+            :cell="getProductCell(parent.tab)"
             @on-product-detail="(product)=>{$parentVm.handleProductDetail(product,parent)}"
           ></content-product>
         </view>
@@ -138,6 +148,12 @@
         }
         return this.styleObjectToString(style);
       },
+      outItemProduct(){
+        //获取每列元素最大宽度
+        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
+      },
     },
     watch: {
       keyword(){
@@ -162,6 +178,10 @@
       this.getList();
     },
     methods: {
+      getProductCell(str){
+        let cellNum = str.split("@")[3] || 1;
+        return Number(cellNum);
+      },
       getParentMV(){
         this.$emit('on-parent-vm', ($vm)=>{
           this.$parentVm = $vm;
@@ -187,7 +207,7 @@
         this.$emit('on-list', {
           params: params,
           cb:(list)=>{
-            this.list = list;
+            this.list = list || [];
             this.$xdHideLoading();
           }
         })
@@ -211,6 +231,12 @@
     }
     .module_cont{
       padding: 20rpx 0;
+      
+      &.product_wrap{
+        display: flex;
+        justify-content: space-between;
+        flex-wrap: wrap;
+      }
     }
     .module_more{
       display: flex;

package/src/components/JfbBaseTfkSearch/ContentFilm.vue

@@ -160,6 +160,7 @@
     height: 100%;
     box-sizing: border-box;
     width: 160rpx;
+    min-height: 200rpx;
 
     & .score {
       height: 40rpx;

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -43,7 +43,7 @@
         <view v-if="!isPreview" style="height: 100rpx;"></view>
 
         <view class="tfk-search" :style="{padding: outSpacing + 'rpx'}">
-          <all-list v-if="!tabId"
+          <all-list v-if="tabId === 'all'"
             :keyword="keyword"
             @on-parent-vm="handleParentVm"
             @on-list="handleList"
@@ -91,7 +91,7 @@
     data() {
       return {
         hideMask: true,
-        tabId: '', //cinema/film/shop/product
+        tabId: 'all', //cinema/film/shop/product
         keyword: '',
         options:{},
         menuList: [],
@@ -198,7 +198,7 @@
        */
       handleList({params, cb}){
         let data = {...params};
-        if(this.tabId === ''){
+        if(this.tabId === 'all'){
           data['search_range'] = this.searchScope.map(item => item.value.split("@")[0]).join(',');
         }
 
@@ -206,7 +206,7 @@
           vm: this,
           data: data
         }).then(res => {
-          if(this.tabId === ''){
+          if(this.tabId === 'all'){
             if(!this.$configProject['isPreview']){
               this.menuList = res.tabs;
             }
@@ -216,10 +216,7 @@
             else cb(null)
           }
         }).catch((e)=>{
-            if(this.tabId === ''){
-              //todo
-            }
-            else  cb(null)
+          cb(null);
         })
       },
 
@@ -283,7 +280,7 @@
             duration: 0
           });
           this.keyword = data;
-          this.tabId = '';
+          this.tabId = 'all';
           this.$refs.searchHistory.addHistory(data);
         }
       },