jufubao-food 1.0.12-beta3 → 1.0.12-beta5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-food",
-  "version": "1.0.12-beta3",
+  "version": "1.0.12-beta5",
   "private": false,
   "description": "聚福宝业务组件餐饮插件包",
   "main": "index.js",

package/src/components/JfbFoodConfirmV2/JfbFoodConfirmV2.vue

@@ -209,7 +209,7 @@
         :getSettleListCoupons="getSettleListCoupons"
         :setSettleSelectCoupon="setSettleSelectCoupon"
       ></cus-coupon-chose>
-      <XdDailog :show.sync="showDialogConfirmShop" :showTitle="false" :showClose="false">
+      <XdDailog :show.sync="showDialogConfirmShop" :showTitle="false">
         <view>
           <view style="font-size: 32rpx;margin: 60rpx auto 50rpx;">确认门店</view>
           <view style="font-size: 28rpx;">

package/src/components/JfbFoodConfirmV2/Mock.js

@@ -1,8 +1,87 @@
-'use strict';
+"use strict";
 
 module.exports = {
-  
-  getFoodCardList:{
+  getFoodCartConfirm: {
+    shop_info: {
+      shop_id: 1170110,
+      shop_name: "星巴克(平谷国泰店)",
+      shop_address: "北京平谷区文化北街13号国泰商场一层",
+      distance: 6722645,
+      distance_conversion: "6,722.6km",
+      shop_icon:
+        "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20220629/b9782f923292030447ff19b62c637715.jpg",
+      meal_method: [
+        { value: "in_store", label: "店内就餐" },
+        { value: "take_away", label: "外带" }
+      ]
+    },
+    order_info: {
+      product_total_amount: 6400,
+      real_total_amount: 6400,
+      total_discount_price: 0,
+      total_market_price: 6400
+    },
+    product_infos: [
+      {
+        product_id: 707,
+        product_name: "双杯抹茶星冰乐®",
+        product_sku: "",
+        specs: [
+          {
+            spec_code: "Cupsize",
+            spec_name: "杯型",
+            spec_value_code: "Grande",
+            spec_value_name: "大杯",
+            image: ""
+          },
+          {
+            spec_code: "Temperature",
+            spec_name: "温度",
+            spec_value_code: "Cold",
+            spec_value_name: "冰",
+            image: ""
+          },
+          {
+            spec_code: "Milk",
+            spec_name: "添加或更换牛奶",
+            spec_value_code: "6411150",
+            spec_value_name: "全脂牛奶",
+            image: ""
+          },
+          {
+            spec_code: "Cream",
+            spec_name: "饮品顶部",
+            spec_value_code: "DefaultCream",
+            spec_value_name: "标准搅打稀奶油",
+            image: ""
+          },
+          {
+            spec_code: "MultiChangeSyrup",
+            spec_name: "无糖风味定制/添加",
+            spec_value_code: "710045678",
+            spec_value_name: "香草风味",
+            image: ""
+          },
+          {
+            spec_code: "ChangeSugar",
+            spec_name: "甜度选择",
+            spec_value_code: "ClassicSugar",
+            spec_value_name: "经典糖",
+            image: ""
+          }
+        ],
+        sub_name: "大杯/冰/全脂牛奶/标准搅打稀奶油/香草风味/经典糖",
+        num: 1,
+        image:
+          "https://image.quanma51.com/self/mahua/sbk/product/7b45d7de7c684b48b14725c7816c4ec9!img",
+        show_prices: [{ p: 6400, n: "PLUS价", t: "S" }],
+        tip: ""
+      }
+    ],
+    is_show_vip_card_list: "N",
+    request_id: "30f4902e9dc47c0f"
+  },
+  getFoodCardList: {
     list: [
       {
         card_number: "101001000005193",
@@ -71,14 +150,14 @@ module.exports = {
     request_id: "ee8f030d48df4faa"
   },
   getPayMethod: {
-    "list":[
-      {"method":"third","show_name":"使用补差","icon":"icon_2"},
-      {"method":"card","show_name":"使用票券","icon":"icon_4"},
-      {"method":"score","show_name":"使用积分","icon":"icon_3"},
-      {"method":"wallet","show_name":"使用余额","icon":"icon_1"},
-      {"method":"coupon","show_name":"使用满减券","icon":"icon_1"}
+    list: [
+      { method: "third", show_name: "使用补差", icon: "icon_2" },
+      { method: "card", show_name: "使用票券", icon: "icon_4" },
+      { method: "score", show_name: "使用积分", icon: "icon_3" },
+      { method: "wallet", show_name: "使用余额", icon: "icon_1" },
+      { method: "coupon", show_name: "使用满减券", icon: "icon_1" }
     ],
-    "request_id":"83b92e9b30d37c9f"
+    request_id: "83b92e9b30d37c9f"
   },
   getUserWallet: {
     show_name: "我的元宝",
@@ -106,5 +185,5 @@ module.exports = {
       }
     ],
     request_id: "823e7aa78fa32fa9"
-  },
-}
+  }
+};

package/src/components/JfbFoodProductInfo/JfbFoodProductInfo.vue

@@ -44,7 +44,7 @@
         <xd-sku :skus="skus" @change="handleSkuChange"></xd-sku>
       </view>
 
-      <view class="attr_wrap">
+      <view v-if="spuList.length" class="attr_wrap">
         <!-- <xd-spu ref="mySpu" @change="handleSpuChange"></xd-spu> -->
         <xd-spu ref="mySpu" :list="spuList" @change="handleSpuChange"></xd-spu>
       </view>
@@ -241,12 +241,16 @@
             src: res.base_info.thumb
           }];
           this.baseInfo = res.base_info;
