jufubao-base 1.0.78 → 1.0.80
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/JfbBaseAfterOrderList/JfbBaseAfterOrderList.vue +101 -44
- package/src/components/JfbBaseCard/JfbBaseCard.vue +75 -65
- package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue +93 -43
- package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue +161 -92
- package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue +101 -45
- package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue +24 -14
- package/src/components/JfbBaseEntry/JfbBaseEntry.vue +19 -1
- package/src/components/JfbBaseLogin/JfbBaseLogin.vue +43 -1
- package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue +176 -107
- package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue +95 -30
- package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue +2 -2
|
@@ -14,7 +14,17 @@
|
|
|
14
14
|
</view>
|
|
15
15
|
<!-- #endif -->
|
|
16
16
|
<view class="jfb-base-entry__body" :style="bodyStyle">
|
|
17
|
-
<view class="entry_list" :style="entryStyle">
|
|
17
|
+
<view v-if="loadingList" class="entry_list skeleton-wrap" :style="entryStyle">
|
|
18
|
+
<view v-for="i in 5" :key="i"
|
|
19
|
+
:class="'row_num_'+rowNum"
|
|
20
|
+
class="entry_item"
|
|
21
|
+
>
|
|
22
|
+
<image v-if="rowNum == 1" style="height: 260rpx;"/>
|
|
23
|
+
<image v-if="rowNum == 2" style="height: 200rpx;"/>
|
|
24
|
+
<image v-if="rowNum == 3" style="height: 150rpx;"/>
|
|
25
|
+
</view>
|
|
26
|
+
</view>
|
|
27
|
+
<view v-else class="entry_list" :style="entryStyle">
|
|
18
28
|
<view v-for="(item,i) in entryList" :key="i"
|
|
19
29
|
class="entry_item"
|
|
20
30
|
:class="'row_num_'+rowNum"
|
|
@@ -52,6 +62,7 @@
|
|
|
52
62
|
bgcolor: "",
|
|
53
63
|
rowNum: 1,
|
|
54
64
|
paddingInput: 20,
|
|
65
|
+
loadingList: true,
|
|
55
66
|
}
|
|
56
67
|
},
|
|
57
68
|
computed: {
|
|
@@ -96,6 +107,7 @@
|
|
|
96
107
|
vm: this,
|
|
97
108
|
data: {}
|
|
98
109
|
}).then(res => {
|
|
110
|
+
this.loadingList = false;
|
|
99
111
|
this.$xdHideLoading();
|
|
100
112
|
this.entryList = res.list.map(item => {
|
|
101
113
|
const {dir, path, host} = item['redirect_data'];
|
|
@@ -160,9 +172,15 @@
|
|
|
160
172
|
&__body{
|
|
161
173
|
.entry_list{
|
|
162
174
|
display: grid;
|
|
175
|
+
&.skeleton-wrap{
|
|
176
|
+
.entry_item{
|
|
177
|
+
.skeleton-item(100%, auto);
|
|
178
|
+
}
|
|
179
|
+
}
|
|
163
180
|
.entry_item{
|
|
164
181
|
width: 100%;
|
|
165
182
|
box-sizing: border-box;
|
|
183
|
+
|
|
166
184
|
image{
|
|
167
185
|
width: 100%;
|
|
168
186
|
display: block;
|
|
@@ -758,7 +758,7 @@ export default {
|
|
|
758
758
|
margin-left: unit(20,rpx) !important;
|
|
759
759
|
}
|
|
760
760
|
}
|
|
761
|
-
|
|
761
|
+
|
|
762
762
|
.form-group {
|
|
763
763
|
padding: 40rpx 70rpx;
|
|
764
764
|
}
|
|
@@ -908,4 +908,46 @@ export default {
|
|
|
908
908
|
.login-pub {
|
|
909
909
|
margin-top: unit(40, rpx);
|
|
910
910
|
}
|
|
911
|
+
|
|
912
|
+
.bottom_btn {
|
|
913
|
+
position: fixed;
|
|
914
|
+
width: 100%;
|
|
915
|
+
display:flex;
|
|
916
|
+
justify-content: center;
|
|
917
|
+
align-items: center;
|
|
918
|
+
height: unit(100, rpx);
|
|
919
|
+
background: #ffffff;
|
|
920
|
+
|
|
921
|
+
& > view {
|
|
922
|
+
height: unit(44, rpx);
|
|
923
|
+
line-height: unit(44, rpx);
|
|
924
|
+
width: unit(150, rpx);
|
|
925
|
+
text-align: center;
|
|
926
|
+
cursor: pointer;
|
|
927
|
+
font-size: unit(24, rpx);
|
|
928
|
+
border-radius: unit(12, rpx);
|
|
929
|
+
}
|
|
930
|
+
}
|
|
931
|
+
|
|
932
|
+
.preview-login {
|
|
933
|
+
padding: unit(40, rpx) 0;
|
|
934
|
+
|
|
935
|
+
&-input {
|
|
936
|
+
height: unit(70, rpx);
|
|
937
|
+
border-radius: unit(12, rpx);
|
|
938
|
+
padding: 0 unit(20, rpx);
|
|
939
|
+
text-align: left;
|
|
940
|
+
border: 1px solid #eee;
|
|
941
|
+
background: #F7F7F7;
|
|
942
|
+
color: #666;
|
|
943
|
+
transition: box-shadow 0.5s;
|
|
944
|
+
box-shadow: 0 0 0 rgba(0,0,0,0);
|
|
945
|
+
|
|
946
|
+
&:hover {
|
|
947
|
+
box-shadow: 0 0 unit(10, rpx) rgba(0,0,0,.1);
|
|
948
|
+
}
|
|
949
|
+
}
|
|
950
|
+
}
|
|
951
|
+
|
|
952
|
+
|
|
911
953
|
</style>
|
|
@@ -29,130 +29,161 @@
|
|
|
29
29
|
></xd-tab>
|
|
30
30
|
</view>
|
|
31
31
|
<view style="height: 100rpx;"></view>
|
|
32
|
-
<view
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
:style="{ padding: outMargin }"
|
|
36
|
-
>
|
|
37
|
-
<view
|
|
38
|
-
@click="handleToLink(detailPath, item)"
|
|
39
|
-
class="jfb-base-order-list__body-order-item"
|
|
40
|
-
v-for="item in orderList"
|
|
41
|
-
:key="item.main_order_id"
|
|
42
|
-
:style="{
|
|
43
|
-
background: backgroundColor,
|
|
44
|
-
border: borderBox,
|
|
45
|
-
borderRadius: radius + 'rpx',
|
|
46
|
-
boxShadow: shadowBox,
|
|
47
|
-
marginBottom: padding + 'rpx',
|
|
48
|
-
}"
|
|
32
|
+
<view v-if="loadingList" class="jfb-base-order-list__body-order skeleton-wrap">
|
|
33
|
+
<view class="jfb-base-order-list__body-order-item"
|
|
34
|
+
v-for="i in 5" :key="i"
|
|
49
35
|
>
|
|
50
|
-
<view class="jfb-base-order-list__body-order-item-biz">
|
|
51
|
-
<xd-font-icon
|
|
52
|
-
v-if="item.biz_code_icon"
|
|
53
|
-
:icon="item.biz_code_icon"
|
|
54
|
-
:size="item['biz_code_icon_size']"
|
|
55
|
-
></xd-font-icon>
|
|
56
|
-
<view :class="{ marginLeft: item.biz_code_icon }">{{
|
|
57
|
-
item.biz_code_name
|
|
58
|
-
}}</view>
|
|
59
|
-
</view>
|
|
36
|
+
<view class="jfb-base-order-list__body-order-item-biz"><view></view></view>
|
|
60
37
|
<view class="jfb-base-order-list__body-order-item-title">
|
|
61
|
-
<view
|
|
62
|
-
<view
|
|
63
|
-
:style="{color:item.status.status_type !== 'error' ? mainColor : '#999999',}"
|
|
64
|
-
>{{ item.status.status_name }}</view>
|
|
38
|
+
<view></view>
|
|
39
|
+
<view></view>
|
|
65
40
|
</view>
|
|
66
41
|
<view class="order-list">
|
|
67
42
|
<view
|
|
68
|
-
class="jfb-base-order-list__body-order-item-content"
|
|
69
|
-
|
|
70
|
-
:key="Sitem.product_id + Sindex"
|
|
71
|
-
v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']">
|
|
72
|
-
<image
|
|
73
|
-
:src="Sitem.product_thumb"
|
|
74
|
-
style="background: #ffffff"
|
|
75
|
-
mode="aspectFit"
|
|
76
|
-
></image>
|
|
43
|
+
class="jfb-base-order-list__body-order-item-content">
|
|
44
|
+
<image></image>
|
|
77
45
|
<view class="jfb-base-order-list__body-order-item-content-info">
|
|
78
|
-
<view
|
|
79
|
-
|
|
80
|
-
>
|
|
81
|
-
|
|
82
|
-
<view
|
|
83
|
-
v-if="Sitem.product_sku_name"
|
|
84
|
-
class="jfb-base-order-list__body-order-item-content-info-skuname"
|
|
85
|
-
>规格:{{ Sitem.product_sku_name }}</view
|
|
86
|
-
>
|
|
87
|
-
<view
|
|
88
|
-
class="jfb-base-order-list__body-order-item-content-info-price"
|
|
89
|
-
>
|
|
90
|
-
<view :style="{ fontSize: '32rpx', color: mainColor }">
|
|
91
|
-
<xd-unit
|
|
92
|
-
:isOld="false"
|
|
93
|
-
:price="Sitem.sale_price"
|
|
94
|
-
:color="mainColor"
|
|
95
|
-
:fontSize="32"
|
|
96
|
-
v-if="item.biz_code !== 'gift'"
|
|
97
|
-
></xd-unit>
|
|
98
|
-
</view>
|
|
99
|
-
<view class="info-price">
|
|
100
|
-
<text>X</text>
|
|
101
|
-
<text>{{ Sitem.product_num }}</text>
|
|
102
|
-
</view>
|
|
46
|
+
<view class="jfb-base-order-list__body-order-item-content-info-name"></view>
|
|
47
|
+
<view class="jfb-base-order-list__body-order-item-content-info-price">
|
|
48
|
+
<view></view>
|
|
49
|
+
<view class="info-price"></view>
|
|
103
50
|
</view>
|
|
104
51
|
</view>
|
|
105
52
|
</view>
|
|
106
|
-
<view
|
|
107
|
-
class="order-list-icon"
|
|
108
|
-
:style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
|
|
109
|
-
v-if="item.products.length > showLen"
|
|
110
|
-
@click.stop="item['isOpen'] = !item['isOpen']"
|
|
111
|
-
>
|
|
112
|
-
<view :style="{ background: backgroundColor }">
|
|
113
|
-
<xd-font-icon
|
|
114
|
-
color="#666"
|
|
115
|
-
:icon="item['isOpen'] ? 'iconshang_up' : 'iconxia_down'"
|
|
116
|
-
size="24"
|
|
117
|
-
></xd-font-icon>
|
|
118
|
-
</view>
|
|
119
|
-
</view>
|
|
120
53
|
</view>
|
|
121
54
|
<view class="jfb-base-order-list__body-order-item-bottom">
|
|
122
|
-
<view
|
|
123
|
-
<view
|
|
124
|
-
<text>合计:</text>
|
|
125
|
-
<xd-unit
|
|
126
|
-
:isOld="false"
|
|
127
|
-
:price="item.total_amount"
|
|
128
|
-
:color="mainColor"
|
|
129
|
-
:fontSize="28"
|
|
130
|
-
></xd-unit>
|
|
131
|
-
</view>
|
|
55
|
+
<view></view>
|
|
56
|
+
<view></view>
|
|
132
57
|
</view>
|
|
58
|
+
</view>
|
|
59
|
+
</view>
|
|
60
|
+
<template v-else>
|
|
61
|
+
<view
|
|
62
|
+
v-if="orderList && orderList.length > 0"
|
|
63
|
+
class="jfb-base-order-list__body-order"
|
|
64
|
+
:style="{ padding: outMargin }"
|
|
65
|
+
>
|
|
133
66
|
<view
|
|
134
|
-
|
|
135
|
-
|
|
67
|
+
@click="handleToLink(detailPath, item)"
|
|
68
|
+
class="jfb-base-order-list__body-order-item"
|
|
69
|
+
v-for="item in orderList"
|
|
70
|
+
:key="item.main_order_id"
|
|
71
|
+
:style="{
|
|
72
|
+
background: backgroundColor,
|
|
73
|
+
border: borderBox,
|
|
74
|
+
borderRadius: radius + 'rpx',
|
|
75
|
+
boxShadow: shadowBox,
|
|
76
|
+
marginBottom: padding + 'rpx',
|
|
77
|
+
}"
|
|
136
78
|
>
|
|
137
|
-
<view
|
|
138
|
-
<xd-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
79
|
+
<view class="jfb-base-order-list__body-order-item-biz">
|
|
80
|
+
<xd-font-icon
|
|
81
|
+
v-if="item.biz_code_icon"
|
|
82
|
+
:icon="item.biz_code_icon"
|
|
83
|
+
:size="item['biz_code_icon_size']"
|
|
84
|
+
></xd-font-icon>
|
|
85
|
+
<view :class="{ marginLeft: item.biz_code_icon }">{{
|
|
86
|
+
item.biz_code_name
|
|
87
|
+
}}</view>
|
|
88
|
+
</view>
|
|
89
|
+
<view class="jfb-base-order-list__body-order-item-title">
|
|
90
|
+
<view>订单编号:{{ item.main_order_id }}</view>
|
|
91
|
+
<view
|
|
92
|
+
:style="{color:item.status.status_type !== 'error' ? mainColor : '#999999',}"
|
|
93
|
+
>{{ item.status.status_name }}</view>
|
|
94
|
+
</view>
|
|
95
|
+
<view class="order-list">
|
|
96
|
+
<view
|
|
97
|
+
class="jfb-base-order-list__body-order-item-content"
|
|
98
|
+
v-for="(Sitem, Sindex) in item.products"
|
|
99
|
+
:key="Sitem.product_id + Sindex"
|
|
100
|
+
v-if="(item['isOpen'] === false && Sindex < showLen) || item['isOpen']">
|
|
101
|
+
<image
|
|
102
|
+
:src="Sitem.product_thumb"
|
|
103
|
+
style="background: #ffffff"
|
|
104
|
+
mode="aspectFit"
|
|
105
|
+
></image>
|
|
106
|
+
<view class="jfb-base-order-list__body-order-item-content-info">
|
|
107
|
+
<view
|
|
108
|
+
class="jfb-base-order-list__body-order-item-content-info-name"
|
|
109
|
+
>{{ Sitem.product_name }}</view
|
|
110
|
+
>
|
|
111
|
+
<view
|
|
112
|
+
v-if="Sitem.product_sku_name"
|
|
113
|
+
class="jfb-base-order-list__body-order-item-content-info-skuname"
|
|
114
|
+
>规格:{{ Sitem.product_sku_name }}</view
|
|
115
|
+
>
|
|
116
|
+
<view
|
|
117
|
+
class="jfb-base-order-list__body-order-item-content-info-price"
|
|
118
|
+
>
|
|
119
|
+
<view :style="{ fontSize: '32rpx', color: mainColor }">
|
|
120
|
+
<xd-unit
|
|
121
|
+
:isOld="false"
|
|
122
|
+
:price="Sitem.sale_price"
|
|
123
|
+
:color="mainColor"
|
|
124
|
+
:fontSize="32"
|
|
125
|
+
v-if="item.biz_code !== 'gift'"
|
|
126
|
+
></xd-unit>
|
|
127
|
+
</view>
|
|
128
|
+
<view class="info-price">
|
|
129
|
+
<text>X</text>
|
|
130
|
+
<text>{{ Sitem.product_num }}</text>
|
|
131
|
+
</view>
|
|
132
|
+
</view>
|
|
133
|
+
</view>
|
|
134
|
+
</view>
|
|
135
|
+
<view
|
|
136
|
+
class="order-list-icon"
|
|
137
|
+
:style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
|
|
138
|
+
v-if="item.products.length > showLen"
|
|
139
|
+
@click.stop="item['isOpen'] = !item['isOpen']"
|
|
140
|
+
>
|
|
141
|
+
<view :style="{ background: backgroundColor }">
|
|
142
|
+
<xd-font-icon
|
|
143
|
+
color="#666"
|
|
144
|
+
:icon="item['isOpen'] ? 'iconshang_up' : 'iconxia_down'"
|
|
145
|
+
size="24"
|
|
146
|
+
></xd-font-icon>
|
|
147
|
+
</view>
|
|
148
|
+
</view>
|
|
149
|
+
</view>
|
|
150
|
+
<view class="jfb-base-order-list__body-order-item-bottom">
|
|
151
|
+
<view>下单时间:{{ item.created_time_text }}</view>
|
|
152
|
+
<view v-if="item.biz_code !== 'gift'">
|
|
153
|
+
<text>合计:</text>
|
|
154
|
+
<xd-unit
|
|
155
|
+
:isOld="false"
|
|
156
|
+
:price="item.total_amount"
|
|
157
|
+
:color="mainColor"
|
|
158
|
+
:fontSize="28"
|
|
159
|
+
></xd-unit>
|
|
160
|
+
</view>
|
|
161
|
+
</view>
|
|
162
|
+
<view
|
|
163
|
+
class="jfb-base-order-list__body-order-item-pay"
|
|
164
|
+
v-if="item.buttons.length"
|
|
165
|
+
>
|
|
166
|
+
<view v-for="(btn,index) in item.buttons" :key="btn.action+index">
|
|
167
|
+
<xd-button
|
|
168
|
+
:type="getBtnType(btn.action)"
|
|
169
|
+
size="mini"
|
|
170
|
+
@click="handleBtnEvent(btn.action, item)"
|
|
171
|
+
>{{ btn.text }}
|
|
172
|
+
</xd-button>
|
|
173
|
+
</view>
|
|
144
174
|
</view>
|
|
145
175
|
</view>
|
|
146
176
|
</view>
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
icon
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
</
|
|
177
|
+
<view v-else class="jfb-base-order-list__body-no">
|
|
178
|
+
<xd-font-icon
|
|
179
|
+
size="120"
|
|
180
|
+
color="#ccc"
|
|
181
|
+
icon="iconzanwudingdan"
|
|
182
|
+
></xd-font-icon>
|
|
183
|
+
<view>暂无订单</view>
|
|
184
|
+
</view>
|
|
185
|
+
</template>
|
|
186
|
+
|
|
156
187
|
</view>
|
|
157
188
|
</view>
|
|
158
189
|
</template>
|
|
@@ -192,6 +223,7 @@ export default {
|
|
|
192
223
|
payPath: "",
|
|
193
224
|
status: null, //全部、已完成、已取消
|
|
194
225
|
initStatus: false,
|
|
226
|
+
loadingList: false,
|
|
195
227
|
|
|
196
228
|
//基础
|
|
197
229
|
radius: 0,
|
|
@@ -390,6 +422,7 @@ export default {
|
|
|
390
422
|
this.$xdShowLoading({});
|
|
391
423
|
let tab = "all";
|
|
392
424
|
if (status) tab = this.tabList[this.tabIndex].status;
|
|
425
|
+
this.loadingList = true;
|
|
393
426
|
jfbRootExec("getBaseOrderList", {
|
|
394
427
|
vm: this,
|
|
395
428
|
data: {
|
|
@@ -399,6 +432,7 @@ export default {
|
|
|
399
432
|
},
|
|
400
433
|
})
|
|
401
434
|
.then((res) => {
|
|
435
|
+
this.loadingList = false;
|
|
402
436
|
this.$xdHideLoading();
|
|
403
437
|
console.log(res.list, "list");
|
|
404
438
|
let list = res.list.map((item) => {
|
|
@@ -507,6 +541,12 @@ export default {
|
|
|
507
541
|
}
|
|
508
542
|
&-order {
|
|
509
543
|
&-item {
|
|
544
|
+
.skeleton-wrap & {
|
|
545
|
+
background-color: #FFFFFF;
|
|
546
|
+
border: 1px solid #EEEEEE;
|
|
547
|
+
border-radius: 10rpx;
|
|
548
|
+
margin: 20rpx;
|
|
549
|
+
}
|
|
510
550
|
&-biz {
|
|
511
551
|
color: #333333;
|
|
512
552
|
font-size: unit(28, rpx);
|
|
@@ -515,6 +555,12 @@ export default {
|
|
|
515
555
|
border-bottom: unit(2, rpx) solid #eee;
|
|
516
556
|
display: flex;
|
|
517
557
|
align-items: center;
|
|
558
|
+
|
|
559
|
+
& > view{
|
|
560
|
+
.skeleton-wrap &{
|
|
561
|
+
.skeleton-item(100rpx, 28rpx);
|
|
562
|
+
}
|
|
563
|
+
}
|
|
518
564
|
}
|
|
519
565
|
|
|
520
566
|
&-title {
|
|
@@ -528,9 +574,15 @@ export default {
|
|
|
528
574
|
|
|
529
575
|
& > view:first-child {
|
|
530
576
|
color: #333;
|
|
577
|
+
.skeleton-wrap &{
|
|
578
|
+
.skeleton-item(300rpx, 28rpx);
|
|
579
|
+
}
|
|
531
580
|
}
|
|
532
581
|
|
|
533
582
|
& > view:nth-child(2) {
|
|
583
|
+
.skeleton-wrap &{
|
|
584
|
+
.skeleton-item(100rpx, 28rpx);
|
|
585
|
+
}
|
|
534
586
|
}
|
|
535
587
|
}
|
|
536
588
|
|
|
@@ -545,6 +597,9 @@ export default {
|
|
|
545
597
|
height: unit(160, rpx);
|
|
546
598
|
border-radius: unit(8, rpx);
|
|
547
599
|
flex-shrink: 0;
|
|
600
|
+
.skeleton-wrap &{
|
|
601
|
+
.skeleton-item(160rpx, 160rpx);
|
|
602
|
+
}
|
|
548
603
|
}
|
|
549
604
|
|
|
550
605
|
&-info {
|
|
@@ -560,6 +615,10 @@ export default {
|
|
|
560
615
|
font-weight: 500;
|
|
561
616
|
.uni-max-cut(1, 64);
|
|
562
617
|
line-height: unit(64, rpx);
|
|
618
|
+
|
|
619
|
+
.skeleton-wrap &{
|
|
620
|
+
.skeleton-item(160rpx, 48rpx);
|
|
621
|
+
}
|
|
563
622
|
}
|
|
564
623
|
|
|
565
624
|
&-skuname {
|
|
@@ -584,6 +643,10 @@ export default {
|
|
|
584
643
|
display: flex;
|
|
585
644
|
justify-content: space-between;
|
|
586
645
|
align-items: center;
|
|
646
|
+
.skeleton-wrap &{
|
|
647
|
+
.skeleton-item(100%, 32rpx);
|
|
648
|
+
margin-top: 20rpx;
|
|
649
|
+
}
|
|
587
650
|
}
|
|
588
651
|
}
|
|
589
652
|
}
|
|
@@ -599,6 +662,9 @@ export default {
|
|
|
599
662
|
|
|
600
663
|
& > view:first-child {
|
|
601
664
|
color: #999;
|
|
665
|
+
.skeleton-wrap &{
|
|
666
|
+
.skeleton-item(300rpx, 28rpx);
|
|
667
|
+
}
|
|
602
668
|
}
|
|
603
669
|
|
|
604
670
|
& > view:nth-child(2) {
|
|
@@ -607,6 +673,9 @@ export default {
|
|
|
607
673
|
& > view {
|
|
608
674
|
margin-left: unit(10, rpx);
|
|
609
675
|
}
|
|
676
|
+
.skeleton-wrap &{
|
|
677
|
+
.skeleton-item(300rpx, 28rpx);
|
|
678
|
+
}
|
|
610
679
|
}
|
|
611
680
|
}
|
|
612
681
|
|
|
@@ -16,12 +16,8 @@
|
|
|
16
16
|
</view>
|
|
17
17
|
<!-- #endif -->
|
|
18
18
|
<view class="jfb-base-recharge-order__body">
|
|
19
|
-
<view v-if="
|
|
20
|
-
<view
|
|
21
|
-
v-for="(item, index) in orderList"
|
|
22
|
-
:key="index"
|
|
23
|
-
class="jfb-base-recharge-order__body-order"
|
|
24
|
-
@click="handleToDetail(item)"
|
|
19
|
+
<view v-if="loadingList" :style="{ padding: outMargin }" class="skeleton-wrap">
|
|
20
|
+
<view v-for="i in 3" :key="i" class="jfb-base-recharge-order__body-order"
|
|
25
21
|
:style="{
|
|
26
22
|
background: backgroundColor,
|
|
27
23
|
border: borderBox,
|
|
@@ -31,40 +27,72 @@
|
|
|
31
27
|
}"
|
|
32
28
|
>
|
|
33
29
|
<view class="jfb-base-recharge-order__body-order-header">
|
|
34
|
-
|
|
30
|
+
<view></view>
|
|
35
31
|
</view>
|
|
36
32
|
<view class="jfb-base-recharge-order__body-order-middle">
|
|
37
|
-
<view
|
|
38
|
-
|
|
39
|
-
{{ item.order_id }}
|
|
40
|
-
</view>
|
|
41
|
-
<view :style="{ color: item.textColor }">
|
|
42
|
-
{{ item.pay_status_name }}
|
|
43
|
-
</view>
|
|
33
|
+
<view></view>
|
|
34
|
+
<view></view>
|
|
44
35
|
</view>
|
|
45
36
|
<view class="jfb-base-recharge-order__body-order-bottom">
|
|
46
|
-
<view
|
|
37
|
+
<view></view>
|
|
47
38
|
</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 }">
|
|
48
46
|
<view
|
|
49
|
-
|
|
47
|
+
v-for="(item, index) in orderList"
|
|
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
|
+
}"
|
|
50
58
|
>
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
<
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
<view class="jfb-base-recharge-order__body-order-header">
|
|
60
|
+
充值订单
|
|
61
|
+
</view>
|
|
62
|
+
<view class="jfb-base-recharge-order__body-order-middle">
|
|
63
|
+
<view
|
|
64
|
+
>订单编号:
|
|
65
|
+
{{ item.order_id }}
|
|
66
|
+
</view>
|
|
67
|
+
<view :style="{ color: item.textColor }">
|
|
68
|
+
{{ item.pay_status_name }}
|
|
69
|
+
</view>
|
|
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"
|
|
62
76
|
>
|
|
63
|
-
|
|
64
|
-
|
|
77
|
+
<view style="display: flex; align-items: center;font-size: 24rpx;"
|
|
78
|
+
>合计:<xd-unit :fontSize="24" iconSize="0.24" :price="item.total_amount"></xd-unit
|
|
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>
|
|
65
92
|
</view>
|
|
66
93
|
</view>
|
|
67
|
-
</
|
|
94
|
+
</template>
|
|
95
|
+
|
|
68
96
|
</view>
|
|
69
97
|
</view>
|
|
70
98
|
</template>
|
|
@@ -95,6 +123,7 @@ export default {
|
|
|
95
123
|
orderList: [],
|
|
96
124
|
detailPath: "",
|
|
97
125
|
payPath: "",
|
|
126
|
+
loadingList: false,
|
|
98
127
|
|
|
99
128
|
//基础
|
|
100
129
|
radius: 0,
|
|
@@ -211,6 +240,7 @@ export default {
|
|
|
211
240
|
}).value;
|
|
212
241
|
},
|
|
213
242
|
getList() {
|
|
243
|
+
this.loadingList = true;
|
|
214
244
|
jfbRootExec("getRechargeOrderList", {
|
|
215
245
|
vm: this,
|
|
216
246
|
data: {
|
|
@@ -219,6 +249,7 @@ export default {
|
|
|
219
249
|
},
|
|
220
250
|
})
|
|
221
251
|
.then((res) => {
|
|
252
|
+
this.loadingList = false;
|
|
222
253
|
this.orderList = res.list.map((item) => {
|
|
223
254
|
item.total_amount = item.total_amount / 100;
|
|
224
255
|
item["created_time"] = this.$xdUniHelper.getDate(
|
|
@@ -280,11 +311,45 @@ export default {
|
|
|
280
311
|
color: #333;
|
|
281
312
|
border-bottom: unit(2, rpx) solid #f2f2f2;
|
|
282
313
|
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
|
+
}
|
|
283
333
|
}
|
|
284
334
|
|
|
285
335
|
&-bottom {
|
|
286
336
|
border-bottom: unit(2, rpx) solid #f2f2f2;
|
|
287
337
|
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
|
+
}
|
|
288
353
|
}
|
|
289
354
|
|
|
290
355
|
&-middle,
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
</view>
|
|
50
50
|
</view>
|
|
51
51
|
</view>
|
|
52
|
-
|
|
52
|
+
|
|
53
53
|
<view @click="handleLogout()" v-if="logined" class="logout">
|
|
54
54
|
<view v-if="textType ==='N'">[退出登录]</view>
|
|
55
55
|
</view>
|
|
@@ -217,7 +217,7 @@
|
|
|
217
217
|
this.address_url = getContainerPropsValue(container, 'content.address_url', {value: ''});
|
|
218
218
|
this.color = getContainerPropsValue(container, 'content.textColor', '#333');
|
|
219
219
|
this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', 'rgba(0,0,0,0)');
|
|
220
|
-
this.textType =
|
|
220
|
+
this.textType = getContainerPropsValue(container, 'content.text_type', 'N');
|
|
221
221
|
|
|
222
222
|
this.is_shadow = getContainerPropsValue(container, 'content.is_shadow', 'N');
|
|
223
223
|
this.is_shadow_bg = getContainerPropsValue(container, 'content.is_shadow_bg', '#fff');
|