jufubao-mall 2.0.21 → 2.0.23-beta1

package/src/components/JfbMallTestNormal/data.js

@@ -0,0 +1,152 @@
+'use strict';
+
+export default [
+  {
+    "brand_id": 14,
+    "brand_name": "广隆蛋挞王",
+    "brand_type": "MA",
+    "business_status": "CLOSED",
+    "consume_mode": ["SELL"],
+    "consume_mode_name": "",
+    "distance": "42km",
+    "distance_conversion": "41.9km",
+    "default_consume_type": "CV",
+    "consume_type": [
+      "CV"
+    ],
+    "discount_ratio" : 7500, //折扣
+    "is_support_jhd": true,
+    "address": "顺义区东六环与顺于路交叉口东150米",
+    "province_name": "",
+    "city_name": "",
+    "area_name": "",
+    "street_name": "",
+    "phone": "(010)89430806",
+    "resource_shop_id": 80034891,
+    "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAzNDg5LCJzaG9wX2lkIjoxMTUzNTIwLCJ2ZXJzaW9uIjoyfQ",
+    "resource_shop_name": "六九豆浆饺子(石门市场店)",
+    "shop_icon": "https://cake-img-v1.jufubao.cn/uploads/20221018/5c1f49a47055a452ac6c5a3efd9d5174.jpg",
+    "shop_id": 1153520,
+    "shop_tags": [],
+    "stars": 0,
+    "time_slot_name": "-",
+    "business_code": ""
+  },
+  {
+    "brand_id": 100003,
+    "brand_name": "面包新语",
+    "brand_type": "MA",
+    "business_status": "OPEN_BUSINESS",
+    "consume_mode": [
+      "SELL"
+    ],
+    "consume_mode_name": "",
+    "distance": "55km",
+    "distance_conversion": "54.8km",
+    "default_consume_type": "QP",
+    "consume_type": ['QP'],
+    "price":9999, //价格
+    "is_support_jhd": false,
+    "address": "东城区东直门街道东城区东直门内南大街4号（东直门内第一个十字路口东南角）",
+    "province_name": "",
+    "city_name": "",
+    "area_name": "",
+    "street_name": "",
+    "phone": "64034959",
+    "resource_shop_id": 8000077,
+    "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwMDc3LCJzaG9wX2lkIjoxMDIzNTMwLCJ2ZXJzaW9uIjoyfQ",
+    "resource_shop_name": "东直门[2]",
+    "shop_icon": "https://cake-img-v1.jufubao.cn/uploads/20200629/1125b2379b4d8c7fefb4a8abd3dd6f0d.png",
+    "shop_id": 1023530,
+    "shop_tags": [],
+    "stars": 0,
+    "time_slot_name": "09:00-18:00",
+    "business_code": ""
+  },
+  {
+    "brand_id": 1000031,
+    "brand_name": "企业团建等企业福利",
+    "brand_type": "MA",
+    "business_status": "OPEN_BUSINESS",
+    "consume_mode": [
+      "SELL"
+    ],
+    "consume_mode_name": "",
+    "distance": "56km",
+    "distance_conversion": "55.5km",
+    "default_consume_type": "WB",
+    "consume_type": ["WB"],
+    "is_support_jhd": true,
+    "address": "东城区建国门街道北京inn",
+    "province_name": "",
+    "city_name": "",
+    "area_name": "",
+    "street_name": "",
+    "phone": "18843854566",
+    "resource_shop_id": 8000078,
+    "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwMDc4LCJzaG9wX2lkIjoxMDM3MjY2LCJ2ZXJzaW9uIjoyfQ",
+    "resource_shop_name": "a加盟商-185",
+    "shop_icon": "https://img3.jufubao.cn/uploads/20250314/41051efe77b3955bd8567f0da4488d6a.jpg",
+    "shop_id": 1037266,
+    "shop_tags": [],
+    "stars": 0,
+    "time_slot_name": "-",
+    "business_code": "",
+    "discount_ratio" : 7500, //折扣
+  },
+  {
+    "brand_id": 1000031,
+    "brand_name": "85度C",
+    "brand_type": "MA",
+    "business_status": "OPEN_BUSINESS",
+    "consume_mode": ["SELL"],
+    "consume_mode_name": "",
+    "distance": "56km",
+    "distance_conversion": "55.5km",
+    "default_consume_type": "JHD",
+    "consume_type": ["JHD"],
+    "is_support_jhd": true,
+    "address": "东城区建国门街道北京inn",
+    "province_name": "",
+    "city_name": "",
+    "area_name": "",
+    "street_name": "",
+    "phone": "18843854566",
+    "resource_shop_id": 80000781,
+    "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwMDc4LCJzaG9wX2lkIjoxMDM3MjY2LCJ2ZXJzaW9uIjoyfQ",
+    "resource_shop_name": "a加盟商-185",
+    "shop_icon": "https://img5-v1.jufubao.cn/uploads/20230131/35b974aa874efc336c44e86a7a028987.jpg",
+    "shop_id": 1037266,
+    "shop_tags": [],
+    "stars": 0,
+    "time_slot_name": "-",
+    "business_code": "",
+    "price":99099, //价格
+  },
+  {
+    cinema_id: 6780394,
+    resource_shop_id: 6780394,
+    latitude: "39.760059",
+    longitude: "116.545494",
+    address: "北京市通州区新海东路1号米拉广场6楼",
+    resource_shop_name: "【大地】大地影院（通州米拉家园店）",
+    cinema_name: "【大地】大地影院（通州米拉家园店）",
+    ticket_notice: "",
+    brand_id: 0,
+    about: "",
+    shop_icon: "https://cake-img-v1.jufubao.cn/uploads/20220628/2a3e5f7e6873657bb6c7eb14fd7b937a.jpg?x-oss-process=style/size2",
+    distance: "27.1km",
+    cinema_type: ["SEAT", 'CODE','SELL'], //
+    consume_mode: ["SEAT", 'CODE','SELL'], //'SELL'
+    status: "Y",
+    is_open: "Y",
+    default_consume_type: "QP",
+    show_cinema_type: "SEAT",
+    show_cinema_type_name: "在线选座",
+    brand_name: "",
+    area_code: "2809",
+    area_name: "通州区",
+    price:99899, //价格
+  },
+]
+

