jufubao-mall 2.0.35-beta2 → 2.0.35-beta4

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

@@ -0,0 +1,242 @@
+'use strict';
+
+
+import {dataVal, statusDataVal, statusShow} from "@/utils/AttrTools";
+import more from "./more";
+import brand from "./brand";
+import tab from "./tab";
+
+export default function (data, gValue, gColor, oldData) {
+  return [
+    {
+      ele: 'title',
+      label: '常规',
+      size: 'small',
+      groupKey:'style',
+    },
+    {
+      label: '外边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'marginStatus',
+      value: statusDataVal({data, key:'marginStatus', fields:['margin'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-margin-padding',
+      groupKey:'style',
+      valueKey: 'margin',
+      value: dataVal({
+        data,
+        key:'margin',
+        dValue:(gValue.isAdd && gValue.isFirst? ({top:0, left:0, right:0,bottom:16}) : {top:0, left:0, right:0,bottom:20}),
+        gValue,
+        isPM: true,
+      }),
+      hidden: !statusShow({data, key: 'marginStatus', fields:['margin'], gValue}),
+      setting: {
+        type: 'margin',
+      },
+    },
+    {ele: 'group_end'},
+    {
+      label: '內边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'bgImagePaddingStatus',
+      value: statusDataVal({data, key:'bgImagePaddingStatus', fields:['bgImagePadding'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-margin-padding',
+      valueKey: 'bgImagePadding',
+      value: dataVal({
+        data,
+        key:'bgImagePadding',
+        dValue:(gValue.isAdd && gValue.isFirst? ({top:0, left:0, right:0,bottom:16}) : {top:0, left:0, right:0,bottom:20}),
+        gValue,
+        isPM: true,
+      }),
+      hidden: !statusShow({data, key: 'bgImagePaddingStatus', fields:['bgImagePadding'], gValue}),
+      groupKey: 'style',
+      setting: {
+        type: 'padding',
+      },
+      placeholder: '请填充设置',
+      inline: false,
+      notice: `设置内填充，<span style="color: red">单位：像素</span>。默认值：<span style="color:red">${data['listLayout'] === 'slide'?32:0}</span>像素`,
+    },
+    {ele: 'group_end'},
+    {
+      label: '背景',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'bodyStatus',
+      value: statusDataVal({data, key:'bodyStatus', fields:['outBgColor'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '背景色',
+      ele: 'xd-color',
+      valueKey: 'outBgColor',
+      value: dataVal({data, key:'outBgColor', dValue:'#fff', gValue}),
+      hidden: !statusShow({data, key: 'bodyStatus', fields:['outBgColor'], gValue}),
+      placeholder: '请选择背景色',
+      classNmae: 'input80',
+      groupKey: 'style',
+      labelInline: true,
+      setting: {
+        showAlpha: true
+      }
+    },
+    {ele: 'group_end'},
+    {
+      label: '圆角',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'mainNewRadiusStatus',
+      value: statusDataVal({data, key:'mainNewRadiusStatus',cValue:'N', fields:['mainNewRadius'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '无圆角', value: 'N'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: "",
+      groupKey: 'style',
+      ele: 'xd-slider',
+      valueKey: "mainRadius",
+      value: data['mainRadius'] === undefined?0:data['mainRadius'],
+      className: "input80",
+      labelInline: true,
+      hidden: false,
+      setting:{
+        min: 0,//最小值
+        max: 60, //最小值
+        step:1, //步长
+        showStops:false,//显示间断点
+        showInput:false,//显示输入框
+      }
+    },
+    {
+      label: '',
+      ele: 'xd-site-select-list',
+      labelInline: true,
+      valueKey: 'mainNewRadius',
+      value: dataVal({data, key:'mainNewRadius', dValue:'10', gValue}), //默认0
+      hidden: !statusShow({data, key: 'mainNewRadiusStatus', fields:['mainNewRadius'], gValue}),
+      placeholder: '请选择圆角',
+      multiple: false,
+      className: 'input80',
+      groupKey:'style',
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({
+          setting_id: 'edtix_style_radius',
+          key: Date.now()
+        })
+          .then(res => {
+            res.list = res.list.filter(item=>{
+              return item.label !== '无';
+            });
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    {ele: 'group_end'},
+    {
+      ele: 'title',
+      label: '內容区',
+      size: 'small',
+      groupKey:'style',
+    },
+    {
+      label: '内容区背景',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'contBgColorStatus',
+      value: statusDataVal({data, key:'contBgColorStatus', fields:['contBgColor'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '背景色',
+      ele: 'xd-color',
+      valueKey: 'contBgColor',
+      value: dataVal({data, key:'contBgColor', dValue:'', gValue}),
+      hidden: !statusShow({data, key: 'contBgColorStatus', fields:['contBgColor'], gValue}),
+      placeholder: '请选择背景色',
+      classNmae: 'input80',
+      groupKey: 'style',
+      labelInline: true,
+      setting: {
+        showAlpha: true
+      }
+    },
+    {ele: 'group_end'},
+    {
+      label: '内容区边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'itemPaddingStatus',
+      value: statusDataVal({data, key:'itemPaddingStatus', fields:['itemPadding'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '填充设置:',
+      ele: 'xd-margin-padding',
+      valueKey: 'itemPadding',
+      value: dataVal({
+        data,
+        key:'itemPadding',
+        dValue:20,
+        gValue,
+        isPM: true,
+      }),
+      hidden: !statusShow({data, key: 'itemPaddingStatus', fields:['itemPadding'], gValue}),
+      groupKey: 'style',
+      setting: {
+        type: 'padding',
+      },
+      placeholder: '请填充设置',
+      inline: false,
+      notice: `设置内填充，<span style="color: red">单位：像素</span>。默认值：<span style="color:red">${data['listLayout'] !== 'carousel'?'32,0,0,0':'20'}</span>像素`,
+    },
+    {ele: 'group_end'},
+    ...tab(data, gValue, gColor, oldData),
+    ...brand(data, gValue, gColor, oldData),
+    ...more(data, gValue, gColor, oldData),
+  ]
+}
+

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

@@ -0,0 +1,275 @@
+'use strict';
+
+import {
+  dataVal,
+  statusDataVal,
+  statusShow,
+  clone,
+  cRaBorShadow,
+  isDefStatus,
+  oldTonNewBorAndSha
+} from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData={})=>{
+
+  return [
+    {
+      ele: 'title',
+      label: '选项样式',
+      size: 'small',
+      groupKey:'style',
+    },
+    {
+      label: '列间距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'tabSpacingStatus',
+      value: statusDataVal({data, key:'tabSpacingStatus', fields:['tabSpacing'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: "",
+      groupKey: 'style',
+      ele: 'xd-slider',
+      valueKey: "tabSpacing",
+      value: dataVal({data, key:'tabSpacing', dValue:0, gValue}),
+      hidden: !statusShow({data, key: 'tabSpacingStatus', fields:['tabSpacing'], gValue}),
+      className: "input80",
+      labelInline: true,
+      setting:{
+        min: 0,//最小值
+        max: 80, //最小值
+        step:1, //步长
+        showStops:false,//显示间断点
+      }
+    },
+    {ele: 'group_end'},
+    {
+      label: '背景',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'tabBgColorStatus',
+      value: statusDataVal({data, key:'tabBgColorStatus', fields:['tabBgColor'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-color',
+      valueKey: 'tabBgColor',
+      value: dataVal({data, key:'tabBgColor', dValue:'rgba(0,0,0,0)', gValue}),
+      hidden: !statusShow({data, key: 'tabBgColorStatus', fields:['tabBgColor'], gValue}),
+      placeholder: '请选择背景',
+      classNmae: 'input60',
+      groupKey: 'style',
+      labelInline: true,
+      setting: {
+        showAlpha: true
+      }
+    },
+    {ele: 'group_end'},
+    {
+      label: '圆角',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'tabNewRadiusStatus',
+      value: statusDataVal({data, key:'tabNewRadiusStatus',cValue: 'N', fields:['tabNewRadius'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '无圆角', value: 'N'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: "圆角设置：",
+      groupKey: 'style',
+      ele: 'xd-slider',
+      valueKey: "tabRadius",
+      value: data['tabRadius']===undefined?0:data['tabRadius'],
+      className: "input80",
+      labelInline: true,
+      setting:{
+        min: 0,//最小值
+        max: 80, //最小值
+        step:1, //步长
+        showStops:false,//显示间断点
+      }
+    },
+    {
+      label: '',
+      ele: 'xd-site-select-list',
+      labelInline: true,
+      valueKey: 'tabNewRadius',
+      value: dataVal({data, key:'tabNewRadius', dValue:'10', gValue}),
+      hidden: !statusShow({data, key: 'tabNewRadiusStatus', fields:['tabNewRadius'], gValue}),
+      placeholder: '请选择更多圆角',
+      multiple: false,
+      className: 'input80',
+      groupKey:'style',
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({
+          setting_id: 'edtix_style_radius',
+          key: Date.now()
+        })
+          .then(res => {
+            debugger
+            res.list = res.list.filter(item=>{
+              return item.label !== '无';
+            });
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    {ele: 'group_end'},
+    {
+      label: '内边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'tabPaddingStatus',
+      value: statusDataVal({data, key:'tabPaddingStatus', fields:['tabPadding'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-margin-padding',
+      groupKey:'style',
+      valueKey: 'tabPadding',
+      value: dataVal({
+        data,
+        key:'tabPadding',
+        dValue:0,
+        gValue,
+        isPM: true,
+      }),
+      hidden: !statusShow({data, key: 'tabPaddingStatus', fields:['tabPadding'], gValue}),
+      setting: {
+        type: 'padding',
+      },
+    },
+    {ele: 'group_end'},
+
+
+    //废弃样式（不可删除）
+    {
+      label: '背景颜色:',
+      ele: 'xd-color',
+      hidden:false,
+      valueKey: 'titleBackgroundColor',
+      value: data['titleBackgroundColor'] || '',
+      placeholder: '请选择背景颜色',
+      classNmae: 'input80',
+      groupKey: 'style',
+    },
+    {
+      label: '选中背景颜色:',
+      hidden:false,
+      ele: 'xd-color',
+      valueKey: 'titleActBackgroundColor',
+      value: data['titleActBackgroundColor'] || '',
+      placeholder: '请选择选中背景颜色',
+      classNmae: 'input80',
+      groupKey: 'style',
+    },
+    {
+      label: '文字颜色:',
+      ele: 'xd-color',
+      hidden:false,
+      valueKey: 'titleTextColor',
+      value: data['titleTextColor'] || '',
+      placeholder: '请选择文字颜色',
+      classNmae: 'input80',
+      groupKey: 'style',
+    },
+    {
+      label: '选中文字颜色:',
+      hidden:false,
+      ele: 'xd-color',
+      valueKey: 'titleActTextColor',
+      value: data['titleActTextColor'] || '',
+      placeholder: '请选择选中文字颜色',
+      classNmae: 'input80',
+      groupKey: 'style',
+    },
+    //废弃样式（不可删除）
+
+    // {
+    //   ele: 'title',
+    //   label: '标题设置',
+    //   size: 'small',
+    //   groupKey: 'style',
+    // },
+    // {
+    //   ele: 'line',
+    //   label: '选项设置',
+    //   size: 'small',
+    //   groupKey: 'style',
+    // },
+    // {
+    //   label: '背景色:',
+    //   ele: 'xd-color',
+    //   valueKey: 'tabBgColor',
+    //   value: data['tabBgColor'] || '',
+    //   placeholder: '请选择背景色',
+    //   classNmae: 'input80',
+    //   groupKey: 'style',
+    //   labelInline: true,
+    //   setting: {
+    //     showAlpha: true
+    //   }
+    // },
+    {
+      label: '选项样式设置:',
+      ele: 'xd-text-and-bgc',
+      groupKey:'style',
+      valueKey: 'tabStyle',
+      value: data['tabStyle'] || null,
+      setting: {
+        fontSize: true,
+        weight:true,
+        bgColor:true,
+        selected:true,
+        default:{
+          color: '#999',
+          fontSize: '28rpx',
+          fontWeight:'normal',
+          bgColor:'',
+          actColor: '#fff',
+          actFontSize: '28rpx',
+          actFontWeight:'normal',
+          actBgColor:''
+        }
+      },
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+            data.cb([])
+          });
+      },
+    },
+
+  ].filter(i=>i)
+}
+

package/src/components/JfbMallProductList/Attr.js

@@ -8,6 +8,7 @@ export default {
   style: [],
   advanced: [],
   content: (data, gValue, gColor, oldData={})=>{
+    debugger
     console.log(data['row_num'],"data['row_num']");
 
     let defContShadow = oldTonNewBorAndSha(

package/src/components/JfbMallShopVip/JfbMallShopVip.vue

@@ -108,13 +108,14 @@
                   v-for="item in nearbyShopList"
                   :key="item.key"
                   :id="`scroll-${item.resource_shop_id}`"
+                  @click.shop="handleToEvent(item, 'shop')"
                 >
                   <view class="shop_list-item-title">
                     <view class="title">
                       <view>{{item.resource_shop_name}}</view>
                       <view class="active" v-if="resource_shop_id === item.resource_shop_id">正在预览</view>
                     </view>
-                    <view>
+                    <view @click="handleToEvent(item, 'detail')">
                       <text>详情</text>
                       <xd-font-icon icon="iconxiangyou_xian" color="#999" size="30" width="26" height="26"></xd-font-icon>
                     </view>
@@ -147,7 +148,6 @@
   import { gCPVal } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import getServiceUrl from "@/common/getServiceUrl";
-  import CusShops from "./CusShops.vue"
   // #ifdef H5
   import XdBaiduMap from "./XdBaiduMap"
   // #endif
@@ -160,7 +160,6 @@
     components: {
       XdNoData,
       XdFontIcon,
-      CusShops,
       // #ifdef H5
       XdBaiduMap,
       // #endif
@@ -522,7 +521,6 @@
 
 
       handleRegionChange(e){
-       console.log('handleRegionChange',e);
         //重新定位
         if(['location','update'].includes(e.causedBy)){
           this.localImage = '';
@@ -723,25 +721,12 @@
        * @description
        * @param item
        * @param type detail|shop
-       * @param isMap
        */
-      handleToEvent({item,type,isMap=false}) {
-        let curShop = {};
-        if(isMap) curShop = this.nearbyShopList.filter(it=>it.resource_shop_id === item.id)[0];
-        else curShop = this.$xdUniHelper.cloneDeep(item);
-
+      handleToEvent(item,type) {
+        debugger
         let parmas = [];
         let url = ''
-        if(curShop.resource_shop_id) parmas.push(`resource_shop_id=${curShop.resource_shop_id}`);
-        if(curShop.brand_id) parmas.push(`brand_id=${curShop.brand_id}`);
-        if(curShop.consume_mode) parmas.push(`consume_mode=${curShop.consume_mode.join(',')}`);
-        if(curShop.shop_id) parmas.push(`shop_id=${curShop.shop_id}`);
-
-        //详情增加扩张参数
-        if(curShop.exts_params && type === 'detail'){
-          parmas.push(`exts_params=${curShop.exts_params}`);
-          parmas.push(`resource_shop=${Base64.encodeURI(JSON.stringify({shop_id: curShop.shop_id,resource_shop_id: curShop.resource_shop_id }))}`);
-        }
+        if(item['resource_shop_id'])  parmas.push(`resource_shop_id=${item['resource_shop_id']}`)
 
         //去门店
         if(type === 'shop') url = this.codePath;
@@ -751,7 +736,6 @@
 
         if(!url) throw new Error(`${type} => 未设置访问地址，参数:${parmas.join('&')}`);
 
-
         //预览模式
         if(this.$configProject['isPreview']) {
           console.warn(`uri=>${url}?${parmas.join('&')}`)
@@ -795,9 +779,9 @@
       .shop_map {
         background: #fff;
         font-size: unit(28, rpx);
-
         .mpa_wrap {
-          height: 500rpx;
+          padding: 20rpx;
+          height: 460rpx;
           background: #fff;
           transition: all .3s ease-in-out;
           position: relative;
@@ -811,6 +795,7 @@
             height: 0;
             position: relative;
             z-index: 0;
+            padding: 0;
             overflow: hidden;
           }
         }

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

@@ -79,7 +79,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     {ele: 'group_end'},
     {
-      label: '间距设置',
+      label: '行间距',
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'cardItemSpaceStatus',