jufubao-mall 2.0.16-beta7 → 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 (11) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbMallNewShopList/JfbMallNewShopList.vue +3 -1
  3. package/src/components/JfbMallNewShopList/Mock.js +0 -360
  4. package/src/components/JfbMallNewShopList/XdQueryFilter.vue +3 -10
  5. package/src/components/JfbMallNewShopList/cusAttr/content.js +2 -2
  6. package/src/components/JfbMallNewShopList/cusAttr/shops.js +5 -5
  7. package/src/components/JfbMallNewShopList/cusAttr/style.js +1 -1
  8. package/src/components/JfbMallShop/JfbMallShop.vue +52 -48
  9. package/src/components/JfbMallShop/Mock.js +16 -94
  10. package/src/components/JfbMallShop/cusAttr/content.js +24 -19
  11. package/src/components/JfbMallShop/cusAttr/style.js +5 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-mall",
3
- "version": "2.0.16-beta7",
3
+ "version": "2.0.16-beta9",
4
4
  "private": false,
5
5
  "description": "聚福宝商城业务组件插件包",
6
6
  "main": "index.js",
package/src/components/JfbMallNewShopList/JfbMallNewShopList.vue CHANGED
@@ -304,7 +304,7 @@
304
304
  this.cusContent = cusContent;
305
305
 
306
306
  //style
307
- let sValue = `{"cardItemSpace":16,"margin":{"bottom":16,"left":0,"right":0,"top":16},"backgroundColor":"rgba(245, 245, 245, 1)"}`
307
+ let sValue = `{"cardItemSpace":16,"margin":{"bottom":16,"left":16,"right":16,"top":16},"backgroundColor":"rgba(245, 245, 245, 1)"}`
308
308
  let shopStyle = this.getRelationStatus(container,'shopStyle', { cardItemSpaceStatus:['cardItemSpace'],bodyPaddingStatus:['bodyPadding']}, sValue);
309
309
  this.bodyPadding = gCPVal(container,'bodyPadding', [{ bottom:0,left:16, right:16,top:16}], {sKey:'bodyPaddingStatus',fields:['bodyPadding'],cusFields: ['shopStyle','margin',shopStyle],isPMR: true});
310
310
  this.contentBgColor = gCPVal(container,'contentBgColor', '#f8f8f8', {sKey:'contentBgColorStatus',fields:['contentBgColor']});
@@ -661,6 +661,8 @@
661
661
  &_title {
662
662
  text-align: center;
663
663
  flex: 1;
664
+ font-size: 28rpx;
665
+ color: #333;
664
666
  }
665
667
 
