npm - jufubao-mall - Versions diffs - 2.0.16-beta8 → 2.0.16-beta9 - Mend

jufubao-mall 2.0.16-beta8 → 2.0.16-beta9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/package.json CHANGED Viewed

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

package/src/components/JfbMallNewShopList/Mock.js CHANGED Viewed

@@ -480,366 +480,6 @@ module.exports = {
         "latitude": "36.49419441977518",
         "discount_ratio": 8100
       },
-      {
-        "brand_id": 20013,
-        "brand_name": "塞奇",
-        "brand_type": "MA",
-        "business_status": "OPEN_BUSINESS",
-        "consume_mode": [
-          "SELL"
-        ],
-        "consume_options":[],
-        "consume_mode_name": "",
-        "distance": "1233km",
-        "distance_conversion": "1,232.4km",
-        "default_consume_type": "CV",
-        "consume_type": [
-          "CV"
-        ],
-        "is_support_jhd": true,
-        "address": "兰州新区兰州市新区中川园区栖霞中心社区京都之星购物中心1F-1029-2号",
-        "province_name": "",
-        "city_name": "",
-        "area_name": "",
-        "street_name": "",
-        "phone": "0931-8423221",
-        "resource_shop_id": 8057328,
-        "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDU3MzI4LCJzaG9wX2lkIjoxMTM2OTYxLCJ2ZXJzaW9uIjoyfQ",
-        "resource_shop_name": "塞奇新区京都广场店[无]",
-        "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/43c89de1f4563758938f4c1585695523.png",
-        "shop_id": 1136961,
-        "shop_tags": [],
-        "stars": 0,
-        "time_slot_name": "-",
-        "business_code": "",
-        "longitude": "103.67888288761792",
-        "latitude": "36.487307479335655",
-        "discount_ratio": 8100
-      },
-      {
-        "brand_id": 20007,
-        "brand_name": "甜美香积",
-        "brand_type": "MA",
-        "business_status": "OPEN_BUSINESS",
-        "consume_mode": [
-          "SELL"
-        ],
-        "consume_options":[],
-        "consume_mode_name": "",
-        "distance": "1234km",
-        "distance_conversion": "1,233.0km",
-        "default_consume_type": "CV",
-        "consume_type": [
-          "CV"
-        ],
-        "is_support_jhd": false,
-        "address": "城关区城区甘肃省兰州市城关区雁儿湾路236号欣欣嘉园东区9-103室",
-        "province_name": "",
-        "city_name": "",
-        "area_name": "",
-        "street_name": "",
-        "phone": "0931-8696076",
-        "resource_shop_id": 3500732,
-        "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjozNTAwNzMyLCJzaG9wX2lkIjoxMDA3MzIsInZlcnNpb24iOjJ9",
-        "resource_shop_name": "甜美香积欣欣嘉园店[无]",
-        "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/bc0d713ffe1ad05c9105ce3b7cac3256.png",
-        "shop_id": 100732,
-        "shop_tags": [],
-        "stars": 0,
-        "time_slot_name": "08:00-21:00",
-        "business_code": "",
-        "longitude": "103.90956080000001",
-        "latitude": "36.048156600000006",
-        "discount_ratio": 8100
-      },
-      {
-        "brand_id": 20013,
-        "brand_name": "塞奇",
-        "brand_type": "MA",
-        "business_status": "OPEN_BUSINESS",
-        "consume_mode": [
-          "SELL"
-        ],
-        "consume_options":[],
-        "consume_mode_name": "",
-        "distance": "1234km",
-        "distance_conversion": "1,233.1km",
-        "default_consume_type": "CV",
-        "consume_type": [
-          "CV"
-        ],
-        "is_support_jhd": false,
-        "address": "城关区兰州市城关区雁南街道刘家滩村608府25-2号",
-        "province_name": "",
-        "city_name": "",
-        "area_name": "",
-        "street_name": "",
-        "phone": "13919270868",
-        "resource_shop_id": 8000467,
-        "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwNDY3LCJzaG9wX2lkIjoxMDM5NzQ0LCJ2ZXJzaW9uIjoyfQ",
-        "resource_shop_name": "塞奇科教城店[无]",
-        "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/43c89de1f4563758938f4c1585695523.png",
-        "shop_id": 1039744,
-        "shop_tags": [],
-        "stars": 0,
-        "time_slot_name": "-",
-        "business_code": "",
-        "longitude": "103.90137905904297",
-        "latitude": "36.0615664312187",
-        "discount_ratio": 8100
-      },
-      {
-        "brand_id": 20007,
-        "brand_name": "甜美香积",
-        "brand_type": "MA",
-        "business_status": "OPEN_BUSINESS",
-        "consume_mode": [
-          "SELL"
-        ],
-        "consume_options":[],
-        "consume_mode_name": "",
-        "distance": "1234km",
-        "distance_conversion": "1,233.7km",
-        "default_consume_type": "CV",
-        "consume_type": [
-          "CV"
-        ],
-        "is_support_jhd": false,
-        "address": "城关区城区甘肃省兰州市城关区格林小镇16号8号商铺",
-        "province_name": "",
-        "city_name": "",
-        "area_name": "",
-        "street_name": "",
-        "phone": "0931-8594076",
-        "resource_shop_id": 3500731,
-        "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjozNTAwNzMxLCJzaG9wX2lkIjoxMDA3MzEsInZlcnNpb24iOjJ9",
-        "resource_shop_name": "甜美香积格林小镇店[无]",
-        "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/bc0d713ffe1ad05c9105ce3b7cac3256.png",
-        "shop_id": 100731,
-        "shop_tags": [],
-        "stars": 0,
-        "time_slot_name": "08:00-21:00",
-        "business_code": "",
-        "longitude": "103.89042809999998",
-        "latitude": "36.0665271",
-        "discount_ratio": 8100
-      },
-      {
-        "brand_id": 20156,
-        "brand_name": "安旗",
-        "brand_type": "MA",
-        "business_status": "OPEN_BUSINESS",
-        "consume_mode": [
-          "SELL"
-        ],
-        "consume_options":[],
-        "consume_mode_name": "",
-        "distance": "1234km",
-        "distance_conversion": "1,233.7km",
-        "default_consume_type": "CV",
-        "consume_type": [
-          "CV"
-        ],
-        "is_support_jhd": false,
-        "address": "城关区焦家湾街道甘肃省兰州市城关区东岗东路483号",
-        "province_name": "",
-        "city_name": "",
-        "area_name": "",
-        "street_name": "",
-        "phone": "156-0931-3067",
-        "resource_shop_id": 3512729,
-        "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjozNTEyNzI5LCJzaG9wX2lkIjoxMTE3MDMsInZlcnNpb24iOjJ9",
-        "resource_shop_name": "安旗焦家湾店[无]",
-        "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20210119/2fa6587feb8dce76942010d6adc4a1e3.jpg",
-        "shop_id": 111703,
-        "shop_tags": [],
-        "stars": 0,
-        "time_slot_name": "09:00-21:00",
-        "business_code": "",
-        "longitude": "103.90647489999999",
-        "latitude": "36.03784149999999",
-        "discount_ratio": 7700
-      },
-      {
-        "brand_id": 20011,
-        "brand_name": "红房子",
-        "brand_type": "MA",
-        "business_status": "OPEN_BUSINESS",
-        "consume_mode": [
-          "SELL"
-        ],
-        "consume_options":[],
-        "consume_mode_name": "",
-        "distance": "1234km",
-        "distance_conversion": "1,234.0km",
-        "default_consume_type": "CV",
-        "consume_type": [
-          "CV"
-        ],
-        "is_support_jhd": false,
-        "address": "城关区城区甘肃省兰州市城关区雁南路18号软件大厦一层A-B-2-3室",
-        "province_name": "",
-        "city_name": "",
-        "area_name": "",
-        "street_name": "",
-        "phone": "0931-8853015",
-        "resource_shop_id": 3500717,
-        "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjozNTAwNzE3LCJzaG9wX2lkIjoxMDA3MTcsInZlcnNpb24iOjJ9",
-        "resource_shop_name": "红房子飞雁街店[无]",
-        "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/2853d901c59fccd9d69526ad394a6d3c.png",
-        "shop_id": 100717,
-        "shop_tags": [],
-        "stars": 0,
-        "time_slot_name": "08:00-21:00",
-        "business_code": "",
-        "longitude": "103.894136",
-        "latitude": "36.054105",
-        "discount_ratio": 8600
-      },
-      {
-        "brand_id": 21103,
-        "brand_name": "谷麦密码",
-        "brand_type": "MA",
-        "business_status": "OPEN_BUSINESS",
-        "consume_mode": [
-          "SELL"
-        ],
-        "consume_options":[],
-        "consume_mode_name": "",
-        "distance": "1235km",
-        "distance_conversion": "1,234.2km",
-        "default_consume_type": "CV",
-        "consume_type": [
-          "CV"
-        ],
-        "is_support_jhd": false,
-        "address": "城关区兰州市城关区南滨河路东路5002号(室内步行街1层1012号商铺）",
-        "province_name": "",
-        "city_name": "",
-        "area_name": "",
-        "street_name": "",
-        "phone": "13919033881",
-        "resource_shop_id": 3517423,
-        "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjozNTE3NDIzLCJzaG9wX2lkIjoxMzU2MDAsInZlcnNpb24iOjJ9",
-        "resource_shop_name": "谷麦密码名城广场店[无]",
-        "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20230529/5c5e45188cde68ea6efa95dcb8c982c4.jpg",
-        "shop_id": 135600,
-        "shop_tags": [],
-        "stars": 0,
-        "time_slot_name": "09:00-21:00",
-        "business_code": "",
-        "longitude": "103.87480457697183",
-        "latitude": "36.084009425167906",
-        "discount_ratio": 7700
-      },
-      {
-        "brand_id": 20011,
-        "brand_name": "红房子",
-        "brand_type": "MA",
-        "business_status": "OPEN_BUSINESS",
-        "consume_mode": [
-          "SELL"
-        ],
-        "consume_options":[],
-        "consume_mode_name": "",
-        "distance": "1235km",
-        "distance_conversion": "1,234.3km",
-        "default_consume_type": "CV",
-        "consume_type": [
-          "CV"
-        ],
-        "is_support_jhd": false,
-        "address": "城关区甘肃省兰州市城关区雁滩路3566-2号",
-        "province_name": "",
-        "city_name": "",
-        "area_name": "",
-        "street_name": "",
-        "phone": "0931-8230106",
-        "resource_shop_id": 3517647,
-        "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjozNTE3NjQ3LCJzaG9wX2lkIjoxMzMwOTksInZlcnNpb24iOjJ9",
-        "resource_shop_name": "红房子雁滩店[无]",
-        "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/2853d901c59fccd9d69526ad394a6d3c.png",
-        "shop_id": 133099,
-        "shop_tags": [],
-        "stars": 0,
-        "time_slot_name": "09:00-18:00",
-        "business_code": "",
-        "longitude": "103.88307653342991",
-        "latitude": "36.06753095801935",
-        "discount_ratio": 8600
-      },
-      {
-        "brand_id": 20074,
-        "brand_name": "法贝德",
-        "brand_type": "MA",
-        "business_status": "OPEN_BUSINESS",
-        "consume_mode": [
-          "SELL"
-        ],
-        "consume_options":[],
-        "consume_mode_name": "",
-        "distance": "1235km",
-        "distance_conversion": "1,234.3km",
-        "default_consume_type": "CV",
-        "consume_type": [
-          "CV"
-        ],
-        "is_support_jhd": false,
-        "address": "城关区甘肃省兰州市城关区拱星墩街道段家滩路507号筑梦时代广场5栋1楼102号铺面",
-        "province_name": "",
-        "city_name": "",
-        "area_name": "",
-        "street_name": "",
-        "phone": "18109317967",
-        "resource_shop_id": 8002284,
-        "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAyMjg0LCJzaG9wX2lkIjoxMDQxODA5LCJ2ZXJzaW9uIjoyfQ",
-        "resource_shop_name": "法贝德筑梦时代店[无]",
-        "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200804/d48dc9dc025ad2240c7602a4ca15260b.jpg",
-        "shop_id": 1041809,
-        "shop_tags": [],
-        "stars": 0,
-        "time_slot_name": "-",
-        "business_code": "",
-        "longitude": "103.89317007380113",
-        "latitude": "36.04904662594761",
-        "discount_ratio": 8000
-      },
-      {
-        "brand_id": 20007,
-        "brand_name": "甜美香积",
-        "brand_type": "MA",
-        "business_status": "OPEN_BUSINESS",
-        "consume_mode": [
-          "SELL"
-        ],
-        "consume_options":[],
-        "consume_mode_name": "",
-        "distance": "1235km",
-        "distance_conversion": "1,234.7km",
-        "default_consume_type": "CV",
-        "consume_type": [
-          "CV"
-        ],
-        "is_support_jhd": false,
-        "address": "城关区甘肃省兰州市城关区雁滩路3113号欣大百货一层1-22号",
-        "province_name": "",
-        "city_name": "",
-        "area_name": "",
-        "street_name": "",
-        "phone": "09318833656",
-        "resource_shop_id": 8000706,
-        "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwNzA2LCJzaG9wX2lkIjoxMDQwNDc2LCJ2ZXJzaW9uIjoyfQ",
-        "resource_shop_name": "甜美香积欣大百货店[无]",
-        "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/bc0d713ffe1ad05c9105ce3b7cac3256.png",
-        "shop_id": 1040476,
-        "shop_tags": [],
-        "stars": 0,
-        "time_slot_name": "-",
-        "business_code": "",
-        "longitude": "103.87782198517985",
-        "latitude": "36.06679685897937",
-        "discount_ratio": 8100
-      }
     ],
     "total_size": 1,
     "next_page_token":"",

