jufubao-base 1.0.417 → 1.0.418-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.417",
3
+ "version": "1.0.418-beta2",
4
4
  "private": false,
5
5
  "description": "聚福宝业务组件基础插件包",
6
6
  "main": "index.js",
@@ -795,6 +795,7 @@ export default {
795
795
  list: [
796
796
  { label: '样式1', value: '1' },
797
797
  { label: '样式2', value: '2' },
798
+ { label: '样式3', value: '3' }
798
799
  ]
799
800
  },
800
801
  {
@@ -332,6 +332,48 @@
332
332
  </view>
333
333
  </view>
334
334
  </view>
335
+ </view>
336
+ <view v-else-if="qrcodeLayout === '3' && order_from === 'offline'" style="padding: 30rpx;">
337
+ <view class="box_background">
338
+ <image class="box-bg-img" src="https://jfbv2-img-jufubao-cn.oss-cn-beijing.aliyuncs.com/common/new-coupon-bg-3.jpeg" mode="scaleToFill"></image>
339
+ <view class="background_content">
340
+ <view class="card-left">
341
+ <view class="card-header">
342
+ <view class="logo-circle">
343
+ <image :src="info.shop.brand_icon"></image>
344
+ </view>
345
+ <text class="header-title">{{info.shop.brand_name}}</text>
346
+ </view>
347
+ <view class="card-body">
348
+ <view class="card-body-inner">
349
+ <view class="title-wrap">
350
+ <text class="shop-name">{{info.shop.brand_name}}</text>
351
+ <text class="shop-name">电子提货券</text>
352
+ </view>
353
+ <view class="price"><text>¥</text> {{info.pay_info.goods_amount}}</view>
354
+ <view class="divider-line"></view>
355
+ <view class="info-list">
356
+ <text class="info-item">
357
+ {{info.codes[0].can_read_code}}
358
+ </text>
359
+ <text class="info-item">有效期至:{{info.codes[0].code_end_time_text}}</text>
360
+ <text class="info-item">适用范围:{{info.shop.brand_name}},{{info.shop.shop_name}}</text>
361
+ <text class="info-item">本券不兑换现金、不找零、遗失不补、过期自动失效</text>
362
+ </view>
363
+ </view>
364
+ </view>
365
+ </view>
366
+ <!-- 右侧区域(无头部,仅二维码) -->
367
+ <view class="card-right">
368
+ <view class="card-right-inner">
369
+ <view class="qrcode-wrap">
370
+ <image class="qrcode-img" :src="info.codes[0].code_url" mode="aspectFit"></image>
371
+ </view>
372
+ <text class="qrcode-tip">请到店出示此券核验</text>
373
+ </view>
374
+ </view>
375
+ </view>
376
+ </view>
335
377
  </view>
336
378
 
337
379
  <!-- <view v-if="qrcodeLayout === '2' && order_from === 'offline'" class="qr_new">
@@ -2988,6 +3030,154 @@ export default {
2988
3030
  margin-left: 50%;
2989
3031
  transform: translate(-50%);
2990
3032
  }
3033
+ .box_background{
3034
+ position: relative;
3035
+ background: #9C1B10;
3036
+ border-radius: 24rpx;
3037
+ overflow: hidden;
3038
+
3039
+ .box-bg-img {
3040
+ position: absolute;
3041
+ left: 0;
3042
+ top: 0;
3043
+ width: 100%;
3044
+ height: 100%;
3045
+ margin: 0;
3046
+ transform: none;
3047
+ }
3048
+
3049
+ .background_content{
3050
+ position: relative;
3051
+ z-index: 1;
3052
+ display: flex;
3053
+ box-sizing: border-box;
3054
+
3055
+ .card-left {
3056
+ flex: 1;
3057
+ display: flex;
3058
+ flex-direction: column;
3059
+ }
3060
+
3061
+ .card-header {
3062
+ position: relative;
3063
+ display: flex;
3064
+ align-items: center;
3065
+ padding: 12rpx 20rpx;
3066
+
3067
+ .logo-circle {
3068
+ width: 44rpx;
3069
+ height: 44rpx;
3070
+ background: #fff;
3071
+ border-radius: 50%;
3072
+ display: flex;
3073
+ align-items: center;
3074
+ justify-content: center;
3075
+ margin-right: 6rpx;
3076
+ image {
3077
+ width: 44rpx;
3078
+ height: 44rpx;
3079
+ border-radius: 50%;
3080
+ margin: 0;
3081
+ transform: none;
3082
+ }
3083
+ }
3084
+ .header-title {
3085
+ font-size: 24rpx;
3086
+ color: #fff;
3087
+ font-weight: bold;
3088
+ }
3089
+ }
3090
+
3091
+ .card-body {
3092
+ flex: 1;
3093
+
3094
+ .card-body-inner {
3095
+ padding: 18rpx 14rpx 0 18rpx;
3096
+ }
3097
+
3098
+ .title-wrap {
3099
+ text-align: center;
3100
+ .shop-name {
3101
+ display: block;
3102
+ font-size:22rpx;
3103
+ color: #222;
3104
+ font-weight: 500;
3105
+ }
3106
+ .ticket-name {
3107
+ display: block;
3108
+ font-size: 22rpx;
3109
+ font-weight: bold;
3110
+ margin-top: 4rpx;
3111
+ color: #111;
3112
+ }
3113
+ }
3114
+
3115
+ .price {
3116
+ font-size: 64rpx;
3117
+ font-weight: bold;
3118
+ color: #222;
3119
+ text-align: center;
3120
+ text{
3121
+ font-size: 40rpx;
3122
+ }
3123
+ }
3124
+
3125
+ .divider-line {
3126
+ width: 100%;
3127
+ height: 2rpx;
3128
+ background: #ddd;
3129
+ margin-bottom: 24rpx;
3130
+ }
3131
+
3132
+ .info-list {
3133
+ .info-item {
3134
+ display: block;
3135
+ font-size: 14rpx;
3136
+ color: #666;
3137
+ line-height: 1.7;
3138
+ }
3139
+ }
3140
+ }
3141
+ // 右侧区域:没有红色头部!
3142
+ .card-right {
3143
+ width: 280rpx;
3144
+ border-left: 2rpx dashed #A1A16F;
3145
+
3146
+ .card-right-inner {
3147
+ display: flex;
3148
+ flex-direction: column;
3149
+ align-items: center;
3150
+ justify-content: center;
3151
+ padding: 20rpx;
3152
+ }
3153
+
3154
+ .qrcode-wrap {
3155
+ width: 240rpx;
3156
+ height: 240rpx;
3157
+ border: 2px solid #A1A16F;
3158
+ border-radius: 8rpx;
3159
+ margin: 14rpx 20rpx;
3160
+ align-items: center;
3161
+ justify-content: center;
3162
+ box-sizing: border-box;
3163
+ .qrcode-img {
3164
+ width: 100%;
3165
+ height: 100%;
3166
+ border-radius: 8rpx;
3167
+ margin: 0;
3168
+ transform: none;
3169
+ }
3170
+ }
3171
+ .qrcode-tip {
3172
+ margin-bottom: 38rpx;
3173
+ font-size: 24rpx;
3174
+ color: #000000;
3175
+ font-weight: 500;
3176
+ line-height: 1.6;
3177
+ }
3178
+ }
3179
+ }
3180
+ }
2991
3181
  }
