jufubao-mall 2.0.16-beta53 → 2.0.16-beta54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.16-beta53",
+  "version": "2.0.16-beta54",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallResourceShopList/JfbMallResourceShopList.vue

@@ -2,6 +2,7 @@
   <view
     class="jfb-mall-resource-shop-list"
     @click="handleEditxSelect"
+    :style="[bodyStyle]"
     :class="{ editx : isEditx && active }"
   >
     <!--#ifdef H5-->
@@ -60,7 +61,7 @@
           </swiper-item>
         </swiper>
       </view>
-      <view class="query_filter" :style="[queryFilterStyle]">
+      <view class="query_filter" :style="[queryFilterStyle]" v-if="showQuery === 'Y'">
         <view v-if="filterItemsComp.length===1">店铺列表</view>
         <!-- <template>
           <view class="query_filter_r" @click="switchQueryModal('city')" v-if="filterModeData.includes('city_code')">
@@ -99,12 +100,13 @@
             :filter-type="curQueryTab"
             :collapse-num="6"
             :padding="bodyPadding"
+            :height="filterHeight.height"
             :filter-selected="searchFilterParams"
             @onConfirm="handleQueryFilter"></xd-query-filter>
         </view>
       </view>
       <view class="query_filter_copy" :style="[queryCopyStyle]"></view>
-      <view v-show="showQueryModal" class="modal" @click="closeQueryModal" @touchmove.stop.prevent="moveHandle"></view>
+      <view v-show="showQueryModal" class="modal" @click="closeQueryModal" @touchmove.stop.prevent="moveHandle" :style="[modelStyle]"></view>
       <view v-if="initAttr" :style="[shopListStyle]">
         <cus-shops
           :layout="layout"
@@ -120,50 +122,14 @@
           @on-event="handleToClick"
         ></cus-shops>
       </view>
-      <!-- <view v-if="shopList.length" class="shop_list">
-        <view class="shop_item"
-          v-for="item in shopList" :key="item.resource_shop_id"
-          :style="[cardItemBoxStyle]"
-          @click="handleToShopDetail(item)"
-        >
-          <view class="shop_image">
-            <image v-if="item.errorStatus" :src="errorImage" :alt="item['resource_shop_name']" ></image>
-            <image v-else :src="item.shop_icon" mode="aspectFit" @error="handleError(item)"></image>
-          </view>
-          <view class="shop_info">
-            <view class="shop_name">
-              <view class="_name">{{item.resource_shop_name}}</view>
-              <view v-if="item.distance" class="distance">{{item.distance}}</view>
-            </view>
-            <view class="shop_address">{{ item.address }}</view>
-            <view class="shop_foot">
-              <view class="l_tags">
-                <template v-if="showQuickEntry!=='Y'">
-                  <view v-if="item.consume_mode.includes('SELL')" class="shop_tag">支持核销</view>
-                  <view v-if="item.consume_mode.includes('SEAT')" class="shop_tag">在线选座</view>
-                </template>
-              </view>
-              <view v-if="showQuickEntry==='Y'" class="r_btns">
-                <template v-if="item.consume_mode.includes('SELL')">
-                  <view v-if="item.default_consume_type === 'WB'" class="change_btn"
-                    @click.stop="handleToScan(item)">{{ scanName }}</view>
-                  <view v-else-if="item.default_consume_type === 'QP'" class="change_btn"
-                    @click.stop="handleToEasyPay(item)">{{ takeGoodsName }}</view>
-                  <view v-else-if="item.default_consume_type === 'JHD'" class="change_btn"
-                    @click.stop="handleToExchange(item)"
-                  >{{ jhdName }}</view>
-                </template>
-                <template v-if="item.consume_mode.includes('SEAT')">
-                  <view class="change_btn" @click.stop="toSchedulePath(item)">{{ buyTicketName }}</view>
-                </template>
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view v-else>
+        <xd-more
+        v-if="($configProject['isPreview'] || !hasNextPage) && (shopList && shopList.length > 0)"
+        :color="footerColor"
+        :background="footerColor"
+      ><text>我是有底线的</text></xd-more>
+      <!-- <view v-else>
         <xd-no-data></xd-no-data>