666
668
  &_item {
package/src/components/JfbMallNewShopList/Mock.js CHANGED
@@ -480,366 +480,6 @@ module.exports = {
480
480
  "latitude": "36.49419441977518",
481
481
  "discount_ratio": 8100
482
482
  },
483
- {
484
- "brand_id": 20013,
485
- "brand_name": "塞奇",
486
- "brand_type": "MA",
487
- "business_status": "OPEN_BUSINESS",
488
- "consume_mode": [
489
- "SELL"
490
- ],
491
- "consume_options":[],
492
- "consume_mode_name": "",
493
- "distance": "1233km",
494
- "distance_conversion": "1,232.4km",
495
- "default_consume_type": "CV",
496
- "consume_type": [
497
- "CV"
498
- ],
499
- "is_support_jhd": true,
500
- "address": "兰州新区兰州市新区中川园区栖霞中心社区京都之星购物中心1F-1029-2号",
501
- "province_name": "",
502
- "city_name": "",
503
- "area_name": "",
504
- "street_name": "",
505
- "phone": "0931-8423221",
506
- "resource_shop_id": 8057328,
507
- "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDU3MzI4LCJzaG9wX2lkIjoxMTM2OTYxLCJ2ZXJzaW9uIjoyfQ",
508
- "resource_shop_name": "塞奇新区京都广场店[无]",
509
- "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/43c89de1f4563758938f4c1585695523.png",
510
- "shop_id": 1136961,
511
- "shop_tags": [],
512
- "stars": 0,
513
- "time_slot_name": "-",
514
- "business_code": "",
515
- "longitude": "103.67888288761792",
516
- "latitude": "36.487307479335655",
517
- "discount_ratio": 8100
518
- },
519
- {
520
- "brand_id": 20007,
521
- "brand_name": "甜美香积",
522
- "brand_type": "MA",
523
- "business_status": "OPEN_BUSINESS",
524
- "consume_mode": [
525
- "SELL"
526
- ],
527
- "consume_options":[],
528
- "consume_mode_name": "",
529
- "distance": "1234km",
530
- "distance_conversion": "1,233.0km",
531
- "default_consume_type": "CV",
532
- "consume_type": [
533
- "CV"
534
- ],
535
- "is_support_jhd": false,
536
- "address": "城关区城区甘肃省兰州市城关区雁儿湾路236号欣欣嘉园东区9-103室",
537
- "province_name": "",
538
- "city_name": "",
539
- "area_name": "",
540
- "street_name": "",
541
- "phone": "0931-8696076",
542
- "resource_shop_id": 3500732,
543
- "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjozNTAwNzMyLCJzaG9wX2lkIjoxMDA3MzIsInZlcnNpb24iOjJ9",
544
- "resource_shop_name": "甜美香积欣欣嘉园店[无]",
545
- "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/bc0d713ffe1ad05c9105ce3b7cac3256.png",
546
- "shop_id": 100732,
547
- "shop_tags": [],
548
- "stars": 0,
549
- "time_slot_name": "08:00-21:00",
550
- "business_code": "",
551
- "longitude": "103.90956080000001",
552
- "latitude": "36.048156600000006",
553
- "discount_ratio": 8100
554
- },
555
- {
556
- "brand_id": 20013,
557
- "brand_name": "塞奇",
558
- "brand_type": "MA",
559
- "business_status": "OPEN_BUSINESS",
560
- "consume_mode": [
561
- "SELL"
562
- ],
563
- "consume_options":[],
564
- "consume_mode_name": "",
565
- "distance": "1234km",
566
- "distance_conversion": "1,233.1km",
567
- "default_consume_type": "CV",
568
- "consume_type": [
569
- "CV"
570
- ],
571
- "is_support_jhd": false,
572
- "address": "城关区兰州市城关区雁南街道刘家滩村608府25-2号",
573
- "province_name": "",
574
- "city_name": "",
575
- "area_name": "",
576
- "street_name": "",
577
- "phone": "13919270868",
578
- "resource_shop_id": 8000467,
579
- "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwNDY3LCJzaG9wX2lkIjoxMDM5NzQ0LCJ2ZXJzaW9uIjoyfQ",
580
- "resource_shop_name": "塞奇科教城店[无]",
581
- "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/43c89de1f4563758938f4c1585695523.png",
582
- "shop_id": 1039744,
583
- "shop_tags": [],
584
- "stars": 0,
585
- "time_slot_name": "-",
586
- "business_code": "",
587
- "longitude": "103.90137905904297",
588
- "latitude": "36.0615664312187",
589
- "discount_ratio": 8100
590
- },
591
- {
592
- "brand_id": 20007,
593
- "brand_name": "甜美香积",
594
- "brand_type": "MA",
595
- "business_status": "OPEN_BUSINESS",
596
- "consume_mode": [
597
- "SELL"
598
- ],
599
- "consume_options":[],
600
- "consume_mode_name": "",
601
- "distance": "1234km",
602
- "distance_conversion": "1,233.7km",
603
- "default_consume_type": "CV",
604
- "consume_type": [
605
- "CV"
606
- ],
607
- "is_support_jhd": false,
608
- "address": "城关区城区甘肃省兰州市城关区格林小镇16号8号商铺",
609
- "province_name": "",
610
- "city_name": "",
611
- "area_name": "",
612
- "street_name": "",
613
- "phone": "0931-8594076",
614
- "resource_shop_id": 3500731,
615
- "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjozNTAwNzMxLCJzaG9wX2lkIjoxMDA3MzEsInZlcnNpb24iOjJ9",
616
- "resource_shop_name": "甜美香积格林小镇店[无]",
617
- "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/bc0d713ffe1ad05c9105ce3b7cac3256.png",
618
- "shop_id": 100731,
619
- "shop_tags": [],
620
- "stars": 0,
621
- "time_slot_name": "08:00-21:00",
622
- "business_code": "",
623
- "longitude": "103.89042809999998",
624
- "latitude": "36.0665271",
625
- "discount_ratio": 8100
626
- },
627
- {
628
- "brand_id": 20156,
629
- "brand_name": "安旗",
630
- "brand_type": "MA",
631
- "business_status": "OPEN_BUSINESS",
632
- "consume_mode": [
633
- "SELL"
634
- ],
635
- "consume_options":[],
636
- "consume_mode_name": "",
637
- "distance": "1234km",
638
- "distance_conversion": "1,233.7km",
639
- "default_consume_type": "CV",
640
- "consume_type": [
641
- "CV"
642
- ],
643
- "is_support_jhd": false,
644
- "address": "城关区焦家湾街道甘肃省兰州市城关区东岗东路483号",
645
- "province_name": "",
646
- "city_name": "",
647
- "area_name": "",
648
- "street_name": "",
649
- "phone": "156-0931-3067",
650
- "resource_shop_id": 3512729,
651
- "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjozNTEyNzI5LCJzaG9wX2lkIjoxMTE3MDMsInZlcnNpb24iOjJ9",
652
- "resource_shop_name": "安旗焦家湾店[无]",
653
- "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20210119/2fa6587feb8dce76942010d6adc4a1e3.jpg",
654
- "shop_id": 111703,
655
- "shop_tags": [],
656
- "stars": 0,
657
- "time_slot_name": "09:00-21:00",
658
- "business_code": "",
659
- "longitude": "103.90647489999999",
660
- "latitude": "36.03784149999999",
661
- "discount_ratio": 7700
662
- },
663
- {
664
- "brand_id": 20011,
665
- "brand_name": "红房子",
666
- "brand_type": "MA",
667
- "business_status": "OPEN_BUSINESS",
668
- "consume_mode": [
669
- "SELL"
670
- ],
671
- "consume_options":[],
672
- "consume_mode_name": "",
673
- "distance": "1234km",
674
- "distance_conversion": "1,234.0km",
675
- "default_consume_type": "CV",
676
- "consume_type": [
677
- "CV"
678
- ],
679
- "is_support_jhd": false,
680
- "address": "城关区城区甘肃省兰州市城关区雁南路18号软件大厦一层A-B-2-3室",
681
- "province_name": "",
682
- "city_name": "",
683
- "area_name": "",
684
- "street_name": "",
685
- "phone": "0931-8853015",
686
- "resource_shop_id": 3500717,
687
- "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjozNTAwNzE3LCJzaG9wX2lkIjoxMDA3MTcsInZlcnNpb24iOjJ9",
688
- "resource_shop_name": "红房子飞雁街店[无]",
689
- "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/2853d901c59fccd9d69526ad394a6d3c.png",
690
- "shop_id": 100717,
691
- "shop_tags": [],
692
- "stars": 0,
693
- "time_slot_name": "08:00-21:00",
694
- "business_code": "",
695
- "longitude": "103.894136",
696
- "latitude": "36.054105",
697
- "discount_ratio": 8600
698
- },
699
- {
700
- "brand_id": 21103,
701
- "brand_name": "谷麦密码",
702
- "brand_type": "MA",
703
- "business_status": "OPEN_BUSINESS",
704
- "consume_mode": [
705
- "SELL"
706
- ],
707
- "consume_options":[],
708
- "consume_mode_name": "",
709
- "distance": "1235km",
710
- "distance_conversion": "1,234.2km",
711
- "default_consume_type": "CV",
712
- "consume_type": [
713
- "CV"
714
- ],
715
- "is_support_jhd": false,
716
- "address": "城关区兰州市城关区南滨河路东路5002号(室内步行街1层1012号商铺）",
717
- "province_name": "",
718
- "city_name": "",
719
- "area_name": "",
720
- "street_name": "",
721
- "phone": "13919033881",
722
- "resource_shop_id": 3517423,
723
- "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjozNTE3NDIzLCJzaG9wX2lkIjoxMzU2MDAsInZlcnNpb24iOjJ9",
724
- "resource_shop_name": "谷麦密码名城广场店[无]",
725
- "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20230529/5c5e45188cde68ea6efa95dcb8c982c4.jpg",
726
- "shop_id": 135600,
727
- "shop_tags": [],
728
- "stars": 0,
729
- "time_slot_name": "09:00-21:00",
730
- "business_code": "",
731
- "longitude": "103.87480457697183",
732
- "latitude": "36.084009425167906",
733
- "discount_ratio": 7700
734
- },
735
- {
736
- "brand_id": 20011,
737
- "brand_name": "红房子",
738
- "brand_type": "MA",
739
- "business_status": "OPEN_BUSINESS",
740
- "consume_mode": [
741
- "SELL"
742
- ],
743
- "consume_options":[],
744
- "consume_mode_name": "",
745
- "distance": "1235km",
746
- "distance_conversion": "1,234.3km",
747
- "default_consume_type": "CV",
748
- "consume_type": [
749
- "CV"
750
- ],
751
- "is_support_jhd": false,
752
- "address": "城关区甘肃省兰州市城关区雁滩路3566-2号",
753
- "province_name": "",
754
- "city_name": "",
755
- "area_name": "",
756
- "street_name": "",
757
- "phone": "0931-8230106",
758
- "resource_shop_id": 3517647,
759
- "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjozNTE3NjQ3LCJzaG9wX2lkIjoxMzMwOTksInZlcnNpb24iOjJ9",
760
- "resource_shop_name": "红房子雁滩店[无]",
761
- "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/2853d901c59fccd9d69526ad394a6d3c.png",
762
- "shop_id": 133099,
763
- "shop_tags": [],
764
- "stars": 0,
765
- "time_slot_name": "09:00-18:00",
766
- "business_code": "",
767
- "longitude": "103.88307653342991",
768
- "latitude": "36.06753095801935",
769
- "discount_ratio": 8600
770
- },
771
- {
772
- "brand_id": 20074,
773
- "brand_name": "法贝德",
774
- "brand_type": "MA",
775
- "business_status": "OPEN_BUSINESS",
776
- "consume_mode": [
777
- "SELL"
778
- ],
779
- "consume_options":[],
780
- "consume_mode_name": "",
781
- "distance": "1235km",
782
- "distance_conversion": "1,234.3km",
783
- "default_consume_type": "CV",
784
- "consume_type": [
785
- "CV"
786
- ],
787
- "is_support_jhd": false,
788
- "address": "城关区甘肃省兰州市城关区拱星墩街道段家滩路507号筑梦时代广场5栋1楼102号铺面",
789
- "province_name": "",
790
- "city_name": "",
791
- "area_name": "",
792
- "street_name": "",
793
- "phone": "18109317967",
794
- "resource_shop_id": 8002284,
795
- "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAyMjg0LCJzaG9wX2lkIjoxMDQxODA5LCJ2ZXJzaW9uIjoyfQ",
796
- "resource_shop_name": "法贝德筑梦时代店[无]",
797
- "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200804/d48dc9dc025ad2240c7602a4ca15260b.jpg",
798
- "shop_id": 1041809,
799
- "shop_tags": [],
800
- "stars": 0,
801
- "time_slot_name": "-",
802
- "business_code": "",
803
- "longitude": "103.89317007380113",
804
- "latitude": "36.04904662594761",
805
- "discount_ratio": 8000
806
- },
807
- {
808
- "brand_id": 20007,
809
- "brand_name": "甜美香积",
810
- "brand_type": "MA",
811
- "business_status": "OPEN_BUSINESS",
812
- "consume_mode": [
813
- "SELL"
814
- ],
815
- "consume_options":[],
816
- "consume_mode_name": "",
817
- "distance": "1235km",
818
- "distance_conversion": "1,234.7km",
819
- "default_consume_type": "CV",
820
- "consume_type": [
821
- "CV"
822
- ],
823
- "is_support_jhd": false,
824
- "address": "城关区甘肃省兰州市城关区雁滩路3113号欣大百货一层1-22号",
825
- "province_name": "",
826
- "city_name": "",
827
- "area_name": "",
828
- "street_name": "",
829
- "phone": "09318833656",
830
- "resource_shop_id": 8000706,
831
- "exts_params": "eyJyZXNvdXJjZV9zaG9wX2lkIjo4MDAwNzA2LCJzaG9wX2lkIjoxMDQwNDc2LCJ2ZXJzaW9uIjoyfQ",
832
- "resource_shop_name": "甜美香积欣大百货店[无]",
833
- "shop_icon": "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20200629/bc0d713ffe1ad05c9105ce3b7cac3256.png",
834
- "shop_id": 1040476,
835
- "shop_tags": [],
836
- "stars": 0,
837
- "time_slot_name": "-",
838
- "business_code": "",
839
- "longitude": "103.87782198517985",
840
- "latitude": "36.06679685897937",
841
- "discount_ratio": 8100
842
- }
843
483
  ],
