jufubao-base 1.0.77-beta7 → 1.0.78-beta1
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/common/authorize.js +5 -1
- package/src/components/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue +44 -101
- package/src/components/JfbBaseCard/JfbBaseCard.vue +65 -75
- package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue +43 -93
- package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue +92 -161
- package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue +45 -101
- package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue +14 -24
- package/src/components/JfbBaseEntry/JfbBaseEntry.vue +1 -19
- package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue +1 -1
- package/src/components/JfbBaseLogin/JfbBaseLogin.vue +1 -42
- package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue +0 -3
- package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue +107 -176
- package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue +30 -95
- package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue +0 -3
- package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue +1 -1
|
@@ -16,8 +16,12 @@
|
|
|
16
16
|
</view>
|
|
17
17
|
<!-- #endif -->
|
|
18
18
|
<view class="jfb-base-recharge-order__body">
|
|
19
|
-
<view v-if="
|
|
20
|
-
<view
|
|
19
|
+
<view v-if="orderList&&orderList.length>0" :style="{ padding: outMargin }">
|
|
20
|
+
<view
|
|
21
|
+
v-for="(item, index) in orderList"
|
|
22
|
+
:key="index"
|
|
23
|
+
class="jfb-base-recharge-order__body-order"
|
|
24
|
+
@click="handleToDetail(item)"
|
|
21
25
|
:style="{
|
|
22
26
|
background: backgroundColor,
|
|
23
27
|
border: borderBox,
|
|
@@ -27,72 +31,40 @@
|
|
|
27
31
|
}"
|
|
28
32
|
>
|
|
29
33
|
<view class="jfb-base-recharge-order__body-order-header">
|
|
30
|
-
|
|
34
|
+
充值订单
|
|
31
35
|
</view>
|
|
32
36
|
<view class="jfb-base-recharge-order__body-order-middle">
|
|
33
|
-
<view
|
|
34
|
-
|
|
37
|
+
<view
|
|
38
|
+
>订单编号：
|
|
39
|
+
{{ item.order_id }}
|
|
40
|
+
</view>
|
|
41
|
+
<view :style="{ color: item.textColor }">
|
|
42
|
+
{{ item.pay_status_name }}
|
|
43
|
+
</view>
|
|
35
44
|
</view>
|
|
36
45
|
<view class="jfb-base-recharge-order__body-order-bottom">
|
|
37
|
-
<view
|
|
46
|
+
<view>交易日期：{{ item.created_time }} </view>
|
|
38
47
|
</view>
|
|
39
|
-
<view class="jfb-base-recharge-order__body-order-bbb">
|
|
40
|
-
<view></view>
|
|
41
|
-
</view>
|
|
42
|
-
</view>
|
|
43
|
-
</view>
|
|
44
|
-
<template v-else>
|
|
45
|
-
<view v-if="orderList&&orderList.length>0" :style="{ padding: outMargin }">
|
|
46
48
|
<view
|
|
47
|
-
|
|
48
|
-
:key="index"
|
|
49
|
-
class="jfb-base-recharge-order__body-order"
|
|
50
|
-
@click="handleToDetail(item)"
|
|
51
|
-
:style="{
|
|
52
|
-
background: backgroundColor,
|
|
53
|
-
border: borderBox,
|
|
54
|
-
borderRadius: radius + 'rpx',
|
|
55
|
-
boxShadow: shadowBox,
|
|
56
|
-
marginBottom: padding + 'rpx',
|
|
57
|
-
}"
|
|
49
|
+
style="margin-top: 32rpx; display: flex; justify-content: space-between"
|
|
58
50
|
>
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
<
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
</view>
|
|
71
|
-
<view class="jfb-base-recharge-order__body-order-bottom">
|
|
72
|
-
<view>交易日期：{{ item.created_time }} </view>
|
|
73
|
-
</view>
|
|
74
|
-
<view
|
|
75
|
-
style="margin-top: 32rpx; display: flex; justify-content: space-between"
|
|
51
|
+
<view style="display: flex; align-items: center;font-size: 24rpx;"
|
|
52
|
+
>合计：<xd-unit :fontSize="24" iconSize="0.24" :price="item.total_amount"></xd-unit
|
|
53
|
+
></view>
|
|
54
|
+
<xd-button
|
|
55
|
+
v-if="item.pay_status !== '3000'"
|
|
56
|
+
width="200rpx"
|
|
57
|
+
style="margin: 0"
|
|
58
|
+
size="mini"
|
|
59
|
+
type="primary"
|
|
60
|
+
:bgColor="mainColor"
|
|
61
|
+
@click="handleToPay(item)"
|
|
76
62
|
>
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
></view>
|
|
80
|
-
<xd-button
|
|
81
|
-
v-if="item.pay_status !== '3000'"
|
|
82
|
-
width="200rpx"
|
|
83
|
-
style="margin: 0"
|
|
84
|
-
size="mini"
|
|
85
|
-
type="primary"
|
|
86
|
-
:bgColor="mainColor"
|
|
87
|
-
@click="handleToPay(item)"
|
|
88
|
-
>
|
|
89
|
-
{{ item.pay_status === "3007" ? "去支付" : "重新支付" }}
|
|
90
|
-
</xd-button>
|
|
91
|
-
</view>
|
|
63
|
+
{{ item.pay_status === "3007" ? "去支付" : "重新支付" }}
|
|
64
|
+
</xd-button>
|
|
92
65
|
</view>
|
|
93
66
|
</view>
|
|
94
|
-
</
|
|
95
|
-
|
|
67
|
+
</view>
|
|
96
68
|
</view>
|
|
97
69
|
</view>
|
|
98
70
|
</template>
|
|
@@ -123,7 +95,6 @@ export default {
|
|
|
123
95
|
orderList: [],
|
|
124
96
|
detailPath: "",
|
|
125
97
|
payPath: "",
|
|
126
|
-
loadingList: false,
|
|
127
98
|
|
|
128
99
|
//基础
|
|
129
100
|
radius: 0,
|
|
@@ -240,7 +211,6 @@ export default {
|
|
|
240
211
|
}).value;
|
|
241
212
|
},
|
|
242
213
|
getList() {
|
|
243
|
-
this.loadingList = true;
|
|
244
214
|
jfbRootExec("getRechargeOrderList", {
|
|
245
215
|
vm: this,
|
|
246
216
|
data: {
|
|
@@ -249,7 +219,6 @@ export default {
|
|
|
249
219
|
},
|
|
250
220
|
})
|
|
251
221
|
.then((res) => {
|
|
252
|
-
this.loadingList = false;
|
|
253
222
|
this.orderList = res.list.map((item) => {
|
|
254
223
|
item.total_amount = item.total_amount / 100;
|
|
255
224
|
item["created_time"] = this.$xdUniHelper.getDate(
|
|
@@ -311,45 +280,11 @@ export default {
|
|
|
311
280
|
color: #333;
|
|
312
281
|
border-bottom: unit(2, rpx) solid #f2f2f2;
|
|
313
282
|
padding-bottom: unit(24, rpx);
|
|
314
|
-
|
|
315
|
-
& > view {
|
|
316
|
-
.skeleton-wrap &{
|
|
317
|
-
.skeleton-item(200rpx, 32rpx);
|
|
318
|
-
}
|
|
319
|
-
}
|
|
320
|
-
}
|
|
321
|
-
|
|
322
|
-
&-middle {
|
|
323
|
-
& > view:first-child {
|
|
324
|
-
.skeleton-wrap &{
|
|
325
|
-
.skeleton-item(400rpx, 32rpx);
|
|
326
|
-
}
|
|
327
|
-
}
|
|
328
|
-
& > view:last-child {
|
|
329
|
-
.skeleton-wrap &{
|
|
330
|
-
.skeleton-item(100rpx, 32rpx);
|
|
331
|
-
}
|
|
332
|
-
}
|
|
333
283
|
}
|
|
334
284
|
|
|
335
285
|
&-bottom {
|
|
336
286
|
border-bottom: unit(2, rpx) solid #f2f2f2;
|
|
337
287
|
padding-bottom: unit(32,rpx);
|
|
338
|
-
|
|
339
|
-
& > view:first-child {
|
|
340
|
-
.skeleton-wrap &{
|
|
341
|
-
.skeleton-item(400rpx, 32rpx);
|
|
342
|
-
}
|
|
343
|
-
}
|
|
344
|
-
}
|
|
345
|
-
&-bbb {
|
|
346
|
-
padding: unit(32,rpx) 0 0;
|
|
347
|
-
|
|
348
|
-
& > view:first-child {
|
|
349
|
-
.skeleton-wrap &{
|
|
350
|
-
.skeleton-item(100%, 32rpx);
|
|
351
|
-
}
|
|
352
|
-
}
|
|
353
288
|
}
|
|
354
289
|
|
|
355
290
|
&-middle,
|
|
@@ -98,9 +98,6 @@
|
|
|
98
98
|
<view class="jfb-base-success__body-cashier-text">
|
|
99
99
|
{{ info.codes[0].can_read_code }}
|
|
100
100
|
</view>
|
|
101
|
-
<view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">
|
|
102
|
-
{{info.codes[0].refund_tip_text}}
|
|
103
|
-
</view>
|
|
104
101
|
<view
|
|
105
102
|
v-if="info.codes[0].code_end_time"
|
|
106
103
|
class="jfb-base-success__body-cashier-code"
|