diff --git a/common/css/page.css b/common/css/page.css
index aabdc7a0..83ced3e5 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -1115,7 +1115,7 @@ button[disabled].bg-grey {
justify-content: space-around;
}
.jc-e {
- justify-content: end;
+ justify-content: flex-end;
}
.align-c {
align-items: center;
diff --git a/common/css/plugins.css b/common/css/plugins.css
index 9ac3b906..eb92f5e2 100644
--- a/common/css/plugins.css
+++ b/common/css/plugins.css
@@ -194,7 +194,8 @@
margin-left: 10rpx;
}
.plugins-blog-grid-list .item .blog-img {
- width: 100%;
+ width: 100%;
+ height: 220rpx !important;
}
/**
diff --git a/lang/en.json b/lang/en.json
index 48d75af4..b91d8ef9 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -184,11 +184,11 @@
"plugins-coin-user": "Virtual currency",
"plugins-coin-recharge": "Recharge",
"plugins-coin-convert": "conversion",
- "plugins-coin-withdrawal": "Withdrawal",
+ "plugins-coin-cash": "Withdrawal",
"plugins-coin-detail": "detail",
"plugins-coin-transfer-accounts-detail": "Transfer details",
"plugins-coin-transaction-detail": "Transaction details",
- "plugins-coin-withdrawal-detail": "Withdrawal details",
+ "plugins-coin-cash-detail": "Withdrawal details",
"plugins-coin-convert-detail": "Conversion details",
"plugins-coin-collection": "Collection",
"plugins-coin-recharge-pay": "Recharge payment",
@@ -1246,10 +1246,10 @@
"35837l": "3. If you have not bound your email or it has expired, you can bind your email and complete the verification by receiving the email.",
"q2a553": "4. Please input the verification code correctly below. If you cannot see it clearly, you can click on the image to replace it. After completing the input, proceed to the next step.",
"lh6bjr": "5. After receiving the security verification code, please complete the verification within 10 minutes.",
- "ob4gn0": "6. After successful security verification, please complete the withdrawal application within 30 minutes.",
+ "ob4gn0": "6. After successful security verification, please complete the cash application within 30 minutes.",
"d2ng16": "Bind phone number",
"l2i4s8": "Current effective amount",
- "27b4w5": "Minimum withdrawal amount",
+ "27b4w5": "Minimum cash amount",
"2hc312": "Verification code format with 4 digits",
"5dcsbd": "Please choose the authentication method"
}
@@ -1268,13 +1268,13 @@
"1xtff6": "Name of account holder",
"445m7n": "The real name of the account holder of the receiving account",
"858o54": "Security verification has timed out. Please verify again before proceeding",
- "ke15x5": "Return to reapply for withdrawal",
+ "ke15x5": "Return to reapply for cash",
"cymbdz": "Withdrawal amount, minimum",
"27ky42": ", highest",
"u2rnlw": "The format of the payment platform is between 1 and 60 characters",
"s72t44": "The format of the receiving account should be between 1 and 60 characters",
"f4605e": "The format of the account holder's name is between 1 to 30 characters",
- "6t7x9u": "Please fill in the withdrawal amount",
+ "6t7x9u": "Please fill in the cash amount",
"vbr59h": "Please fill in the payment platform",
"0mn186": "Please fill in the receiving account number",
"c7h4mu": "Please fill in the name of the account holder",
diff --git a/lang/zh.json b/lang/zh.json
index 3f1145f2..f974555a 100644
--- a/lang/zh.json
+++ b/lang/zh.json
@@ -189,11 +189,11 @@
"plugins-coin-recharge": "充值",
"plugins-coin-recharge-pay": "充值支付",
"plugins-coin-convert": "转换",
- "plugins-coin-withdrawal": "提现",
+ "plugins-coin-cash": "提现",
"plugins-coin-detail": "明细",
"plugins-coin-transfer-list": "转账明细",
"plugins-coin-transaction-list": "交易明细",
- "plugins-coin-withdrawal-list": "提现明细",
+ "plugins-coin-cash-list": "提现明细",
"plugins-coin-convert-list": "转换明细",
"plugins-coin-recharge-list": "充值明细",
"plugins-coin-collection": "收款"
diff --git a/pages.json b/pages.json
index 8dc30d28..93fc1c26 100644
--- a/pages.json
+++ b/pages.json
@@ -1475,7 +1475,7 @@
}
},
{
- "path": "withdrawal/withdrawal",
+ "path": "cash/cash",
"style": {
// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
"navigationStyle": "custom",
@@ -1517,7 +1517,7 @@
}
},
{
- "path": "withdrawal-list/withdrawal-list",
+ "path": "cash-list/cash-list",
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b4ef8936..1730b62c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -185,7 +185,7 @@
{{$t('common.more')}}
-
+
diff --git a/pages/plugins/coin/withdrawal-list/withdrawal-list.css b/pages/plugins/coin/cash-list/cash-list.css
similarity index 92%
rename from pages/plugins/coin/withdrawal-list/withdrawal-list.css
rename to pages/plugins/coin/cash-list/cash-list.css
index 0b94792a..83130956 100644
--- a/pages/plugins/coin/withdrawal-list/withdrawal-list.css
+++ b/pages/plugins/coin/cash-list/cash-list.css
@@ -1,4 +1,4 @@
-.withdrawal .nav {
+.cash .nav {
z-index: 102;
}
diff --git a/pages/plugins/coin/withdrawal-list/withdrawal-list.vue b/pages/plugins/coin/cash-list/cash-list.vue
similarity index 88%
rename from pages/plugins/coin/withdrawal-list/withdrawal-list.vue
rename to pages/plugins/coin/cash-list/cash-list.vue
index c271737d..1086aa29 100644
--- a/pages/plugins/coin/withdrawal-list/withdrawal-list.vue
+++ b/pages/plugins/coin/cash-list/cash-list.vue
@@ -1,6 +1,6 @@
-
+
账户
@@ -17,8 +17,8 @@
-
-
+
+
{{ item.add_time }}
{{ item.status_name }}
@@ -141,7 +141,7 @@
network_list_index: null,
network_list: [],
- data: [],
+ data_list: [],
data_page_total: 0,
data_page: 1,
data_is_loading: 0,
@@ -262,52 +262,37 @@
if (this.data_page > 1) {
uni.hideLoading();
}
- console.log(res.data.data);
uni.stopPullDownRefresh();
if (res.data.code == 0) {
+ // 数据列表
var data = res.data.data;
- if (data.data_list.length > 0) {
- if (this.data_page <= 1) {
- var temp_data_list = data.data_list;
- } else {
- var temp_data_list = this.data || [];
- var temp_data = res.data.data.data;
- for (var i in temp_data) {
- temp_data_list.push(temp_data[i]);
- }
- }
- this.setData({
- data: temp_data_list,
- data_page_total: data.page_total,
- data_page: data.page + 1,
- data_list_loding_status: 3,
- data_is_loading: 0,
- });
-
- // 是否还有数据
- this.setData({
- data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
- });
+ if (this.data_page <= 1) {
+ var temp_data_list = data.data_list || [];
} else {
- if (data.page <= 1) {
- this.setData({
- data: data.data_list,
- data_page_total: data.page_total,
- data_page: data.page + 1,
- data_list_loding_status: 3,
- data_is_loading: 0,
- });
- } else {
- this.setData({
- data_list_loding_status: 0,
- data_is_loading: 0,
- });
+ var temp_data_list = this.data_list || [];
+ var temp_data = data.data_list;
+ for (var i in temp_data) {
+ temp_data_list.push(temp_data[i]);
}
}
+
+ this.setData({
+ data_list: temp_data_list,
+ data_total: data.total,
+ data_page_total: data.page_total,
+ data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+ data_page: this.data_page + 1,
+ data_is_loading: 0,
+ });
+
+ // 是否还有数据
+ this.setData({
+ data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+ });
} else {
this.setData({
- data_list_loding_status: 0,
- data_is_loading: 0,
+ data_list_loding_status: 2,
+ data_list_loding_msg: res.data.msg,
});
}
},
@@ -430,5 +415,5 @@
};
diff --git a/pages/plugins/coin/withdrawal/withdrawal.css b/pages/plugins/coin/cash/cash.css
similarity index 88%
rename from pages/plugins/coin/withdrawal/withdrawal.css
rename to pages/plugins/coin/cash/cash.css
index 902f102f..db41582d 100644
--- a/pages/plugins/coin/withdrawal/withdrawal.css
+++ b/pages/plugins/coin/cash/cash.css
@@ -1,7 +1,7 @@
/*
* 顶部
*/
-.withdrawal .title {
+.cash .title {
background: radial-gradient(60% 70% at 90% 79%, rgba(33, 125, 239, 0.85) 0%, #A6C8F3 100%);
padding-top: 130rpx;
/* #ifndef H5 */
@@ -25,7 +25,7 @@
padding: 0;
}
-.withdrawal .detail {
+.cash .detail {
--height: 64rpx;
height: var(--height);
line-height: var(--height);
@@ -35,14 +35,14 @@
margin-top: 40rpx;
}
-.withdrawal .text {
+.cash .text {
color: #EBF3FF;
}
/*
* 内容
*/
-.withdrawal .content {
+.cash .content {
margin-top: -200rpx;
border-radius: 32rpx 32rpx 0 0;
min-height: calc(100vh - 528rpx);
@@ -51,18 +51,18 @@
/* #endif */
}
-.withdrawal .content-input-bg {
+.cash .content-input-bg {
background-color: #fafafc;
}
-.withdrawal .price-item {
+.cash .price-item {
--size: -10rpx;
margin-left: var(--size);
margin-right: var(--size);
width: calc(100% - var(--size));
}
-.withdrawal .price-list {
+.cash .price-list {
background: #F5F7F9;
border: 2rpx solid #F5F7F9;
border-radius: 16rpx;
@@ -71,22 +71,22 @@
width: calc((100% / 3) - 24rpx);
}
-.withdrawal .price-img {
+.cash .price-img {
--size: 36rpx;
width: var(--size);
height: var(--size) !important;
}
-.withdrawal-btn {
+.cash-btn {
background: linear-gradient(107deg, #31B4FC 0%, #0842E2 100%);
transition: all 0.3s ease-in-out;
}
-.withdrawal-btn:active {
+.cash-btn:active {
background: linear-gradient(107deg, #168ACA 0%, #022A97 100%);
}
-.withdrawal .content-tips .item::before {
+.cash .content-tips .item::before {
content: '';
width: 12rpx;
height: 12rpx;
diff --git a/pages/plugins/coin/withdrawal/withdrawal.vue b/pages/plugins/coin/cash/cash.vue
similarity index 95%
rename from pages/plugins/coin/withdrawal/withdrawal.vue
rename to pages/plugins/coin/cash/cash.vue
index 42566cd4..ef3c1090 100644
--- a/pages/plugins/coin/withdrawal/withdrawal.vue
+++ b/pages/plugins/coin/cash/cash.vue
@@ -1,7 +1,7 @@
-
+
@@ -21,7 +21,7 @@
{{ accounts_list[accounts_list_index]['default_symbol'] }}{{ accounts_list[accounts_list_index]['default_coin'] }}
- 提现明细
+ 提现明细
@@ -30,7 +30,7 @@
提现数量
- 全部提现
+ 全部提现
@@ -44,7 +44,7 @@
提币网络
-
+
{{ network_list[network_list_index]['name'] }}
@@ -63,7 +63,7 @@
-->
-
+
@@ -219,7 +219,7 @@
},
// 充币网络切换
- withdrawal_event(e) {
+ cash_event(e) {
this.setData({
network_list_index: parseInt(e.detail.value || 0),
});
@@ -227,7 +227,7 @@
},
// 全部提现
- all_withdrawal_event(e) {
+ all_cash_event(e) {
this.setData({
coin_num: this.accounts_list[this.accounts_list_index].normal_coin || '',
});
@@ -255,7 +255,7 @@
},
// 申请提现
- apply_for_withdrawal_event() {
+ apply_for_cash_event() {
var new_data = {
accounts_id: this.accounts_list[this.accounts_list_index].id,
network_id: this.network_list[this.network_list_index].id,
@@ -284,7 +284,7 @@
if (res.data.code == 0) {
app.globalData.showToast(res.data.msg, 'success');
setTimeout(function () {
- app.globalData.url_open('/pages/plugins/coin/withdrawal-list/withdrawal-list', true);
+ app.globalData.url_open('/pages/plugins/coin/cash-list/cash-list', true);
}, 1000);
} else {
if (app.globalData.is_login_check(res.data)) {
@@ -320,5 +320,5 @@
};
diff --git a/pages/plugins/coin/convert-list/convert-list.vue b/pages/plugins/coin/convert-list/convert-list.vue
index b42cb0cd..25d14fef 100644
--- a/pages/plugins/coin/convert-list/convert-list.vue
+++ b/pages/plugins/coin/convert-list/convert-list.vue
@@ -9,8 +9,8 @@
-
-
+
+
{{ item.add_time }}
@@ -99,7 +99,7 @@
accounts_list_index: null,
accounts_list: [],
- data: [],
+ data_list: [],
data_page_total: 0,
data_page: 1,
data_is_loading: 0,
@@ -217,52 +217,37 @@
if (this.data_page > 1) {
uni.hideLoading();
}
- console.log(res.data.data);
uni.stopPullDownRefresh();
if (res.data.code == 0) {
+ // 数据列表
var data = res.data.data;
- if (data.data_list.length > 0) {
- if (this.data_page <= 1) {
- var temp_data_list = data.data_list;
- } else {
- var temp_data_list = this.data || [];
- var temp_data = res.data.data.data;
- for (var i in temp_data) {
- temp_data_list.push(temp_data[i]);
- }
- }
- this.setData({
- data: temp_data_list,
- data_page_total: data.page_total,
- data_page: data.page + 1,
- data_list_loding_status: 3,
- data_is_loading: 0,
- });
-
- // 是否还有数据
- this.setData({
- data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
- });
+ if (this.data_page <= 1) {
+ var temp_data_list = data.data_list || [];
} else {
- if (data.page <= 1) {
- this.setData({
- data: data.data_list,
- data_page_total: data.page_total,
- data_page: data.page + 1,
- data_list_loding_status: 3,
- data_is_loading: 0,
- });
- } else {
- this.setData({
- data_list_loding_status: 0,
- data_is_loading: 0,
- });
+ var temp_data_list = this.data_list || [];
+ var temp_data = data.data_list;
+ for (var i in temp_data) {
+ temp_data_list.push(temp_data[i]);
}
}
+
+ this.setData({
+ data_list: temp_data_list,
+ data_total: data.total,
+ data_page_total: data.page_total,
+ data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+ data_page: this.data_page + 1,
+ data_is_loading: 0,
+ });
+
+ // 是否还有数据
+ this.setData({
+ data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+ });
} else {
this.setData({
data_list_loding_status: 2,
- data_is_loading: 0,
+ data_list_loding_msg: res.data.msg,
});
}
},
diff --git a/pages/plugins/coin/detail/detail.vue b/pages/plugins/coin/detail/detail.vue
index 89c1d7c2..f7b72932 100644
--- a/pages/plugins/coin/detail/detail.vue
+++ b/pages/plugins/coin/detail/detail.vue
@@ -109,7 +109,7 @@
交易明细
- 提现明细
+ 提现明细
转换明细
diff --git a/pages/plugins/coin/recharge-list/recharge-list.css b/pages/plugins/coin/recharge-list/recharge-list.css
index 0e768bde..87aa7604 100644
--- a/pages/plugins/coin/recharge-list/recharge-list.css
+++ b/pages/plugins/coin/recharge-list/recharge-list.css
@@ -19,14 +19,14 @@
}
.recharge-del-btn {
- color: #0079ff;
+ color: #0079ff !important;
background-color: #fff;
border: 2rpx solid #0079ff;
}
.recharge-apy-btn {
background: linear-gradient(107deg, #31B4FC 0%, #0842E2 100%), #0079FF;
- color: #fff;
+ color: #fff !important;
}
.convert-group-row .title {
diff --git a/pages/plugins/coin/recharge-list/recharge-list.vue b/pages/plugins/coin/recharge-list/recharge-list.vue
index 0dd227ec..8cb53235 100644
--- a/pages/plugins/coin/recharge-list/recharge-list.vue
+++ b/pages/plugins/coin/recharge-list/recharge-list.vue
@@ -17,8 +17,8 @@
-
-
+
+
{{ item.status_name }}
{{ item.add_time }}
@@ -154,7 +154,7 @@
network_list_index: null,
network_list: [],
- data: [],
+ data_list: [],
data_page_total: 0,
data_page: 1,
data_is_loading: 0,
@@ -216,7 +216,6 @@
dataType: 'json',
success: (res) => {
uni.stopPullDownRefresh();
- console.log(res.data.data);
if (res.data.code == 0) {
var data = res.data.data;
this.setData({
@@ -275,48 +274,33 @@
if (this.data_page > 1) {
uni.hideLoading();
}
- console.log(res.data.data);
uni.stopPullDownRefresh();
if (res.data.code == 0) {
+ // 数据列表
var data = res.data.data;
- if (data.data_list.length > 0) {
- if (this.data_page <= 1) {
- var temp_data_list = data.data_list;
- } else {
- var temp_data_list = this.data || [];
- var temp_data = res.data.data.data;
- for (var i in temp_data) {
- temp_data_list.push(temp_data[i]);
- }
- }
- this.setData({
- data: temp_data_list,
- data_page_total: data.page_total,
- data_page: data.page + 1,
- data_list_loding_status: 3,
- data_is_loading: 0,
- });
-
- // 是否还有数据
- this.setData({
- data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
- });
+ if (this.data_page <= 1) {
+ var temp_data_list = data.data_list || [];
} else {
- if (data.page <= 1) {
- this.setData({
- data: data.data_list,
- data_page_total: data.page_total,
- data_page: data.page + 1,
- data_list_loding_status: 3,
- data_is_loading: 0,
- });
- } else {
- this.setData({
- data_list_loding_status: 0,
- data_is_loading: 0,
- });
+ var temp_data_list = this.data_list || [];
+ var temp_data = data.data_list;
+ for (var i in temp_data) {
+ temp_data_list.push(temp_data[i]);
}
}
+
+ this.setData({
+ data_list: temp_data_list,
+ data_total: data.total,
+ data_page_total: data.page_total,
+ data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+ data_page: this.data_page + 1,
+ data_is_loading: 0,
+ });
+
+ // 是否还有数据
+ this.setData({
+ data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+ });
} else {
this.setData({
data_list_loding_status: 2,
diff --git a/pages/plugins/coin/recharge-pay/recharge-pay.css b/pages/plugins/coin/recharge-pay/recharge-pay.css
index 2778e04c..e81c8400 100644
--- a/pages/plugins/coin/recharge-pay/recharge-pay.css
+++ b/pages/plugins/coin/recharge-pay/recharge-pay.css
@@ -103,10 +103,10 @@
.cancel-btn {
border: 2rpx solid #0079FF;
background-color: transparent;
- color: #0079FF;
+ color: #0079FF !important;
}
.submit-btn {
background: linear-gradient(107deg, #3AB1F3 0%, #3C6BF7 100%);
- color: #fff;
+ color: #fff !important;
}
\ No newline at end of file
diff --git a/pages/plugins/coin/recharge/recharge.css b/pages/plugins/coin/recharge/recharge.css
index eaf50eab..e978c190 100644
--- a/pages/plugins/coin/recharge/recharge.css
+++ b/pages/plugins/coin/recharge/recharge.css
@@ -29,7 +29,7 @@
background-color: #fff;
border-radius: 40rpx;
text-align: center;
- padding: 30rpx 38rpx;
+ padding: 20rpx;
}
.recharge-qrcode .img {
diff --git a/pages/plugins/coin/recharge/recharge.vue b/pages/plugins/coin/recharge/recharge.vue
index 17b9fe89..88f8bee9 100644
--- a/pages/plugins/coin/recharge/recharge.vue
+++ b/pages/plugins/coin/recharge/recharge.vue
@@ -18,7 +18,7 @@
-
+
@@ -292,6 +292,11 @@
text_copy_event(e) {
app.globalData.text_copy_event(e);
},
+
+ // 二维码预览
+ recharge_qrcode_event(e) {
+ app.globalData.image_show_event(e);
+ }
},
};
diff --git a/pages/plugins/coin/transaction-list/transaction-list.vue b/pages/plugins/coin/transaction-list/transaction-list.vue
index e9f774a6..314689e2 100644
--- a/pages/plugins/coin/transaction-list/transaction-list.vue
+++ b/pages/plugins/coin/transaction-list/transaction-list.vue
@@ -21,8 +21,8 @@
-
-
+
+
{{ item.business_type_name }}
{{ item.add_time }}
@@ -181,7 +181,7 @@
coin_type_list_index: null,
coin_type_list: [],
- data: [],
+ data_list: [],
data_page_total: 0,
data_page: 1,
data_is_loading: 0,
@@ -304,48 +304,33 @@
if (this.data_page > 1) {
uni.hideLoading();
}
- console.log(res.data.data);
uni.stopPullDownRefresh();
if (res.data.code == 0) {
+ // 数据列表
var data = res.data.data;
- if (data.data_list.length > 0) {
- if (this.data_page <= 1) {
- var temp_data_list = data.data_list;
- } else {
- var temp_data_list = this.data || [];
- var temp_data = res.data.data.data;
- for (var i in temp_data) {
- temp_data_list.push(temp_data[i]);
- }
- }
- this.setData({
- data: temp_data_list,
- data_page_total: data.page_total,
- data_page: data.page + 1,
- data_list_loding_status: 3,
- data_is_loading: 0,
- });
-
- // 是否还有数据
- this.setData({
- data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
- });
+ if (this.data_page <= 1) {
+ var temp_data_list = data.data_list || [];
} else {
- if (data.page <= 1) {
- this.setData({
- data: data.data_list,
- data_page_total: data.page_total,
- data_page: data.page + 1,
- data_list_loding_status: 3,
- data_is_loading: 0,
- });
- } else {
- this.setData({
- data_list_loding_status: 0,
- data_is_loading: 0,
- });
+ var temp_data_list = this.data_list || [];
+ var temp_data = data.data_list;
+ for (var i in temp_data) {
+ temp_data_list.push(temp_data[i]);
}
}
+
+ this.setData({
+ data_list: temp_data_list,
+ data_total: data.total,
+ data_page_total: data.page_total,
+ data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+ data_page: this.data_page + 1,
+ data_is_loading: 0,
+ });
+
+ // 是否还有数据
+ this.setData({
+ data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+ });
} else {
this.setData({
data_list_loding_status: 2,
diff --git a/pages/plugins/coin/transfer-list/transfer-list.vue b/pages/plugins/coin/transfer-list/transfer-list.vue
index 0611992a..d24bf7ec 100644
--- a/pages/plugins/coin/transfer-list/transfer-list.vue
+++ b/pages/plugins/coin/transfer-list/transfer-list.vue
@@ -9,8 +9,8 @@
-
-
+
+
转账时间
{{ item.add_time }}
@@ -89,7 +89,7 @@
accounts_list_index: null,
accounts_list: [],
- data: [],
+ data_list: [],
data_page_total: 0,
data_page: 1,
data_is_loading: 0,
@@ -206,41 +206,36 @@
}
uni.stopPullDownRefresh();
if (res.data.code == 0) {
+ // 数据列表
var data = res.data.data;
- if (data.data_list.length > 0) {
- if (this.data_page <= 1) {
- var temp_data_list = data.data_list;
- } else {
- var temp_data_list = this.data || [];
- var temp_data = res.data.data.data;
- for (var i in temp_data) {
- temp_data_list.push(temp_data[i]);
- }
- }
- this.setData({
- data: temp_data_list,
- data_page_total: data.page_total,
- data_page: data.page + 1,
- data_list_loding_status: 3,
- data_is_loading: 0,
- });
-
- // 是否还有数据
- this.setData({
- data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
- });
+ if (this.data_page <= 1) {
+ var temp_data_list = data.data_list || [];
} else {
- this.setData({
- data_list_loding_status: 0,
- data_is_loading: 0,
- });
+ var temp_data_list = this.data_list || [];
+ var temp_data = data.data_list;
+ for (var i in temp_data) {
+ temp_data_list.push(temp_data[i]);
+ }
}
+
+ this.setData({
+ data_list: temp_data_list,
+ data_total: data.total,
+ data_page_total: data.page_total,
+ data_list_loding_status: temp_data_list.length > 0 ? 3 : 0,
+ data_page: this.data_page + 1,
+ data_is_loading: 0,
+ });
+
+ // 是否还有数据
+ this.setData({
+ data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
+ });
} else {
this.setData({
data_list_loding_status: 2,
- data_is_loading: 0,
+ data_list_loding_msg: res.data.msg,
});
- app.globalData.showToast(res.data.msg);
}
},
fail: () => {
diff --git a/pages/plugins/coin/user/user.vue b/pages/plugins/coin/user/user.vue
index e753df47..1e69131f 100644
--- a/pages/plugins/coin/user/user.vue
+++ b/pages/plugins/coin/user/user.vue
@@ -26,9 +26,9 @@
转换
-
+
-
+
提现
@@ -79,7 +79,7 @@
交易明细
- 提现明细
+ 提现明细
转换明细
diff --git a/pages/plugins/invoice/invoice/invoice.vue b/pages/plugins/invoice/invoice/invoice.vue
index 8ce00010..f7849924 100644
--- a/pages/plugins/invoice/invoice/invoice.vue
+++ b/pages/plugins/invoice/invoice/invoice.vue
@@ -253,7 +253,6 @@
} else {
this.setData({
data_list_loding_status: 0,
- data_list: [],
data_bottom_line_status: false,
data_is_loading: 0,
});
diff --git a/pages/plugins/invoice/order/order.vue b/pages/plugins/invoice/order/order.vue
index 190b9d1a..27487f5e 100644
--- a/pages/plugins/invoice/order/order.vue
+++ b/pages/plugins/invoice/order/order.vue
@@ -188,7 +188,6 @@
} else {
this.setData({
data_list_loding_status: 0,
- data_list: [],
data_bottom_line_status: false,
data_is_loading: 0,
});
diff --git a/static/icon/iconfont.css b/static/icon/iconfont.css
index be4ec22c..d6973d95 100644
--- a/static/icon/iconfont.css
+++ b/static/icon/iconfont.css
@@ -34,7 +34,7 @@
content: "\e71d";
}
-.icon-withdrawal:before {
+.icon-cash:before {
content: "\e717";
}
diff --git a/static/icon/iconfont.ttf b/static/icon/iconfont.ttf
index dbc23916..ad44848f 100644
Binary files a/static/icon/iconfont.ttf and b/static/icon/iconfont.ttf differ