844
484
  "total_size": 1,
845
485
  "next_page_token":"",
package/src/components/JfbMallNewShopList/XdQueryFilter.vue CHANGED
@@ -215,16 +215,9 @@ export default {
215
215
  setChooseTag(tab, item){
216
216
  //单选
217
217
  if(!tab.multiple) {
218
- //取消
219
- if(this.selectedIds[tab.value] && this.selectedIds[tab.value].includes(item.value)) {
220
- this.setSelectData(tab.value, '', '', '')
221
- }
222
- //新增
223
- else {
224
- this.setSelectData(tab.value, item.value, item, item.label);
225
- //单选直接触发返回数据
226
- if(this.isShowBtn === false) this.onConfirm();
227
- }
218
+ this.setSelectData(tab.value, item.value, item, item.label);
219
+ //单选直接触发返回数据
220
+ if(this.isShowBtn === false) this.onConfirm();
228
221
  }
229
222
  //多选
230
223
  else {
package/src/components/JfbMallNewShopList/cusAttr/content.js CHANGED
@@ -127,13 +127,13 @@ export default (data, gValue, gColor, oldData={})=>{
127
127
  key: 'shopStyle',
128
128
  fields: checkFieldsBg,
129
129
  gValue,
130
- sValue:`{"cardItemSpace":16,"margin":{"bottom":16,"left":0,"right":0,"top":16},"backgroundColor":"rgba(245, 245, 245, 1)"}`,
130
+ sValue:`{"cardItemSpace":16,"margin":{"bottom":16,"left":16,"right":16,"top":16},"backgroundColor":"rgba(245, 245, 245, 1)"}`,
131
131
  }),
132
132
  labelInline:true,
133
133
  className: 'input100',
134
134
  handleCustom(cusRes) {
135
135
  XdBus.getParentApi('getCompStylesOptions')({
136
- layout_ids: 'HRpFvIp2mhuIUZujv9dnR',
136
+ layout_ids: '0kzfDGB7TKSmh5z2KTKH4',
137
137
  key: Date.now()
138
138
  })
139
139
  .then(res => {
package/src/components/JfbMallNewShopList/cusAttr/shops.js CHANGED
@@ -63,7 +63,7 @@ export default function (data, gValue, gColor, oldData) {
63
63
  },
64
64
  {ele: 'group_start'},
65
65
  {
66
- label: '颜色',
66
+ label: '',
67
67
  ele: 'xd-color',
68
68
  groupKey:'style',
69
69
  valueKey: 'cardItemBgColor',
@@ -124,7 +124,7 @@ export default function (data, gValue, gColor, oldData) {
124
124
  },
125
125
  {ele: 'group_start'},
126
126
  {
127
- label: '大小',
127
+ label: '',
128
128
  ele: 'xd-site-select-list',
129
129
  labelInline: true,
130
130
  valueKey: 'cardItemRadius',
@@ -216,7 +216,7 @@ export default function (data, gValue, gColor, oldData) {
216
216
  },
217
217
  {ele: 'group_start'},
218
218
  {
219
- label: '大小',
219
+ label: '',
220
220
  ele: 'xd-site-select-list',
221
221
  labelInline: true,
222
222
  valueKey: 'itemImageRadius',
@@ -270,7 +270,7 @@ export default function (data, gValue, gColor, oldData) {
270
270
  hidden:true,
271
271
  },
272
272
  {
273
- label: '距离样式',
273
+ label: '距离文字色',
274
274
  ele: 'xd-radio',
275
275
  groupKey: 'style',
276
276
  valueKey: 'distanceColorStatus',
@@ -283,7 +283,7 @@ export default function (data, gValue, gColor, oldData) {
283
283
  },
284
284
  {ele: 'group_start'},
285
285
  {
286
- label: '文字颜色',
286
+ label: '',
287
287
  ele: 'xd-color',
288
288
  groupKey:'style',
289
289
  valueKey: 'distanceColor',
package/src/components/JfbMallNewShopList/cusAttr/style.js CHANGED
@@ -60,7 +60,7 @@ export default function (data, gValue,gColor,oldData){
60
60
  },
61
61
  {ele: 'group_start'},
62
62
  {
63
- label: '颜色',
63
+ label: '',
64
64
  ele: 'xd-color',
65
65
  groupKey:'style',
66
66
  valueKey: 'contentBgColor',
package/src/components/JfbMallShop/JfbMallShop.vue CHANGED
@@ -67,60 +67,62 @@
67
67
  </view>
68
68
  <view class="shop_exchange_box">
69
69
  <template v-for="item in shopInfo.consume_options">
70
- <view v-if="item.consume_mode === 'WB' && showScan === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
71
- <view class="shop_wrap-exchange_txt">
72
- <view class="exchange_name">{{scanName}}</view>
73
- <view class="exchange_desc">{{item.desc}}</view>
74
- </view>
75
- <view class="shop_wrap-exchange_btn">
76
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ scanBtnName }}</xd-button>
77
- </view>
78
- </view>
79
- <view v-if="item.consume_mode === 'JHD' && showExchange==='Y'" class="shop_wrap-exchange" :key="item.consume_mode">
80
- <view class="shop_wrap-exchange_txt">
81
- <view class="exchange_name">{{ exchangeName }}</view>
82
- <view class="exchange_desc">{{item.desc}}</view>
83
- </view>
84
- <view class="shop_wrap-exchange_btn">
85
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{exchangeBtnName}}</xd-button>
86
- </view>
87
- </view>
88
- <view v-if="item.consume_mode === 'QP' && showTake === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
89
- <view class="shop_wrap-exchange_txt">
90
- <view class="exchange_name">{{takeName}}</view>
91
- <view class="exchange_desc">{{item.desc}}</view>
92
- </view>
93
- <view class="shop_wrap-exchange_btn">
94
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{takeBtnName}}</xd-button>
95
- </view>
96
- </view>
97
- <view v-if="item.consume_mode === 'SEAT' && showMovie === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
98
- <view class="shop_wrap-exchange_txt">
99
- <view class="exchange_name">{{movieName}}</view>
100
- <view class="exchange_desc">{{item.desc}}</view>
70
+ <template v-if="isPreview || shopInfo.default_consume_type === item.consume_mode">
71
+ <view v-if="item.consume_mode === 'WB' && showScan === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
72
+ <view class="shop_wrap-exchange_txt">
73
+ <view class="exchange_name">{{scanName}}</view>
74
+ <view class="exchange_desc">{{item.desc}}</view>
75
+ </view>
76
+ <view class="shop_wrap-exchange_btn">
77
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ scanBtnName }}</xd-button>
78
+ </view>
101
79
  </view>
102
- <view class="shop_wrap-exchange_btn">
103
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ movieBtnName }}</xd-button>
80
+ <view v-if="item.consume_mode === 'JHD' && showExchange==='Y'" class="shop_wrap-exchange" :key="item.consume_mode">
81
+ <view class="shop_wrap-exchange_txt">
82
+ <view class="exchange_name">{{ exchangeName }}</view>
83
+ <view class="exchange_desc">{{item.desc}}</view>
84
+ </view>
85
+ <view class="shop_wrap-exchange_btn">
86
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{exchangeBtnName}}</xd-button>
87
+ </view>
104
88
  </view>
105
- </view>
106
- <view v-if="item.consume_mode === 'HDSELF' && showFood === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
107
- <view class="shop_wrap-exchange_txt">
108
- <view class="exchange_name">{{foodName}}</view>
109
- <view class="exchange_desc">{{item.desc}}</view>
89
+ <view v-if="item.consume_mode === 'QP' && showTake === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
90
+ <view class="shop_wrap-exchange_txt">
91
+ <view class="exchange_name">{{takeName}}</view>
92
+ <view class="exchange_desc">{{item.desc}}</view>
93
+ </view>
94
+ <view class="shop_wrap-exchange_btn">
95
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{takeBtnName}}</xd-button>
96
+ </view>
110
97
  </view>
111
- <view class="shop_wrap-exchange_btn">
112
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{foodBtnName}}</xd-button>
98
+ <view v-if="item.consume_mode === 'SEAT' && showMovie === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
99
+ <view class="shop_wrap-exchange_txt">
100
+ <view class="exchange_name">{{movieName}}</view>
101
+ <view class="exchange_desc">{{item.desc}}</view>
102
+ </view>
103
+ <view class="shop_wrap-exchange_btn">
104
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{ movieBtnName }}</xd-button>
105
+ </view>
113
106
  </view>
