jufubao-base 1.0.169-beta17 → 1.0.169-beta19

package/package.json

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

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -14,7 +14,7 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-notice__body">
-      <view class="jfb-base-notice__body-line"></view>
+      <view class="jfb-base-notice__body-line" v-if="contentList.length > 0"></view>
       <view>
         <template v-if="style === '3' && isPreview">
           <view class="jfb-base-notice__body-pop" :style="{backgroundColor:backgroundColor, color:warningColor}">弹窗模式方便编辑(占位)，在线上此模块不显</view>
@@ -23,7 +23,7 @@
           <template v-if="contentList.length === 0 && isPreview">
             <view class="jfb-base-notice__body-pop" :style="{backgroundColor:backgroundColor, color:warningColor}">接口无数返回，请检查是否配置成功!</view>
           </template>
-          <view v-else class="jfb-base-notice__body-scroll">
+          <view v-if="contentList.length > 0" class="jfb-base-notice__body-scroll">
             <view
               class="upAndDown"
               :style="{

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

@@ -41,13 +41,12 @@
         </view>
       </view>
       <view class="JfbBaseNotice">
-        <jfb-notice
+        <xd-notice
           :panelSetting="noticeSetting"
           :apiGetContent="apiGetContent"
-        ></jfb-notice>
+        ></xd-notice>
       </view>
       <view class="card_list_wrap" :style="listBoxStyle">
-
         <!-- 我的票券包- 已绑票券 -->
         <template v-if="menuType === 'card'">
           <view v-if="loadingList">
@@ -137,7 +136,7 @@
 
         </template>
       </view>
-      
+
     </view>
   </view>
 </template>
@@ -145,7 +144,7 @@
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
   import XdUnit from "@/components/XdUnit/XdUnit";
-  import JfbNotice from "./JfbNotice";
+  import XdNotice from "./XdNotice";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseTfkCardLoginMixin from "./JfbBaseTfkCardLoginMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -163,7 +162,7 @@
       XdNoticeBar,
       XdCouponItem,
       XdUnit,