2992
3182
 
2993
3183
  &-booking {
@@ -3246,4 +3436,5 @@ export default {
3246
3436
  color: #FA5C5C;
3247
3437
  margin-top: unit(10, rpx);
3248
3438
  }
3439
+
3249
3440
  </style>
@@ -24,7 +24,8 @@ export default {
24
24
  groupKey: "content",
25
25
  list: [
26
26
  { label: '样式1', value: '1' },
27
- { label: '样式2', value: '2' }
27
+ { label: '样式2', value: '2' },
28
+ { label: '样式3', value: '3' }
28
29
  ],
29
30
  labelInline:true,
30
31
  inline: false,
@@ -50,7 +51,7 @@ export default {
50
51
  ele: 'xd-radio',
51
52
  valueKey: 'is_show_order_info',
52
53
  groupKey:'content',
53
- hidden: data.layoutStyle === '2',
54
+ hidden: data.layoutStyle !== '1',
54
55
  value: data['is_show_order_info'] || 'Y',
55
56
  placeholder: '请选择',
56
57
  list: [
@@ -77,7 +78,7 @@ export default {
77
78
  groupKey:'content',
78
79
  value:data['is_show_code']|| '',
79
80
  placeholder: '请选择',
80
- hidden: data.layoutStyle === '2',
81
+ hidden: data.layoutStyle !== '1',
81
82
  list: [
82
83
  {"label": "是", "value": "Y"},
83
84
  {"label": "否", "value": "N"},
@@ -90,7 +91,7 @@ export default {
90
91
  groupKey:'content',
91
92
  value:data['is_show_product'] || 'Y',
92
93
  placeholder: '请选择',
93
- hidden: data.layoutStyle === '2',
94
+ hidden: data.layoutStyle !== '1',
94
95
  list: [
95
96
  {"label": "是", "value": "Y"},
96
97
  {"label": "否", "value": "N"},
@@ -68,6 +68,48 @@
68
68
  </view>
69
69
  </view>
70
70
  </view>
71
+ <view v-if="layoutStyle === '3' && info.status.status_type === 'success'" class="take_qrcode_box">
72
+ <view class="box_background">
73
+ <image class="box-bg-img" src="https://jfbv2-img-jufubao-cn.oss-cn-beijing.aliyuncs.com/common/new-coupon-bg-3.jpeg" mode="scaleToFill"></image>
74
+ <view class="background_content">
75
+ <view class="card-left">
76
+ <view class="card-header">
77
+ <view class="logo-circle">
78
+ <image :src="info.shop.brand_icon"></image>
79
+ </view>
80
+ <text class="header-title">{{info.shop.brand_name}}</text>
81
+ </view>
82
+ <view class="card-body">
83
+ <view class="card-body-inner">
84
+ <view class="title-wrap">
85
+ <text class="shop-name">{{info.shop.brand_name}}</text>
86
+ <text class="shop-name">电子提货券</text>
87
+ </view>
88
+ <view class="price"><text>¥</text> {{info.pay_info.goods_amount}}</view>
89
+ <view class="divider-line"></view>
90
+ <view class="info-list">
91
+ <text class="info-item">
92
+ {{info.codes[0].can_read_code}}
93
+ </text>
94
+ <text class="info-item">有效期至:{{info.codes[0].code_end_time_text}}</text>
95
+ <text class="info-item">适用范围:{{info.shop.brand_name}},{{info.shop.shop_name}}</text>
96
+ <text class="info-item">本券不兑换现金、不找零、遗失不补、过期自动失效</text>
97
+ </view>
98
+ </view>
99
+ </view>
100
+ </view>
101
+ <!-- 右侧区域(无头部,仅二维码) -->
102
+ <view class="card-right">
103
+ <view class="card-right-inner">
104
+ <view class="qrcode-wrap">
105
+ <image class="qrcode-img" :src="info.codes[0].code_url" mode="aspectFit"></image>
106
+ </view>
107
+ <text class="qrcode-tip">请到店出示此券核验</text>
108
+ </view>
109
+ </view>
110
+ </view>
111
+ </view>
112
+ </view>
71
113
  <!-- 取货码 -->
72
114
 
73
115
 
@@ -660,7 +702,7 @@ export default {
660
702
  this.packageData = true;
661
703
  styleForm.getInitItem(this, value);
662
704
 
663
- if(this.layoutStyle === '2'){
705
+ if(this.layoutStyle !== '1'){
664
706
  this.is_show_order_info = 'N';
665
707
  this.is_show_product = 'N';
666
708
  this.is_show_code = 'N';
@@ -672,7 +714,7 @@ export default {
672
714
  vm: this,
673
715
  data: {
674
716
  main_order_id: this.order_id,
675
- is_show_code: this.layoutStyle === '2' ? 1 : (this.is_show_code === "Y" ? 1 : 0),
717
+ is_show_code: this.layoutStyle !== '1' ? 1 : (this.is_show_code === "Y" ? 1 : 0),
676
718
  is_show_product: this.is_show_product === "Y" ? 1 : 0,
677
719
  custom_content_page_id: this.pageAttr.page_id,
678
720
  custom_content_container_id: this.cid,
@@ -1221,7 +1263,6 @@ export default {
1221
1263
  }
1222
1264
  }
1223
1265
  }
1224
-
1225
1266
  .take_qrcode_box {
1226
1267
  margin-bottom: 48rpx;
1227
1268
  width: 100%;
@@ -1309,6 +1350,156 @@ export default {
1309
1350
  color: #666666;
1310
1351
  }
1311
1352
  }
1353
+ .box_background{
1354
+ position: relative;
1355
+ background: #9C1B10;
1356
+ border-radius: 24rpx;
1357
+ overflow: hidden;
1358
+
1359
+ .box-bg-img {
1360
+ position: absolute;
1361
+ left: 0;
1362
+ top: 0;
1363
+ width: 100%;
1364
+ height: 100%;
1365
+ }
1366
+ }
1367
+ .background_content{
1368
+ position: relative;
1369
+ z-index: 1;
1370
+ display: flex;
1371
+ box-sizing: border-box;
1372
+
1373
+ .card-left {
1374
+ flex: 1;
1375
+ display: flex;
1376
+ flex-direction: column;
1377
+ }
1378
+
1379
+ .card-header {
1380
+ position: relative;
1381
+ display: flex;
1382
+ align-items: center;
1383
+ padding: 12rpx 20rpx;
1384
+
1385
+ .logo-circle {
1386
+ width: 44rpx;
1387
+ height: 44rpx;
1388
+ background: #fff;
1389
+ border-radius: 50%;
1390
+ display: flex;
1391
+ align-items: center;
1392
+ justify-content: center;
1393
+ margin-right: 6rpx;
1394
+ image {
1395
+ width: 44rpx;
1396
+ height: 44rpx;
1397
+ border-radius: 50%;
1398
+ }
1399
+ }
1400
+ .header-title {
1401
+ font-size: 24rpx;
1402
+ color: #fff;
1403
+ font-weight: bold;
1404
+ }
1405
+ }
1406
+
1407
+ .card-body {
1408
+ flex: 1;
1409
+
1410
+ .card-body-inner {
1411
+ padding: 18rpx 14rpx 0 18rpx;
1412
+ }
1413
+
1414
+ .title-wrap {
1415
+ text-align: center;
1416
+ .shop-name {
1417
+ display: block;
1418
+ font-size:22rpx;
1419
+ color: #222;
1420
+ font-weight: 500;
1421
+ }
1422
+ .ticket-name {
1423
+ display: block;
1424
+ font-size: 22rpx;
1425
+ font-weight: bold;
1426
+ margin-top: 4rpx;
1427
+ color: #111;
1428
+ }
1429
+ }
1430
+
1431
+ .price {
1432
+ font-size: 64rpx;
1433
+ font-weight: bold;
1434
+ color: #222;
1435
+ text-align: center;
1436
+ text{
1437
+ font-size: 40rpx;
1438
+ }
1439
+ }
1440
+
1441
+ .divider-line {
1442
+ width: 100%;
1443
+ height: 2rpx;
1444
+ background: #ddd;
1445
+ margin-bottom: 24rpx;
1446
+ }
1447
+
1448
+ .info-list {
1449
+ .info-item {
1450
+ display: block;
1451
+ font-size: 14rpx;
1452
+ color: #666;
1453
+ line-height: 1.7;
1454
+ }
1455
+ }
1456
+ }
1457
+
1458
+ // 中间垂直虚线
1459
+ .dashed-split {
1460
+ // width: 2rpx;
1461
+ // background-image: linear-gradient(to bottom, #b8b29c 0, #b8b29c 50%, transparent 50%);
1462
+ // background-size: 2rpx 12rpx;
1463
+ // margin: 30rpx 0;
1464
+ }
1465
+
1466
+ // 右侧区域:没有红色头部!
1467
+ .card-right {
1468
+ width: 280rpx;
1469
+ border-left: 2rpx dashed #A1A16F;
1470
+
1471
+ .card-right-inner {
1472
+ display: flex;
1473
+ flex-direction: column;
1474
+ align-items: center;
1475
+ justify-content: center;
1476
+ padding: 20rpx;
1477
+ }
1478
+
1479
+ .qrcode-wrap {
1480
+ width: 240rpx;
1481
+ height: 240rpx;
1482
+ border: 2px solid #A1A16F;
1483
+ border-radius: 8rpx;
1484
+ margin: 14rpx 20rpx;
1485
+ align-items: center;
1486
+ justify-content: center;
1487
+ box-sizing: border-box;
1488
+ .qrcode-img {
1489
+ width: 100%;
1490
+ height: 100%;
1491
+ border-radius: 8rpx;
1492
+ }
1493
+ }
1494
+ .qrcode-tip {
1495
+ margin-bottom: 38rpx;
1496
+ font-size: 24rpx;
1497
+ color: #000000;
1498
+ font-weight: 500;
1499
+ line-height: 1.6;
1500
+ }
1501
+ }
1502
+ }
1312
1503
  }
1313
1504
 
1314
1505
  .codes-index {
@@ -1,22 +0,0 @@
1
- 'use strict';
2
-
3
- /**
4
- * @description 第三方库
5
- * @param threePackagePath {String} 第三方库所在项目路径存放路径路
6
- * @param packname {String} 包名字
7
- * @returns {string|*}
8
- */
9
- const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
10
- if(packname === 'gxd-commands-bussiness') {
11
- return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
12
- }
13
-
14
- if (packname === 'gxd-uni-library-editx') {
15
- return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
16
- }
17
-
18
- };
19
-
20
- module.exports = {
21
- getPackagePath
22
- }