114
- </view>
115
- <view v-if="item.consume_mode === 'TRAVEL' && showTravel === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
116
- <view class="shop_wrap-exchange_txt">
117
- <view class="exchange_name">{{ travelName }}</view>
118
- <view class="exchange_desc">{{item.desc}}</view>
107
+ <view v-if="item.consume_mode === 'HDSELF' && showFood === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
108
+ <view class="shop_wrap-exchange_txt">
109
+ <view class="exchange_name">{{foodName}}</view>
110
+ <view class="exchange_desc">{{item.desc}}</view>
111
+ </view>
112
+ <view class="shop_wrap-exchange_btn">
113
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{foodBtnName}}</xd-button>
114
+ </view>
119
115
  </view>
120
- <view class="shop_wrap-exchange_btn">
121
- <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{travelBtnName}}</xd-button>
116
+ <view v-if="item.consume_mode === 'TRAVEL' && showTravel === 'Y'" class="shop_wrap-exchange" :key="item.consume_mode">
117
+ <view class="shop_wrap-exchange_txt">
118
+ <view class="exchange_name">{{ travelName }}</view>
119
+ <view class="exchange_desc">{{item.desc}}</view>
120
+ </view>
121
+ <view class="shop_wrap-exchange_btn">
122
+ <xd-button @click="handleToExchange(item)" style="margin:0 0 0 20rpx" type="primary" size="small">{{travelBtnName}}</xd-button>
123
+ </view>
122
124
  </view>