package/src/mixins/componentsMixins.js

@@ -331,6 +331,7 @@ export default {
     active(val){
       if(this.$configProject.isPreview && val) this.autoHideMask();
     },
+
   },
 
   methods:{

package/src/mixins/productCompMixins.js

@@ -6,6 +6,8 @@ export default {
   data(){
     return {
 
+      productConfig:{},//商品信息
+
       //品牌样式
       brandColor:'#999',
       brandBgColor:'',
@@ -20,15 +22,16 @@ export default {
       posterKey:'posterKey',
       posterIndex:'',
       isPoster:'N',
-
+      isOnLoaded: false,
     }
   },
 
   computed:{
     isOpenPoster(){
       //三列与一列垂直不显示广告
-      return !(this.column_num === 3 || this.columnOneLayout === 'V');
+      return !(this.column_num === 3 || this.columnOneLayout === 'V') && this.isPoster === 'Y';
     },
+
     //广告位置样式设置
     posterSizeComp(){
       return {
@@ -78,33 +81,21 @@ export default {
 
     //商品样式设置
     contProductStyles(){
-      // let boxShadow = this.getShadowCompatibleOldStyle(this.contShadow,{
-      //   type: this.is_shadow,
-      //   width: this.is_shadow_w,
-      //   color: this.is_shadow_bg
-      // }, ['none',this.gStyleValue.shadow]);
-      // debugger
       return {
         ...this.getContentStyle(),
-        boxShadow: this.contShadow,
         border: this.contBorder,
-        backgroundColor: this.itemBgcColor,
+        backgroundColor: this.itemBgcColor ||this.contBgColor ,
       }
     },
 
 
     //商品样式设置
     posterProductStyles(){
-      // let boxShadow = this.getShadowCompatibleOldStyle(this.contShadow,{
-      //   type: this.is_shadow,
-      //   width: this.is_shadow_w,
-      //   color: this.is_shadow_bg
-      // }, ['none',this.gStyleValue.shadow]);
       return {
         ...this.getContentStyle('poster'),
         boxShadow: this.contShadow,
         border: this.contBorder,
-        backgroundColor: this.itemBgcColor,
+        backgroundColor: this.itemBgcColor ||this.contBgColor ,
         overflow:'hidden'
       }
     },
@@ -150,6 +141,12 @@ export default {
     posterNum(){
       this.onJfbUpdate()
     },
+    need_show_tags(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']){
+        this.getList();
+      }
+    },
   },
   methods:{
     //重新加载广告位置
@@ -238,11 +235,24 @@ export default {
 
       let otherWidth = (outMarginRL + outPaddingRL + columnSpacing + isPreview + borderRL + paddingRL);
 
+      //设置上下编辑
+      let marginBottom = this.rowSpacing + 'rpx';
+      let marginTop = 0;
+      if(this['isProductTop'] === true) {
+        marginBottom = 0;
+        marginTop = this.rowSpacing + 'rpx';
+      }
+
+      let borderRadius = '';
+      if(this.radius !== undefined) borderRadius = this.radius;
+      else if(this.contRadius !== undefined) borderRadius  = this.contRadius;
+
       return {
-        marginBottom: this.rowSpacing + 'rpx',
+        marginBottom,
+        marginTop,
         width: (outWidth - otherWidth)/this.column_num + 'rpx',
-        borderRadius: this.radius + 'rpx',
-        boxShadow: '0 0 10rpx rgba(0,0,0,.08)',
+        borderRadius: borderRadius + 'rpx',
+        boxShadow: this.contShadow,
         padding: str,
         backgroundColor: 'rgba(255,255,255,.8)'
       };

package/src/components/JfbMallProductList/PosterAttr.js

@@ -1,327 +0,0 @@
-'use strict';
-
-function checkValue(value, dValue = 0){
-  if(value === undefined || value === '' || value === null) return dValue;
-  return Number(value || 0);
-}
-
-export default (data)=>{
-
-  let bodyPadding = data.bodyPadding || {};
-  let listPadding = data.listPadding || {};
-  let itemPadding = data.itemPadding || {}
-  let contBorder = data.contBorder || {};
-  let columnSpacing = 20;
-  let column_num = 2;
-  let height = 0;
-  if(data.row_num) column_num = data.row_num;
-  if(column_num === 1) height = 200;
-  if(column_num === 2) height = 540;
-  if(column_num === 3) height = 200;
-
-  //总宽度
-  let maxW = 750
-
-  //外边距
-  let outMargin = (Number(checkValue(bodyPadding.left, 0)) + Number(checkValue(bodyPadding.right, 0)))
-
-  //列表填充
-  let outPadding = (Number(checkValue(listPadding.left, 20)) + Number(checkValue(listPadding.right, 20)))
-
-  //间距设置
-  if(typeof data.columnSpacing === 'string' && data.columnSpacing) columnSpacing = Number(data.columnSpacing);
-  let columnSpacings = columnSpacing * (column_num-1); //公式:列数量 * 边距 + 边距
-
-  //item内容填充
-  let paddinRL = 0//(Number(checkValue(itemPadding.left, 20)) + Number(checkValue(itemPadding.right, 20))) * column_num;
-
-  //边框
-  let borderRL = 0;
-  if(contBorder.type === 'Y') {
-    let value = data.contBorder.value || {}
-    if(value.width !== undefined) {
-      borderRL = Number(value.width) * 2;
-    }
-  }
-  const width = (maxW - (outMargin + outPadding + columnSpacings  + paddinRL + borderRL))/column_num;
-
-  let size = {width:width,height:height};
-  let poster = {
-    size: size,
-    type:'1',
-    position: Object.assign({},data.poster && data.poster.position)
-  };
-
-  return [
-    {
-      label: '广告位置配置:',
-      ele: 'xd-site-poster',
-      valueKey: 'poster',
-      className: 'input80',
-      value: poster,
-      groupKey:'content',
-      hidden: data['isPoster'] !== 'Y',
-      setting: {
-        count: 1,
-        scene: {label: '广告', value: 'normal'},
-        sizeDisabled: {
-          wDisabled:true,
-          hDisabled: true,
-        },
-        typeDisabled: true
-      },
-      handleCustom({action, data}) {
-        //设置场景参数
-        if(data) {
-          data.params = Object.assign({}, {scene: 'normal'}, data.params || {})
-        }
-
-        //获取显示内容
-        if (action === 'screenList') {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'editx_base_ad_split_screen'})
-            .then(res => {
-              data.cb(res['list'])
-            })
-            .catch(error => {
-              console.error(error);
-            });
-          return
-        }
-
-        //获取返回参数(广告位高度必选项)
-        if (action === 'getPosterInfo') {
-          XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
-            .then(res => {
-              data.cb({list: res.list, selectId: res.selected})
-            })
-            .catch(error => {
-              console.error(error);
-            });
-          return
-        }
-
-        //使用内容分类
-        if (action === 'cmsPublishEditxContent') {
-          XdBus.getParentApi('cmsPublishEditxContent')(data.params)
-            .then(res => {
-              data.cb(res)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-          return
-        }
-
-        let loading = XdBus.getParentApi('loading')({});
-        //位置列表
-        if (action === 'getListPostion') {
-          XdBus.getParentApi('getListPosterPosition')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(res)
-            })
-            .catch(error => {
-              loading.close();
-              console.error(error);
-            });
-        }
-
-        //位置创建
-        if (action === 'addPostion') {
-          XdBus.getParentApi('addPosterPosition')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //位置编辑
-        if (action === 'editPostion') {
-          XdBus.getParentApi('updatePosterPosition')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //位置删除
-        if (action === 'deleltePostion') {
-          XdBus.getParentApi('deletePosterPosition')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //获取广告位内容列表
-        if (action === 'getListContent') {
-          XdBus.getParentApi('getListPosterContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(res)
-            })
-            .catch(error => {
-              loading.close();
-              console.error(error);
-            });
-        }
-
-        //广告内容创建
-        if (action === 'addContent') {
-          XdBus.getParentApi('addPosterContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //广告内容编辑
-        if (action === 'editContent') {
-          XdBus.getParentApi('updatePosterContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //广告内容删除
-        if (action === 'deleteContent') {
-          XdBus.getParentApi('deletePosterContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(true)
-            })
-            .catch(error => {
-              console.error(error);
-              loading.close();
-              data.cb(false)
-            });
-        }
-
-        //获取广告内容跳转地址类型
-        if (action === 'jumpPosterContentType') {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: "cms_setting"})
-            .then(res => {
-              loading.close();
-              data.cb(res['redirect_type'])
-            })
-            .catch(error => {
-              loading.close();
-              console.error(error);
-            });
-        }
-
-        //发布
-        if (action === 'publish') {
-          console.log('publish', data.params)
-          XdBus.getParentApi('cmsPublishContent')(data.params)
-            .then(res => {
-              loading.close();
-              data.cb(res)
-            })
-            .catch(error => {
-              loading.close();
-              console.error(error);
-            });
-        }
-
-        //获取站内页面地址
-        if (action === 'router') {
-          loading.close()
-          return XdBus.getParentApi('getPagesTree');
-
-        }
-
-        //通知页面进行刷新
-        if(action === 'update') {
-          XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
-          loading.close()
-        }
-      },
-    },
-    {
-      label: '广告位放置位置:',
-      ele: 'el-input',
-      type: 'number',
-      valueKey: 'posterIndex',
-      groupKey:'content',
-      value: data['posterIndex'] || '',
-      placeholder: '请输入广告位放置位置',
-      className: 'input40',
-      hidden: data['isPoster'] !== 'Y',
-      inline: false,
-      notice: '广告位放置位置<br/>当前使用一列时，默认位置：<span style="color:red">4</span>位，<br/>当前使用二列时，默认位置：<span style="color:red">2</span>位，'
-    },
-    {
-      label: '广告位置使用张数:',
-      ele: 'el-input',
-      type: 'number',
-      valueKey: 'posterNum',
-      groupKey:'content',
-      value: data['posterNum'] || 1,
-      placeholder: '请输入广告位置使用张数',
-      className: 'input40',
-      hidden: data['isPoster'] !== 'Y',
-      unit: '张',
-    },
-    {
-      label: '广告轮播周期:',
-      ele: 'el-input',
-      type: 'number',
-      valueKey: 'carouselTime',
-      groupKey:'content',
-      value: data['carouselTime'] || 5,
-      placeholder: '广告轮播周期，默认5秒',
-      className: 'input40',
-      hidden: data['isPoster'] !== 'Y',
-      unit: '秒',
-    },
-    {
-      label: '广告显示dot类型:',
-      ele: 'xd-select-list',
-      valueKey: 'dot_type',
-      value: data['dot_type'] || 'round',
-      groupKey:'content',
-      placeholder: '请选择广告显示dot类型',
-      multiple: false,
-      hidden: data['isPoster'] !== 'Y',
-      className: 'input80',
-      list:[
-        {label: '显示圆点', value: 'dot'},
-        {label: '显示长方形', value: 'default'},
-        {label: '显示圆点+长条', value: 'round'},
-        {label: '显示索引+标题', value: 'nav'},
-        {label: '显示索引', value: 'indexes'},
-        {label: '不显示', value: 'normal'},
-      ],
-      notice: '在使用非通屏显示类型广告位之外的样式时，<span style="color: red">(显示索引+标题|显示索引)</span>使用"<span style="color: red">显示圆点</span>"',
-      inline: false,
-    },
-  ]
-}
-