jufubao-mall 2.0.16-beta52 → 2.0.16-beta53

package/package.json

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

package/src/components/JfbMallResourceShopList/JfbMallResourceShopList.vue

@@ -93,11 +93,12 @@
         </view>
         <view v-show="showQueryModal" class="query_modal">
           <xd-query-filter
-            v-if="['filter','shop_category','brand','area'].includes(curQueryTab)"
+            v-if="['filter','shop_category','business_line','brand','area'].includes(curQueryTab)"
             :key="curQueryTab"
             :list="searchFilterList"
             :filter-type="curQueryTab"
             :collapse-num="6"
+            :padding="bodyPadding"
             :filter-selected="searchFilterParams"
             @onConfirm="handleQueryFilter"></xd-query-filter>
         </view>
@@ -288,6 +289,8 @@
         queryFilterHight:0,
         menuGreater:'N',
         queryGreater:'N',
+        isMore:'N',
+        loading: false, //是否正在加载
       }
     },
     filters:{
@@ -359,7 +362,7 @@
         let tabs = [];
         if(this.filterMode.includes('area')) tabs.push({value: 'area', label: '区域', icon: 'icondizhitubiao',size: 24});
         if(this.filterMode.includes('brand')) tabs.push({value: 'brand', label: '品牌', icon: 'iconxia_down',size: 18});
-        if(this.filterMode.includes('namespace')) tabs.push({value: 'namespace', label: '业务线', icon: 'iconxia_down',size: 18});
+        if(this.filterMode.includes('business_line')) tabs.push({value: 'business_line', label: '业务线', icon: 'iconxia_down',size: 18});
         if(this.filterMode.includes('shop_category')) tabs.push({value: 'shop_category', label: '门店分类', icon: 'iconxia_down',size: 18});
         console.log(this.filterMode,this.filterMode==['filter'],this.filterMode.includes('filter'),['filter'].includes('filter'),'ffffffff')
         if(this.filterMode.includes('filter')){
@@ -389,6 +392,7 @@
         handler(n,o){
           if(n&&n!==o){
             if(n==='Y'){
+              console.log(this.menuWrapTop/this.$rpxNum+this.bodyPadding.top,this.menuWrapTop/this.$rpxNum,this.bodyPadding.top,'aaaaaa')
               this.menuWrapStyle = {
                 top: this.menuWrapTop/this.$rpxNum+this.bodyPadding.top+'rpx',
                 position: 'absolute',
@@ -431,6 +435,16 @@
             }
           }
         }
+      },
+      isMore:{
+        handler(n,o){
+          if(n&&n!==o){
+            if(n==='Y'&&o==='N'){
+              this.menuWrapTop = this.scrollTop;
+              console.log(this.menuWrapTop,'this.menuWrapTop')
+            }
+          }
+        }
       }
     },
     created() {
@@ -449,11 +463,16 @@
         console.log(this.layoutInfo,'this.layoutInfo')
         this.scrollTop = scrollTop;
         this.$nextTick(() => {
-          // console.log(scrollTop / this.$rpxNum,this.num-this.menuWrapNum,'aaaaaaa')
-          if(Math.floor(scrollTop / this.$rpxNum)===Math.floor(this.num-this.menuWrapNum)){
+          // console.log(Math.floor(scrollTop / this.$rpxNum),Math.floor(this.num-this.menuWrapNum),this.num,this.menuWrapNum,'asaaaaaaa')
+          if(Math.floor(scrollTop / this.$rpxNum)==Math.floor(this.num-this.menuWrapNum)){
             // debugger
-            console.log(scrollTop,'bbbbbb')
-            this.menuWrapTop = scrollTop
+            // console.log(scrollTop,'bbbbbb')
+            // this.menuWrapTop = scrollTop
+          }
+          if(Math.floor(scrollTop / this.$rpxNum)>Math.floor(this.num-this.menuWrapNum)){
+            this.isMore = 'Y';
+          }else{
+            this.isMore = 'N';
           }
           if(scrollTop / this.$rpxNum>Math.floor(this.num-this.menuWrapNum)+this.bodyPadding.top){
             this.menuGreater = 'Y';
@@ -654,6 +673,7 @@
           this.initAttr = true;
       },
       switchQueryModal(curQueryTab){
+        console.log(curQueryTab,'curQueryTab')
         if(this.curQueryTab === curQueryTab) {
           this.showQueryModal = !this.showQueryModal;
         }
@@ -735,27 +755,34 @@
         }
         if(this.area_code) data.area_code = this.area_code;
         this.$xdShowLoading({});
+        this.loading = true;
         jfbRootExec("resourceGetShopList", {
           vm: this,
           data: this.$xdUniHelper.deleteParamEmptyKey(data)
         }).then(res => {
           this.$xdHideLoading();
+          this.loading = false;
           let list = res.list.map(item => {
             item.shop_icon = getServiceUrl(item.shop_icon, 'size2');
             return item;
           });
           console.log(list,'list')
           // debugger
-          if(this.page_token == 1) this.shopList = list;
-          else this.shopList = this.shopList.concat(list);
+          if(this.page_token == '1'){
+            this.shopList = res.list || [];
+          }else{
+            this.shopList = this.shopList.concat(res.list);
+          }
           this.next_page_token = res.next_page_token;
           this.hasNext = res.next_page_token !== "";
-          if(this.page_token == 1){
-            uni.pageScrollTo({
-              scrollTop: 0,
-              duration: 0
-            })
-          }
+          // if(this.page_token == 1){
+          //   uni.pageScrollTo({
+          //     scrollTop: 0,
+          //     duration: 0
+          //   })
+          // }
+        }).catch(err=>{
+          this.loading = false;
         })
       },
       getParams(){
@@ -779,7 +806,7 @@
         getSFP('keyword',this.keyword);
         getSFP('brand_type',this.shopType);
         getSFP('consume_mode',this.serverType);
-        getSFP('shop_category_ids',this.searchFilterParams['shop_category']);
+        getSFP('category_ids',this.searchFilterParams['shop_category']);
         getSFP('brand_ids',this.searchFilterParams['brand']);
         getSFP('area_codes',this.searchFilterParams['area']);
         getSFP('namespaces',this.searchFilterParams['business_line']);
@@ -961,11 +988,10 @@
         this.watchScroll(options.e.scrollTop)
       },
       onJfbReachBottom(options) {
-        if(this.hasNext){
-          this.page_token = this.next_page_token;
+        if(this.loading) return;
+        if(this.hasNextPage){
           this.getList();
         }
-        // console.log('event.onJfbReachBottom', options)
       },
       onJfbShow(options) {
         console.log('event.onJfbShow', options)
@@ -1139,6 +1165,7 @@
       },
       //==evnet===
       handleQueryFilter({items, ids, labels}){
+        this.page_token = '1';
         console.log(items, ids, labels,'handleQueryFilter')
         Object.keys(items).map(key=>{
           this.$set(this.searchFilterParams,key,ids[key])
@@ -1169,7 +1196,7 @@
         border-bottom: 1px solid #EEEEEE;
         width: 100%;
         left: 0;
-        z-index: 999;
+        z-index: 99;
         position: fixed;
         width: 100%;
         

package/src/components/JfbMallResourceShopList/Mock.js

@@ -248,6 +248,25 @@ module.exports = {
             third_platform_code: ""
           }
         ]
+      },
+      {
+        "title": "业务线",
+        "value": "business_line",
+        "multiple": true,
+          "options": [
+          {
+          "label": "电影(勿改)",
+          "value": "movie"
+          },
+          {
+          "label": "蛋糕(勿改)",
+          "value": "cake"
+          },
+          {
+          "label": "旅游(勿改)",
+          "value": "travel"
+          }
+        ]
       }
     ],
     request_id: "f1733f02aa8c9672"

package/src/components/JfbMallResourceShopList/XdQueryFilter.vue

@@ -75,6 +75,12 @@ export default {
         return {}
       }
     },
+    padding:{
+      type: Object,
+      default(){
+        return {}
+      }
+    },
   },
   computed:{
     itemStyleComp(){
@@ -82,7 +88,7 @@ export default {
 
       let outWidth = uni.getSystemInfoSync().safeArea.width;
       let columnSpacingWidth = columnSpacing * (column-1) * this.$rpxNum;
-      let marginRL = 96 * this.$rpxNum; //左右默认48rpx
+      let marginRL = 96 * this.$rpxNum +this.padding.left+this.padding.right; //左右默认48rpx
       let paddingRL = 16  * this.$rpxNum
 
       return {
@@ -145,6 +151,7 @@ export default {
     },
   },
   created(){
+    console.log(this.padding, this.list,'sssssaaaaa')
     this.initData();
   },
   methods: {
@@ -203,6 +210,7 @@ export default {
       });
 
       this.filterTabs = filterTabs
+      console.log(this.filterTabs, 'filterTabs')
     },
     isActive(tab, value){
       if(!this.selectedIds[tab.value]) return false
@@ -285,7 +293,7 @@ export default {
 <style lang="less" scoped>
   .filter_wrap{
     overflow: auto;
-    max-height: 50vh;
+    max-height: 30vh!important;
 
     .filter_item{
       &:last-child {

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

@@ -30,8 +30,8 @@ export default (data, gValue, gColor, oldData) => {
   let defQuickEntry = [
     {check:true,value:'jhd',input:data.jhdName||'',placeholder:'聚好兑名称，默认“聚好兑”'},
     {check:true,value:'scan',input:data.scanName||'', placeholder:'扫一扫名称，默认“扫一扫”'},
-    {check:true,value:'takeGoods',input:data.takeGoodsName||'', placeholder:'展快捷码名称，默认“展快捷码”'},
-    {check:true,value:'buyTicket',input:data.buyTicketName||'', placeholder:'去购票名称，默认“去购票”'},
+    {check:true,value:'qp',input:data.takeGoodsName||'', placeholder:'展快捷码名称，默认“展快捷码”'},
+    {check:false,value:'seat',input:data.buyTicketName||'', placeholder:'去购票名称，默认“去购票”'},
     // {check: false,value:'code',input:data.code||'',placeholder:'电子码名称，默认“电子码”'},
     // {check: false,value:'hdSelf',input:data.hdSelf||'',placeholder:'到店取名称，默认“去点餐”'},
   ];
@@ -208,7 +208,7 @@ export default (data, gValue, gColor, oldData) => {
       list:[
         {"label": "区域", "value": 'area'},
         {"label": "品牌", "value": 'brand'},
-        {"label": "业务线", "value": 'namespace'},
+        {"label": "业务线", "value": 'business_line'},
         {"label": "门店分类", "value": 'shop_category'},
         {"label": "筛选", "value": 'filter'},
       ],
@@ -317,7 +317,7 @@ export default (data, gValue, gColor, oldData) => {
       label: '快捷入口',
       ele: 'xd-cus-switch',
       valueKey: 'showQuickEntry',
-      value: dataVal({data, key:'showQuickEntry', dValue:"Y", gValue}),
+      value: dataVal({data, key:'showQuickEntry', dValue:"N", gValue}),
       className: 'input100',
       groupKey:'content',
       labelInline:true,