-      </view> -->
+      </view>  -->
       <!-- CV:店员核销（小蜜蜂）；WB:用户扫水牌；CR:收银机；POS:POS机；JHD:聚好兑;QP：快捷支付 -->
     </view>
   </view>
@@ -181,6 +147,7 @@
   import getServiceUrl from "@/common/getServiceUrl";
   import XdNoData from "@/components/XdNoData/XdNoData.vue"
   import CusShops from "@/components/CusShops/CusShops.vue"
+  import XdMore from "@/components/XdMore/XdMore.vue";
   let $vm = null;
   export default {
     // #ifdef MP-WEIXIN
@@ -192,6 +159,7 @@
       XdQueryFilter,
       XdNoData,
       CusShops,
+      XdMore,
     },
     mixins: [
       componentsMixins, extsMixins, JfbMallResourceShopListMixin
@@ -223,7 +191,7 @@
         consume_mode: '',
 
         next_page_token: "",
-        hasNext: true,
+        hasNextPage: true,
         shopList: [],
 
         errorImage:'https://img0.jufubao.cn/common/empty/shop.png?v1=1',
@@ -239,7 +207,7 @@
         buyTicketName: "",
 
         bodyBgColor: "",
-        defBodyBgColor:"rgba(245, 245, 245, 1)",
+        defBodyBgColor:"#f8f8f8",
         bodyPadding: {},
         listPadding: {bottom:20,left:20,right:20,top:20},
         cardItemBgColor: "",
@@ -291,6 +259,10 @@
         queryGreater:'N',
         isMore:'N',
         loading: false, //是否正在加载
+        modelTop:0,
+        popId:null,
+        footerColor:'#ddd',
+        searchFilterList:[],
       }
     },
     filters:{
@@ -369,8 +341,26 @@
           tabs.push({value: 'filter', label: '筛选', icon: 'iconshaixuanbiaoji_mian',size: 24});
         } 
         return tabs
-      }
-      
+      },
+      bodyStyle(){
+        return {
+          overflow:this.showQueryModal?'hidden':'auto',
+        }
+      },
+      modelStyle(){
+        return {
+          top:this.modelTop-this.scrollTop+'px',
+        }
+      },
+      filterHeight(){
+        console.log(this.listPadding.top,'pppp')
+        let height = this.modelTop-this.scrollTop-this.listPadding.top*this.$rpxNum;
+        // let height = 0
+        console.log(this.modelTop,this.scrollTop,height,'hhhh')
+        return{
+          height
+        }
+      },
     },
     watch: {
       container(value, oldValue) {
@@ -445,9 +435,36 @@
             }
           }
         }
