jufubao-mall 2.0.8-beta2 → 2.0.8-beta201

package/package.json

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

package/src/components/JfbMallBrandWall/JfbMallBrandWall.vue

@@ -23,6 +23,7 @@
             :scroll-x="layout==='v1'"
             :scroll-y="layout==='v2'"
             :style="{height:layout==='v2'?tabStyleComp.height:'auto'}"
+            :class="{'tab-linex':layout==='v1' && hStyle ==='v3'}"
           >
             <view
               class="tab_list"
@@ -244,18 +245,17 @@
       skeletonStyle(){
         let margin = 0;
         if(this.layout === 'v1') {
-          if(this.hStyle !== 'v1') margin = '0 24rpx 0 0';
-          else margin = '24rpx 24rpx 0 0';
+           margin = '24rpx 24rpx 24rpx 0';
         }
         if(this.layout === 'v2') {
-          margin = '0 24rpx 24rpx'
+          margin = '12rpx'
         }
         return {
           "color": "#999",
           "fontSize": "32rpx",
           "fontWeight": "400",
           "height": this.layout === 'v1' ?"60rpx":'90rpx',
-          "minWidth": '160rpx',
+          "minWidth": this.layout === 'v1'?'132rpx':'10rpx',
           "padding":  this.layout === 'v1'?"0 16rpx":0,
           "marginRight": this.layout === 'v1'?"20rpx":0,
           "margin": margin,
@@ -273,7 +273,7 @@
       getItemWH(){
         let outWdith = 0;
         if(this.layout === 'v2') {
-          outWdith += 198;
+          outWdith += 172;
           if(this.titleBorderWidth) outWdith += this.titleBorderWidth * 2;
           if(this.titleBorderWidth === 0 && this.vStyle === 'v1') outWdith +=2
           outWdith += this.getPMValue(this.tabPadding, 'RL', 0);
@@ -348,12 +348,12 @@
           outHeight += this.getPMValue(this.listPadding, 'TB',0);
           outHeight += this.getPMValue(this.bodyPadding, 'TB',0);
           outHeight = outHeight * this.$rpxNum
-          if(['v1', 'v3'].includes(this.vStyle)) {
+          if(['v1', 'v2'].includes(this.vStyle)) {
             style['height'] = `${this.layoutInfo.bodyMinHeightPx - outHeight}px`;
           }
-          if(['v2', 'v4'].includes(this.vStyle)) {
-            style['max-height'] = `${this.layoutInfo.bodyMinHeightPx - outHeight}px`;
-          }
+          // if(['v2', 'v4'].includes(this.vStyle)) {
+          //   style['max-height'] = `${this.layoutInfo.bodyMinHeightPx - outHeight}px`;
+          // }
           style['overflowY'] = 'auto';
           style['overflowX'] = 'hidden';
         }
@@ -367,7 +367,6 @@
         //上下结构
         if(this.layout === 'v1') {
           style['padding'] = this.getMarginAndPadding(this.tabPadding, 0);
-          if(['v2', 'v3', 'v4'].includes(this.hStyle)) style['height'] = '110rpx';
           if(!this.isPreview) {
             style['position'] = 'fixed';
             style['zIndex'] = '10';
@@ -378,21 +377,17 @@
 
         //左右结构
         if(this.layout === 'v2') {
-          style['width'] = '198rpx';
+          style['width'] = '172rpx';
           style['flexShrink'] = 0;
           style['overflow'] = 'hidden';
           style['padding'] = this.getMarginAndPadding(this.tabPadding, 0);
 
-          if(['v1', 'v2', 'v3'].includes(this.vStyle)) {
+          if(['v1', 'v2'].includes(this.vStyle)) {
             let tb = this.getPMValue(this.bodyPadding, 'TB', 0) * this.$rpxNum +  this.titleBorderWidth * 2 *this.$rpxNum;
             tb +=  this.getPMValue(this.tabPadding, 'TB', 0) * this.$rpxNum
             style['height'] = `calc(${ this.layoutInfo.bodyMinHeightPx}px - ${tb}px)`;
             style['borderRadius'] = `0 ${this.titleRadius}rpx  ${this.titleRadius}rpx  0`;
           }
-          if(['v4'].includes(this.vStyle)){
-            style['borderRadius'] = `${this.titleRadius}rpx`;
-            style['height'] = `auto`;
-          }
         }
         return style;
       },
@@ -405,28 +400,6 @@
           ...this.getTabHeight,
         };
       },
-      getTabItemHeight(){
-        if(this.layout === 'v1'){
-          return  {
-            height: ['v2', 'v3','v4'].includes(this.hStyle)?'110rpx':'60rpx',
-            lineHeight: ['v2', 'v3','v4'].includes(this.hStyle)?'110rpx':'60rpx',
-            marginRight: this.titleSp + 'rpx',
-            minWidth: ['v2', 'v3','v4'].includes(this.hStyle)?'198rpx':'170rpx',
-            padding: ['v2', 'v3','v4'].includes(this.hStyle)?'0':'0 16rpx',
-          }
-        }
-
-        if(this.layout === 'v2'){
-          return {
-            height: '100rpx',
-            lineHeight: '100rpx',
-            borderRadius:'0',
-            fontSize:'24rpx',
-            marginBottom: this.titlePadding + 'rpx'
-          }
-        }
-
-      },
       tabItemStyleComp(){
         let style = {
           color: this.titleStyle.color,
@@ -445,6 +418,27 @@
         }
         return style
       },
+      getTabItemHeight(){
+        if(this.layout === 'v1'){
+          return  {
+            height:['v1'].includes(this.hStyle) ?'60rpx' : '108rpx',
+            lineHeight: ['v1'].includes(this.hStyle) ?'60rpx' : '108rpx',
+            marginRight: this.titleSp + 'rpx',
+          }
+        }
+
+        if(this.layout === 'v2'){
+          return {
+            height: '100rpx',
+            lineHeight: '100rpx',
+            borderRadius:'0',
+            fontSize:'24rpx',
+            marginBottom: this.titlePadding + 'rpx'
+          }
+        }
+
+      },
+
       tabActItemStyleComp(){
         let style = {
           color: this.titleStyle.actColor,
@@ -473,9 +467,9 @@
         if(this.layout === 'v2') return {}
         return {
           borderRadius:['v1'].includes(this.hStyle)?'60rpx': 0,
-          backgroundColor: ['v1'].includes(this.hStyle)?this.titleStyle.bgColor:'',
+          backgroundColor: ['v1'].includes(this.hStyle) ? this.titleStyle.bgColor:'',
           color: this.titleStyle.color,
-          padding: ['v1'].includes(this.hStyle)?'0 20rpx': 0,
+          padding:'0 32rpx',
           fontSize: this.titleStyle.fontSize + 'rpx',
           fontWeight: this.titleStyle.fontWeight,
         }
@@ -495,7 +489,7 @@
           borderRadius:['v1'].includes(this.hStyle)?'60rpx': 0,
           backgroundColor: bgColor,
           backgroundImage: bgImage,
-          padding: ['v1'].includes(this.hStyle)?'0 20rpx': 0,
+          padding: '0 32rpx',
           color: this.titleStyle.actColor,
           fontSize: this.titleStyle.actFontSize + 'rpx',
           fontWeight: this.titleStyle.actFontWeight,
@@ -526,8 +520,6 @@
       onJfbLoad(options) {
         //设置业务请求代码
         this.setNameSpace(options);
-        console.log(this.showTabs);
-
         this.getList();
       },
       /**
@@ -540,8 +532,14 @@
         this.category_ids = gCPVal(container, 'category_ids', []);
         this.brandNumber = gCPVal(container, 'brandNumber', 300);
         this.layout = gCPVal(container, 'layout', 'v1');
-        this.vStyle = gCPVal(container, 'vStyle', 'v2');
-        this.hStyle = gCPVal(container, 'hStyle', 'v1');
+        let vStyle = gCPVal(container, 'vStyle', 'v1'); //左右接口布局
+        if(['v3', 'v4'].includes(vStyle)) vStyle = 'v1';
+        this.vStyle = vStyle;
+
+        let hStyle = gCPVal(container, 'hStyle', 'v1'); //上下接口布局
+        if(['v2'].includes(hStyle)) hStyle = 'v1';
+        this.hStyle = hStyle;
+
 
         if( this.layout === 'v1') {
           this.contentCell = gCPVal(container, 'contentCell', 4);
@@ -584,14 +582,12 @@
         this.newLabel = gCPVal(container, 'tabContent', [newLabel.length > 0 ? newLabel: defNewLabel]);
 
 
-
-
         //常规
         let defBodyPadding= 0;
         if(this.layout === 'v2') {
           if(['v1','v2'].includes(this.vStyle)) defBodyPadding = 0;
-          if(['v3'].includes(this.vStyle)) defBodyPadding = {top:32,left:0, right:32, bottom:0};
-          if(['v4'].includes(this.vStyle)) defBodyPadding = {top:32,left:32, right:32, bottom:0};
+          if(['v3'].includes(this.vStyle)) defBodyPadding = {top:24,left:0, right:24, bottom:0};
+          if(['v4'].includes(this.vStyle)) defBodyPadding = {top:24,left:24, right:24, bottom:0};
         }
         this.bodyPadding = gCPVal(container, 'bodyPadding', [defBodyPadding,0], {sKey: 'bodyPaddingStatus', fields: ['bodyPadding'], isPMR: true});
         let defContentBoxBgc = '#fff';
@@ -606,43 +602,50 @@
         //内容区域
         let defContBgColor = '';
         if(this.layout === 'v2'){
-          if(['v2','v3', 'v4'].includes(this.vStyle))defContentBoxBgc = '#fff'
+          if(['v2','v3', 'v4'].includes(this.vStyle)) defContBgColor = '#fff'
         }
         if(this.layout === 'v1') defContBgColor = '#f8f8f8';
         this.contBgColor = gCPVal(container, 'contBgColor', [defContBgColor,'rgba(0,0,0,0)'], {sKey: 'contBgColorStatus', fields: ['contBgColor']});
-        let defListPadding = {top:32,left:32, right:32, bottom:32};
+        let defListPadding = {top:48,left:48, right:48, bottom:48};
+
+        if(this.layout === 'v2'){
+          if(['v2'].includes(this.vStyle)) defListPadding = {top:40,left:40, right:40, bottom:40};
+        }
         if(this.layout === 'v1'){
           if(this.contentCell === 3) defListPadding = {top:48,left:48, right:48, bottom:48};
-          else defListPadding = {top:24,left:24, right:24, bottom:24};
+          else defListPadding = {top:40,left:40, right:40, bottom:40};
         }
 
         this.listPadding = gCPVal(container, 'listPadding', [defListPadding,24], {sKey: 'listPaddingStatus', fields: ['listPadding'], isPMR: true});
         let defListMargin= 0;
         if(this.layout === 'v2'){
-          if(['v3', 'v4'].includes(this.vStyle)) defListMargin = {top:0,left:32, right:0, bottom:0}
-          if(['v2'].includes(this.vStyle)) defListMargin = {top:32,left:32, right:32, bottom:0}
+          //if(['v3', 'v4'].includes(this.vStyle)) defListMargin = {top:0,left:24, right:0, bottom:0}
+          if(['v2'].includes(this.vStyle)) defListMargin = {top:24,left:24, right:24, bottom:24}
         }
         this.listMargin = gCPVal(container, 'listMargin', [defListMargin,0], {sKey: 'listMarginStatus', fields: ['listMargin'], isPMR: true});
         this.contRadius = gCPVal(container, 'contRadius', [this.gStyleValue.radius,0],{sKey: 'contRadiusStatus', fields: ['contRadius']})||0;
 
 
         //选项卡
+        let defTitleBgc = '#fff';
         let defTabPadding = 0;
         let oldTabPadding = 0;
         if(this.layout === 'v2') {
-          if(['v3', 'v4'].includes(this.vStyle)) defTabPadding = 0;
-          if(['v2'].includes(this.vStyle)) defTabPadding = {top:40,left:0, right:0, bottom:0};
-          if(['v1'].includes(this.vStyle)) defTabPadding = {top:20,left:0, right:0, bottom:0};
+          if(['v2', 'v1'].includes(this.vStyle)) defTabPadding = {top:0,left:0, right:0, bottom:0};
+          if(['v1'].includes(this.vStyle)) defTitleBgc = '#f8f8f8';
         }
         if(this.layout === 'v1') {
-          if(['v4'].includes(this.hStyle)) defTabPadding =  {top:0,left:32, right:32, bottom:0};
-          if(['v1'].includes(this.hStyle)){
-            defTabPadding =  {top:24,left:32, right:32, bottom:24};
-            oldTabPadding = {top:24,left:32, right:32, bottom:24};
+          defTabPadding =  {top:0,left:32, right:0, bottom:0};
+          oldTabPadding = {top:0,left:32, right:0, bottom:0};
+
+          if(['v1'].includes(this.hStyle)) {
+            defTabPadding =  {top:24,left:32, right:0, bottom:24};
+            oldTabPadding = {top:24,left:32, right:0, bottom:24};
           }
+
         }
         this.tabPadding = gCPVal(container, 'tabPadding', [defTabPadding,oldTabPadding], {sKey: 'tabPaddingStatus', fields: ['tabPadding'], isPMR: true});
-        this.titleBgc = gCPVal(container, 'titleBgc', ['#fff','#fff'],{sKey: 'titleBgcStatus', fields: ['titleBgc']});
+        this.titleBgc = gCPVal(container, 'titleBgc', [defTitleBgc,'#fff'],{sKey: 'titleBgcStatus', fields: ['titleBgc']});
         let titleColor =  gCPVal(container, 'titleColor', '');
         let titleActColor =  gCPVal(container, 'titleActColor', '');
         let titleBgcColor =  gCPVal(container, 'titleBgcColor', '');
@@ -670,20 +673,22 @@
         this.titleShadow = gCPVal(container, 'titleShadow', [this.gStyleValue.shadow,'none'], {isShadow:true, bsOld:['isTitleShadow','isTitleShadowBgcW','isTitleShadowBgc']});
         this.titleBorder = gCPVal(container, 'titleBorder', [{color: '#eee', width: '0', style: 'solid'},{color: '#eee', width: '0', style: 'solid'}], {isBorder:true, bsOld:['isTitleBorder','isTitleBorderW','isTitleBorderColor']});
         this.titleBorderWidth = gCPVal(container, 'titleBorder', [{color: '#eee', width: '0', style: 'solid'},{color: '#eee', width: '0', style: 'solid'}], {isBorder:true,isBsWidth: true, bsOld:['isTitleBorder','isTitleBorderW','isTitleBorderColor']});
+
         let defTitleRadius = null;
         if(this.layout === 'v2'){
-          if(['v3','v4'].includes(this.vStyle)) defTitleRadius = '20';
+          if(['v1','v2'].includes(this.vStyle)) defTitleRadius = '0';
         }
         this.titleRadius = gCPVal(container, 'titleRadius', [defTitleRadius,this.gStyleValue.radius,'0'],{sKey: 'titleRadiusStatus', fields: ['titleRadius']})||0;
         this.titlePadding = gCPVal(container, 'titlePadding', '0',{sKey: 'titlePaddingStatus', fields: ['titlePadding']});
-        this.titleSp = gCPVal(container, 'titleSp', '0',{sKey: 'titleSpStatus', fields: ['titleSp']});
+        this.titleSp = gCPVal(container, 'titleSp', [48, 0],{sKey: 'titleSpStatus', fields: ['titleSp']});
 
         //内容
         this.contentBgc = gCPVal(container, 'contentBgc', '#fff',{sKey: 'contentBgcStatus', fields: ['contentBgc']} );
         let contentPadding = gCPVal(container, 'contentPadding',''), bindSize = 68;
         if(this.layout === 'v1' && this.contentCell === 3) bindSize = 28;
+        if(this.layout === 'v1' && this.contentCell === 5) bindSize = 60;
         if(contentPadding) bindSize = 100 - Number(contentPadding);
-        this.bindSize = 100 - Number(gCPVal(container, 'bindSize', [68,bindSize],{sKey: 'bindSizeStatus', fields: ['bindSize']}));
+        this.bindSize = 100 - Number(gCPVal(container, 'bindSize', [bindSize,68],{sKey: 'bindSizeStatus', fields: ['bindSize']}));
         this.radius = gCPVal(container, 'radius', [this.gStyleValue.radius,0],{sKey: 'radiusStatus', fields: ['radius']})||0;
         this.brandShadow = gCPVal(container, 'brandShadow', [this.gStyleValue.shadow,'none'], {isShadow:true, bsOld:['isContShadow','isContShadowBgcW','isContShadowBgc']});
         this.brandBorder = gCPVal(container, 'brandBorder', [{color: '#f8f8f8', width: '2', style: 'solid'},{color: '#eee', width: '0', style: 'solid'}], {isBorder:true, bsOld:['isContBorder','isContBorderW','isContBorderColor']});
@@ -729,16 +734,16 @@
       },
       getList(){
         this.$xdShowLoading({});
-        jfbRootExec("getNewBrandWallList", {
-          vm: this,
-          data: {
-            znamespace: this.xnamespace,
-            city_code: this.isCityFilter === "Y" ? this.stateCity.city_code : "",
-            page_size: this.brandNumber,
-            tab: this.showTabs[this.tabIndex].value,
-            category_ids: []//this.category_ids.join(","),
-          }
-        }).then(res => {
+        let params = {
+          page_size: this.brandNumber,
+          tab: this.showTabs[this.tabIndex].value,
+        }
+        if(this.xnamespace) params['znamespace'] = this.xnamespace;
+        if(this.isCityFilter === "Y") params['city_code'] = this.stateCity.city_code;
+        else params['city_code'] = '';
+        if(this.category_ids && this.category_ids.length > 0) params['category_ids'] = this.category_ids.join(",");
+        jfbRootExec("getNewBrandWallList", {vm: this,data: params}).then(res => {
+          this.$xdHideLoading();
 
           let brandList = res.items.map(item => {
             item['brand_icon'] = item.brand_icon ? getServiceUrl(item.brand_icon, "size2") : "";
@@ -761,9 +766,6 @@
             this.has_sell = res.has_sell;
           }
           this.loaded = true;
-          this.$xdHideLoading();
-
-
 
           this.$nextTick(()=>{
             this.compTabHeight()
@@ -829,13 +831,17 @@
               justify-content: flex-start;
               align-items: center;
               flex-flow: nowrap;
+              position: relative;
               & > view {
                 text-align: center;
                 &.lineCom {
+                  position: absolute;
+                  left:0;
+                  top:50%;
+                  transform: translateY(-50%);
                   width: 6rpx;
-                  height: 43rpx;
+                  height: 46rpx;
                   border-radius: 4rpx;
-                  flex-shrink: 0;
                 }
                 &:last-child {
                   flex: 1;
@@ -847,15 +853,12 @@
               & > view {
                 &.lineCom {
                   position: absolute;
-                  left:32rpx;
-                  bottom: 0;
-                  right:32rpx;
+                  left: 50%;
+                  width: 64rpx;
+                  transform: translateX(-50%);
+                  bottom: 16rpx;
                   height: 6rpx;
                   border-radius: 4rpx;
-                  &.lineSmall {
-                    right:70rpx;
-                    left:70rpx;
-                  }
                 }
               }
 

package/src/components/JfbMallBrandWall/cusAttr/brand.js

@@ -4,8 +4,8 @@ import {dataVal, statusDataVal, statusShow,cRaBorShadow} from "@/utils/AttrTools
 
 export default (data, gValue, gColor, oldData)=>{
   //分类设置
-  let defBrandBorder = cRaBorShadow( data, 'brandBorder', {old:['isContBorder','isContBorderW','isContShadowBgc','solid']},gValue);
-  let defBrandShadow = cRaBorShadow( data, 'brandShadow', {old:['isContShadow','isContShadowBgcW','isContBorderColor']},gValue);
+  let defBrandBorder = cRaBorShadow( data, 'brandBorder', {old:['isContBorder','isContBorderW','isContBorderColor','solid']},gValue);
+  let defBrandShadow = cRaBorShadow( data, 'brandShadow', {old:['isContShadow','isContShadowBgcW','isContShadowBgc']},gValue);
 
   //品牌大小
   let bindSize = 100;

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

@@ -4,6 +4,7 @@ import {
   dataVal,
   clone
 } from "@/utils/AttrTools";
+import {gCPVal} from "@/utils/xd.base";
 
 export default (data, gValue, gColor, oldData={})=>{
   //老数据
@@ -30,6 +31,17 @@ export default (data, gValue, gColor, oldData={})=>{
   }
   if(data['tabContent'] !== undefined) tabContent = data['tabContent'];
 
+  //左右结构布局
+  let vStyle = data['vStyle'] || 'v1';
+  if(['v3', 'v4'].includes(data['vStyle'])) vStyle = 'v1';
+
+
+  //上下结构布局
+  let hStyle = data['hStyle'] || 'v1';
+  if(['v2'].includes(data['hStyle'])) hStyle = 'v1';
+
+
+
   return [
     {
       ele: 'title',
@@ -147,7 +159,7 @@ export default (data, gValue, gColor, oldData={})=>{
       groupKey: 'content',
       valueKey: "vStyle",
       cusStyle:{marginLeft: '82px' },
-      value: dataVal({data, key:'vStyle', dValue:'v1', gValue}),
+      value: vStyle,
       hidden: !['v2'].includes(dataVal({data, key:'layout', dValue:'v1', gValue})),
       labelInline:true,
       key: Date.now(),
@@ -172,7 +184,7 @@ export default (data, gValue, gColor, oldData={})=>{
       groupKey: 'content',
       valueKey: "hStyle",
       cusStyle:{marginLeft: '82px' },
-      value: dataVal({data, key:'hStyle', dValue:'v1', gValue}),
+      value: hStyle,
       hidden: !['v1'].includes(dataVal({data, key:'layout', dValue:'v1', gValue})),
       key: Date.now(),
       isKey:true,

package/src/components/JfbMallBrandWall/cusAttr/tab.js

@@ -4,6 +4,7 @@ import {dataVal, statusDataVal, statusShow, clone, cRaBorShadow,isDefStatus} fro
 
 export default (datas, gValue, gColor, oldData={})=>{
   let data = clone(datas);
+  debugger
   if(typeof data['tabPadding'] === 'string' && data['tabPadding'] ) {
     data['tabPadding'] = {
       top: Number(data['tabPadding']),
@@ -66,10 +67,7 @@ export default (datas, gValue, gColor, oldData={})=>{
   }
   if(statusDataVal({data, key:'tabPaddingStatus', fields:['tabPadding'],gValue}) === 'C') {
     if(data['layout'] === 'v2') data['tabPadding'] = {top:20,left:0, right:0, bottom:0};
-    else {
-      if(data.hStyle === 'v1') data['tabPadding'] = {top:24,left:32, right:32, bottom:24}
-      else data['tabPadding'] = {top:0,left:0, right:0, bottom:0}
-    }
+    else data['tabPadding'] = {top:24,left:32, right:0, bottom:24}
   }
 
 
@@ -147,7 +145,7 @@ export default (datas, gValue, gColor, oldData={})=>{
       groupKey: 'style',
       ele: 'xd-slider',
       valueKey: "titleSp",
-      value:  dataVal({data, key:'titleSp', dValue:0, gValue}),
+      value:  dataVal({data, key:'titleSp', dValue:gValue.isAdd && gValue.isFirst ?48: 0, gValue}),
       hidden: !statusShow({data, key: 'titleSpStatus', fields:['titleSp'], gValue}),
       className: "input100",
       labelInline: true,
@@ -338,7 +336,7 @@ export default (datas, gValue, gColor, oldData={})=>{
       value: dataVal({
         data,
         key:'tabPadding',
-        dValue:[gValue.isAdd&&gValue.isFirst ? 0: {top:24,left:32, right:32, bottom:24}],
+        dValue:[gValue.isAdd&&gValue.isFirst ? 0: {top:24,left:32, right:0, bottom:24}],
         gValue,
         isPM: true,
       }),

package/src/components/JfbMallShopVip/JfbMallShopVip.vue

@@ -13,6 +13,7 @@
         <view
           class="shop_tabs"
           :style="[tabsStyleComp]"
+          v-if="titleList.length > 1"
         >
           <view
             class="tab_item"
@@ -57,7 +58,7 @@
                   v-for="(item,index) in marketList"
                   :key="index"
                   :marker-id="item.id"
-                  style="background: rgba(0,0,0,.8);border-radius: 20px;padding: 4px 8px;color: #FFFFFF;"
+                  style="background: rgba(0,0,0,.8);border-radius: 6px;padding: 8px 12px;color: #fff;"
                   :style="{display: item.id === showMarkerId ? 'block' : 'none'}"
                 >{{ item.title }}</cover-view>
               </cover-view>
@@ -93,13 +94,15 @@
               <cus-shops
                 layout="v1"
                 :select-id="selectIds"
-                :is-show-btn="false"
+                :is-show-btn="fastEntryStatus"
                 :content="cusContent"
                 :cus-style="cusStyle"
                 :list="showShopList"
                 :main-color="mainColor"
                 :sub-main-color="subMainColor"
-                @on-event="handleToCode"
+                :names="cusNames"
+                :entry="cusEntry"
+                @on-event="handleToEvent"
               ></cus-shops>
             </scroll-view>
           </template>
@@ -149,8 +152,8 @@
         hasNext: true,
         next_page_token: "",
         brand_id: '',
-        shop_id:'',
-        resource_shop_id:'',
+        shop_id: '',
+        resource_shop_id: '',
 
         //地图
         initBaidu: false,
@@ -171,23 +174,34 @@
         scrollTop: 0,
 
         //基础
-        serverType:['SELL'],
-        cusContent:[],
-        tabLayout:'v1',
+        serverType: ['SELL'],
+        cusContent: [],
+        tabLayout: 'v1',
         xnamespace: "",
-        showOftenTab:'N',
-
+        showOftenTab: 'N',
+        fastEntryStatus: false,
+        cusNames: {},
+        cusEntry: {},
+        shopListStyle: 'v1',
 
         //style
-        bodyPadding:{},
-        cusStyle:{},
-        contentBgColor:'rgba(0,0,0,0)',
+        bodyPadding: {},
+        cusStyle: {},
+        contentBgColor: 'rgba(0,0,0,0)',
 
         //选项卡
         tabBgColor: '#fff',
-        tabStyle:{},
-        isCallback:null,
-        callbackParams: {}
+        tabStyle: {},
+        isCallback: null,
+        callbackParams: {},
+
+        //高级
+        codePath: '', //门店跳转
+        cashierPath: '',//支持核销
+        buyTicketPath: '',//在线选择
+        codeAfterPath: '',//电子码
+        hdSelfPath: '',//小时达
+        travelfPath: '', //旅游购票
       }
     },
     computed: {
@@ -271,7 +285,9 @@
         }
       },
       contStyleComp(){
-        let height = this.layoutInfo.bodyMinHeightRpx - 100 - 72;
+        let height = this.layoutInfo.bodyMinHeightRpx  - 72;
+        //大于一个标签显示标签
+        if(this.titleList.length > 1) height = height - 100;
         if(this.mapIsExtend) height = height - 400;
         height = height - this.getPMValue(this.bodyPadding, 'TB', 0);
         return {
@@ -542,6 +558,22 @@
         this.showOftenTab = gCPVal(container, 'showOftenTab', 'N');
         if(this.showOftenTab === 'N') this.titleList = [{label: '附近门店', value: 'nearby'}];
         if(this.showOftenTab === 'Y') this.titleList = [{label: '附近门店', value: 'nearby'},{label: '常用门店', value: 'often'}];
+        this.shopListStyle =  gCPVal(container, 'shopListStyle', 'v1');
+        this.fastEntryStatus = gCPVal(container, 'fastEntryStatus', 'N') === 'Y';
+        let fastEntry = gCPVal(container, 'fastEntry', []).filter(item=>{
+          return item.check === true
+        });
+        let cusNames = {};
+        let cusEntry = {};
+        if(this.fastEntryStatus) {
+          for(let i = 0; i< fastEntry.length ;i++) {
+            if(fastEntry[i].input)  cusNames[fastEntry[i].value] = fastEntry[i].input
+            cusEntry[fastEntry[i].value] = fastEntry[i].check;
+          }
+        }
+        this.cusNames = cusNames;
+        this.cusEntry = cusEntry;
+
 
         //content
         let cusContent = [];
@@ -621,38 +653,85 @@
         }
 
         //高级
-        this.codePath = getContainerPropsValue(container, 'content.codePath', { value: "" }).value;
+        this.codePath = gCPVal(container, 'codePath', { value: "" }).value;
+        this.cashierPath = gCPVal(container, 'cashierPath', { value: "" }).value;
+        this.buyTicketPath = gCPVal(container, 'buyTicketPath', { value: "" }).value;
+        this.codeAfterPath = gCPVal(container, 'codeAfterPath', { value: "" }).value;
+        this.hdSelfPath = gCPVal(container, 'hdSelfPath', { value: "" }).value;
+        this.travelfPath = gCPVal(container, 'travelfPath', { value: "" }).value;
+
+        //关闭显示附近门店
+        if(this.showOftenTab === 'N')  this.tab = 'nearby';
+
       },
-      handleToCode({item,funcName,type}) {
-        if(this.$configProject['isPreview'] || !this.codePath ) return;
+      //==点击事件===========
+      handleToEvent({item,type}) {
         let parmas = [];
+        let url = ''
         if(item.resource_shop_id) parmas.push(`resource_shop_id=${item.resource_shop_id}`);
         if(item.brand_id) parmas.push(`brand_id=${item.brand_id}`);
         if(item.consume_mode) parmas.push(`consume_mode=${item.consume_mode.join(',')}`);
         if(item.shop_id) parmas.push(`shop_id=${item.shop_id}`);
 
+        //详情增加扩张参数
+        if(item.exts_params && type === 'DL'){
+          parmas.push(`exts_params=${item.exts_params}`);
+          parmas.push(`resource_shop=${Base64.encodeURI(JSON.stringify({shop_id: item.shop_id,resource_shop_id: item.resource_shop_id }))}`);
+        }
 
-        //返回操作
-        if(this.isCallback) {
-          parmas = []
-          if(item.resource_shop_id) parmas.push(`resource_shop_id=${item.resource_shop_id}`);
-          if(!this.$xdUniHelper.isEmpty(this.callbackParams)) {
-            Object.keys(this.callbackParams).map(it=>{
-              parmas.push(`${it}=${this.callbackParams[it]}`);
-            })
+        //在线选择,电子码传惨处理
+        if(['SEAT','CODE'].includes(type)) parmas = [`cinema_id=${item.resource_shop_id}`]
+        if(['TRAVEL'].includes(type)) parmas = [`shop_id=${item.resource_shop_id}`]
+
+        //点击详情地址
+        if(type === 'DL') {
+          //有回调地址处理
+          if(this.isCallback) {
+            parmas = []
+            if(item.resource_shop_id) parmas.push(`resource_shop_id=${item.resource_shop_id}`);
+            if(!this.$xdUniHelper.isEmpty(this.callbackParams)) {
+              Object.keys(this.callbackParams).map(it=>{
+                parmas.push(`${it}=${this.callbackParams[it]}`);
+              })
+            }
+            this.$xdUniHelper.redirectTo({
+              url: this.isCallback + `?${parmas.join('&')}`
+            },false,true)
+            return
           }
-          this.$xdUniHelper.redirectTo({
-            url: this.isCallback + `?${parmas.join('&')}`
-          },false,true)
-          return
+
+          //其他情况
+          url = this.codePath;
+        }
+
+        //支持核销
+        if(type === 'SELL')  url = this.cashierPath;
+        //在线选择
+        if(type === 'SEAT')  url = this.buyTicketPath;
+        //电子码
+        if(type === 'CODE')  url = this.codeAfterPath;
+        //小时达
+        if(type === 'HDSELF')  url = this.hdSelfPath;
+        //旅游购票
+        if(type === 'TRAVEL')  url = this.travelfPath;
+
+        if(!url) throw new Error(`${type} => 未设置访问地址`);
+
+
+        //预览模式
+        if(this.$configProject['isPreview']) {
+          console.warn(`uri=>${url}?${parmas.join('&')}`)
+          return;
         }
 
         //普通跳转
         this.$xdUniHelper.navigateTo({
-          url: this.codePath + `?${parmas.join('&')}`
+          url: `${url}?${parmas.join('&')}`
         })
       },
 
+      //==点击事件===========
+
       onJfbScroll(options) {
 
       },

package/src/components/JfbMallShopVip/Mock.js

@@ -211,7 +211,7 @@ module.exports = {
         "consume_mode_name": "",
         "distance": "1059km",
         "distance_conversion": "1,058.9km",
-        "default_consume_type": "CV",
+        "default_consume_type": "JHD",
         "consume_type": [
           "CV"
         ],
@@ -245,10 +245,13 @@ module.exports = {
           "SELL",
           "HDSELF"
         ],
-        "consume_mode_name": "",
+        "consume_mode_name":{
+          "SELL":'电子码',
+          "HDSELF":'小时达'
+        },
         "distance": "1217km",
         "distance_conversion": "1,216.0km",
-        "default_consume_type": "CV",
+        "default_consume_type": "WB",
         "consume_type": [
           "CV"
         ],
@@ -285,7 +288,7 @@ module.exports = {
         "consume_mode_name": "",
         "distance": "1224km",
         "distance_conversion": "1,223.8km",
-        "default_consume_type": "CV",
+        "default_consume_type": "QP",
         "consume_type": [
           "CV"
         ],
@@ -321,7 +324,7 @@ module.exports = {
         "consume_mode_name": "",
         "distance": "1226km",
         "distance_conversion": "1,226.0km",
-        "default_consume_type": "CV",
+        "default_consume_type": "QP",
         "consume_type": [
           "CV"
         ],
@@ -356,7 +359,7 @@ module.exports = {
         "consume_mode_name": "",
         "distance": "1230km",
         "distance_conversion": "1,229.7km",
-        "default_consume_type": "CV",
+        "default_consume_type": "SEAT",
         "consume_type": [
           "CV"
         ],
@@ -386,12 +389,12 @@ module.exports = {
         "brand_type": "MA",
         "business_status": "OPEN_BUSINESS",
         "consume_mode": [
-          "SELL"
+          "CODE"
         ],
-        "consume_mode_name": "",
+        "consume_mode_name": {CODE: '电子码'},
         "distance": "1231km",
         "distance_conversion": "1,230.6km",
-        "default_consume_type": "CV",
+        "default_consume_type": "CODE",
         "consume_type": [
           "CV"
         ],
@@ -421,12 +424,12 @@ module.exports = {
         "brand_type": "MA",
         "business_status": "OPEN_BUSINESS",
         "consume_mode": [
-          "SELL"
+          "TRAVEL"
         ],
         "consume_mode_name": "",
         "distance": "1231km",
         "distance_conversion": "1,230.7km",
-        "default_consume_type": "CV",
+        "default_consume_type": "",
         "consume_type": [
           "CV"
         ],

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

@@ -7,10 +7,10 @@ export default (data, gValue, gColor, oldData={})=>{
   }
   return [
     {
-      label: '跳转地址',
+      label: '门店地址',
       ele: 'xd-select-pages-path',
       valueKey: 'codePath',
-      placeholder: '请选择跳转地址页面',
+      placeholder: '请选择门店地址跳转地址',
       groupKey:'advanced',
       value: codePath,
       labelInline:true,
@@ -21,6 +21,81 @@ export default (data, gValue, gColor, oldData={})=>{
       },
       inline: false,
     },
+    {
+      label: '核销地址',
+      ele: 'xd-select-pages-path',
+      valueKey: 'cashierPath',
+      placeholder: '请选择核销地址跳转地址',
+      groupKey:'advanced',
+      className: 'input100',
+      value: data['cashierPath'] || null,
+      setting: {
+        mode:'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+      labelInline:true,
+    },
+    {
+      label: '在线选座',
+      ele: 'xd-select-pages-path',
+      valueKey: 'buyTicketPath',
+      placeholder: '请选择在线选座跳转地址',
+      groupKey:'advanced',
+      className: 'input100',
+      value: data['buyTicketPath'] || null,
+      setting: {
+        mode:'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+      labelInline:true,
+    },
+    {
+      label: '电子码地址',
+      ele: 'xd-select-pages-path',
+      valueKey: 'codeAfterPath',
+      placeholder: '请选择电子码跳转地址',
+      groupKey:'advanced',
+      className: 'input100',
+      value: data['codeAfterPath'] || null,
+      setting: {
+        mode:'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+      labelInline:true,
+    },
+    {
+      label: '小时达地址',
+      ele: 'xd-select-pages-path',
+      valueKey: 'hdSelfPath',
+      placeholder: '请选择小时达到店自取跳转地址',
+      groupKey:'advanced',
+      className: 'input100',
+      value: data['hdSelfPath'] || null,
+      setting: {
+        mode:'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+      labelInline:true,
+    },
+    {
+      label: '旅游门票',
+      ele: 'xd-select-pages-path',
+      valueKey: 'travelfPath',
+      placeholder: '请选择旅游在线订票跳转地址',
+      groupKey:'advanced',
+      className: 'input100',
+      value: data['travelfPath'] || null,
+      setting: {
+        mode:'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+      labelInline:true,
+    },
     {
       label: '版本号:',
       ele: 'el-input',

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

@@ -56,7 +56,7 @@ export default function (data, gValue, gColor, oldData){
           server:'supplier-partner',
           fn:'shop',
           path:'p1',
-        })
+        }, {cusume_mode: 1})
           .then(res => {
             data.cb(res['consume_mode'])
           })
@@ -89,6 +89,27 @@ export default function (data, gValue, gColor, oldData){
       size: 'small',
       groupKey:'content',
     },
+    0&&{
+      label: "列表布局",
+      ele: "xd-style-image",
+      groupKey: 'content',
+      valueKey: "shopListStyle",
+      value:  dataVal({data, key:'shopListStyle', dValue:'v1', gValue}),
+      labelInline:true,
+      className: 'input100',
+      handleCustom(cusRes) {
+        XdBus.getParentApi('getCompStylesOptions')({
+          layout_ids: '67gEK19OLvv1pnomF15oJ',
+          key: Date.now()
+        })
+          .then(res => {
+            cusRes.data.cb(res)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
     {
       label: "门店样式",
       ele: "xd-style-image",
@@ -254,5 +275,47 @@ export default function (data, gValue, gColor, oldData){
       indent: true
     },
     {ele: 'group_end'},
+    {
+      ele:'xd-line',
+      groupKey:'content'
+    },
+    {
+      label: '快捷入口',
+      ele: 'xd-cus-switch',
+      valueKey: 'fastEntryStatus',
+      value: dataVal({data, key:'fastEntryStatus', dValue:"N", gValue}),
+      className: 'input100',
+      groupKey:'content',
+      labelInline:true,
+      cusStyle:{marginBottom: '10px'},
+      setting: {
+        isBackType: 'string'
+      },
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-name-check',
+      valueKey: 'fastEntry',
+      groupKey:'content',
+      value: dataVal({data, key:'fastEntry', dValue:[], gValue}),
+      className: 'input100',
+      setting: {
+        isSort:false,
+        width: 100,
+      },
+      labelInline:true,
+      hidden: data['fastEntryStatus'] !== 'Y',
+      handleCustom({action, data}) {
+        data.cb([
+          {value:'cashier', label: '支持核销',input:'',check: false,placeholder:'支持核销名称，默认“去买单”'},
+          {value:'buyTicket', label: '在线选座',input:'',check: false,placeholder:'在线选座名称，默认“去购票”'},
+          {value:'code', label: '电子码门店',input:'',check: false,placeholder:'电子码门店称，默认“电子码”'},
+          {value:'hdSelf', label: '小时达到店',input:'',check: false,placeholder:'小时达到店名称，默认“到店自取”'},
+          {value:'travel', label: '旅游门票',input:'',check: false,placeholder:'旅游门票名称，默认“去购票”'}
+        ])
+      },
+    },
+    {ele: 'group_end'},
   ].filter(i=>i)
 }