123
- </view>
125
+ </template>
124
126
  </template>
125
127
  </view>
126
128
  <view v-if="isShowCodeProduct && productList.length" class="code_product_wrap">
@@ -223,6 +225,7 @@
223
225
  spacing:32,
224
226
  alphaColor: "",
225
227
  is_plus_site: false,
228
+ isPreview: false,
226
229
 
227
230
  errorStatus: false,
228
231
  errorImage:'https://img0.jufubao.cn/common/empty/shop.png?v1=1',
@@ -406,6 +409,7 @@
406
409
  this.init(this.container);
407
410
  this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
408
411
  this.alphaColor = Color(this.mainColor).alpha(0.1).toString();
412
+ this.isPreview = this.$configProject.isPreview;
409
413
  },
410
414
  methods: {
411
415
  onJfbLoad(options) {
package/src/components/JfbMallShop/Mock.js CHANGED
@@ -25,7 +25,7 @@ module.exports = {
25
25
  "xsd",
26
26
  "travel"
27
27
  ],
28
- default_consume_type: "CV",
28
+ default_consume_type: "JHD",
29
29
  is_support_jhd: true,
30
30
  resource_shop_name: "福司令渠道门店",
31
31
  brand_about: "福司令渠道门店品牌描述内容",
@@ -92,8 +92,9 @@ module.exports = {
92
92
  promo_price: 0,
93
93
  tags: [],
94
94
  show_prices: [
95
- { p: 4990, n: "", t: "S" },
96
- { p: 0, n: "工会会员价", t: "T" }
95
+ { p: 4490, n: "", t: "S" },
96
+ { p: 4990, n: "原价", t: "U" },
97
+ { p: 500, n: "省", t: "E" },
97
98
  ]
98
99
  },
99
100
  {
@@ -113,8 +114,9 @@ module.exports = {
113
114
  promo_price: 0,
114
115
  tags: [],
115
116
  show_prices: [
116
- { p: 13, n: "", t: "S" },
117
- { p: 0, n: "工会会员价", t: "T" }
117
+ { p: 4490, n: "", t: "S" },
118
+ { p: 4990, n: "原价", t: "U" },
119
+ { p: 500, n: "省", t: "E" },
118
120
  ]
119
121
  },
120
122
  {
@@ -133,8 +135,9 @@ module.exports = {
133
135
  promo_price: 0,
134
136
  tags: [],
135
137
  show_prices: [
136
- { p: 2189, n: "", t: "S" },
137
- { p: 0, n: "工会会员价", t: "T" }
138
+ { p: 4490, n: "", t: "S" },
139
+ { p: 4990, n: "原价", t: "U" },
140
+ { p: 500, n: "省", t: "E" },
138
141
  ]
139
142
  },
140
143
  {
@@ -154,8 +157,9 @@ module.exports = {
154
157
  promo_price: 0,
155
158
  tags: [],
156
159
  show_prices: [
157
- { p: 15, n: "", t: "S" },
158
- { p: 0, n: "工会会员价", t: "T" }
160
+ { p: 4490, n: "", t: "S" },
161
+ { p: 4990, n: "原价", t: "U" },
162
+ { p: 500, n: "省", t: "E" },
159
163
  ]
160
164
  },
161
165
  {
@@ -175,7 +179,6 @@ module.exports = {
175
179
  tags: [],
176
180
  show_prices: [
177
181
  { p: 10500, n: "", t: "S" },
178
- { p: 0, n: "工会会员价", t: "T" }
179
182
  ]
180
183
  },
181
184
  {
@@ -194,92 +197,11 @@ module.exports = {
194
197
  promo_price: 0,
195
198
  tags: [],
196
199
  show_prices: [
197
- { p: 134, n: "", t: "S" },
198
- { p: 0, n: "工会会员价", t: "T" }
200
+ { p: 4490, n: "", t: "S" },
201
+ { p: 4990, n: "原价", t: "U" },
202
+ { p: 500, n: "省", t: "E" },
199
203
  ]
200
204
  },
201
- {
202
- product_id: 60039053,
203
- product_type: "network",
204
- brand_id: 14,
205
- brand_name: "测试1111",
206
- list_title: "QQ普通会员1个月",
207
- status: "ok",
208
- sale_num: 0,
209
- thumb:
210
- "http://file.yiqida.cn/upload/2021-07-01/e0/7c/e02eb7167c72d8188cc9829779c2dc41.jpg",
211
- sale_price: 795,
212
- vip_price: 0,
213
- market_price: 1000,
214
- market_tags: ["rec", "hot", "new"],
215
- promo_price: 0,
216
- tags: [],
217
- show_prices: [
218
- { p: 795, n: "", t: "S" },
219
- { p: 0, n: "工会会员价", t: "T" }
220
- ]
221
- },
222
- {
223
- product_id: 60032162,
224
- product_type: "good",
225
- brand_id: 14,
226
- brand_name:
227
- "测试1111就是考虑到极乐空间工商卡溜达鸡干撒卡拉季鲸打卡利发估计山卡拉电极法个",
228
- list_title: "同城商品-多规格（核销）",
229
- status: "ok",
230
- sale_num: 139,
231
- thumb: "https://sandbox-img5.jufubao.cn/uploads/20250107/37b016de24300cc74e8ebc23f0f3ce12.jpeg",
232
- sale_price: 7600,
233
- vip_price: 0,
234
- market_price: 7600,
235
- market_tags: ["rec", "hot", "new"],
236
- promo_price: 0,
237
- tags: [],
238
- show_prices: [
239
- { p: 7600, n: "", t: "S" },
240
- { p: 0, n: "工会会员价", t: "T" }
241
- ]
242
- },
243
- {
244
- product_id: 60038977,
245
- product_type: "good",
246
- brand_id: 14,
247
- brand_name: "测试1111",
248
- list_title: "商品【ppt】多规格",
249
- status: "ok",
250
- sale_num: 4,
251
- thumb: "https://sandbox-img5.jufubao.cn/uploads/20250729/4843dd391a5457e535afb6d0dd344557.jpeg",
252
- sale_price: 10500,
253
- vip_price: 0,
254
- market_price: 10500,
255
- market_tags: ["rec", "hot"],
256
- promo_price: 0,
257
- tags: [],
258
- show_prices: [
259
- { p: 10500, n: "", t: "S" },
260
- { p: 0, n: "工会会员价", t: "T" }
261
- ]
262
- },
263
- {
264
- product_id: 60030267,
265
- product_type: "network",
266
- brand_id: 14,
267
- brand_name: "测试1111",
268
- list_title: "测试网络视听",
269
- status: "ok",
270
- sale_num: 120,
271
- thumb: "https://sandbox-img5.jufubao.cn/uploads/20240104/6956d6640db2aac3b884e7164bf598ba.png",
272
- sale_price: 1300,
273
- vip_price: 0,
274
- market_price: 2100,
275
- market_tags: ["rec", "hot", "new"],
276
- promo_price: 0,
277
- tags: [],
278
- show_prices: [
279
- { p: 1300, n: "", t: "S" },
280
- { p: 0, n: "工会会员价", t: "T" }
281
- ]
282
- }
283
205
  ],
284
206
  request_id: "8560c761aa7ca2eb"
285
207
  }
package/src/components/JfbMallShop/cusAttr/content.js CHANGED
@@ -9,6 +9,11 @@ import {
9
9
  } from "@/utils/AttrTools";
10
10
 
11
11
  export default function (data, gValue,gColor,oldData){
12
+ let isShowCashier = data.isShowCashier || "Y";
13
+ let showOtherEnter = "N";
14
+ if(gValue.isAdd === true && gValue.isFirst) {
15
+ showOtherEnter = "Y";
16
+ }
12
17
 
13
18
  return [
14
19
  {
@@ -81,7 +86,7 @@ export default function (data, gValue,gColor,oldData){
81
86
  label: '聚好兑',
82
87
  ele: 'xd-cus-switch',
83
88
  valueKey: 'showExchange',
84
- value: dataVal({ data, key: 'showExchange', dValue: 'Y', gValue }),
89
+ value: dataVal({ data, key: 'showExchange', dValue: isShowCashier, gValue }),
85
90
  className: 'input100',
86
91
  labelInline: true,
87
92
  groupKey: 'content',
@@ -102,7 +107,7 @@ export default function (data, gValue,gColor,oldData){
102
107
  className: 'input80',
103
108
  placeholder: "聚好兑",
104
109
  inline: false,
105
- max: 5,
110
+ max: 4,
106
111
  },
107
112
  {
108
113
  label: '标题',
@@ -114,7 +119,7 @@ export default function (data, gValue,gColor,oldData){
114
119
  groupKey: 'content',
115
120
  className: 'input80',
116
121
  inline: false,
117
- max: 5,
122
+ max: 4,
118
123
  placeholder: "聚好兑"
119
124
  },
120
125
  { ele: 'group_end' },
@@ -124,7 +129,7 @@ export default function (data, gValue,gColor,oldData){
124
129
  label: '扫一扫',
125
130
  ele: 'xd-cus-switch',
126
131
  valueKey: 'showScan',
127
- value: dataVal({ data, key: 'showScan', dValue: 'Y', gValue }),
132
+ value: dataVal({ data, key: 'showScan', dValue: isShowCashier, gValue }),
128
133
  className: 'input100',
129
134
  labelInline: true,
130
135
  groupKey: 'content',
@@ -144,7 +149,7 @@ export default function (data, gValue,gColor,oldData){
144
149
  groupKey: 'content',
145
150
  className: 'input80',
146
151
  placeholder: "扫一扫",
147
- max: 5,
152
+ max: 4,
148
153
  inline: false
149
154
  },
150
155
  {
@@ -157,7 +162,7 @@ export default function (data, gValue,gColor,oldData){
157
162
  groupKey: 'content',
158
163
  className: 'input80',
159
164
  inline: false,
160
- max: 5,
165
+ max: 4,
161
166
  placeholder: "扫码提货"
162
167
  },
163
168
  { ele: 'group_end' },
@@ -167,7 +172,7 @@ export default function (data, gValue,gColor,oldData){
167
172
  label: '快捷码',
168
173
  ele: 'xd-cus-switch',
169
174
  valueKey: 'showTake',
170
- value: dataVal({ data, key: 'showTake', dValue: 'Y', gValue }),
175
+ value: dataVal({ data, key: 'showTake', dValue: isShowCashier, gValue }),
171
176
  className: 'input100',
172
177
  labelInline: true,
173
178
  groupKey: 'content',
@@ -187,7 +192,7 @@ export default function (data, gValue,gColor,oldData){
187
192
  groupKey: 'content',
188
193
  className: 'input80',
189
194
  placeholder: "去提货",
190
- max: 5,
195
+ max: 4,
191
196
  inline: false
192
197
  },
193
198
  {
@@ -200,7 +205,7 @@ export default function (data, gValue,gColor,oldData){
200
205
  groupKey: 'content',
201
206
  className: 'input80',
202
207
  inline: false,
203
- max: 5,
208
+ max: 4,
204
209
  placeholder: "快捷提货"
205
210
  },
206
211
  { ele: 'group_end' },
@@ -210,7 +215,7 @@ export default function (data, gValue,gColor,oldData){
210
215
  label: '在线选座',
211
216
  ele: 'xd-cus-switch',
212
217
  valueKey: 'showMovie',
213
- value: dataVal({ data, key: 'showMovie', dValue: 'Y', gValue }),
218
+ value: dataVal({ data, key: 'showMovie', dValue: showOtherEnter, gValue }),
214
219
  className: 'input100',
215
220
  labelInline: true,
216
221
  groupKey: 'content',
@@ -230,7 +235,7 @@ export default function (data, gValue,gColor,oldData){
230
235
  groupKey: 'content',
231
236
  className: 'input80',
232
237
  placeholder: "去订票",
233
- max: 5,
238
+ max: 4,
234
239
  inline: false
235
240
  },
236
241
  {
@@ -243,7 +248,7 @@ export default function (data, gValue,gColor,oldData){
243
248
  groupKey: 'content',
244
249
  className: 'input80',
245
250
  inline: false,
246
- max: 5,
251
+ max: 4,
247
252
  placeholder: "在线选座"
248
253
  },
249
254
  { ele: 'group_end' },
@@ -253,7 +258,7 @@ export default function (data, gValue,gColor,oldData){
253
258
  label: '电子码',
254
259
  ele: 'xd-cus-switch',
255
260
  valueKey: 'showCode',
256
- value: dataVal({ data, key: 'showCode', dValue: 'Y', gValue }),
261
+ value: dataVal({ data, key: 'showCode', dValue: showOtherEnter, gValue }),
257
262
  className: 'input100',
258
263
  labelInline: true,
259
264
  groupKey: 'content',
@@ -268,7 +273,7 @@ export default function (data, gValue,gColor,oldData){
268
273
  label: '到店自取',
269
274
  ele: 'xd-cus-switch',
270
275
  valueKey: 'showFood',
271
- value: dataVal({ data, key: 'showFood', dValue: 'Y', gValue }),
276
+ value: dataVal({ data, key: 'showFood', dValue: showOtherEnter, gValue }),
272
277
  className: 'input100',
273
278
  labelInline: true,
274
279
  groupKey: 'content',
@@ -288,7 +293,7 @@ export default function (data, gValue,gColor,oldData){
288
293
  groupKey: 'content',
289
294
  className: 'input80',
290
295
  placeholder: "去下单",
291
- max: 5,
296
+ max: 4,
292
297
  inline: false
293
298
  },
294
299
  {
@@ -301,7 +306,7 @@ export default function (data, gValue,gColor,oldData){
301
306
  groupKey: 'content',
302
307
  className: 'input80',
303
308
  inline: false,
304
- max: 5,
309
+ max: 4,
305
310
  placeholder: "到店自取"
306
311
  },
307
312
  { ele: 'group_end' },
@@ -311,7 +316,7 @@ export default function (data, gValue,gColor,oldData){
311
316
  label: '旅游门店',
312
317
  ele: 'xd-cus-switch',
313
318
  valueKey: 'showTravel',
314
- value: dataVal({ data, key: 'showTravel', dValue: 'Y', gValue }),
319
+ value: dataVal({ data, key: 'showTravel', dValue: showOtherEnter, gValue }),
315
320
  className: 'input100',
316
321
  labelInline: true,
317
322
  groupKey: 'content',
@@ -331,7 +336,7 @@ export default function (data, gValue,gColor,oldData){
331
336
  groupKey: 'content',
332
337
  className: 'input80',
333
338
  placeholder: "去订票",
334
- max: 5,
339
+ max: 4,
335
340
  inline: false
336
341
  },
337
342
  {
@@ -344,7 +349,7 @@ export default function (data, gValue,gColor,oldData){
344
349
  groupKey: 'content',
345
350
  className: 'input80',
346
351
  inline: false,
347
- max: 5,
352
+ max: 4,
348
353
  placeholder: "旅游门店"
349
354
  },
350
355
  { ele: 'group_end' },
package/src/components/JfbMallShop/cusAttr/style.js CHANGED
@@ -15,6 +15,7 @@ import productStyle from "@/utils/Attr/productStyle";
15
15
  const Color = require('color');
16
16
 
17
17
  export default function (data={},gValue={},gColor={},oldData) {
18
+ console.log("gValue",gValue)
18
19
  let defContBorder = cRaBorShadow( data, 'contBorder', {dValue:'D'},gValue);
19
20
  let defContShadow = cRaBorShadow( data, 'contShadow', {dValue:'D'},gValue);
20
21
  //导航投影设置
@@ -192,7 +193,7 @@ export default function (data={},gValue={},gColor={},oldData) {
192
193
  ele: 'xd-radio',
193
194
  groupKey: 'style',
194
195
  valueKey: 'radiusStatus',
195
- value: statusDataVal({data, key:'radiusStatus', cValue:'N',}),
196
+ value: statusDataVal({data, key:'radiusStatus', cValue:'D',}),
196
197
  labelInline:true,
197
198
  list: [
198
199
  {label: '默认', value: 'D'},
@@ -206,7 +207,7 @@ export default function (data={},gValue={},gColor={},oldData) {
206
207
  ele: 'xd-site-select-list',
207
208
  labelInline: true,
208
209
  valueKey: 'radius',
209
- value: dataVal({data, key:'radius', dValue: '0', gValue}),
210
+ value: dataVal({data, key:'radius', dValue: gValue.radius, gValue}),
210
211
  hidden: !statusShow({data, key: 'radiusStatus', fields:['radius'], gValue}),
211
212
  placeholder: '请选择商品是否设置圆角',
212
213
  multiple: false,
@@ -234,7 +235,7 @@ export default function (data={},gValue={},gColor={},oldData) {
234
235
  ele: 'xd-radio',
235
236
  groupKey: 'style',
236
237
  valueKey: 'imageRadiusStatus',
237
- value: statusDataVal({data, key:'imageRadiusStatus', cValue:'N'}),
238
+ value: statusDataVal({data, key:'imageRadiusStatus', cValue:'D'}),
238
239
  labelInline:true,
239
240
  list: [
240
241
  {label: '默认', value: 'D'},
@@ -252,7 +253,7 @@ export default function (data={},gValue={},gColor={},oldData) {
252
253
  placeholder: '请选择商品图圆角是否设置圆角',
253
254
  multiple: false,
254
255
  className: 'input80',
255
- value: dataVal({data, key:'imageRadius', dValue: '0', gValue}),
256
+ value: dataVal({data, key:'imageRadius', dValue: gValue.radius, gValue}),
256
257
  hidden: !statusShow({data, key: 'imageRadiusStatus', fields:['imageRadius'], gValue}),
257
258
  handleCustom({action, data}) {
258
259
  XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})