From c5bacccad77dea48b157dad30fea9516029fe556 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Fri, 29 Mar 2024 11:42:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=99=9A=E6=8B=9F=E5=B8=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=202024.3.29=20sws?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coin/convert-detail/convert-detail.vue | 81 +++++++++--------- pages/plugins/coin/convert/convert.vue | 6 +- pages/plugins/coin/detail/detail.vue | 54 ++++++------ .../coin/recharge-detail/recharge-detail.vue | 85 +++++++++---------- pages/plugins/coin/recharge/recharge.vue | 4 +- .../transaction-detail/transaction-detail.vue | 81 +++++++++--------- .../transfer-accounts-detail.vue | 68 +++++++-------- pages/plugins/coin/user/user.vue | 2 +- .../withdrawal-detail/withdrawal-detail.vue | 77 ++++++++--------- pages/plugins/coin/withdrawal/withdrawal.vue | 4 +- 10 files changed, 228 insertions(+), 234 deletions(-) diff --git a/pages/plugins/coin/convert-detail/convert-detail.vue b/pages/plugins/coin/convert-detail/convert-detail.vue index 5c399fd8..887a9c5c 100644 --- a/pages/plugins/coin/convert-detail/convert-detail.vue +++ b/pages/plugins/coin/convert-detail/convert-detail.vue @@ -9,39 +9,45 @@ - - - {{ item.add_time }} - - - - 转换单号： - {{ item.convert_no }} + + + + {{ item.add_time }} - - 转出余额： - {{ item.convert_value }} - - - 转出账户： - {{ item.send_accounts_id }} - - - 转入账户： - {{ item.receive_accounts_id }} - - - 最新币： - {{ item.coin }} - - - 备注： - {{ item.note }} + + + 转换单号： + {{ item.convert_no }} + + + 转出余额： + {{ item.convert_value }} + + + 转出账户： + {{ item.send_accounts_id }} + + + 转入账户： + {{ item.receive_accounts_id }} + + + 最新币： + {{ item.coin }} + + + 备注： + {{ item.note }} + + + + + + + - - @@ -82,7 +88,6 @@ theme_view: app.globalData.get_theme_value_view(), accounts_static_url: accounts_static_url, data_list_loding_status: 1, - data_list_loding_msg: '', data_bottom_line_status: false, // 弹窗距离顶部距离 @@ -134,7 +139,7 @@ init(e) { var user = app.globalData.get_user_info(this, 'init'); if (user != false) { - this.init_data(); + this.get_data(); this.get_data_list(); var self = this; var timer = setInterval(function () { @@ -148,7 +153,7 @@ }, // 初始化数据 - init_data() { + get_data() { uni.request({ url: app.globalData.get_request_url('init', 'user', 'coin'), method: 'POST', @@ -230,7 +235,6 @@ data: temp_data_list, data_page_total: data.page_total, data_page: data.page + 1, - data_list_loding_msg: '', data_list_loding_status: 3, data_is_loading: 0, }); @@ -245,7 +249,6 @@ data: data.data_list, data_page_total: data.page_total, data_page: data.page + 1, - data_list_loding_msg: '', data_list_loding_status: 3, data_is_loading: 0, }); @@ -255,18 +258,12 @@ data_is_loading: 0, }); } - if (app.globalData.is_login_check(res.data, this, 'get_data_list')) { - app.globalData.showToast(res.data.msg); - } } } else { this.setData({ data_list_loding_status: 2, - data_list_loding_msg: res.data.msg, + data_is_loading: 0, }); - if (app.globalData.is_login_check(res.data, this, 'get_data_list')) { - app.globalData.showToast(res.data.msg); - } } }, fail: () => { @@ -276,7 +273,7 @@ uni.stopPullDownRefresh(); this.setData({ data_list_loding_status: 2, - data_list_loding_msg: this.$t('common.internet_error_tips'), + data_is_loading: 0, }); app.globalData.showToast(this.$t('common.internet_error_tips')); }, diff --git a/pages/plugins/coin/convert/convert.vue b/pages/plugins/coin/convert/convert.vue index 554c66ad..ceda8efd 100644 --- a/pages/plugins/coin/convert/convert.vue +++ b/pages/plugins/coin/convert/convert.vue @@ -7,7 +7,7 @@ - + {{ coin_list[send_accounts_id_index]['platform_name'] }} @@ -28,7 +28,7 @@ - + {{ coin_list[receive_accounts_id_index]['platform_name'] }} @@ -69,7 +69,7 @@ - + {{ item.platform_name }} diff --git a/pages/plugins/coin/detail/detail.vue b/pages/plugins/coin/detail/detail.vue index b95c541f..f8816249 100644 --- a/pages/plugins/coin/detail/detail.vue +++ b/pages/plugins/coin/detail/detail.vue @@ -6,7 +6,7 @@ - + {{ accounts_list[accounts_list_index]['platform_name'] }} @@ -33,30 +33,36 @@ - - - {{ item.coin_type_name }} - {{ item.add_time }} - - - - 操作类型： - {{ item.operate_type_name }} + + + + {{ item.coin_type_name }} + {{ item.add_time }} - - 操作数量： - {{ item.operate_coin }} - - - 原始数量： - {{ item.original_coin }} - - - 最新数量： - {{ item.latest_coin }} + + + 操作类型： + {{ item.operate_type_name }} + + + 操作数量： + {{ item.operate_coin }} + + + 原始数量： + {{ item.original_coin }} + + + 最新数量： + {{ item.latest_coin }} + + + + + @@ -72,7 +78,7 @@ - + {{ item.platform_name }} @@ -131,6 +137,7 @@ wallet_static_url: wallet_static_url, status_bar_height: bar_height, params: null, + data_list_loding_status: 1, // 虚拟币下拉框探弹窗状态 popup_coin_status: false, @@ -211,11 +218,10 @@ uni.request({ url: app.globalData.get_request_url('detail', 'accounts', 'coin'), method: 'POST', - data: this.params.id, + data: this.params, dataType: 'json', success: (res) => { uni.stopPullDownRefresh(); - console.log(res.data.data); if (res.data.code == 0) { var data = res.data.data; this.setData({ diff --git a/pages/plugins/coin/recharge-detail/recharge-detail.vue b/pages/plugins/coin/recharge-detail/recharge-detail.vue index 857fe27c..43d72ec0 100644 --- a/pages/plugins/coin/recharge-detail/recharge-detail.vue +++ b/pages/plugins/coin/recharge-detail/recharge-detail.vue @@ -17,40 +17,46 @@ - - - {{ item.status_name }} - {{ item.add_time }} + + + + {{ item.status_name }} + {{ item.add_time }} + + + + 充值单号： + {{ item.recharge_no }} + + + 平台： + {{ item.platform_name }} + + + 充值网络： + {{ item.network_name }} + + + 充值地址： + {{ item.address }} + + + 充值币： + {{ item.coin }} + + +
+ + +
- - - 充值单号： - {{ item.recharge_no }} - - - 平台： - {{ item.platform_name }} - - - 充值网络： - {{ item.network_name }} - - - 充值地址： - {{ item.address }} - - - 充值币： - {{ item.coin }} - - -
- - -
+ + + + + + - - @@ -127,7 +133,6 @@ theme_view: app.globalData.get_theme_value_view(), accounts_static_url: accounts_static_url, data_list_loding_status: 1, - data_list_loding_msg: '', data_bottom_line_status: false, // 弹窗距离顶部距离 @@ -189,7 +194,7 @@ init(e) { var user = app.globalData.get_user_info(this, 'init'); if (user != false) { - this.init_data(); + this.get_data(); this.get_data_list(); var self = this; var timer = setInterval(function () { @@ -203,7 +208,7 @@ }, // 初始化数据 - init_data() { + get_data() { uni.request({ url: app.globalData.get_request_url('init', 'user', 'coin'), method: 'POST', @@ -288,7 +293,6 @@ data: temp_data_list, data_page_total: data.page_total, data_page: data.page + 1, - data_list_loding_msg: '', data_list_loding_status: 3, data_is_loading: 0, }); @@ -303,7 +307,6 @@ data: data.data_list, data_page_total: data.page_total, data_page: data.page + 1, - data_list_loding_msg: '', data_list_loding_status: 3, data_is_loading: 0, }); @@ -313,18 +316,12 @@ data_is_loading: 0, }); } - if (app.globalData.is_login_check(res.data, this, 'get_data_list')) { - app.globalData.showToast(res.data.msg); - } } } else { this.setData({ data_list_loding_status: 2, data_list_loding_msg: res.data.msg, }); - if (app.globalData.is_login_check(res.data, this, 'get_data_list')) { - app.globalData.showToast(res.data.msg); - } } }, fail: () => { @@ -334,7 +331,7 @@ uni.stopPullDownRefresh(); this.setData({ data_list_loding_status: 2, - data_list_loding_msg: this.$t('common.internet_error_tips'), + data_is_loading: 0, }); app.globalData.showToast(this.$t('common.internet_error_tips')); }, diff --git a/pages/plugins/coin/recharge/recharge.vue b/pages/plugins/coin/recharge/recharge.vue index bb22e9d2..236a83d1 100644 --- a/pages/plugins/coin/recharge/recharge.vue +++ b/pages/plugins/coin/recharge/recharge.vue @@ -7,7 +7,7 @@ - + {{ accounts_list[accounts_list_index]['platform_name'] }} @@ -84,7 +84,7 @@ - + {{ item.platform_name }} diff --git a/pages/plugins/coin/transaction-detail/transaction-detail.vue b/pages/plugins/coin/transaction-detail/transaction-detail.vue index 0ea9bfdd..2e3e04a6 100644 --- a/pages/plugins/coin/transaction-detail/transaction-detail.vue +++ b/pages/plugins/coin/transaction-detail/transaction-detail.vue @@ -21,40 +21,46 @@ - - - {{ item.business_type_name }} - {{ item.add_time }} - - - - 币类型： - {{ item.coin_type_name }} + + + + {{ item.business_type_name }} + {{ item.add_time }} - - 操作类型： - {{ item.operate_type_name }} - - - 操作币： - {{ item.operate_coin }} - - - 原始币： - {{ item.original_coin }} - - - 最新币： - {{ item.latest_coin }} - - - 描述： - {{ item.msg }} + + + 币类型： + {{ item.coin_type_name }} + + + 操作类型： + {{ item.operate_type_name }} + + + 操作币： + {{ item.operate_coin }} + + + 原始币： + {{ item.original_coin }} + + + 最新币： + {{ item.latest_coin }} + + + 描述： + {{ item.msg }} + + + + + + + - - @@ -149,7 +155,6 @@ theme_view: app.globalData.get_theme_value_view(), accounts_static_url: accounts_static_url, data_list_loding_status: 1, - data_list_loding_msg: '', data_bottom_line_status: false, // 弹窗距离顶部距离 @@ -216,7 +221,7 @@ init(e) { var user = app.globalData.get_user_info(this, 'init'); if (user != false) { - this.init_data(); + this.get_data(); this.get_data_list(); var self = this; var timer = setInterval(function () { @@ -230,7 +235,7 @@ }, // 初始化数据 - init_data() { + get_data() { uni.request({ url: app.globalData.get_request_url('init', 'user', 'coin'), method: 'POST', @@ -317,7 +322,6 @@ data: temp_data_list, data_page_total: data.page_total, data_page: data.page + 1, - data_list_loding_msg: '', data_list_loding_status: 3, data_is_loading: 0, }); @@ -332,7 +336,6 @@ data: data.data_list, data_page_total: data.page_total, data_page: data.page + 1, - data_list_loding_msg: '', data_list_loding_status: 3, data_is_loading: 0, }); @@ -342,18 +345,12 @@ data_is_loading: 0, }); } - if (app.globalData.is_login_check(res.data, this, 'get_data_list')) { - app.globalData.showToast(res.data.msg); - } } } else { this.setData({ data_list_loding_status: 2, data_list_loding_msg: res.data.msg, }); - if (app.globalData.is_login_check(res.data, this, 'get_data_list')) { - app.globalData.showToast(res.data.msg); - } } }, fail: () => { @@ -363,7 +360,7 @@ uni.stopPullDownRefresh(); this.setData({ data_list_loding_status: 2, - data_list_loding_msg: this.$t('common.internet_error_tips'), + data_is_loading: 0, }); app.globalData.showToast(this.$t('common.internet_error_tips')); }, diff --git a/pages/plugins/coin/transfer-accounts-detail/transfer-accounts-detail.vue b/pages/plugins/coin/transfer-accounts-detail/transfer-accounts-detail.vue index c8239c37..f49ab3ee 100644 --- a/pages/plugins/coin/transfer-accounts-detail/transfer-accounts-detail.vue +++ b/pages/plugins/coin/transfer-accounts-detail/transfer-accounts-detail.vue @@ -9,32 +9,38 @@ - - - 转账时间 - {{ item.add_time }} - - - - 转账单号： - {{ item.transfer_no }} + + + + 转账时间 + {{ item.add_time }} - - 收款人： - {{ item.receive_user.username }} - - - 转账币： - {{ item.coin }} - - - 转账备注： - {{ item.note }} + + + 转账单号： + {{ item.transfer_no }} + + + 收款人： + {{ item.receive_user.username }} + + + 转账币： + {{ item.coin }} + + + 转账备注： + {{ item.note }} + + + + + + + - - @@ -72,7 +78,6 @@ theme_view: app.globalData.get_theme_value_view(), accounts_static_url: accounts_static_url, data_list_loding_status: 1, - data_list_loding_msg: '', data_bottom_line_status: false, // 弹窗距离顶部距离 @@ -124,7 +129,7 @@ init(e) { var user = app.globalData.get_user_info(this, 'init'); if (user != false) { - this.init_data(); + this.get_data(); this.get_data_list(); var self = this; var timer = setInterval(function () { @@ -137,7 +142,7 @@ } }, // 初始化数据 - init_data() { + get_data() { uni.request({ url: app.globalData.get_request_url('init', 'user', 'coin'), method: 'POST', @@ -216,8 +221,8 @@ data: temp_data_list, data_page_total: data.page_total, data_page: data.page + 1, - data_list_loding_msg: '', data_list_loding_status: 3, + data_is_loading: 0, }); // 是否还有数据 @@ -229,18 +234,13 @@ data_list_loding_status: 0, data_is_loading: 0, }); - if (app.globalData.is_login_check(res.data, this, 'get_data_list')) { - app.globalData.showToast(res.data.msg); - } } } else { this.setData({ data_list_loding_status: 2, - data_list_loding_msg: res.data.msg, + data_is_loading: 0, }); - if (app.globalData.is_login_check(res.data, this, 'get_data_list')) { - app.globalData.showToast(res.data.msg); - } + app.globalData.showToast(res.data.msg); } }, fail: () => { @@ -250,7 +250,7 @@ uni.stopPullDownRefresh(); this.setData({ data_list_loding_status: 2, - data_list_loding_msg: this.$t('common.internet_error_tips'), + data_is_loading: 0, }); app.globalData.showToast(this.$t('common.internet_error_tips')); }, diff --git a/pages/plugins/coin/user/user.vue b/pages/plugins/coin/user/user.vue index a44c6c11..4dbfc329 100644 --- a/pages/plugins/coin/user/user.vue +++ b/pages/plugins/coin/user/user.vue @@ -45,7 +45,7 @@ - + {{ item.platform_name }} diff --git a/pages/plugins/coin/withdrawal-detail/withdrawal-detail.vue b/pages/plugins/coin/withdrawal-detail/withdrawal-detail.vue index e176e81e..78116510 100644 --- a/pages/plugins/coin/withdrawal-detail/withdrawal-detail.vue +++ b/pages/plugins/coin/withdrawal-detail/withdrawal-detail.vue @@ -17,36 +17,42 @@ - - - {{ item.add_time }} - {{ item.status_name }} - - - - 提现单号： - {{ item.cash_no }} + + + + {{ item.add_time }} + {{ item.status_name }} - - 平台： - {{ item.platform_name }} - - - 充值网络： - {{ item.network_name }} - - - 充值地址： - {{ item.address }} - - - 提现币： - {{ item.coin }} + + + 提现单号： + {{ item.cash_no }} + + + 平台： + {{ item.platform_name }} + + + 充值网络： + {{ item.network_name }} + + + 充值地址： + {{ item.address }} + + + 提现币： + {{ item.coin }} + + + + + + + - - @@ -114,7 +120,6 @@ theme_view: app.globalData.get_theme_value_view(), wallet_static_url: wallet_static_url, data_list_loding_status: 1, - data_list_loding_msg: '', data_bottom_line_status: false, // 弹窗距离顶部距离 @@ -176,7 +181,7 @@ init(e) { var user = app.globalData.get_user_info(this, 'init'); if (user != false) { - this.init_data(); + this.get_data(); this.get_data_list(); var self = this; var timer = setInterval(function () { @@ -190,7 +195,7 @@ }, // 初始化数据 - init_data() { + get_data() { uni.request({ url: app.globalData.get_request_url('init', 'user', 'coin'), method: 'POST', @@ -275,7 +280,6 @@ data: temp_data_list, data_page_total: data.page_total, data_page: data.page + 1, - data_list_loding_msg: '', data_list_loding_status: 3, data_is_loading: 0, }); @@ -290,7 +294,6 @@ data: data.data_list, data_page_total: data.page_total, data_page: data.page + 1, - data_list_loding_msg: '', data_list_loding_status: 3, data_is_loading: 0, }); @@ -300,18 +303,12 @@ data_is_loading: 0, }); } - if (app.globalData.is_login_check(res.data, this, 'get_data_list')) { - app.globalData.showToast(res.data.msg); - } } } else { this.setData({ - data_list_loding_status: 2, - data_list_loding_msg: res.data.msg, + data_list_loding_status: 0, + data_is_loading: 0, }); - if (app.globalData.is_login_check(res.data, this, 'get_data_list')) { - app.globalData.showToast(res.data.msg); - } } }, fail: () => { @@ -321,7 +318,7 @@ uni.stopPullDownRefresh(); this.setData({ data_list_loding_status: 2, - data_list_loding_msg: this.$t('common.internet_error_tips'), + data_is_loading: 0, }); app.globalData.showToast(this.$t('common.internet_error_tips')); }, diff --git a/pages/plugins/coin/withdrawal/withdrawal.vue b/pages/plugins/coin/withdrawal/withdrawal.vue index 0b23d001..88b4c0b6 100644 --- a/pages/plugins/coin/withdrawal/withdrawal.vue +++ b/pages/plugins/coin/withdrawal/withdrawal.vue @@ -8,7 +8,7 @@ - + {{ accounts_list[accounts_list_index]['platform_name'] }} @@ -79,7 +79,7 @@ - + {{ item.platform_name }}