jufubao-base 1.0.410 → 1.0.412
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 +1 -1
- package/src/components/JfbBaseOrderDetail/Attr.js +12 -0
- package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue +123 -44
- package/src/components/JfbBaseOrderDetail/Mock.js +1 -0
- package/src/components/JfbBaseSuccess/Attr.js +12 -0
- package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue +4 -2
package/package.json
CHANGED
|
@@ -731,6 +731,18 @@ export default {
|
|
|
731
731
|
{ label: '隐藏', value: '0' },
|
|
732
732
|
]
|
|
733
733
|
},
|
|
734
|
+
{
|
|
735
|
+
label: "核销订单样式",
|
|
736
|
+
ele: "xd-radio",
|
|
737
|
+
valueKey: 'qrcodeLayout',
|
|
738
|
+
groupKey:'content',
|
|
739
|
+
value: data['qrcodeLayout'] || '1',
|
|
740
|
+
placeholder: '请选择核销订单样式',
|
|
741
|
+
list: [
|
|
742
|
+
{ label: '样式1', value: '1' },
|
|
743
|
+
{ label: '样式2', value: '2' },
|
|
744
|
+
]
|
|
745
|
+
},
|
|
734
746
|
{
|
|
735
747
|
label: '底部客服',
|
|
736
748
|
ele: 'xd-cus-switch',
|
|
@@ -293,52 +293,83 @@
|
|
|
293
293
|
marginBottom: padding + 'rpx',
|
|
294
294
|
}"
|
|
295
295
|
v-if="info.codes.length === 1 && (info.codes[0].show_type === 'qrcode' || info.codes[0].show_type === 'barcode')"
|
|
296
|
-
class="
|
|
296
|
+
class=" jfb-base-order-detail__body-cashier"
|
|
297
297
|
>
|
|
298
|
-
<view
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
class="
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
background: bgColor,
|
|
326
|
-
}"
|
|
327
|
-
>{{ info.codes[0].code_end_time }}</view>
|
|
328
|
-
<!-- 自动刷新倒计时 -->
|
|
329
|
-
<view v-if="info.codes[0].is_auto_refresh === 'Y'" class="jfb-base-order-detail__body-card-refresh" @click="handleCodeRefresh">
|
|
330
|
-
<text>{{ codeRefreshMinute }}分{{ codeRefreshSecond }}秒后自动刷新</text>
|
|
331
|
-
<xd-font-icon icon="iconmian-loading" size="24" color="#999"></xd-font-icon>
|
|
298
|
+
<view v-if="qrcodeLayout === '2' && order_from === 'offline'" class="qr_new">
|
|
299
|
+
<view class="qr_top">
|
|
300
|
+
<view class="qr_left">
|
|
301
|
+
<view class="qr_name">{{ info.shop.brand_name }}</view>
|
|
302
|
+
<view class="qr_point">
|
|
303
|
+
<view class="m_unit">￥</view>
|
|
304
|
+
<view>{{ info.pay_info.goods_amount }}</view>
|
|
305
|
+
<!-- <xd-unit
|
|
306
|
+
:price="info.pay_info.real_pay_amount"
|
|
307
|
+
:font-size="72"
|
|
308
|
+
:iocn-size="0.45"
|
|
309
|
+
></xd-unit> -->
|
|
310
|
+
</view>
|
|
311
|
+
</view>
|
|
312
|
+
<view class="qr_right">
|
|
313
|
+
<image :style="{
|
|
314
|
+
height: '160rpx',
|
|
315
|
+
width: '160rpx',
|
|
316
|
+
}"
|
|
317
|
+
:src="info.codes[0].code_url"
|
|
318
|
+
></image>
|
|
319
|
+
</view>
|
|
320
|
+
</view>
|
|
321
|
+
<view class="qr_bottom">
|
|
322
|
+
{{ info.codes[0].can_read_code }}
|
|
323
|
+
{{info.codes[0].refund_tip_text}}
|
|
324
|
+
</view>
|
|
332
325
|
</view>
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
326
|
+
<view v-else class="jfb-base-order-detail__body-card">
|
|
327
|
+
<view class="jfb-base-order-detail__body-cashier-text">{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
|
|
328
|
+
<view v-if="showPreviewCode" style="position: relative">
|
|
329
|
+
<image
|
|
330
|
+
:style="{
|
|
331
|
+
height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
|
|
332
|
+
width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
|
|
333
|
+
}"
|
|
334
|
+
:src="info.codes[0].code_url"
|
|
335
|
+
></image>
|
|
336
|
+
<image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
|
|
337
|
+
</view>
|
|
338
|
+
<view v-if="info.codes[0].tips" class="jfb-base-order-detail__body-cashier-text">{{ info.codes[0].tips }}</view>
|
|
339
|
+
<view v-if="info.codes[0].can_read_password" class="jfb-base-order-detail__body-cashier-password" @click="showPassword = true">
|
|
340
|
+
{{ showPassword ? info.codes[0].can_read_code : "查看" }}
|
|
341
|
+
</view>
|
|
342
|
+
<view v-else class="jfb-base-order-detail__body-cashier-text">
|
|
343
|
+
{{ info.codes[0].can_read_code }}
|
|
344
|
+
</view>
|
|
345
|
+
<view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
|
|
346
|
+
{{info.codes[0].refund_tip_text}}
|
|
347
|
+
</view>
|
|
348
|
+
<view
|
|
349
|
+
v-if="info.codes[0].code_end_time"
|
|
350
|
+
class="jfb-base-order-detail__body-cashier-code"
|
|
351
|
+
:style="{
|
|
352
|
+
borderColor: mainColor,
|
|
353
|
+
color: mainColor,
|
|
354
|
+
background: bgColor,
|
|
355
|
+
}"
|
|
356
|
+
>{{ info.codes[0].code_end_time }}</view>
|
|
357
|
+
<!-- 自动刷新倒计时 -->
|
|
358
|
+
<view v-if="info.codes[0].is_auto_refresh === 'Y'" class="jfb-base-order-detail__body-card-refresh" @click="handleCodeRefresh">
|
|
359
|
+
<text>{{ codeRefreshMinute }}分{{ codeRefreshSecond }}秒后自动刷新</text>
|
|
360
|
+
<xd-font-icon icon="iconmian-loading" size="24" color="#999"></xd-font-icon>
|
|
361
|
+
</view>
|
|
362
|
+
<!-- 预约按钮 -->
|
|
363
|
+
<view v-if="info.codes[0].reservation_buttons && info.codes[0].reservation_buttons.length > 0" class="jfb-base-order-detail__body-reserve">
|
|
364
|
+
<view
|
|
365
|
+
v-for="(btn, idx) in info.codes[0].reservation_buttons"
|
|
366
|
+
:key="idx"
|
|
367
|
+
class="jfb-base-order-detail__body-reserve-btn"
|
|
368
|
+
@click="handleReservationJump(btn.url)"
|
|
369
|
+
>{{ btn.name }}</view>
|
|
370
|
+
</view>
|
|
341
371
|
</view>
|
|
372
|
+
|
|
342
373
|
</view>
|
|
343
374
|
<!--单条条形码或者二维码-->
|
|
344
375
|
<!--其他情况显示-->
|
|
@@ -1127,6 +1158,7 @@ export default {
|
|
|
1127
1158
|
is_show_support_shop: "",
|
|
1128
1159
|
is_show_delete_order:'N', //删除订单
|
|
1129
1160
|
ticket_method_msg:'', //取票提示文案
|
|
1161
|
+
qrcodeLayout: '1',
|
|
1130
1162
|
|
|
1131
1163
|
showPassword: false,
|
|
1132
1164
|
dialogPassword: "",
|
|
@@ -1190,6 +1222,7 @@ export default {
|
|
|
1190
1222
|
refundPath: "",
|
|
1191
1223
|
refundFastPath: "",
|
|
1192
1224
|
btnTextSize: 20,
|
|
1225
|
+
order_from: "",
|
|
1193
1226
|
|
|
1194
1227
|
showSupplement: false,
|
|
1195
1228
|
supplementList: [],
|
|
@@ -1356,7 +1389,7 @@ export default {
|
|
|
1356
1389
|
},
|
|
1357
1390
|
})
|
|
1358
1391
|
.then((res) => {
|
|
1359
|
-
|
|
1392
|
+
|
|
1360
1393
|
//跳转到第三方订单
|
|
1361
1394
|
if(res['third_order_detail_url']) {
|
|
1362
1395
|
this.$xdUniHelper.redirectTo({url: res['third_order_detail_url']}, false, true);
|
|
@@ -1368,6 +1401,7 @@ export default {
|
|
|
1368
1401
|
|
|
1369
1402
|
this.biz_code = res.biz_code;
|
|
1370
1403
|
this.is_not_show_price = res.is_not_show_price;
|
|
1404
|
+
this.order_from = res.order_from;
|
|
1371
1405
|
|
|
1372
1406
|
//旅游模块
|
|
1373
1407
|
if(res.extras && res.extras.travel_booking_info) {
|
|
@@ -1381,6 +1415,10 @@ export default {
|
|
|
1381
1415
|
res.pay_info.real_pay_amount,
|
|
1382
1416
|
100
|
|
1383
1417
|
);
|
|
1418
|
+
res.pay_info.goods_amount = this.$xdUniHelper.divisionFloatNumber(
|
|
1419
|
+
res.pay_info.goods_amount,
|
|
1420
|
+
100
|
|
1421
|
+
);
|
|
1384
1422
|
res.pay_info.base =
|
|
1385
1423
|
res.pay_info.base &&
|
|
1386
1424
|
res.pay_info.base.map((item) => {
|
|
@@ -1676,6 +1714,7 @@ export default {
|
|
|
1676
1714
|
this.lineHeight = getContainerPropsValue(container, "content.lineHeight", 20);
|
|
1677
1715
|
this.btnTextSize = getContainerPropsValue(container, "content.btnTextSize", 20);
|
|
1678
1716
|
let sectionShadow = getContainerPropsValue(container, "content.sectionShadow", "");
|
|
1717
|
+
this.qrcodeLayout = '2';
|
|
1679
1718
|
this.sectionShadow = this.getShadowCompatibleOldStyle(sectionShadow, {
|
|
1680
1719
|
type: this.is_shadow,
|
|
1681
1720
|
width: this.is_shadow_w,
|
|
@@ -2170,6 +2209,46 @@ export default {
|
|
|
2170
2209
|
height: 24rpx;
|
|
2171
2210
|
margin-right: 20rpx;
|
|
2172
2211
|
}
|
|
2212
|
+
.qr_new{
|
|
2213
|
+
.qr_top{
|
|
2214
|
+
width: 100%;
|
|
2215
|
+
display: flex;
|
|
2216
|
+
padding: 32rpx 32rpx 16rpx;
|
|
2217
|
+
box-sizing: border-box;
|
|
2218
|
+
.qr_left{
|
|
2219
|
+
flex: 1;
|
|
2220
|
+
.qr_name{
|
|
2221
|
+
color: #333333;
|
|
2222
|
+
font-size: 32rpx;
|
|
2223
|
+
font-weight: 500;
|
|
2224
|
+
}
|
|
2225
|
+
.qr_point{
|
|
2226
|
+
margin-top: 16rpx;
|
|
2227
|
+
font-size: 72rpx;
|
|
2228
|
+
color: #333333;
|
|
2229
|
+
font-weight: 500;
|
|
2230
|
+
display: flex;
|
|
2231
|
+
align-items: flex-end;
|
|
2232
|
+
.m_unit{
|
|
2233
|
+
font-size: 48rpx;
|
|
2234
|
+
margin-bottom: 12rpx;
|
|
2235
|
+
}
|
|
2236
|
+
}
|
|
2237
|
+
}
|
|
2238
|
+
.qr_right{
|
|
2239
|
+
image{
|
|
2240
|
+
margin: 0;
|
|
2241
|
+
transform: initial;
|
|
2242
|
+
}
|
|
2243
|
+
}
|
|
2244
|
+
}
|
|
2245
|
+
.qr_bottom{
|
|
2246
|
+
font-size: 24rpx;
|
|
2247
|
+
color: #666666;
|
|
2248
|
+
border-top: 1px solid #EEEEEE;
|
|
2249
|
+
padding: 16rpx 32rpx 32rpx;
|
|
2250
|
+
}
|
|
2251
|
+
}
|
|
2173
2252
|
|
|
2174
2253
|
.code-url {
|
|
2175
2254
|
display: flex;
|
|
@@ -32,6 +32,18 @@ export default {
|
|
|
32
32
|
{"label": "否", "value": "N"},
|
|
33
33
|
],
|
|
34
34
|
},
|
|
35
|
+
{
|
|
36
|
+
label: "支付成功展示隐藏:",
|
|
37
|
+
ele: "xd-radio",
|
|
38
|
+
valueKey: 'is_show_pay',
|
|
39
|
+
groupKey:'content',
|
|
40
|
+
value: data['is_show_pay'] || 'Y',
|
|
41
|
+
placeholder: '请选择',
|
|
42
|
+
list: [
|
|
43
|
+
{"label": "是", "value": "Y"},
|
|
44
|
+
{"label": "否", "value": "N"},
|
|
45
|
+
],
|
|
46
|
+
},
|
|
35
47
|
{
|
|
36
48
|
label: '是否显示码:',
|
|
37
49
|
ele: 'xd-radio',
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
<template v-if="noUserLoding === false && info !== null">
|
|
27
27
|
<view :style="{ margin: jfbListMarginComputed }">
|
|
28
28
|
<view
|
|
29
|
-
v-if="info.status.status_type === 'wait' ||
|
|
29
|
+
v-if="info.status.status_type === 'wait' || is_show_pay === 'Y'"
|
|
30
30
|
class="jfb-base-success__body-icon"
|
|
31
31
|
:style="{
|
|
32
32
|
marginBottom: jfbListSpacing + 'rpx',
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
:color="info.status.iconColor"
|
|
45
45
|
></xd-font-icon>
|
|
46
46
|
</view>
|
|
47
|
-
<view>{{ info.status.status_name }}</view>
|
|
47
|
+
<view style="margin-top: 16rpx;">{{ info.status.status_name }}</view>
|
|
48
48
|
<view class="jfb-base-success__body-icon-item-tip">{{info.status.comment }}</view>
|
|
49
49
|
</view>
|
|
50
50
|
<view class="jfb-base-success__body-icon-btn">
|
|
@@ -455,6 +455,7 @@ export default {
|
|
|
455
455
|
index: "", //首页跳转
|
|
456
456
|
is_show_code: "",
|
|
457
457
|
is_show_order_info: "",
|
|
458
|
+
is_show_pay: "",
|
|
458
459
|
is_show_product: "",
|
|
459
460
|
webViewPath: "/pages/webview/webview", //容器路径
|
|
460
461
|
isPreview: false,
|
|
@@ -612,6 +613,7 @@ export default {
|
|
|
612
613
|
"content.is_show_order_info",
|
|
613
614
|
"Y"
|
|
614
615
|
);
|
|
616
|
+
this.is_show_pay = getContainerPropsValue(value, 'content.is_show_pay', 'Y')
|
|
615
617
|
this.is_show_product = getContainerPropsValue(
|
|
616
618
|
value,
|
|
617
619
|
"content.is_show_product",
|