jufubao-base 1.0.227 → 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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-base",
3
- "version": "1.0.227",
3
+ "version": "1.0.228-beta2",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
@@ -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);
@@ -118,30 +118,28 @@
118
118
 
119
119
  computed: {
120
120
  bodyStyle(){
121
- let margin = `${this.checkValue(this.margin.top, 0)}rpx`;
122
- margin = `${margin} ${this.checkValue(this.margin.right, 0)}rpx`;
123
- margin = `${margin} ${this.checkValue(this.margin.bottom, 0)}rpx`;
124
- margin = `${margin} ${this.checkValue(this.margin.left, 0)}rpx`;
125
-
126
- let padding = `${this.checkValue(this.padding.top, 20)}rpx`;
127
- padding = `${padding} ${this.checkValue(this.padding.right, 20)}rpx`;
128
- padding = `${padding} ${this.checkValue(this.padding.bottom, 20)}rpx`;
129
- padding = `${padding} ${this.checkValue(this.padding.left, 20)}rpx`;
121
+ let margin = `${this.checkValue(this.margin.top, 20)}rpx`;
122
+ margin = `${margin} ${this.checkValue(this.margin.right, 20)}rpx`;
123
+ margin = `${margin} ${this.checkValue(this.margin.bottom, 20)}rpx`;
124
+ margin = `${margin} ${this.checkValue(this.margin.left, 20)}rpx`;
130
125
 
131
126
  return {
132
127
  margin,
133
- padding
134
128
  }
135
129
  },
136
-
137
130
  contStyle(){
138
131
  let border = 0;
139
132
  if (this.is_border === 'Y') border = `${this.is_border_w}rpx solid ${this.is_border_c}`;
133
+ let padding = `${this.checkValue(this.padding.top, 20)}rpx`;
134
+ padding = `${padding} ${this.checkValue(this.padding.right, 20)}rpx`;
135
+ padding = `${padding} ${this.checkValue(this.padding.bottom, 20)}rpx`;
136
+ padding = `${padding} ${this.checkValue(this.padding.left, 20)}rpx`;
140
137
  return {
141
138
  background: this.backgroundColor,
142
139
  borderRadius: this.radius + 'rpx',
143
140
  marginBottom: this.rowSpacing + 'rpx',
144
- border
141
+ border,
142
+ padding
145
143
  }
146
144
  },
147
145
 
@@ -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",
@@ -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,
@@ -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'] "
@@ -319,6 +319,27 @@ export default {
319
319
  value: data.btnTextColor || '',
320
320
  classNmae: 'input80',
321
321
  },
322
+ {
323
+ label: '文字大小:',
324
+ ele: 'xd-site-select-list',
325
+ valueKey: 'btnTextSize',
326
+ groupKey:'style',
327
+ value: data['btnTextSize'] || '',
328
+ placeholder: '请选择文字大小',
329
+ multiple: false,
330
+ className: 'input60',
331
+ handleCustom({action, data}) {
332
+ XdBus.getParentApi('getOptionsSettingList')({
333
+ setting_id: 'edtix_style_font_size'
334
+ })
335
+ .then(res => {
336
+ data.cb(res.list)
337
+ })
338
+ .catch(error => {
339
+ console.error(error);
340
+ });
341
+ },
342
+ },
322
343
  {
323
344
  "label": "自定义按钮跳转地址:",
324
345
  "ele": "xd-select-pages-path",
@@ -116,7 +116,7 @@
116
116
  v-if="info.codes[0].can_read_password"
117
117
  class="jfb-base-success__body-cashier-password"
118
118
  @click="showPassword = true"
119
- :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
119
+ :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
120
120
  >{{ showPassword ? info.codes[0].can_read_code : "查看" }}</view>
121
121
  <view v-else class="jfb-base-success__body-cashier-text">{{ info.codes[0].can_read_code }}</view>
122
122
  <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">{{info.codes[0].refund_tip_text}}</view>
@@ -157,7 +157,7 @@
157
157
  <view
158
158
  class="jfb-base-success__body-num-info-copy"
159
159
  @click="copy(item.code)"
160
- :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
160
+ :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
161
161
  >复制</view>
162
162
  <view
163
163
  v-if="item['code_end_time']"
@@ -187,7 +187,7 @@
187
187
  <view
188
188
  class="jfb-base-success__body-num-info-copy"
189
189
  @click="copy(item.code)"
190
- :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
190
+ :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
191
191
  >复制</view>
192
192
  </view>
193
193
  <view
@@ -200,7 +200,7 @@
200
200
  <view
201
201
  class="jfb-base-success__body-num-info-copy"
202
202
  @click="copy(item.password)"
203
- :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
203
+ :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
204
204
  >复制</view>
205
205
  <view
206
206
  v-if="item['code_end_time']"
@@ -227,7 +227,7 @@
227
227
  <view
228
228
  class="jfb-base-success__body-num-info-copy"
229
229
  @click="handleShowCode(item)"
230
- :style="{marginTop:0, borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
230
+ :style="{marginTop:0, borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
231
231
  >查看二维码和{{ item.password_title }}</view>
232
232
  <view
233
233
  v-if="item['code_end_time']"
@@ -254,7 +254,7 @@
254
254
  <view
255
255
  class="jfb-base-success__body-num-info-copy"
256
256
  @click="handleShowCode(item)"
257
- :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
257
+ :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
258
258
  >查看一维码</view>
259
259
  <view
260
260
  v-if="item['code_end_time']"
@@ -281,13 +281,13 @@
281
281
  <view
282
282
  class="jfb-base-success__body-num-info-copy"
283
283
  @click="handleToLink(item.code)"
284
- :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
284
+ :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
285
285
  >访问</view>
286
286
  </view>
287
287
  <view
288
288
  class="jfb-base-success__body-num-info-copy"
289
289
  @click="copy(item.code)"
290
- :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
290
+ :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
291
291
  >复制</view>
292
292
  <view
293
293
  v-if="item['code_end_time']"
@@ -432,6 +432,7 @@ export default {
432
432
  btnTextColor:'',
433
433
  btnBgColor:'',
434
434
  btnBorderColor:'',
435
+ btnTextSize: '',
435
436
 
436
437
  info: null,
437
438
  timeer: null,
@@ -533,7 +534,9 @@ export default {
533
534
  this.btnBgColor = getContainerPropsValue(value, "content.btnBgColor", '#e5e5e5');
534
535
  this.btnTextColor = getContainerPropsValue(value, "content.btnTextColor", '#666');
535
536
  this.btnBorderColor = getContainerPropsValue(value, "content.btnBorderColor", 'rgba(0,0,0,0)');
537
+ this.btnTextSize = getContainerPropsValue(value, "content.btnTextSize", '28');
536
538
  this.payBgColor = getContainerPropsValue(value, "content.payBgColor", '#fff');
539
+ console.log("this., fontSize: btnTextSize + 'rpx'", this.btnTextSize)
537
540
  this.custom_btn_path = getContainerPropsValue(
538
541
  value,
539
542
  "content.custom_btn_path",
@@ -25,7 +25,7 @@
25
25
  :class="{center: textType === 'N',vertical: textType === 'Y'}"
26
26
  >
27
27
  <template v-if="logined">
28
- <image v-if="userInfo['head_url']" :src="userInfo['head_url']"></image>
28
+ <image v-if="userInfo['head_url']" :style="{border: `1px solid ${imageColor}`, borderRadius:imageRadius}" :src="userInfo['head_url']"></image>
29
29
  <view class="no-image" :style="{borderColor: imageColor, borderRadius:imageRadius}" v-else>
30
30
  <xd-font-icon :color="imageColor" icon="iconwode_mian" size="100"></xd-font-icon>
31
31
  </view>
@@ -473,6 +473,12 @@ export default {
473
473
  },
474
474
  inline: false,
475
475
  },
476
+ {
477
+ label: '',
478
+ ele: 'slot',
479
+ slot: 'is_reference',
480
+ groupKey:'advanced',
481
+ },
476
482
  ].filter(i => i)
477
483
  },
478
484
  advanced: [],