package/src/components/JfbMallNewShopList/XdQueryFilter.vue CHANGED Viewed

@@ -215,16 +215,9 @@ export default {
     setChooseTag(tab, item){
       //单选
       if(!tab.multiple) {
-        //取消
-        if(this.selectedIds[tab.value] && this.selectedIds[tab.value].includes(item.value)) {
-          this.setSelectData(tab.value, '', '', '')
-        }
-        //新增
-        else {
-          this.setSelectData(tab.value, item.value, item, item.label);
-          //单选直接触发返回数据
-          if(this.isShowBtn === false) this.onConfirm();
-        }
+        this.setSelectData(tab.value, item.value, item, item.label);
+        //单选直接触发返回数据
+        if(this.isShowBtn === false) this.onConfirm();
       }
       //多选
       else {

package/src/components/JfbMallNewShopList/cusAttr/shops.js CHANGED Viewed

@@ -63,7 +63,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     {ele: 'group_start'},
     {
-      label: '颜色',
+      label: '',
       ele: 'xd-color',
       groupKey:'style',
       valueKey: 'cardItemBgColor',
@@ -124,7 +124,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     {ele: 'group_start'},
     {
-      label: '大小',
+      label: '',
       ele: 'xd-site-select-list',
       labelInline: true,
       valueKey: 'cardItemRadius',
@@ -216,7 +216,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     {ele: 'group_start'},
     {
-      label: '大小',
+      label: '',
       ele: 'xd-site-select-list',
       labelInline: true,
       valueKey: 'itemImageRadius',
@@ -270,7 +270,7 @@ export default function (data, gValue, gColor, oldData) {
       hidden:true,
     },
     {
-      label: '距离样式',
+      label: '距离文字色',
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'distanceColorStatus',
@@ -283,7 +283,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     {ele: 'group_start'},
     {
-      label: '文字颜色',
+      label: '',
       ele: 'xd-color',
       groupKey:'style',
       valueKey: 'distanceColor',

package/src/components/JfbMallNewShopList/cusAttr/style.js CHANGED Viewed

@@ -60,7 +60,7 @@ export default function (data, gValue,gColor,oldData){
     },
     {ele: 'group_start'},
     {
-      label: '颜色',
+      label: '',
       ele: 'xd-color',
       groupKey:'style',
       valueKey: 'contentBgColor',

package/src/components/JfbMallShop/Mock.js CHANGED Viewed

@@ -92,8 +92,9 @@ module.exports = {
         promo_price: 0,
         tags: [],
         show_prices: [
-          { p: 4990, n: "", t: "S" },
-          { p: 0, n: "工会会员价", t: "T" }
+          { p: 4490, n: "", t: "S" },
+          { p: 4990, n: "原价", t: "U" },
+          { p: 500, n: "省", t: "E" },
         ]
       },
       {
@@ -113,8 +114,9 @@ module.exports = {
         promo_price: 0,
         tags: [],
         show_prices: [
-          { p: 13, n: "", t: "S" },
-          { p: 0, n: "工会会员价", t: "T" }
+          { p: 4490, n: "", t: "S" },
+          { p: 4990, n: "原价", t: "U" },
+          { p: 500, n: "省", t: "E" },
         ]
       },
       {
@@ -133,8 +135,9 @@ module.exports = {
         promo_price: 0,
         tags: [],
         show_prices: [
-          { p: 2189, n: "", t: "S" },
-          { p: 0, n: "工会会员价", t: "T" }
+          { p: 4490, n: "", t: "S" },
+          { p: 4990, n: "原价", t: "U" },
+          { p: 500, n: "省", t: "E" },
         ]
       },
       {
@@ -154,8 +157,9 @@ module.exports = {
         promo_price: 0,
         tags: [],
         show_prices: [
-          { p: 15, n: "", t: "S" },
-          { p: 0, n: "工会会员价", t: "T" }
+          { p: 4490, n: "", t: "S" },
+          { p: 4990, n: "原价", t: "U" },
+          { p: 500, n: "省", t: "E" },
         ]
       },
       {
@@ -175,7 +179,6 @@ module.exports = {
         tags: [],
         show_prices: [
           { p: 10500, n: "", t: "S" },
-          { p: 0, n: "工会会员价", t: "T" }
         ]
       },
       {
@@ -194,92 +197,11 @@ module.exports = {
         promo_price: 0,
         tags: [],
         show_prices: [
-          { p: 134, n: "", t: "S" },
-          { p: 0, n: "工会会员价", t: "T" }
+          { p: 4490, n: "", t: "S" },
+          { p: 4990, n: "原价", t: "U" },
+          { p: 500, n: "省", t: "E" },
         ]
       },
-      {
-        product_id: 60039053,
-        product_type: "network",
-        brand_id: 14,
-        brand_name: "测试1111",
-        list_title: "QQ普通会员1个月",
-        status: "ok",
-        sale_num: 0,
-        thumb:
-          "http://file.yiqida.cn/upload/2021-07-01/e0/7c/e02eb7167c72d8188cc9829779c2dc41.jpg",
-        sale_price: 795,
-        vip_price: 0,
-        market_price: 1000,
-        market_tags: ["rec", "hot", "new"],
-        promo_price: 0,
-        tags: [],
-        show_prices: [
-          { p: 795, n: "", t: "S" },
-          { p: 0, n: "工会会员价", t: "T" }
-        ]
-      },
-      {
-        product_id: 60032162,
-        product_type: "good",
-        brand_id: 14,
-        brand_name:
-          "测试1111就是考虑到极乐空间工商卡溜达鸡干撒卡拉季鲸打卡利发估计山卡拉电极法个",
-        list_title: "同城商品-多规格（核销）",
-        status: "ok",
-        sale_num: 139,
-        thumb: "https://sandbox-img5.jufubao.cn/uploads/20250107/37b016de24300cc74e8ebc23f0f3ce12.jpeg",
-        sale_price: 7600,
-        vip_price: 0,
-        market_price: 7600,
-        market_tags: ["rec", "hot", "new"],
-        promo_price: 0,
-        tags: [],
-        show_prices: [
-          { p: 7600, n: "", t: "S" },
-          { p: 0, n: "工会会员价", t: "T" }
-        ]
-      },
-      {
-        product_id: 60038977,
-        product_type: "good",
-        brand_id: 14,
-        brand_name: "测试1111",
-        list_title: "商品【ppt】多规格",
-        status: "ok",
-        sale_num: 4,
-        thumb: "https://sandbox-img5.jufubao.cn/uploads/20250729/4843dd391a5457e535afb6d0dd344557.jpeg",
-        sale_price: 10500,
-        vip_price: 0,
-        market_price: 10500,
-        market_tags: ["rec", "hot"],
-        promo_price: 0,
-        tags: [],
-        show_prices: [
-          { p: 10500, n: "", t: "S" },
-          { p: 0, n: "工会会员价", t: "T" }
-        ]
-      },
-      {
-        product_id: 60030267,
-        product_type: "network",
-        brand_id: 14,
-        brand_name: "测试1111",
-        list_title: "测试网络视听",
-        status: "ok",
-        sale_num: 120,
-        thumb: "https://sandbox-img5.jufubao.cn/uploads/20240104/6956d6640db2aac3b884e7164bf598ba.png",
-        sale_price: 1300,
-        vip_price: 0,
-        market_price: 2100,
-        market_tags: ["rec", "hot", "new"],
-        promo_price: 0,
-        tags: [],
-        show_prices: [
-          { p: 1300, n: "", t: "S" },
-          { p: 0, n: "工会会员价", t: "T" }
-        ]
-      }
     ],
     request_id: "8560c761aa7ca2eb"
   }

package/src/components/JfbMallShop/cusAttr/content.js CHANGED Viewed

@@ -9,6 +9,11 @@ import {
 } from "@/utils/AttrTools";
 export default function (data, gValue,gColor,oldData){
+  let isShowCashier = data.isShowCashier || "Y";
+  let showOtherEnter = "N";
+  if(gValue.isAdd === true && gValue.isFirst) {
+    showOtherEnter = "Y";
+  }
   return [
     {
@@ -81,7 +86,7 @@ export default function (data, gValue,gColor,oldData){
       label: '聚好兑',
       ele: 'xd-cus-switch',
       valueKey: 'showExchange',
-      value: dataVal({ data, key: 'showExchange', dValue: 'Y', gValue }),
+      value: dataVal({ data, key: 'showExchange', dValue: isShowCashier, gValue }),
       className: 'input100',
       labelInline: true,
       groupKey: 'content',
@@ -124,7 +129,7 @@ export default function (data, gValue,gColor,oldData){
       label: '扫一扫',
       ele: 'xd-cus-switch',
       valueKey: 'showScan',
-      value: dataVal({ data, key: 'showScan', dValue: 'Y', gValue }),
+      value: dataVal({ data, key: 'showScan', dValue: isShowCashier, gValue }),
       className: 'input100',
       labelInline: true,
       groupKey: 'content',
@@ -167,7 +172,7 @@ export default function (data, gValue,gColor,oldData){
       label: '快捷码',
       ele: 'xd-cus-switch',
       valueKey: 'showTake',
-      value: dataVal({ data, key: 'showTake', dValue: 'Y', gValue }),
+      value: dataVal({ data, key: 'showTake', dValue: isShowCashier, gValue }),
       className: 'input100',
       labelInline: true,
       groupKey: 'content',
@@ -210,7 +215,7 @@ export default function (data, gValue,gColor,oldData){
       label: '在线选座',
       ele: 'xd-cus-switch',
       valueKey: 'showMovie',
-      value: dataVal({ data, key: 'showMovie', dValue: 'Y', gValue }),
+      value: dataVal({ data, key: 'showMovie', dValue: showOtherEnter, gValue }),
       className: 'input100',
       labelInline: true,
       groupKey: 'content',
@@ -253,7 +258,7 @@ export default function (data, gValue,gColor,oldData){
       label: '电子码',
       ele: 'xd-cus-switch',
       valueKey: 'showCode',
-      value: dataVal({ data, key: 'showCode', dValue: 'Y', gValue }),
+      value: dataVal({ data, key: 'showCode', dValue: showOtherEnter, gValue }),
       className: 'input100',
       labelInline: true,
       groupKey: 'content',
@@ -268,7 +273,7 @@ export default function (data, gValue,gColor,oldData){
       label: '到店自取',
       ele: 'xd-cus-switch',
       valueKey: 'showFood',
-      value: dataVal({ data, key: 'showFood', dValue: 'Y', gValue }),
+      value: dataVal({ data, key: 'showFood', dValue: showOtherEnter, gValue }),
       className: 'input100',
       labelInline: true,
       groupKey: 'content',
@@ -311,7 +316,7 @@ export default function (data, gValue,gColor,oldData){
       label: '旅游门店',
       ele: 'xd-cus-switch',
       valueKey: 'showTravel',
-      value: dataVal({ data, key: 'showTravel', dValue: 'Y', gValue }),
+      value: dataVal({ data, key: 'showTravel', dValue: showOtherEnter, gValue }),
       className: 'input100',
       labelInline: true,
       groupKey: 'content',

package/src/components/JfbMallShop/cusAttr/style.js CHANGED Viewed

@@ -15,6 +15,7 @@ import productStyle from "@/utils/Attr/productStyle";
 const Color = require('color');
 export default function (data={},gValue={},gColor={},oldData) {
+  console.log("gValue",gValue)
   let defContBorder = cRaBorShadow( data, 'contBorder', {dValue:'D'},gValue);
   let defContShadow = cRaBorShadow( data, 'contShadow', {dValue:'D'},gValue);
   //导航投影设置
@@ -192,7 +193,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'radiusStatus',
-      value: statusDataVal({data, key:'radiusStatus', cValue:'N',}),
+      value: statusDataVal({data, key:'radiusStatus', cValue:'D',}),
       labelInline:true,
       list: [
         {label: '默认', value: 'D'},
@@ -206,7 +207,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       ele: 'xd-site-select-list',
       labelInline: true,
       valueKey: 'radius',
-      value: dataVal({data, key:'radius', dValue: '0', gValue}),
+      value: dataVal({data, key:'radius', dValue: gValue.radius, gValue}),
       hidden: !statusShow({data, key: 'radiusStatus', fields:['radius'], gValue}),
       placeholder: '请选择商品是否设置圆角',
       multiple: false,
@@ -234,7 +235,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'imageRadiusStatus',
-      value: statusDataVal({data, key:'imageRadiusStatus', cValue:'N'}),
+      value: statusDataVal({data, key:'imageRadiusStatus', cValue:'D'}),
       labelInline:true,
       list: [
         {label: '默认', value: 'D'},
@@ -252,7 +253,7 @@ export default function (data={},gValue={},gColor={},oldData) {
       placeholder: '请选择商品图圆角是否设置圆角',
       multiple: false,
       className: 'input80',
-      value: dataVal({data, key:'imageRadius', dValue: '0', gValue}),
+      value: dataVal({data, key:'imageRadius', dValue: gValue.radius, gValue}),
       hidden: !statusShow({data, key: 'imageRadiusStatus', fields:['imageRadius'], gValue}),
       handleCustom({action, data}) {
         XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})