jufubao-base 1.0.174-beta9 → 1.0.176-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.174-beta9",
+  "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/JfbBaseTfkCardDetail/JfbBaseTfkCardDetail.vue

@@ -675,7 +675,11 @@
           }
         }
       }
-
+      .rule_wrap{
+        font-size: 32rpx;
+        line-height: 1.7;
+        font-weight: 400;
+      }
       .code_wrap{
         display: flex;
         flex-direction: column;

package/src/components/JfbBaseTfkSearch/AllList.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="search_all_list" >
     <template v-if="!loadingList">
-      <view class="module_item" v-for="parent in list" :key="parent.setting_id"
+      <view class="module_item" v-for="(parent, pi) in list" :key="parent.setting_id"
         :style="moduleItemStyle"
       >
         <view class="module_title" :style="moduleItemTitleStyle">{{ parent.name }}</view>
@@ -18,7 +18,7 @@
               :color="{SEAT:listItemStyle.mainColor,CODE:listItemStyle.subMainColor,SELL:listItemStyle.successColor}"
               :border-radius="listItemStyle.imgRradius"
               :brand-color="listItemStyle.brandColor"
-              @on-schedule="data => handleFilmDetail(data, parent)"
+              @on-schedule="data => handleSchedule(data, parent)"
               @on-cashier-detail="data => handleCashierDetail(data, parent)"
               @on-code-detail="data => handleCodeDetail(data, parent)"
             ></content-cinema>
@@ -71,7 +71,7 @@
           </view>
         </view>
         <view class="module_more">
-          <view class="more_inner" :style="moduleMoreStyle" @click="switchMenu(parent)">查看全部</view>
+          <view class="more_inner" :style="moduleMoreStyle" @click="switchMenu(pi)">查看全部</view>
         </view>
       </view>
       <xd-no-data v-if="list && list.length ===0" height="60vh" icon-type="search">商品正在上架中</xd-no-data>
@@ -262,7 +262,9 @@
           }
         })
       },
-      switchMenu(item){
+      switchMenu(index){
+        let item = this.list[index];
+        // console.log('switchMenu', item, pi);
         this.$emit('on-switch', {...item, value: item.tab});
       },
 

package/src/components/JfbBaseTfkSearch/ContentFilm.vue

@@ -110,12 +110,12 @@
         this.errorStatus = true;
       },
       handleDetail(item){
-        console.log('handleDetail.item',item,item.id);
-        this.$emit('on-film-detail',item.id);
+        console.log('handleDetail.item',item,item);
+        this.$emit('on-film-detail',item);
       },
       handleBuy(item){
-        console.log('handleDetail.item',item,item.id);
-        this.$emit('on-buy',item.id);
+        console.log('handleDetail.item',item,item);
+        this.$emit('on-buy',item);
       }
     }
   }

package/src/components/JfbBaseTfkSearch/ContentProduct.vue

@@ -12,7 +12,7 @@
     >
       <image v-if="errorStatus" :src="errorImage" :alt="item['product_name']" ></image>
       <image v-if="!errorStatus" :src="imageUrl" :alt="item['product_name']" @error="handleError()"></image>
-      <xd-product-status :status="item.status"></xd-product-status>
+      <xd-product-status :status="item['status']"></xd-product-status>
     </view>
     <view class="prodcut-content" :style="{marginTop:cell === 1? 0: (outSpacing + 'rpx') }">
       <view class="prodcut-content-info">
@@ -208,6 +208,7 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
+        position: relative;
         & > image {
           height: 100%;
           width: 100%;

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">

package/src/components/JfbBaseTfkSearch/CustomList.vue

@@ -132,6 +132,7 @@
             ></content-product>
           </view>
         </view>
+        <view class="hasNoData" v-if="dataList && dataList.length > 0 && page_token === ''">已经到底没有更多数据了</view>
       </view>
     </view>
   </view>
@@ -467,7 +468,8 @@ export default {
     text-align: center;
     color: #ccc;
     background-color: rgba(255, 255, 255, .05);
-    margin: 20rpx 0
+    margin: 20rpx 0;
+    width: 100%;
   }
 
 </style>

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -310,6 +310,10 @@
       },
       handleSwitchMenu(item){
         this.tabId = item.value;
+        uni.pageScrollTo({
+          scrollTop: 0,
+          duration: 0
+        });
       },
       handleToSearch(item){
         this.keyword = item;

package/src/components/JfbBaseTfkSearch/handleKeyword.js

@@ -4,7 +4,7 @@ export default ($vm, str , keyword='', options={})=>{
   if(keyword === '') return  str;
   try {
     let __option = {
-      tag: 'text',
+      tag: 'span',
       color: 'red',
       weight: '500',
     };