+          this.skus = res.base_info.skus;
         }).catch(err => {
           this.$xdHideLoading()
         })
       },
       addCart(){
-        let specs = this.$refs['mySpu'].getSpecs();
+        let specs = [];
+        if(this.$refs['mySpu']){
+          specs = this.$refs['mySpu'].getSpecs();
+        }
         console.log(specs);
         jfbRootExec("addFoodCart", {
           vm: this,
@@ -312,7 +316,7 @@
 
   .jfb-food-product-info {
     &__body{
-      background-color: #efefef;
+      background-color: #f8f8f8;
       .xd-store-product {
         color: #333;
         &__swiper {

package/src/components/JfbFoodProductInfo/Mock.js

@@ -1,13 +1,318 @@
-'use strict';
+"use strict";
 
 module.exports = {
-  
-  getProductByIdFilmSquate:{},
-  
-  updateProductFilmPaiqiDate:{},
-  
-  removeProductFilmAddress:{},
-  
-  addProductFilmcart:{},
-  
-}
+  getFoodProductDetail: {
+    base_info: {
+      product_id: "708",
+      product_name: "双杯红茶拿铁",
+      category_id: "a0aacaff0fb278c5f8127cec63ec3a53",
+      thumb:
+        "https://image.quanma51.com/self/mahua/sbk/product/c54d777ee7c34cd29a800c2e219249b0!img",
+      sub_title:
+        "超微研磨的优质红茶粉在蒸煮牛奶中呈现出丰盈口感。醇厚细腻，香气馥郁，慢慢品享这红茶与牛奶的对话。本饮品不含咖啡。毫升数仅供参考，饮品量以实际为准。本产品不支持七天无理由退货。/MOP主要原料：红茶固体饮料，牛奶，香草风味饮料浓浆，原味糖浆",
+      show_prices: [{ p: 5200, n: "PLUS价", t: "S" }],
+      skus: [],
+      spus: [
+        {
+          product_sku: "",
+          specs: [
+            {
+              code: "Cupsize",
+              name: "杯型",
+              required: true,
+              multiple: false,
+              multiple_min: 1,
+              multiple_max: -1,
+              is_show_image: false,
+              values: [
+                {
+                  code: "Tall",
+                  name: "中杯",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                },
+                {
+                  code: "Grande",
+                  name: "大杯",
+                  image: "",
+                  price: 600,
+                  num: 1,
+                  checked: true,
+                  enabled: true
+                },
+                {
+                  code: "Venti",
+                  name: "超大杯",
+                  image: "",
+                  price: 1200,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                }
+              ]
+            },
+            {
+              code: "Temperature",
+              name: "温度",
+              required: true,
+              multiple: false,
+              multiple_min: 1,
+              multiple_max: -1,
+              is_show_image: false,
+              values: [
+                {
+                  code: "6200007",
+                  name: "特别热",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                },
+                {
+                  code: "Hot",
+                  name: "热",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: true,
+                  enabled: true
+                },
+                {
+                  code: "6411088",
+                  name: "微热",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                },
+                {
+                  code: "Cold",
+                  name: "冰",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                },
+                {
+                  code: "6411085",
+                  name: "少冰",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                },
+                {
+                  code: "9710026",
+                  name: "去冰",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                }
+              ]
+            },
+            {
+              code: "Milk",
+              name: "添加或更换牛奶",
+              required: true,
+              multiple: false,
+              multiple_min: 1,
+              multiple_max: -1,
+              is_show_image: false,
+              values: [
+                {
+                  code: "6411150",
+                  name: "全脂牛奶",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: true,
+                  enabled: true
+                },
+                {
+                  code: "710029599",
+                  name: "巴旦木奶",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                },
+                {
+                  code: "6411174",
+                  name: "燕麦奶",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                },
+                {
+                  code: "5400001",
+                  name: "脱脂牛奶",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                }
+              ]
+            },
+            {
+              code: "FoamMopFilter",
+              name: "奶泡",
+              required: true,
+              multiple: false,
+              multiple_min: 1,
+              multiple_max: -1,
+              is_show_image: false,
+              values: [
+                {
+                  code: "DefaultFoamMopFilter",
+                  name: "标准奶泡",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: true,
+                  enabled: true
+                },
+                {
+                  code: "6411090",
+                  name: "去奶泡",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                },
+                {
+                  code: "6411137",
+                  name: "少奶泡",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                },
+                {
+                  code: "6411089",
+                  name: "多奶泡",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                }
+              ]
+            },
+            {
+              code: "BlackTeaDrinkPowderMopFilter",
+              name: "红茶底",
+              required: true,
+              multiple: false,
+              multiple_min: 1,
+              multiple_max: -1,
+              is_show_image: false,
+              values: [
+                {
+                  code: "DefaultBlackTeaMopFilter",
+                  name: "标准",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: true,
+                  enabled: true
+                },
+                {
+                  code: "6411145",
+                  name: "少",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                },
+                {
+                  code: "6411146",
+                  name: "多",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                }
+              ]
+            },
+            {
+              code: "MultiChangeSyrup",
+              name: "无糖风味定制/添加",
+              required: true,
+              multiple: false,
+              multiple_min: 1,
+              multiple_max: -1,
+              is_show_image: false,
+              values: [
+                {
+                  code: "710045678",
+                  name: "香草风味",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: true,
+                  enabled: true
+                }
+              ]
+            },
+            {
+              code: "ChangeSugar",
+              name: "甜度选择",
+              required: true,
+              multiple: false,
+              multiple_min: 1,
+              multiple_max: -1,
+              is_show_image: false,
+              values: [
+                {
+                  code: "ClassicSugar",
+                  name: "经典糖",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: true,
+                  enabled: true
+                },
+                {
+                  code: "ZeroCalorieSugar",
+                  name: "0热量代糖",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                },
+                {
+                  code: "NoExtraSugar",
+                  name: "不另外加糖",
+                  image: "",
+                  price: 0,
+                  num: 1,
+                  checked: false,
+                  enabled: true
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    request_id: "d30913e9c3d8c613"
+  }
+};

package/src/components/JfbFoodProductInfo/XdSku.vue

@@ -85,17 +85,10 @@ export default {
           this.$emit("change", {...n});
         }
       },
+      immediate: true
     },
   },
   computed:{
-    choseSkuName(){
-      if(!this.currSku) return "";
-      let standards = this.currSku.standards;
-      if(standards){
-        return standards.map(item => item.value).join(" - ");
-      }
-      return ""
-    },
 
   },
   async created(){

package/src/components/JfbFoodProductList/JfbFoodProductList.vue

@@ -259,7 +259,7 @@
     methods: {
       onJfbLoad(options) {
         this.setNameSpace(options);
-        this.resource_shop_id = options.resource_shop_id || '8003557';
+        this.resource_shop_id = options.resource_shop_id;
         this.consume_mode = options.consume_mode || 'HDSELF';
 
         this.p_getFoodShopDetail();
@@ -269,8 +269,8 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.foodDetailPath = getContainerPropsValue(container, 'content.foodDetailPath', {value: "/main/food/pinfo"}).value;
-        this.confirmPath = getContainerPropsValue(container, 'content.confirmPath', {value: "/main/food/confirmv2"}).value;
+        this.foodDetailPath = getContainerPropsValue(container, 'content.foodDetailPath', {value: "/Smallline/food/pinfo"}).value;
+        this.confirmPath = getContainerPropsValue(container, 'content.confirmPath', {value: "/Smallline/food/confirmv2"}).value;
         this.switchStorePath = getContainerPropsValue(container, 'content.switchStorePath', { value: ''}).value;
         this.productConfig = this.getProductConfig(container);
       },
@@ -625,7 +625,7 @@
 
   .jfb-food-product-list {
     &__body{
-      background-color: #f0f0f0;
+      background-color: #f8f8f8;
       .flex-center{
         display: flex;
         align-items: center;

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

@@ -7,7 +7,7 @@ export default (data)=>{
       ele: 'xd-select-pages-path',
       valueKey: 'foodDetailPath',
       placeholder: '请选择商品详情页跳转地址',
-      value: data.payPath || null,
+      value: data.foodDetailPath || null,
       labelInline: true,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),
@@ -20,7 +20,7 @@ export default (data)=>{
       ele: 'xd-select-pages-path',
       valueKey: 'confirmPath',
       placeholder: '请选择订单确认页跳转地址',
-      value: data.payPath || null,
+      value: data.confirmPath || null,
       labelInline: true,
       setting: {
         router: XdBus.getParentApi('getPagesTree'),

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

@@ -36,164 +36,5 @@ export default function (data, gValue,gColor,oldData){
           .catch();
       }
     },
-
-    {
-      label: "引导支付",
-      ele: "xd-radio",
-      valueKey: "guidePay",
-      value: dataVal({data, key:'guidePay', dValue: "Y", gValue}),
-      groupKey: "content",
-      labelInline: true,
-      className: 'input100',
-      notice:'<div style="margin-right: 10px;">无使用他支付时弹框引导使用票券、钱包、优惠券</div>',
-      inline: false,
-      list: [
-        {label: '是', value: 'Y'},
-        {label: '否', value: 'N'},
-      ]
-    },
-    //2.0新属性
-    {
-      label: "票券定位",
-      ele: "xd-radio",
-      valueKey: "ticketPositionStatus",
-      value: dataVal({data, key: "ticketPositionStatus", dValue: "N", gValue}),
-      groupKey: "content",
-      labelInline: true,
-      inline: false,
-      notice: "开启后会提示票券选择，点击自动滚动到选择支付位置",
-      list: [
-        { label: "显示", value: "Y" },
-        { label: "隐藏", value: "N" },
-      ]
-    },
-    {
-      label: "使用新票券",
-      ele: "xd-radio",
-      valueKey: "bindCard",
-      value: dataVal({data, key:'bindCard', dValue: "1", gValue}),
-      groupKey:'content',
-      labelInline: true,
-      inline: false,
-      notice: `<div style="margin-right: 50px;">票劵选择时是否隐藏使用新票券入口</div>`,
-      list: [
-        { label: "显示", value: "1" },
-        { label: "隐藏", value: "2" },
-      ]
-    },
-    {
-      label: "补差提示",
-      ele: 'xd-radio',
-      valueKey: "skipTip",
-      value: dataVal({data, key:'skipTip', dValue: "N", gValue}),
-      groupKey:'content',
-      labelInline: true,
-      inline: false,
-      notice: "无其它支付方式时，是否弹框提示全部补差",
-      list: [
-        {label: '跳过', value: 'Y'},
-        {label: '不跳过', value: 'N'},
-      ],
-    },
-    {
-      ele: 'title',
-      label: '组件样式',
-      size: 'small',
-      groupKey:'content',
-    },
-    {
-      label: "内容样式",
-      ele: "xd-style-image",
-      groupKey: 'content',
-      valueKey: "cont_style",
-      cusStyle: {marginBottom: '5px'},
-      value: customVal({
-        data,
-        key: 'cont_style',
-        gValue,
-        fields: { sectionHeightStatus: ['sectionHeight'], lrPaddingStatus: ['lrPadding'] },
-        sValue: `{"spacing":20,"margin":{"bottom":0,"top":0,"left":0,"right":0},"backgroundColor": "rgba(245, 245, 245, 1)"}`,
-      }),
-      labelInline:true,
-      isTplRef: true, //内容引用模版被禁用
-      className: 'input100',
-      handleCustom(cusRes) {
-        XdBus.getParentApi('getCompStylesOptions')({
-          layout_ids: 'nEdG7N3K7pwb4SgrDuYLP',
-          key: Date.now()
-        })
-          .then(res => {
-            cusRes.data.cb(res)
-          })
-          .catch(error => {
-            console.error(error);
-          });
-      },
-    },
-    {
-      label: "优惠券风格",
-      ele: "xd-style-image",
-      groupKey: "content",
-      valueKey: "coupon_layout",
-      value: dataVal({data, key:'coupon_layout', dValue: '1', gValue}),
-      labelInline:true,
-      className: 'input100',
-      isTplRef: true, //内容引用模版被禁用
-      handleCustom(cusRes) {
-        XdBus.getParentApi('getCompStylesOptions')({
-          layout_ids: 'xt8e4k6jYdxBpzwnpMvbv',
-          key: Date.now()
-        })
-          .then(res => {
-            cusRes.data.cb(res)
-          })
-          .catch(error => {
-            console.error(error);
-          });
-      },
-    },
-    {
-      ele: 'title',
-      label: '显示内容',
-      size: 'small',
-      groupKey:'content',
-    },
-    
-    {
-      label: '订购人信息',
-      ele: 'xd-cus-switch',
-      valueKey: 'showBuyer',
-      value: dataVal({data, key:'showBuyer', dValue: 'Y', gValue}),
-      className: 'input100',
-      groupKey:'content',
-      labelInline:true,
-      cusStyle:{marginBottom: '10px'},
-      setting: {
-        tips:['显示','不显示'],
-        isBackType: 'string'
-      },
-    },
-    {
-      ele:'xd-line',
-      groupKey:'content'
-    },
-    {
-      label: '订单备注',
-      ele: 'xd-cus-switch',
-      valueKey: 'showOrderComment',
-      value: dataVal({data, key:'showOrderComment', dValue: 'Y', gValue}),
-      className: 'input100',
-      groupKey:'content',
-      labelInline:true,
-      cusStyle:{marginBottom: '10px'},
-      setting: {
-        tips:['显示','不显示'],
-        isBackType: 'string'
-      },
-    },
-    {
-      ele:'xd-line',
-      groupKey:'content'
-    },
   ].filter(i=>i)
 }

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

@@ -14,549 +14,5 @@ import {
 const Color = require('color');
 
 export default function (data={},gValue={},gColor={},oldData) {
-  console.log("confirm data", data)
-
-  let isContDisabled = cusDisabled({
-    data,
-    key: 'cont_style',
-    fields: { sectionHeightStatus: ['sectionHeight'], lrPaddingStatus: ['lrPadding'] },
-    gValue
-  });
-  let isAddrDisabled = cusDisabled({
-    data,
-    key: 'addr_style',
-    fields: { addrLrPaddingStatus: ['addrLrPadding'] },
-    gValue
-  });
-
-  return [
-    {
-      ele: 'title',
-      label: '常规',
-      size: 'small',
-      groupKey:'style',
-    },
-    // {
-    //   label: '外边距',
-    //   ele: 'xd-radio',
-    //   groupKey: 'style',
-    //   valueKey: 'bodyPaddingStatus',
-    //   value: statusDataVal({data, key:'bodyPaddingStatus', dValue: 'D', gValue}),
-    //   labelInline:true,
-    //   list: [
-    //     {label: '默认', value: 'D'},
-    //     {label: '自定义', value: 'C'},
-    //   ]
-    // },
-    // {ele: 'group_start'},
-    // {
-    //   label: '',
-    //   ele: 'xd-margin-padding',
-    //   groupKey:'style',
-    //   valueKey: 'bodyPadding',
-    //   hidden: statusShow({data, key: 'bodyPaddingStatus', dValue: 'D', gValue}),  //隐藏自定义外边距
-    //   value: dataVal({
-    //     data,
-    //     key:'bodyPadding',
-    //     dValue:[0],
-    //     gValue,
-    //     isPM: true,
-    //     isCPM: true,
-    //   }),
-    //   setting: {
-    //     type: 'margin',
-    //   },
-    // },
-    // {ele: 'group_end'},
-    {
-      label: "行间距",
-      ele: "xd-radio",
-      groupKey: "style",
-      valueKey: "sectionHeightStatus",
-      value: statusDataVal({data, key:'sectionHeightStatus', fields:['sectionHeight'], gValue, cusField:['cont_style']}),
-      disabled: isContDisabled,
-      isRefresh: isContDisabled,
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {
-      ele: "group_start"
-    },
-    {
-      label: "",
-      groupKey: 'style',
-      ele: 'xd-slider',
-      valueKey: "sectionHeight",
-      value: dataVal({data, key:'sectionHeight', dValue: '16', gValue}),
-      hidden: !statusShow({data, key: 'sectionHeightStatus', fields:['sectionHeight'], gValue}),
-      className: "input100",
-      labelInline: true,
-      setting:{
-        min: 0,
-        max: 100,
-        step:1,
-        showStops:false,
-        showInput:false,
-      }
-    },
-    {ele: 'group_end'},
-
-    {
-      ele: 'title',
-      label: '内容区',
-      size: 'small',
-      groupKey:'style',
-    },
-    {
-      label: '两侧边距',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'lrPaddingStatus',
-      value: statusDataVal({data, key:'lrPaddingStatus', dValue: 'D', gValue, cusField:['cont_style']}),
-      disabled: isContDisabled,
-      isRefresh: isContDisabled,
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-margin-padding',
-      groupKey:'style',
-      valueKey: 'lrPadding',
-      hidden: statusShow({data, key: 'lrPaddingStatus', dValue: 'D', gValue}),  //隐藏自定义外边距
-      value: dataVal({
-        data,
-        key:'lrPadding',
-        dValue:[0],
-        gValue,
-        isPM: true,
-        isCPM: true,
-      }),
-      setting: {
-        type: 'margin',
-        top: false,
-        bottom: false,
-      },
-    },
-    {ele: 'group_end'},
-
-    {
-      label: '圆角',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'radiusStatus',
-      value: statusDataVal({data, key:'radiusStatus', dValue: 'D', gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '无圆角', value: 'N'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-site-select-list',
-      labelInline: true,
-      valueKey: 'radius',
-      value: dataVal({data, key:'radius', dValue:'10', gValue}),
-      hidden: !statusShow({data, key: 'radiusStatus', dValue: 'C', 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'},
-
-    {
-      label: "投影",
-      ele: "xd-radio",
-      groupKey: "style",
-      valueKey: "blockShadowStatus",
-      value: statusDataVal({data, key:'blockShadowStatus', dValue: 'N', gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '无投影', value: 'N'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-shadow',
-      labelInline: true,
-      groupKey:'style',
-      valueKey: 'blockShadow',
-      value: dataVal({data, key:'blockShadow', dValue:{}, gValue}),
-      hidden: !statusShow({data, key: 'blockShadowStatus', dValue: 'C', gValue}),
-      className: 'input100',
-      setting: {
-        isCloseType: true, //关闭type选项
-        //设置默认值
-        default: {
-          color: '#e5e5e5',
-          width: '10',
-        }
-      },
-      handleCustom({action, data}) {
-        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
-          .then(res => {
-            res.list = res.list.filter(item=>{
-              return item.label !== '无';
-            });
-            data.cb(res.list)
-          })
-          .catch(error => {
-            console.error(error);
-            data.cb([])
-          });
-      },
-    },
-    {ele: 'group_end'},
-
-    {
-      ele: 'title',
-      label: '收货地址',
-      size: 'small',
-      groupKey:'style',
-    },
-
-    {
-      label: "两侧边距",
-      ele: "xd-radio",
-      groupKey: "style",
-      valueKey: "addrLrPaddingStatus",
-      value: statusDataVal({data, key:'addrLrPaddingStatus', dValue: 'D', gValue, cusField:['addr_style']}),
-      disabled: isAddrDisabled,
-      isRefresh: isAddrDisabled,
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-     {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-margin-padding',
-      groupKey:'style',
-      valueKey: 'addrLrPadding',
-      hidden: statusShow({data, key: 'addrLrPaddingStatus', dValue: 'D', gValue}),  //隐藏自定义外边距
-      value: dataVal({
-        data,
-        key:'addrLrPadding',
-        dValue:[0],
-        gValue,
-        isPM: true,
-        isCPM: true,
-      }),
-      setting: {
-        type: 'margin',
-        top: false,
-        bottom: false,
-      },
-    },
-    {ele: 'group_end'},
-
-    {
-      label: "圆角",
-      ele: "xd-radio",
-      groupKey: "style",
-      valueKey: "addrRadiusStatus",
-      value: statusDataVal({data, key:'addrRadiusStatus', dValue: 'D', gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '无圆角', value: 'N'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-site-select-list',
-      labelInline: true,
-      valueKey: 'addrRadius',
-      value: dataVal({data, key:'addrRadius', dValue:'10', gValue}),
-      hidden: !statusShow({data, key: 'addrRadiusStatus', dValue: 'C', 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'},
-
-    {
-      label: "投影",
-      ele: "xd-radio",
-      groupKey: "style",
-      valueKey: "addrShadowStatus",
-      value: statusDataVal({data, key:'addrShadowStatus', dValue: 'N', gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '隐藏', value: 'N'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-shadow',
-      labelInline: true,
-      groupKey:'style',
-      valueKey: 'addrShadow',
-      value: dataVal({data, key:'addrShadow', dValue:{}, gValue}),
-      hidden: !statusShow({data, key: 'addrShadowStatus', dValue: 'C', gValue}),
-      className: 'input100',
-      setting: {
-        isCloseType: true, //关闭type选项
-        //设置默认值
-        default: {
-          color: '#e5e5e5',
-          width: '10',
-        }
-      },
-      handleCustom({action, data}) {
-        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
-          .then(res => {
-            res.list = res.list.filter(item=>{
-              return item.label !== '无';
-            });
-            data.cb(res.list)
-          })
-          .catch(error => {
-            console.error(error);
-            data.cb([])
-          });
-      },
-    },
-    {ele: 'group_end'},
-
-    {
-      ele: 'title',
-      label: '底部按钮区域',
-      size: 'small',
-      groupKey:'style',
-    },
-    {
-      label: "内边距",
-      ele: "xd-radio",
-      groupKey: "style",
-      valueKey: "bottomPaddingStatus",
-      value: statusDataVal({data, key:'bottomPaddingStatus', fields: ['bottomPadding'], gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-margin-padding',
-      groupKey:'style',
-      valueKey: 'bottomPadding',
-      hidden: !statusShow({data, key: 'bottomPaddingStatus', fields: ['bottomPadding'], gValue}),  //隐藏自定义外边距
-      value: dataVal({
-        data,
-        key:'bottomPadding',
-        dValue:[0],
-        gValue,
-        isPM: true,
-        isCPM: true,
-      }),
-      setting: {
-        type: 'margin',
-      },
-    },
-    {ele: 'group_end'},
-
-    {
-      label: "按钮样式",
-      ele: "xd-radio",
-      groupKey: "style",
-      valueKey: "btnStyleStatus",
-      value: statusDataVal({data, key:'btnStyleStatus', fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText'], gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: "group_start"},
-    {
-      label: "圆角",
-      ele: 'xd-site-select-list',
-      valueKey: 'bottomBtnRadius',
-      groupKey:'style',
-      value: dataVal({data, key:'bottomBtnRadius', dValue: '40', gValue}),
-      hidden: !statusShow({data, key: 'btnStyleStatus', fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText'], gValue}),
-      placeholder: '请选择内容圆角设置',
-      labelInline: true,
-      multiple: false,
-      className: 'input80',
-      handleCustom({action, data}) {
-        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
-          .then(res => {
-            data.cb(res.list)
-          })
-          .catch(error => {
-            console.error(error);
-          });
-      },
-    },
-    {
-      label: "高度",
-      ele: 'el-input',
-      type: 'number',
-      valueKey: 'bottomBtnHeight',
-      groupKey:'style',
-      value: dataVal({data, key:'bottomBtnHeight', dValue: 60, gValue}),
-      hidden: !statusShow({data, key: 'btnStyleStatus', fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText'], gValue}),
-      labelInline: true,
-      append: 'px',
-      placeholder: '请输入操作按钮高度',
-      className: 'input80',
-    },
-    {
-      label: '文字',
-      ele: "el-input",
-      valueKey: 'bottomPayText',
-      groupKey:'style',
-      value: dataVal({data, key:'bottomPayText', dValue: '支付', gValue}),
-      hidden: !statusShow({data, key: 'btnStyleStatus', fields: ['bottomBtnRadius', 'bottomBtnHeight', 'bottomPayText'], gValue}),
-      labelInline: true,
-      placeholder: '支付按钮文字，默认“支付”',
-      className: 'input80',
-    },
-    {ele: "group_end"},
-
-    {
-      label: "价格样式",
-      ele: "xd-radio",
-      groupKey: "style",
-      valueKey: "btnPriceStatus",
-      value: statusDataVal({data, key:'btnPriceStatus', fields: ['bottomPricePosition'], gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: "group_start"},
-    {
-      label: "位置",
-      ele: "xd-radio",
-      groupKey: "style",
-      valueKey: "bottomPricePosition",
-      value: dataVal({data, key:'bottomPricePosition', dValue: 'flex-start', gValue}),
-      hidden: !statusShow({data, key: 'btnPriceStatus', fields: ['bottomPricePosition'], gValue}),
-      labelInline: true,
-      list: [
-        {label: "左侧", value: "flex-start"},
-        {label: "右侧", value: "flex-end"},
-        {label: "中间", value: "center"}
-      ],
-    },
-    {ele: "group_end"},
-
-    {
-      ele: 'title',
-      label: '其它配置',
-      size: 'small',
-      groupKey:'style',
-    },
-
-    {
-      label: "表单提示",
-      ele: "xd-radio",
-      groupKey: "style",
-      valueKey: "formTipStatus",
-      value: statusDataVal({data, key:'formTipStatus', fields: ['blessTextColor', 'blessFontSize'], gValue}),
-      labelInline:true,
-      inline: false,
-      notice: "自定义表单提示文字样式",
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: "group_start"},
-    {
-      label: "大小",
-      ele: 'xd-site-select-list',
-      valueKey: 'blessFontSize',
-      groupKey:'style',
-      value: dataVal({data, key:'blessFontSize', dValue: '24', gValue}),
-      hidden: !statusShow({data, key: 'formTipStatus', fields: ['blessTextColor', 'blessFontSize'], gValue}),
-      placeholder: '请选择字体大小',
-      labelInline: true,
-      multiple: false,
-      className: 'input80',
-      handleCustom({action, data}) {
-        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
-          .then(res => {
-            data.cb(res.list)
-          })
-          .catch(error => {
-            console.error(error);
-          });
-      },
-    },
-    {
-      label: '颜色:',
-      ele: 'xd-color',
-      valueKey: 'blessTextColor',
-      groupKey:'style',
-      value: dataVal({data, key:'blessTextColor', dValue: null, gValue}),
-      hidden: !statusShow({data, key: 'formTipStatus', fields: ['blessTextColor', 'blessFontSize'], gValue}),
-      labelInline: true,
-      placeholder: '表单提示文字颜色',
-      className: 'input80',
-      setting: {
-        showAlpha: true
-      },
-    },
-    {ele: "group_end"},
-  ]
+  return []
 }