jufubao-base 1.0.228-beta1 → 1.0.228-beta2

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 (5) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue +45 -12
  3. package/src/components/JfbBaseOrderDetail/Attr.js +21 -0
  4. package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue +8 -1
  5. package/src/components/JfbBasePosterType/FourScreen.vue +1 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.228-beta1",
3
+ "version": "1.0.228-beta2",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue CHANGED
@@ -23,34 +23,49 @@
23
23
  </view>
24
24
  <view class="qrcode_wrap" style="position: relative">
25
25
  <image
26
- :style="{width: '300rpx', height: '300rpx'}"
26
+ :style="{width: '280rpx', height: '280rpx'}"
27
27
  :src="info.card_qrcode"
28
28
  ></image>
29
29
  <image v-if="isBrandLogo" class="logo-icon" :src="brandLogo"></image>
30
30
  </view>
31
- <view v-if="timeStr">{{ timeStr }}后自动刷新</view>
32
- <view class="refresh_wrap" @click="handleRefresh">
31
+ <view style="display:flex;align-items: center;justify-content: center;z-index: 111;position: relative;">
32
+ <view v-if="timeStr">{{ timeStr }}后自动刷新</view>
33
+ <view @click="handleRefresh" style="margin-left: 12rpx;">
34
+ <xd-font-icon
35
+ icon="iconmian-loading"
36
+ :size="32"
37
+ color="#666666"
38
+ ></xd-font-icon>
39
+ </view>
40
+ </view>
41
+ <view class="card_bottom"></view>
42
+ <!-- <view class="refresh_wrap" @click="handleRefresh">
33
43
  <xd-font-icon
34
44
  icon="iconshuaxin"
35
45
  style="margin-right: 24rpx;"
36
46
  size="28"
37
- ></xd-font-icon> 刷新二维码</view>
47
+ ></xd-font-icon> 刷新二维码</view> -->
38
48
  </view>
39
49
  <view class="card_info">
40
50
  <view class="card_type">{{ info['card_type_name'] }}</view>
41
51
  <view class="card_sec">券号：{{ info.card_number }}</view>
42
52
  <view class="card_sec">有效期：{{ info.end_time }}</view>
43
- <view class="card_sec">余额：{{ info.card_point }}{{ info.unit }}</view>
44
- <view class="card_other" v-if="info.other_card_point && info.card_point_type === 2">
45
- <text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text>
53
+ <view class="card_sec">
54
+ 余额：{{ info.card_point }}{{ info.unit }}
55
+ <text v-if="info.other_card_point && info.card_point_type === 2"
56
+ style="font-size: 24rpx;margin-left: 20rpx;"
57
+ >(购买其他物品可抵：{{info.other_card_point}} {{ info.unit }})</text>
46
58
  </view>
59
+ <!-- <view class="card_other" v-if="info.other_card_point && info.card_point_type === 2">
60
+ <text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text>
61
+ </view> -->
47
62
  </view>
48
63
  </view>
49
64
  <view
50
65
  v-if="info.site_entry_settings&&info.site_entry_settings.length>0"
51
66
  class="jfb-base-card-detail-entry__body-business"
52
67
  >
53
- <view class="jfb-base-card-detail-entry__body-business-title">进入业务板块</view>
68
+ <!-- <view class="jfb-base-card-detail-entry__body-business-title">进入业务板块</view> -->
54
69
  <view style="display:flex;align-content:center;justify-content:flex-start">
55
70
  <view class="jfb-base-card-detail-entry__body-business-content">
56
71
  <view
