jufubao-mall 2.0.8 → 2.0.9-beta2

package/package.json

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

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"
@@ -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

@@ -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)
 }