jufubao-base 1.0.174-beta8 → 1.0.175

package/package.json

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

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

@@ -10,7 +10,9 @@
         borderRadius: borderRadius + 'rpx',
       }"
     >
-      <image :src="imageUrl" :alt="item['product_name']"></image>
+      <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>
     </view>
     <view class="prodcut-content" :style="{marginTop:cell === 1? 0: (outSpacing + 'rpx') }">
       <view class="prodcut-content-info">
@@ -64,13 +66,15 @@
 import handleKeyword from "./handleKeyword";
 import getServiceUrl from "@/common/getServiceUrl";
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon.vue";
+import XdProductStatus from "@/components/XdProductStatus/XdProductStatus";
 import XdUnit from "@/components/XdUnit/XdUnit.vue";
 
 export default {
   name: "ContentProduct",
   components:{
     XdFontIcon,
-    XdUnit
+    XdUnit,
+    XdProductStatus
   },
   props:{
     keyword:{
@@ -153,7 +157,9 @@ export default {
   data(){
     return {
       tagObj: null,
-      tagObjColor: null
+      tagObjColor: null,
+      errorStatus: false,
+      errorImage:'https://img0.jufubao.cn/common/empty/product.png?v1=1',
     }
   },
   created() {
@@ -161,10 +167,11 @@ export default {
     this.tagObjColor = this.$colorConfig.productTagsColor;
   },
   methods:{
+    handleError(){
+      this.errorStatus = true;
+    },
     handleDetail(){
-      if(this.item.status === 'ok') {
-        this.$emit('on-product-detail', this.item);
-      }
+      this.$emit('on-product-detail', this.item);
     }
   }
 }
@@ -182,6 +189,7 @@ export default {
 
       .prodcut-image {
         flex-shrink: 0;
+        position: relative;
       }
 
       .prodcut-content {
@@ -200,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

@@ -1,7 +1,8 @@
 <template>
   <view  class="content-item" @click="handleDetail(item)">
     <view class="content-item-image" :style="{marginRight:outSpacing+'rpx',borderRadius:borderRadius+'rpx'}">
-      <image :src="imageUrl" :alt="item['resource_shop_name']"></image>
+      <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>
     </view>
     <view class="content-item-cont">
       <view class="title">
@@ -77,11 +78,20 @@ export default {
       return `${sy}${this.item.address}`;
     },
   },
+  data(){
+    return {
+      errorStatus: false,
+      errorImage:'https://img0.jufubao.cn/common/empty/shop.png?v1=1',
+    }
+  },
   created() {
     // console.log(this.item)
     // debugger
   },
   methods:{
+    handleError(){
+      this.errorStatus = true;
+    },
     handleJhd(item){
       this.$emit('on-shop-jhd',item);
     },

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',
     };