@@ -558,6 +573,8 @@ export default {
558
573
  background-color: #FF2121;
559
574
  border-radius: 24rpx;
560
575
  padding: 24rpx;
576
+
577
+
561
578
  &-title{
562
579
  display: flex;
563
580
  font-size: 32rpx;
@@ -569,10 +586,13 @@ export default {
569
586
  .card_type{
570
587
  font-size: 40rpx;
571
588
  font-weight: 600;
572
- margin-top: 70rpx;
589
+ margin-top: 60rpx;
573
590
  }
574
591
  .card_sec{
575
- margin: 12rpx 0;
592
+ margin: 10rpx 0;
593
+ &:last-child{
594
+ margin-bottom: 0rpx;
595
+ }
576
596
  }
577
597
  .card_other{
578
598
  background-color: rgba(255,255,255, 0.2);
@@ -813,7 +833,8 @@ export default {
813
833
  padding: unit(20,rpx) unit(70,rpx) 0 unit(70,rpx);
814
834
  color: #000;
815
835
  position: relative;
816
- &::after{
836
+
837
+ .card_bottom{
817
838
  content: " ";
818
839
  position: absolute;
819
840
  left: 0;
@@ -824,6 +845,17 @@ export default {
824
845
  border-radius: 100%;
825
846
  z-index: 1;
826
847
  }
848
+ // &::after{
849
+ // content: " ";
850
+ // position: absolute;
851
+ // left: 0;
852
+ // bottom: -40rpx;
853
+ // width: 100%;
854
+ // height: 100rpx;
855
+ // background: #FFFFFF;
856
+ // border-radius: 100%;
857
+ // z-index: 1;
858
+ // }
827
859
 
828
860
  & > view {
829
861
  // margin-bottom: unit(20, rpx);
@@ -851,7 +883,7 @@ export default {
851
883
  justify-content: center;
852
884
  align-items: center;
853
885
  box-sizing: border-box;
854
- height: unit(200, rpx);
886
+ height: unit(140, rpx);
855
887
  width: 100%;
856
888
 
857
889
  & > view {
@@ -892,6 +924,7 @@ export default {
892
924
  background: #fff;
893
925
  border-radius: unit(16,rpx);
894
926
  margin-top: unit(24,rpx);
927
+ padding-top: unit(28,rpx);
895
928
 
896
929
  &-title {
897
930
  font-size: unit(28,rpx);
package/src/components/JfbBaseOrderDetail/Attr.js CHANGED
@@ -384,6 +384,27 @@ export default {
384
384
  });
385
385
  },
386
386
  },
387
+ {
388
+ label: '复制按钮文字大小:',
389
+ ele: 'xd-site-select-list',
390
+ valueKey: 'btnTextSize',
391
+ groupKey:'style',
392
+ value: data['btnTextSize'] || '',
393
+ placeholder: '请选择文字大小',
394
+ multiple: false,
395
+ className: 'input60',
396
+ handleCustom({action, data}) {
397
+ XdBus.getParentApi('getOptionsSettingList')({
398
+ setting_id: 'edtix_style_font_size'
399
+ })
400
+ .then(res => {
401
+ data.cb(res.list)
402
+ })
403
+ .catch(error => {
404
+ console.error(error);
405
+ });
406
+ },
407
+ },
387
408
  {
388
409
  label: "底部按钮配置",
389
410
  ele: "title",
package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue CHANGED
@@ -339,6 +339,7 @@
339
339
  </view>
340
340
  <view
341
341
  class="jfb-base-order-detail__body-num-info-copy"
342
+ :style="{fontSize: btnTextSize+'rpx'}"
342
343
  @click="copy(item.code)"
343
344
  >复制</view>
344
345
  <view
@@ -368,6 +369,7 @@
368
369
  </view>
369
370
  <view
370
371
  class="jfb-base-order-detail__body-num-info-copy"
372
+ :style="{fontSize: btnTextSize+'rpx'}"
371
373
  @click="copy(item.code)"
372
374
  >复制</view>
373
375
  </view>
@@ -380,6 +382,7 @@
380
382
  </view>
381
383
  <view
382
384
  class="jfb-base-order-detail__body-num-info-copy"
385
+ :style="{fontSize: btnTextSize+'rpx'}"
383
386
  @click="copy(item.password)">复制</view>
384
387
  <view
385
388
  v-if="item.code_end_time"
@@ -403,6 +406,7 @@
403
406
  <view
404
407
  class="jfb-base-order-detail__body-num-info-copy"
405
408
  style="margin-top: 0;"
409
+ :style="{fontSize: btnTextSize+'rpx'}"
406
410
  @click="handleShowCode(item)">查看二维码和{{ item.password_title }}</view>
407
411
  <view
408
412
  v-if="item.code_end_time"
@@ -426,6 +430,7 @@
426
430
  </view>
427
431
  <view
428
432
  class="jfb-base-order-detail__body-num-info-copy"
433
+ :style="{fontSize: btnTextSize+'rpx'}"
429
434
  @click="handleShowCode(item)"
430
435
  >查看一维码</view>
431
436
  <view
@@ -538,7 +543,7 @@
538
543
  <view v-html="item.value"></view>
539
544
  </view>
540
545
  <view
541
- :style="{ marginLeft: '30rpx' }"
546
+ :style="{ marginLeft: '30rpx', fontSize: btnTextSize+'rpx' }"
542
547
  v-if="item.type === 'copy'"
543
548
  class="jfb-base-order-detail__body-order-copy"
544
549
  @click="copy(item.value)"
@@ -893,6 +898,7 @@ export default {
893
898
  is_show_all_detail: '',
894
899
  showPreviewCode: true,
895
900
  is_show_product: "",
901
+ btnTextSize: 20,
896
902
  };
897
903
  },
898
904
  watch: {
@@ -1213,6 +1219,7 @@ export default {
1213
1219
  this.is_show_support_shop = getContainerPropsValue(container, "content.is_show_support_shop", "N");
1214
1220
  this.is_show_delete_order = getContainerPropsValue(container, "content.is_show_delete_order", "N");
1215
1221
  this.lineHeight = getContainerPropsValue(container, "content.lineHeight", 20);
1222
+ this.btnTextSize = getContainerPropsValue(container, "content.btnTextSize", 20);
1216
1223
  let sectionShadow = getContainerPropsValue(container, "content.sectionShadow", "");
1217
1224
  this.sectionShadow = this.getShadowCompatibleOldStyle(sectionShadow, {
1218
1225
  type: this.is_shadow,
package/src/components/JfbBasePosterType/FourScreen.vue CHANGED
@@ -39,9 +39,8 @@
39
39
  >
40
40
  <!--#ifdef MP-WEIXIN-->
41
41
  <swiper
42
- v-if="0"
43
42
  class="swiper xd-swiper-content"
44
- :style="{width: '100%', height: getContHeight + 'px'}"
43
+ :style="{width: '100%', height: (getContHeight + getIndexHeigth) + 'px'}"
45
44
  :indicator-dots="false"
46
45
  :autoplay="config['carouselTime'] > 0"
47
46
  :interval="config['carouselTime'] "