jufubao-base 1.0.174-beta4 → 1.0.174-beta8

package/package.json

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

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -53,6 +53,7 @@
             v-if="useSearch==='Y'"
             :placeholder="placeholder"
             class="search_input"
+            :value="keyword"
             @input="handleInput"
             @click="toSearch"
             :placeholder-style="'color:' + inputTextColor"
@@ -100,6 +101,8 @@
         timer: null,
         saveKey: 'xd_user_current_access_city', //用户选中城市存储key
         loaded: false,
+        keyword: "",
+
         //面板
         showLocation: "",
         showLocationKey: 'showLocationKey',
@@ -204,6 +207,7 @@
 
       },
       handleInput(e){
+        this.keyword = e.detail.value;
         if(this.timer) clearTimeout(this.timer);
         this.timer = setTimeout(() => {
           jfbRootFnExec(this, 'onCustomEvent')("baseHeader@search", e.detail.value);
@@ -242,6 +246,11 @@
         }
         this.$xdUniHelper.navigateBack();
       },
+      onJfbCustomEvent({action, data}){
+        if(action === 'baseTfkSearch@keyword'){
+          this.keyword = data;
+        }
+      }
     }
   }
 

package/src/components/JfbBaseTfkSearch/AllList.vue

@@ -42,7 +42,7 @@
               :color="listItemStyle.mainColor"
               :border-radius="listItemStyle.imgRradius"
               :brand-color="listItemStyle.brandColor"
-              :is-echange="listItemStyle.isShowExchange"
+              :is-echange="productConfig.isShowExchange"
               @on-shop-jhd="data => handleShopJhd(data, parent)"
               @on-shop-detail="data => handleShopDetail(data, parent)"
             ></content-shop>
@@ -157,7 +157,7 @@
       },
       moduleItemContStyle(){
         const { contBgColor, contShadow, contBorder, contMargin, contRradius, outSpacing } = this.listItemStyle;
-    
+
         let padding = `${this.checkValue(contMargin.top, 20)}rpx`;
         padding = `${padding} ${this.checkValue(contMargin.right, 20)}rpx`;
         padding = `${padding} ${this.checkValue(contMargin.bottom, 20)}rpx`;

package/src/components/JfbBaseTfkSearch/ContentProduct.vue

@@ -304,9 +304,11 @@ export default {
         flex-flow: wrap;
 
         &.showTwo {
-          &:nth-child(4),&:nth-child(5),&:nth-child(6){
-            margin-top: 8rpx;
-          }
+         & > view{
+           &:nth-child(4),&:nth-child(5),&:nth-child(6){
+             margin-top: 8rpx;
+           }
+         }
         }
         & > view {
           padding: 0 14rpx;

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -65,7 +65,7 @@
 <script>
   import XdSearchHistory from "@/components/XdSearchHistory/XdSearchHistory";
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
+  import { jfbRootExec, jfbRootFnExec } from "@/utils/xd.event";
   import JfbBaseTfkSearchMixin from "./JfbBaseTfkSearchMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
@@ -92,9 +92,11 @@
       componentsMixins, extsMixins, JfbBaseTfkSearchMixin,listMixins
     ],
     data() {
+      let keyword = ''
+      if(this.$configProject['isPreview']) keyword = '商品'
       return {
         tabId: 'all', //cinema/film/shop/product
-        keyword: '',
+        keyword: keyword,
         options:{},
         menuList: [],
         //公共样式
@@ -223,7 +225,7 @@
       },
     },
     created() {
-      if(this.$configProject['isPreview']) this.keyword = '商品'
+
       this.emitParent = new EmitParent({
         getParent: ()=>{
           return this;
@@ -303,7 +305,6 @@
 
         if(this.$configProject['isPreview']){
           this.menuList = this.searchScope;
-          this.keyword = "搜索关键字";
           this.isPreview = true;
         }
       },
@@ -312,6 +313,7 @@
       },
       handleToSearch(item){
         this.keyword = item;
+        jfbRootFnExec(this, 'onCustomEvent')("baseTfkSearch@keyword", item);
       },
       onJfbScroll(options) {
         // console.log('event.onJfbScroll', options)