-      JfbNotice,
+      XdNotice,
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseTfkCardLoginMixin
@@ -460,7 +459,7 @@
         })
       },
       noticeSetting(){
-        
+
         return {
           style: this.noticeStyle,
           is_hide_dailog: this.notice_is_hide_dailog,
@@ -542,7 +541,7 @@
         this.couponUseBtnPadding = getContainerPropsValue(value, "content.couponUseBtnPadding", {top: 20, left: 20, right: 20, bottom: 20});
         this.couponBtnRadius = getContainerPropsValue(value, "content.couponBtnRadius", 16);
         this.couponLeftBgColor = getContainerPropsValue(value, "content.couponLeftBgColor", "");
-        
+
         this.bindCardText = getContainerPropsValue(value, "content.bindCardText", "");
         this.bindCardTextStyle = getContainerPropsValue(value, "content.bindCardTextStyle", {});
         this.bindCardShowType = getContainerPropsValue(value, "content.bindCardShowType", 'text');
@@ -558,7 +557,7 @@
         this.disabledPath = getContainerPropsValue(value, "content.disabledPath", {value: ""}).value;
         this.menuShowType = getContainerPropsValue(value, "content.menuShowType", 'text');
         this.cardFontColor = getContainerPropsValue(value, "content.cardFontColor", '#333');
-       
+
         this.noticeStyle = getContainerPropsValue(value, "content.noticeStyle", '1');
         this.notice_is_hide_dailog = getContainerPropsValue(value, "content.notice_is_hide_dailog", 'N');
         this.noticeIsTitle = getContainerPropsValue(value, "content.noticeIsTitle", '');
@@ -640,7 +639,7 @@
       getCardList(){
         let show_type = this.menuType === 'coupon' ? 'coupon' : 'normal';
         let params = {show_type};
-       
+
         // let params = {is_all: 'Y', is_show_entry_settings: 'Y'};
         // if(options['jfb_business_code']) {
         //   params['card_business_code'] = options['jfb_business_code'];

package/src/components/JfbBaseTfkCardLogin/{JfbNotice.vue → XdNotice.vue}

@@ -187,7 +187,7 @@
   import storage from "@/common/storage";
 
   export default{
-    name: "JfbNotice",
+    name: "XdNotice",
     components: {
       XdFontIcon,
       XdContentXss,
@@ -547,4 +547,4 @@
   .isMp {
     width: 100%;
   }
-</style>
+</style>

package/src/components/JfbBaseTfkSearch/AllList.vue

@@ -13,10 +13,10 @@
             style="width: 100%; height: 100%"
             :keyword="keyword"
             :item="item"
-            :out-spacing="$parentVm.outSpacing"
-            :color="{SEAT:$parentVm.mainColor,CODE:$parentVm.subMainColor,SELL:$parentVm.successColor}"
-            :border-radius="$parentVm.imgRradius"
-            :brand-color="$parentVm.brandColor"
+            :out-spacing="listItemStyle.outSpacing"
+            :color="{SEAT:listItemStyle.mainColor,CODE:listItemStyle.subMainColor,SELL:listItemStyle.successColor}"
+            :border-radius="listItemStyle.imgRradius"
+            :brand-color="listItemStyle.brandColor"
             @on-schedule="handleFilmDetail"
             @on-cashier-detail="handleCashierDetail"
             @on-code-detail="handleCodeDetail"
@@ -26,10 +26,10 @@
             style="width: 100%; height: 100%"
             :keyword="keyword"
             :item="item"
-            :out-spacing="$parentVm.outSpacing"
-            :color="$parentVm.mainColor"
-            :border-radius="$parentVm.imgRradius"
-            :brand-color="$parentVm.brandColor"
+            :out-spacing="listItemStyle.outSpacing"
+            :color="listItemStyle.mainColor"
+            :border-radius="listItemStyle.imgRradius"
+            :brand-color="listItemStyle.brandColor"
             @on-film-detail="handleFilmDetail"
             @on-buy="handleBuy"
           ></content-film>
@@ -37,11 +37,11 @@
             style="width: 100%; height: 100%"
             :keyword="keyword"
             :item="item"
-            :out-spacing="$parentVm.outSpacing"
-            :color="$parentVm.mainColor"
-            :border-radius="$parentVm.imgRradius"
-            :brand-color="$parentVm.brandColor"
-            :is-echange="'Y' || $parentVm.isShowExchange"
+            :out-spacing="listItemStyle.outSpacing"
+            :color="listItemStyle.mainColor"
+            :border-radius="listItemStyle.imgRradius"
+            :brand-color="listItemStyle.brandColor"
+            :is-echange="'Y' || listItemStyle.isShowExchange"
             @on-shop-jhd="handleShopJhd"
             @on-shop-detail="handleShopDetail"
           ></content-shop>
@@ -51,7 +51,7 @@
         <view v-for="(item, i) in parent.items" :key="item.key"
           class="module_cont_inner"
           :style="[moduleItemContStyle, {
-            width: getProductCell(parent.tab) == 2 ? `calc(50% - ${$parentVm.allModuleItemContMargin/2}rpx)`: '100%',
+            width: getProductCell(parent.tab) == 2 ? `calc(50% - ${allStyle.allModuleItemContMargin/2}rpx)`: '100%',
           }]"
         >
           <content-product v-if="parent.type === 'product'"
@@ -59,11 +59,11 @@
             :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"
+            :product-config="productConfig"
+            :out-spacing="listItemStyle.outSpacing"
+            :color="listItemStyle.mainColor"
+            :brand-color="listItemStyle.brandColor"
+            :border-radius="listItemStyle.imgRradius"
             :cell="getProductCell(parent.tab)"
             @on-product-detail="handleProductDetail"
           ></content-product>
@@ -95,6 +95,17 @@
         type:String,
         default:'',
       },
+      allStyle: {
+        type:Object,
+      },
+      listItemStyle:{
+        type:Object|null,
+        default:null,
+      },
+      productConfig:{
+        type:Object|null,
+        default:null,
+      },
     },
     computed: {
       ...mapState({
@@ -102,38 +113,39 @@
         stateLocation: (state) => state.cityLocation.location || {},
       }),
       contMarginComp(){
-        let str = `${this.$parentVm.checkValue(this.$parentVm.contMargin.top, 20)}rpx`;
-        str = `${str} ${this.$parentVm.checkValue(this.$parentVm.contMargin.right, 20)}rpx`;
-        str = `${str} ${this.$parentVm.checkValue(this.$parentVm.contMargin.bottom, 20)}rpx`;
-        str = `${str} ${this.$parentVm.checkValue(this.$parentVm.contMargin.left, 20)}rpx`;
+        if(this.getParent === null) return 0
+        let str = `${this.getParent().checkValue(this.listItemStyle.contMargin.top, 20)}rpx`;
+        str = `${str} ${this.getParent().checkValue(this.listItemStyle.contMargin.right, 20)}rpx`;
+        str = `${str} ${this.getParent().checkValue(this.listItemStyle.contMargin.bottom, 20)}rpx`;
+        str = `${str} ${this.getParent().checkValue(this.listItemStyle.contMargin.left, 20)}rpx`;
         return str
       },
       moduleItemStyle(){
-        const { allModuleRadius } = this.$parentVm;
-        let padding = `${this.$parentVm.checkValue(this.$parentVm.allModulePadding.top, 20)}rpx`;
-        padding = `${padding} ${this.$parentVm.checkValue(this.$parentVm.allModulePadding.right, 20)}rpx`;
-        padding = `${padding} ${this.$parentVm.checkValue(this.$parentVm.allModulePadding.bottom, 20)}rpx`;
-        padding = `${padding} ${this.$parentVm.checkValue(this.$parentVm.allModulePadding.left, 20)}rpx`;
+        const { allModuleRadius, allModulePadding, allListBgColor, allModuleMargin } = this.allStyle;
+        let padding = `${this.checkValue(allModulePadding.top, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(allModulePadding.right, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(allModulePadding.bottom, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(allModulePadding.left, 20)}rpx`;
 
         return this.styleObjectToString({
-          background: this.$parentVm.allListBgColor,
+          background: allListBgColor,
           padding: padding,
-          marginBottom: this.$parentVm.allModuleMargin + 'rpx',
+          marginBottom: allModuleMargin + 'rpx',
           borderRadius: allModuleRadius + 'rpx',
         })
       },
       moduleItemTitleStyle(){
-        let padding = `${this.$parentVm.checkValue(this.$parentVm.allModuleTitlePadding.top, 20)}rpx`;
-        padding = `${padding} ${this.$parentVm.checkValue(this.$parentVm.allModuleTitlePadding.right, 20)}rpx`;
-        padding = `${padding} ${this.$parentVm.checkValue(this.$parentVm.allModuleTitlePadding.bottom, 20)}rpx`;
-        padding = `${padding} ${this.$parentVm.checkValue(this.$parentVm.allModuleTitlePadding.left, 20)}rpx`;
+        const { allModuleTitlePadding, allModuleTitleStyle, allModuleTitleBgColor } = this.allStyle;
+        let padding = `${this.checkValue(allModuleTitlePadding.top, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(allModuleTitlePadding.right, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(allModuleTitlePadding.bottom, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(allModuleTitlePadding.left, 20)}rpx`;
 
-        let allModuleTitleStyle = this.$parentVm.allModuleTitleStyle;
         let style = {padding: padding};
         if(allModuleTitleStyle === 'underline'){
           style['borderBottom'] = '1px solid #EEEEEE';
         }else{
-          style['background'] = this.$parentVm.allModuleTitleBgColor;
+          style['background'] = allModuleTitleBgColor;
         }
 
         return this.styleObjectToString(style);
@@ -142,7 +154,7 @@
         let {
           allModuleItemContBorder, allModuleItemContShadow, allModuleItemContPadding, allModuleItemContMargin,
           allModuleItemContRadius, allModuleItemContBgColor
-        } = this.$parentVm;
+        } = this.allStyle;
         let border = "none";
         let boxShadow = "none";
         if(allModuleItemContBorder && allModuleItemContBorder.type === 'Y'){
@@ -153,10 +165,10 @@
           let { width, color } = allModuleItemContShadow.value;
           boxShadow = `0 0 ${width}rpx ${color}`;
         }
-        let padding = `${this.$parentVm.checkValue(allModuleItemContPadding.top, 20)}rpx`;
-        padding = `${padding} ${this.$parentVm.checkValue(allModuleItemContPadding.right, 20)}rpx`;
-        padding = `${padding} ${this.$parentVm.checkValue(allModuleItemContPadding.bottom, 20)}rpx`;
-        padding = `${padding} ${this.$parentVm.checkValue(allModuleItemContPadding.left, 20)}rpx`;
+        let padding = `${this.checkValue(allModuleItemContPadding.top, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(allModuleItemContPadding.right, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(allModuleItemContPadding.bottom, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(allModuleItemContPadding.left, 20)}rpx`;
         console.log("allModuleItemContShadow", allModuleItemContShadow)
         return this.styleObjectToString({
           padding: padding,
@@ -168,7 +180,7 @@
         })
       },
       moduleMoreStyle(){
-        let allModuleMoreStyle = this.$parentVm.allModuleMoreStyle;
+        const { allModuleMoreStyle } = this.allStyle;
         let style = {};
         if(allModuleMoreStyle === 'text'){
 
@@ -180,11 +192,11 @@
         return this.styleObjectToString(style);
       },
       outItemProduct(){
+        if(this.getParent === null) return 0
         //获取每列元素最大宽度
-        // return 300;
-        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
+        let num = (750 - 3 * Number(this.listItemStyle.outSpacing))/2;
+        num = num - this.getParent().checkValue(this.listItemStyle.contMargin.right, 20) - this.getParent().checkValue(this.listItemStyle.contMargin.left, 20);
+        return num - this.listItemStyle.contBorderWidth * 2
       },
     },
     watch: {
@@ -199,6 +211,8 @@
     },
     data(){
       return {
+        /**@type Function|null**/
+        getParent:null,
         $parentVm:null,
         parentStatus: false,
 
@@ -210,13 +224,16 @@
       this.getList();
     },
     methods: {
+      checkValue(value, defaultValue){
+        return this.getParent().checkValue(value, defaultValue);
+      },
       getProductCell(str = ''){
         let cellNum = str.split("@")[3] || 1;
         return Number(cellNum);
       },
       getParentMV(){
-        this.$emit('on-parent-vm', ($vm)=>{
-          this.$parentVm = $vm;
+        this.$emit('on-parent-vm', (getParent)=>{
+          this.getParent = getParent;
           this.parentStatus = true;
         })
       },
@@ -257,34 +274,34 @@
 
       //影片
       handleFilmDetail(film){
-        this.$parentVm.handleFilmDetail(film, this.dataConfig)
+        this.getParent().handleFilmDetail(film, this.dataConfig)
       },
       handleBuy(film){
-        this.$parentVm.handleBuy(film, this.dataConfig)
+        this.getParent().handleBuy(film, this.dataConfig)
       },
 
       //影院
       handleSchedule(cinema){
-        this.$parentVm.handleSchedule(cinema, this.dataConfig)
+        this.getParent().handleSchedule(cinema, this.dataConfig)
       },
       handleCashierDetail(cinema){
-        this.$parentVm.handleCashierDetail(cinema, this.dataConfig)
+        this.getParent().handleCashierDetail(cinema, this.dataConfig)
       },
       handleCodeDetail(cinema){
-        this.$parentVm.handleCodeDetail(cinema, this.dataConfig)
+        this.getParent().handleCodeDetail(cinema, this.dataConfig)
       },
 
       //门店
       handleShopJhd(shop){
-        this.$parentVm.handleShopJhd(shop, this.dataConfig)
+        this.getParent().handleShopJhd(shop, this.dataConfig)
       },
       handleShopDetail(shop){
-        this.$parentVm.handleShopDetail(shop, this.dataConfig)
+        this.getParent().handleShopDetail(shop, this.dataConfig)
       },
 
       //商品
       handleProductDetail(product){
-        this.$parentVm.handleProductDetail(product, this.dataConfig)
+        this.getParent().handleProductDetail(product, this.dataConfig)
       },
     }
   }

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -40,14 +40,17 @@
             </view>
           </view>
         </view>
-        <view v-if="!isPreview" style="height: 100rpx;"></view>
+        <view v-if="!isPreview" :style="{height: menuHeight}"></view>
         <view class="tfk-search" :style="{padding: outSpacing + 'rpx'}">
-<!--          <all-list v-if="tabId === 'all'"-->
-<!--            :keyword="keyword"-->
-<!--            @on-parent-vm="handleParentVm"-->
-<!--            @on-list="handleList"-->
-<!--            @on-switch="handleSwitchMenu"-->
-<!--          ></all-list>-->
+          <all-list v-if="tabId === 'all'"
+            :keyword="keyword"
+            :list-item-style="listItemStyle"
+            :product-config="productConfig"
+            :all-style="allStyle"
+            @on-parent-vm="handleParentVm"
+            @on-list="handleList"
+            @on-switch="handleSwitchMenu"
+          ></all-list>
           <custom-list
             :tab-id="tabId"
             :keyword="keyword"
@@ -73,7 +76,7 @@
   import extsMixins from "@/mixins/extsMixins";
   import listMixins from "./listMixins";
   import CustomList from "./CustomList.vue";
-  //import AllList from "./AllList.vue";
+  import AllList from "./AllList.vue";
 
   class EmitParent {
     constructor(options) {
@@ -86,7 +89,7 @@
     components: {
       CustomList,
       XdFontIcon,
-      //AllList,
+      AllList,
       XdSearchHistory
     },
     mixins: [
@@ -176,6 +179,13 @@
 
         return this.styleObjectToString(styleObj)
       },
+      menuHeight(){
+        const { menuItemPadding, menuPadding, menuMargin } = this;
+        let height = this.checkValue(menuMargin.top, 20) + this.checkValue(menuMargin.bottom, 20) +
+          this.checkValue(menuPadding.top, 20) + this.checkValue(menuPadding.bottom, 20) +
+          this.checkValue(menuItemPadding.top, 20) + this.checkValue(menuItemPadding.bottom, 20);
+        return (height + 40) + 'rpx';
+      },
       menuItemActiveStyle(){
         let defaultTextColor = this.mainColor;
         let styleActiveObj = {
@@ -187,6 +197,24 @@
         }
         return this.styleObjectToString(styleActiveObj)
       },
+      allStyle(){
+        return {
+          allListBgColor: this.allListBgColor,
+          allModulePadding: this.allModulePadding,
+          allModuleRadius: this.allModuleRadius,
+          allModuleTitleBgColor: this.allModuleTitleBgColor,
+          allModuleTitlePadding: this.allModuleTitlePadding,
+          allModuleMoreStyle: this.allModuleMoreStyle,
+          allModuleMargin: this.allModuleMargin,
+          allModuleTitleStyle: this.allModuleTitleStyle,
+          allModuleItemContBorder: this.allModuleItemContBorder,
+          allModuleItemContMargin: this.allModuleItemContMargin,
+          allModuleItemContShadow: this.allModuleItemContShadow,
+          allModuleItemContPadding: this.allModuleItemContPadding,
+          allModuleItemContRadius: this.allModuleItemContRadius,
+          allModuleItemContBgColor: this.allModuleItemContBgColor
+        }
+      }
     },
     watch: {
       container(value, oldValue) {

package/src/components/JfbBaseTfkSearch/Mock.js

@@ -103,7 +103,7 @@ module.exports = {
             consume_mode: ["STOD", "CODE", "SELL", "SELF"],
             consume_mode_name: "",
             distance: "21km",
-            is_support_jhd: false,
+            is_support_jhd: true,
             address: "河北廊坊市三河市燕郊镇河北廊坊燕郊润旭",
             province_name: "",
             city_name: "",