-      }
+      },
+      showQueryModal:{
+        handler(n,o){
+          if(n){
+            this.setHasPopStatus({popId: this.popId, action: 'add'});  
+          }else{
+            this.setHasPopStatus({popId: this.popId, action: 'del'});
+          } 
+        },
+        immediate:true,
+        deep:true,
+      },
+      // showAllBusinessLine:{
+      //   handler(n,o){
+      //     console.log(n,o,this.namespace,'lllll111')
+      //     if(n == 'Y'){
+      //       this.namespaceList = [{label: "全部", value: "all"}].concat(this.namespaceList);
+      //     }else{
+      //       this.namespaceList = this.namespaceList.filter(item => item.value!=='all');
+      //     }
+      //     if(this.namespaceList.length){
+      //       this.namespace = this.xnamespace||this.namespaceList[0].value;
+      //     }
+      //   },
+      //   immediate:true,
+      //   deep:true,
+      // },
     },
     created() {
+      this.popId = this.$xdUniHelper.randomChar(20);
       this.init(this.container);
       $vm= this;
       //todo
@@ -458,9 +475,9 @@
       
     },
     methods: {
-      ...mapActions(['getCustomList']),
+      ...mapActions(['getCustomList','setHasPopStatus']),
       watchScroll(scrollTop){
-        console.log(this.layoutInfo,'this.layoutInfo')
+        console.log(this.layoutInfo,scrollTop,'this.layoutInfo')
         this.scrollTop = scrollTop;
         this.$nextTick(() => {
           // console.log(Math.floor(scrollTop / this.$rpxNum),Math.floor(this.num-this.menuWrapNum),this.num,this.menuWrapNum,'asaaaaaaa')
@@ -491,6 +508,10 @@
         console.log('options', options)
         //设置业务请求代码
         this.setNameSpace(options);
+        console.log(this.xnamespace,'options','mmmmmm')
+        if(this.xnamespace){
+          this.namespace = this.xnamespace;
+        }
         //地址参数传入过滤条件选中
         if(options['brand_ids']){
           this.$set(this.searchFilterParams, 'brand', options['brand_ids'].split(','));
@@ -524,6 +545,8 @@
         //门店布局
         this.layout = gCPVal(container, 'layout', 'v2');
         this.showBusinessLine = gCPVal(container, 'showBusinessLine', '');
+        this.dimension = gCPVal(container, 'dimension', 'business');
+        console.log(this.dimension+'b',this.showBusinessLine+'s','this.dimension')
         // this.showAllBusinessLine = getContainerPropsValue(container, 'content.showAllBusinessLine', "");
         this.showAllBusinessLine = gCPVal(container, 'showAllBusinessLine', '');
         // this.showQuickEntry = getContainerPropsValue(container, 'content.showQuickEntry', "Y");
@@ -553,7 +576,7 @@
         // this.cardItemBgColor = getContainerPropsValue(container, 'content.cardItemBgColor', "");
         this.distanceColor = gCPVal(container,'distanceColor', '#999999', {sKey:'distanceColorStatus',fields:['distanceColor']});
         //item背景色
-        this.cardItemBgColor = gCPVal(container,'cardItemBgColor', '', {sKey:'cardItemBgColorStatus',fields:['cardItemBgColor']});
+        this.cardItemBgColor = gCPVal(container,'cardItemBgColor', '#f8f8f8', {sKey:'cardItemBgColorStatus',fields:['cardItemBgColor']});
         //投影
         // this.cardItemShadow = this.getXdShadow({width:20, color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.cardItemShadow', {}))
         this.cardItemShadow = gCPVal(container, 'cardItemShadow', [this.gStyleValue.shadow, {color:'',width:'0',}],{isShadow: true});
@@ -568,7 +591,7 @@
         this.takeGoodsPath = gCPVal(container, 'takeGoodsPath', {value: ""}).value;
         this.buyTicketPath = gCPVal(container, 'buyTicketPath', {value: ""}).value;
         this.codePath = gCPVal(container, 'codePath', {value: ""}).value;
-        this.dimension = gCPVal(container, 'dimension', "");
+      
         this.isAutoJump = gCPVal(container, 'isAutoJump', []);
         
         //图片 描边
@@ -605,7 +628,8 @@
         let showQuery = gCPVal(container,'showQuery', 'Y');
         if(showQuery === 'Y') this.filterMode = gCPVal(container, 'filterMode', ['filter'])
         else this.filterMode = [];
-      console.log(this.filterMode,'filterMode')
+        this.showQuery = showQuery;
+        console.log(this.filterMode,'filterMode')
         // let styleOptions = await this.getCustomList({layout_ids:'lbiqpGJWACZc86KmuiXhw',action: true,value:sValue});
         // console.log(styleOptions,'styleOptions')
         //门店样式
@@ -667,10 +691,38 @@
             'color': this.distanceColor,
           }
         }
+        console.log(this.$configProject['isPreview'],'cscscsc')
         if(this.$configProject['isPreview']){
           this.p_getSearchFilter();
         }
           this.initAttr = true;
+        //过滤筛选条件
+        // debugger
+        this.filterSearchMap();
+      },
+      filterSearchMap(){
+        if(this.styleLayout==2){
+          this.searchFilterList = this.searchFilterList.filter(item=>{
+            return item.value!=='area'
+          })
+        }
+        if(this.styleLayout==3){
+          this.searchFilterList = this.searchFilterList.filter(item=>{
+            return item.value!=='brand'
+          })
+        }
+        if(this.showBusinessLine==='Y'){
+          if(this.dimension==='business'){
+            this.searchFilterList = this.searchFilterList.filter(item=>{
+              return item.value!=='business_line'
+            })
+          }else if(this.dimension==='store'){
+            this.searchFilterList = this.searchFilterList.filter(item=>{
+              return item.value!=='shop_category'
+            })
+          }
+          console.log(this.searchFilterList,'searchFilterList')
+        }
       },
       switchQueryModal(curQueryTab){
         console.log(curQueryTab,'curQueryTab')
@@ -738,7 +790,8 @@
       },
       getList(){
         let data = this.getParams();
-        console.log(data,'dddddd')
+        console.log(data,this.namespace,'dddddd')
+        // debugger
         data = {
           ...data,
           page_token: this.page_token,
@@ -747,6 +800,7 @@
           consume_mode: this.consume_mode,
           keyword: this.keyword
         }
+        
         if(this.dimension==='business'){
           data.namespace = this.namespace
         } else {
@@ -766,6 +820,7 @@
             item.shop_icon = getServiceUrl(item.shop_icon, 'size2');
             return item;
           });
+          this.filterSearchMap();
           console.log(list,'list')
           // debugger
           if(this.page_token == '1'){
@@ -774,7 +829,8 @@
             this.shopList = this.shopList.concat(res.list);
           }
           this.next_page_token = res.next_page_token;
-          this.hasNext = res.next_page_token !== "";
+          this.hasNextPage = res.next_page_token !== "";
+          
           // if(this.page_token == 1){
           //   uni.pageScrollTo({
           //     scrollTop: 0,
@@ -846,6 +902,7 @@
           data = {
             ...data,
           }
+          // debugger
           if(this.dimension==='business'){
             data.namespace = this.namespace
           } else {
@@ -863,7 +920,7 @@
               item.icon = getServiceUrl(item.icon, 'size2');
               return item;
             });
-            if(this.showBusinessLine == 'Y' && this.namespaceList.length == 0){
+            if(this.showBusinessLine == 'Y'){
               if(this.dimension==='business'){
                 this.namespaceList = res.namespaces;
               } else if(this.dimension==='store'){
@@ -873,7 +930,10 @@
               if(this.showAllBusinessLine == 'Y'){
                 this.namespaceList = [{label: "全部", value: "all"}].concat(this.namespaceList);
               }else{
-                this.namespace = this.namespaceList[0].value;
+                this.namespaceList = this.namespaceList.filter(item => item.value!=='all');
+              }
+              if(this.namespaceList.length){
+                this.namespace = this.xnamespace||this.namespaceList[0].value;
               }
             }
             // setTimeout(()=>{
@@ -881,27 +941,35 @@
               this.$xdUniHelper.getWindowHeight(['.menu_wrap','.business_wrap','addr_wrap','.brand_wrap','.query_filter'], this)
                 .then(res => {
                   console.log(res,'res')
-                  let num = 0;let menuWrapNum;
+                  let num = 0;let menuWrapNum;let modelTop=0;
                   if(res['.business_wrap']&&res['.business_wrap']['height']){
                     num+=res['.business_wrap']['height']/this.$rpxNum;
                   }
                   if(res['.addr_wrap']&&res['.addr_wrap']['height']){
                     num+=res['.addr_wrap']['height']/this.$rpxNum;
+                    modelTop+=res['.addr_wrap']['height'];
                   }
                   if(res['.brand_wrap']&&res['.brand_wrap']['height']){
                     num+=res['.brand_wrap']['height']/this.$rpxNum;
+                    modelTop+=res['.brand_wrap']['height'];
                   }
                   // num = num+this.bodyPadding.top;
-                  console.log(this.bodyPadding.top/this.$rpxNum,'bodyBoxStyle.paddingTop1')
+                  console.log(this.bodyPadding.top*this.$rpxNum,this.layoutInfo.top/this.$rpxNum,this.layoutInfo.top*this.$rpxNum,'bodyBoxStyle.paddingTop1')
                   if(res['.menu_wrap']&&res['.menu_wrap']['height']){
                     menuWrapNum = res['.menu_wrap']['height']/this.$rpxNum;
+                    modelTop += res['.menu_wrap']['height'];
                   }
                   this.num = num;
                   console.log(this.num,num,'num')
                   this.menuWrapNum = menuWrapNum;
                   if(res['.query_filter']&&res['.query_filter']['height']){
                     this.queryFilterHight = res['.query_filter']['height']/this.$rpxNum;
+                    modelTop += res['.query_filter']['height'];
                   }
+                  modelTop += this.bodyPadding.top*this.$rpxNum;
+                  modelTop +=this.layoutInfo.top*this.$rpxNum;
+                  this.modelTop = modelTop;
+                  console.log(this.modelTop,'modelTop')
                 })
             })
             // },50)
@@ -1166,6 +1234,8 @@
       //==evnet===
       handleQueryFilter({items, ids, labels}){
         this.page_token = '1';
+        // this.brand_id = '';
+        // this.area_code = "";
         console.log(items, ids, labels,'handleQueryFilter')
         Object.keys(items).map(key=>{
           this.$set(this.searchFilterParams,key,ids[key])
@@ -1196,7 +1266,7 @@
         border-bottom: 1px solid #EEEEEE;
         width: 100%;
         left: 0;
-        z-index: 99;
+        z-index: 999;
         position: fixed;
         width: 100%;
         
@@ -1231,6 +1301,8 @@
       }
       .addr_wrap{
         background-color: #FFFFFF;
+        // position: relative;
+        // z-index: 997;
       }
       .addr_list{
         display: flex;
@@ -1438,4 +1510,8 @@
   .query_wrap_selected{
     font-weight: 500;
   }
+  .brand_wrap{
+    // position: relative;
+    // z-index: 997;
+  }
 </style>

package/src/components/JfbMallResourceShopList/XdQueryFilter.vue

@@ -81,6 +81,10 @@ export default {
         return {}
       }
     },
+    height:{
+      type:Number,
+      default: 0
+    }
   },
   computed:{
     itemStyleComp(){
@@ -99,11 +103,13 @@ export default {
       };
     },
     boxListComp(){
-      let maxHeight = this.$root.layoutInfo['bodyMinHeightRpx'] - 180;
+      // console.log(this.height/this.$rpxNum,this.height,this.$root.layoutInfo['bodyMinHeightRpx'],'rrrrr')
+      let maxHeight = this.$root.layoutInfo['bodyMinHeightRpx'] - this.height/this.$rpxNum + 'rpx';
+      console.log(maxHeight,'maxHeight')
       if(this.$configProject.isPreview) maxHeight = 800;
       return {
         backgroundColor: this.filterStyle['filterListColor'] || '#f8f8f8',
-        maxHeight: maxHeight + 'rpx',
+        maxHeight: maxHeight,
         borderTop: this.filterStyle.filterTopBorder|| '2rpx solid #f8f8f8'
       }
     },
@@ -140,6 +146,7 @@ export default {
       selectedLabels:{},
       selectedIds:{},
       filterTabs: [],
+      btnHeight:0,
     }
   },
   watch: {
@@ -152,6 +159,14 @@ export default {
   },
   created(){
     console.log(this.padding, this.list,'sssssaaaaa')
+    this.$nextTick(()=>{
+      this.$xdUniHelper.getWindowHeight(['.bottom_btn'], this)
+        .then(res => {
+          console.log(res,'aaadddd')
+          this.btnHeight = res['bottom_btn']['height'];
+        })
+        .catch(err => {})
+    })
     this.initData();
   },
   methods: {
@@ -293,7 +308,7 @@ export default {
 <style lang="less" scoped>
   .filter_wrap{
     overflow: auto;
-    max-height: 30vh!important;
+    // max-height: 50vh!important;
 
     .filter_item{
       &:last-child {

package/src/components/JfbMallResourceShopList/cusAttr/advanced.js

@@ -17,7 +17,7 @@ export default (data, gValue, gColor, oldData) => {
       ele: 'xd-select-pages-path',
       valueKey: 'shopInfoPath',
       groupKey:'advanced',
-      placeholder: '请选择门店详情跳转地址',
+      placeholder: '请选择门店详情跳转页面',
       value: data.shopInfoPath || null,
       className: 'input100',
       setting: {
@@ -46,7 +46,7 @@ export default (data, gValue, gColor, oldData) => {
       label: '聚好兑:',
       ele: 'xd-select-pages-path',
       valueKey: 'exchangePath',
-      placeholder: '请选择聚好兑跳转地址',
+      placeholder: '请选择聚好兑跳转页面',
       groupKey:'advanced',
       className: 'input100',
       value: data['exchangePath'] || null,
@@ -62,7 +62,7 @@ export default (data, gValue, gColor, oldData) => {
       label: '扫一扫:',
       ele: 'xd-select-pages-path',
       valueKey: 'scanPath',
-      placeholder: '请选择扫一扫跳转地址',
+      placeholder: '请选择扫一扫跳转页面',
       groupKey:'advanced',
       className: 'input100',
       value: data['scanPath'] || null,
@@ -78,7 +78,7 @@ export default (data, gValue, gColor, oldData) => {
       label: '快捷码:',
       ele: 'xd-select-pages-path',
       valueKey: 'takeGoodsPath',
-      placeholder: '请选择展快捷码跳转地址',
+      placeholder: '请选择展快捷码跳转页面',
       groupKey:'advanced',
       className: 'input100',
       value: data['takeGoodsPath'] || null,
@@ -94,7 +94,7 @@ export default (data, gValue, gColor, oldData) => {
       label: '在线选座:',
       ele: 'xd-select-pages-path',
       valueKey: 'buyTicketPath',
-      placeholder: '请选择在线选座跳转地址',
+      placeholder: '请选择在线选座跳转页面',
       groupKey:'advanced',
       className: 'input100',
       value: data['buyTicketPath'] || null,

package/src/components/JfbMallResourceShopList/cusAttr/content.js

@@ -11,6 +11,7 @@ import {
 } from "@/utils/AttrTools";
 
 export default (data, gValue, gColor, oldData) => {
+  console.log(data,'dddddsss')
   let showStoreImg = 'Y'
   let showStoreAddress = 'Y'
   //变化的时候
@@ -206,10 +207,10 @@ export default (data, gValue, gColor, oldData) => {
       valueKey: "filterMode",
       value: dataVal({data, key:'filterMode', dValue:[['filter']], gValue}),
       list:[
-        {"label": "区域", "value": 'area'},
-        {"label": "品牌", "value": 'brand'},
-        {"label": "业务线", "value": 'business_line'},
-        {"label": "门店分类", "value": 'shop_category'},
+        {"label": "区域", "value": 'area',disabled:data.styleLayout==2?true:false},
+        {"label": "品牌", "value": 'brand',disabled:data.styleLayout==3?true:false},
+        {"label": "业务线", "value": 'business_line',disabled:data.showBusinessLine==='Y'&&data.dimension==='business'?true:false},
+        {"label": "门店分类", "value": 'shop_category',disabled:data.showBusinessLine==='Y'&&data.dimension==='store'?true:false},
         {"label": "筛选", "value": 'filter'},
       ],
       labelInline: true,

package/src/components/JfbMallResourceShopList/cusAttr/style.js

@@ -140,7 +140,7 @@ export default function (data, gValue, gColor, oldData) {
       groupKey:'style',
       valueKey: 'cardItemBgColor',
       labelInline:true,
-      value: dataVal({data, key:'cardItemBgColor', dValue:'#FFF', gValue}),
+      value: dataVal({data, key:'cardItemBgColor', dValue:'#f8f8f8', gValue}),
       hidden: !statusShow({data, key: 'cardItemBgColorStatus', fields:['cardItemBgColor'], gValue}),
       placeholder: '请选择背景颜色',
       classNmae: 'input80',