diff --git a/common/css/page.css b/common/css/page.css index 45572071623202cdbf911c08585af72da3d32b9d..6d60b7a06d2a0f013d1a2b7a50d5e8f9ad237b0f 100644 --- a/common/css/page.css +++ b/common/css/page.css @@ -898,6 +898,12 @@ button[disabled].bg-grey { font-size: 28rpx; white-space: initial; } +/** + * 文字超出部分换行 + */ +.warp { + word-break: break-all; +} /** * 基础导航 diff --git a/pages/plugins/coin/cash-list/cash-list.css b/pages/plugins/coin/cash-list/cash-list.css index 8313095676ebc7f666785e28219359599ee562ea..3de89b7e2d556cf97f3da66b471656fc7aed909b 100644 --- a/pages/plugins/coin/cash-list/cash-list.css +++ b/pages/plugins/coin/cash-list/cash-list.css @@ -10,6 +10,19 @@ min-width: 140rpx; } +.recharge-del-btn { + padding: 0 60rpx; + font-size: 28rpx; + margin: 0 0 0 20rpx; + color: #0079ff !important; + background-color: #fff; + border: 2rpx solid #0079ff; +} + +.recharge-del-btn:active { + opacity: 0.7; +} + /* * 钱包弹窗 */ diff --git a/pages/plugins/coin/cash-list/cash-list.vue b/pages/plugins/coin/cash-list/cash-list.vue index f0bad9697f03bf6d50d42134a6ccf7f9ea5c374f..2df9bf97778a9aa969a58dd51f1e34b604c85df7 100644 --- a/pages/plugins/coin/cash-list/cash-list.vue +++ b/pages/plugins/coin/cash-list/cash-list.vue @@ -26,23 +26,23 @@ 提现单号: - {{ item.cash_no }} + {{ item.cash_no }} 平台: - {{ item.platform_name }} + {{ item.platform_name }} 充值网络: - {{ item.network_name }} + {{ item.network_name }} 充值地址: - {{ item.address }} + {{ item.address }} 提现币: - {{ item.coin }} + {{ item.coin }}
@@ -134,6 +134,8 @@ data_list_loding_status: 1, data_bottom_line_status: false, + params: null, + // 弹窗距离顶部距离 popup_top_height: 0, @@ -174,9 +176,11 @@ // 调用公共事件方法 app.globalData.page_event_onload_handle(params); // 设置参数 - this.setData({ - accounts_id: params.id, - }); + if (params !== null && params.id) { + this.setData({ + params: params, + }); + } }, onShow() { @@ -222,7 +226,6 @@ dataType: 'json', success: (res) => { uni.stopPullDownRefresh(); - console.log(res.data.data); if (res.data.code == 0) { var data = res.data.data; this.setData({ @@ -230,10 +233,11 @@ recharge_status_list: data.recharge_status_list || [], network_list: data.network_list || [], }); - if (data.accounts_list.length > 0) { - var index = data.accounts_list.findIndex((item) => item.id === this.accounts_id); + if (data.accounts_list.length > 0 && this.params !== null && this.params.id) { + var index = data.accounts_list.findIndex((item) => item.id === this.params.id); this.setData({ accounts_list_index: index, + accounts_id: data.accounts_list[index].id, accounts_name: data.accounts_list[index].platform_name, }); } @@ -338,11 +342,11 @@ // 账户打开 popup_accounts_open_event() { - if (!this.popup_recharge_status_status && !this.popup_network_status) { - this.setData({ - popup_accounts_status: !this.popup_accounts_status, - }); - } + this.setData({ + popup_accounts_status: !this.popup_accounts_status, + popup_recharge_status_status: false, + popup_network_status: false, + }); }, // 账户关闭 @@ -366,11 +370,11 @@ // 类型打开 popup_recharge_status_open_event() { - if (!this.popup_accounts_status && !this.popup_network_status) { - this.setData({ - popup_recharge_status_status: !this.popup_recharge_status_status, - }); - } + this.setData({ + popup_recharge_status_status: !this.popup_recharge_status_status, + popup_accounts_status: false, + popup_network_status: false, + }); }, // 类型关闭 @@ -394,11 +398,11 @@ // 网络打开 popup_network_open_event() { - if (!this.popup_accounts_status && !this.popup_recharge_status_status) { - this.setData({ - popup_network_status: !this.popup_network_status, - }); - } + this.setData({ + popup_network_status: !this.popup_network_status, + popup_accounts_status: false, + popup_recharge_status_status: false, + }); }, // 网络关闭 @@ -445,7 +449,6 @@ dataType: 'json', success: (res) => { uni.hideLoading(); - console.log(res.data.data); if (res.data.code == 0) { this.setData({ data_page: 1, diff --git a/pages/plugins/coin/collection/collection.vue b/pages/plugins/coin/collection/collection.vue index 0f0feeedfd82c4a7dc69770ce33d4780dd2f49e8..1a18d225e9f06e359c8b94010126ee115b422880 100644 --- a/pages/plugins/coin/collection/collection.vue +++ b/pages/plugins/coin/collection/collection.vue @@ -15,7 +15,7 @@ - 说出来的是你想的,做出来的是你说的,交出来的是你做的 + 扫一扫向对方发起转账,请核对认真账户后再确认转账! diff --git a/pages/plugins/coin/convert-list/convert-list.vue b/pages/plugins/coin/convert-list/convert-list.vue index 6c0d09e17ba89e99177d05b52e02f40cfe5f7638..f986ab64ef582b6385790236678cf941cb04fd54 100644 --- a/pages/plugins/coin/convert-list/convert-list.vue +++ b/pages/plugins/coin/convert-list/convert-list.vue @@ -21,27 +21,27 @@ 转换单号: - {{ item.convert_no }} + {{ item.convert_no }} 转出余额: - {{ item.convert_value }} + {{ item.convert_value }} 转出账户: - {{ item.send_accounts_id }} + {{ item.send_accounts_id }} 转入账户: - {{ item.receive_accounts_id }} + {{ item.receive_accounts_id }} 最新币: - {{ item.coin }} + {{ item.coin }} 备注: - {{ item.note }} + {{ item.note }} @@ -112,6 +112,8 @@ data_list_loding_status: 1, data_bottom_line_status: false, + params: null, + // 弹窗距离顶部距离 popup_top_height: 0, @@ -146,9 +148,11 @@ // 调用公共事件方法 app.globalData.page_event_onload_handle(params); // 设置参数 - this.setData({ - send_accounts_id: params.id, - }); + if (params !== null && params.id) { + this.setData({ + params: params.id, + }); + } }, onShow() { @@ -194,17 +198,17 @@ dataType: 'json', success: (res) => { uni.stopPullDownRefresh(); - console.log(res.data.data); if (res.data.code == 0) { var data = res.data.data; this.setData({ send_accounts_list: data.accounts_list || [], receive_accounts_list: data.accounts_list || [], }); - if (data.accounts_list.length > 0) { - var index = data.accounts_list.findIndex((item) => item.id === this.send_accounts_id); + if (data.accounts_list.length > 0 && this.params !== null && this.params.id) { + var index = data.accounts_list.findIndex((item) => item.id === this.params.id); this.setData({ send_accounts_list_index: index, + send_accounts_id: data.accounts_list[index].id, send_accounts_name: data.accounts_list[index].platform_name, }); } @@ -308,11 +312,10 @@ // 账户打开 popup_send_accounts_open_event() { - if (!this.popup_type_status) { - this.setData({ - popup_send_accounts_status: !this.popup_send_accounts_status, - }); - } + this.setData({ + popup_send_accounts_status: !this.popup_send_accounts_status, + popup_receive_accounts_status: false, + }); }, // 账户关闭 @@ -336,11 +339,10 @@ // 账户打开 popup_receive_accounts_open_event() { - if (!this.popup_type_status) { - this.setData({ - popup_receive_accounts_status: !this.popup_receive_accounts_status, - }); - } + this.setData({ + popup_receive_accounts_status: !this.popup_receive_accounts_status, + popup_send_accounts_status: false, + }); }, // 账户关闭 diff --git a/pages/plugins/coin/detail/detail.vue b/pages/plugins/coin/detail/detail.vue index a7d130d21efee922337a2fe82fcaa5e597e8edaa..f9f391cea36857b4218c9e20cdcad21f6b6bc43d 100644 --- a/pages/plugins/coin/detail/detail.vue +++ b/pages/plugins/coin/detail/detail.vue @@ -4,7 +4,7 @@ - + @@ -42,22 +42,23 @@ 操作类型: - {{ item.operate_type_name }} + {{ item.operate_type_name }} 操作数量: - {{ item.operate_coin }} + {{ item.operate_coin }} 原始数量: - {{ item.original_coin }} + {{ item.original_coin }} 最新数量: - {{ item.latest_coin }} + {{ item.latest_coin }} + 查看更多明细 @@ -98,7 +99,7 @@ - + 充值明细 @@ -186,11 +187,13 @@ // 调用公共事件方法 app.globalData.page_event_onload_handle(params); // 设置参数 - this.setData({ - params: params, - }); - this.coin_oprate_list[1].url = this.coin_oprate_list[1].url + '?id=' + params.id; - this.coin_oprate_list[0].url = this.coin_oprate_list[0].url + '?id=' + params.id; + if (params !== null && params.id) { + this.setData({ + params: params, + }); + this.coin_oprate_list[1].url = this.coin_oprate_list[1].url + '?id=' + params.id; + this.coin_oprate_list[0].url = this.coin_oprate_list[0].url + '?id=' + params.id; + } this.init(); }, @@ -233,13 +236,12 @@ data_list_loding_msg: '', data_list_loding_status: 0, }); - for (var i = 0; i < data.accounts_list.length; i++) { - if (data.accounts_list[i].id === this.params.id) { - this.setData({ - accounts_list_index: i, - }); - } + if (data.accounts_list.length > 0 && this.params !== null && this.params.id) { + this.setData({ + accounts_list_index: data.accounts_list.findIndex((item) => item.id === this.params.id), + }); } + console.log(this.accounts_list_index); } else { this.setData({ data_list_loding_status: 2, diff --git a/pages/plugins/coin/recharge-list/recharge-list.vue b/pages/plugins/coin/recharge-list/recharge-list.vue index 47884769001a505ddb0c0709ef1f1e1d29ccd490..2de44283bd45a88ac6c3950481dd9b69ce8f58a3 100644 --- a/pages/plugins/coin/recharge-list/recharge-list.vue +++ b/pages/plugins/coin/recharge-list/recharge-list.vue @@ -26,23 +26,23 @@ 充值单号: - {{ item.recharge_no }} + {{ item.recharge_no }} 平台: - {{ item.platform_name }} + {{ item.platform_name }} 充值网络: - {{ item.network_name }} + {{ item.network_name }} 充值地址: - {{ item.address }} + {{ item.address }} 充值币: - {{ item.coin }} + {{ item.coin }}
@@ -135,6 +135,8 @@ data_list_loding_status: 1, data_bottom_line_status: false, + params: null, + // 弹窗距离顶部距离 popup_top_height: 0, @@ -175,9 +177,11 @@ // 调用公共事件方法 app.globalData.page_event_onload_handle(params); // 设置参数 - this.setData({ - accounts_id: params.id, - }); + if (params !== null && params.id) { + this.setData({ + params: params, + }); + } }, onShow() { @@ -230,10 +234,11 @@ recharge_status_list: data.recharge_status_list || [], network_list: data.network_list || [], }); - if (data.accounts_list.length > 0) { - var index = data.accounts_list.findIndex((item) => item.id === this.accounts_id); + if (data.accounts_list.length > 0 && this.params !== null && this.params.id) { + var index = data.accounts_list.findIndex((item) => item.id === this.params.id); this.setData({ accounts_list_index: index, + accounts_id: data.accounts_list[index].id, accounts_name: data.accounts_list[index].platform_name, }); } @@ -338,11 +343,11 @@ // 账户打开 popup_accounts_open_event() { - if (!this.popup_recharge_status_status && !this.popup_network_status) { - this.setData({ - popup_accounts_status: !this.popup_accounts_status, - }); - } + this.setData({ + popup_accounts_status: !this.popup_accounts_status, + popup_recharge_status_status: false, + popup_network_status: false, + }); }, // 账户关闭 @@ -366,11 +371,11 @@ // 类型打开 popup_recharge_status_open_event() { - if (!this.popup_accounts_status && !this.popup_network_status) { - this.setData({ - popup_recharge_status_status: !this.popup_recharge_status_status, - }); - } + this.setData({ + popup_recharge_status_status: !this.popup_recharge_status_status, + popup_accounts_status: false, + popup_network_status: false, + }); }, // 类型关闭 @@ -394,11 +399,11 @@ // 网络打开 popup_network_open_event() { - if (!this.popup_accounts_status && !this.popup_recharge_status_status) { - this.setData({ - popup_network_status: !this.popup_network_status, - }); - } + this.setData({ + popup_network_status: !this.popup_network_status, + popup_accounts_status: false, + popup_recharge_status_status: false, + }); }, // 网络关闭 @@ -445,7 +450,6 @@ dataType: 'json', success: (res) => { uni.hideLoading(); - console.log(res.data.data); if (res.data.code == 0) { this.setData({ data_page: 1, diff --git a/pages/plugins/coin/transaction-list/transaction-list.vue b/pages/plugins/coin/transaction-list/transaction-list.vue index fa3d5fae0afd3e87809d45529ee31c2be0b25ebb..0a14fd6767ad126c873a9c4e6576b24c99461a9f 100644 --- a/pages/plugins/coin/transaction-list/transaction-list.vue +++ b/pages/plugins/coin/transaction-list/transaction-list.vue @@ -30,27 +30,27 @@ 币类型: - {{ item.coin_type_name }} + {{ item.coin_type_name }} 操作类型: - {{ item.operate_type_name }} + {{ item.operate_type_name }} 操作币: - {{ item.operate_coin }} + {{ item.operate_coin }} 原始币: - {{ item.original_coin }} + {{ item.original_coin }} 最新币: - {{ item.latest_coin }} + {{ item.latest_coin }} 描述: - {{ item.msg }} + {{ item.msg }} @@ -157,6 +157,8 @@ data_list_loding_status: 1, data_bottom_line_status: false, + params: null, + // 弹窗距离顶部距离 popup_top_height: 0, @@ -203,9 +205,11 @@ // 调用公共事件方法 app.globalData.page_event_onload_handle(params); // 设置参数 - this.setData({ - accounts_id: params.id, - }); + if (params !== null && params.id) { + this.setData({ + params: params, + }); + } }, onShow() { @@ -251,7 +255,6 @@ dataType: 'json', success: (res) => { uni.stopPullDownRefresh(); - console.log(res.data.data); if (res.data.code == 0) { var data = res.data.data; this.setData({ @@ -260,10 +263,11 @@ business_type_list: data.log_business_type_list || [], coin_type_list: data.log_coin_type_list || [], }); - if (data.accounts_list.length > 0) { - var index = data.accounts_list.findIndex((item) => item.id === this.accounts_id); + if (data.accounts_list.length > 0 && this.params !== null && this.params.id) { + var index = data.accounts_list.findIndex((item) => item.id === this.params.id); this.setData({ accounts_list_index: index, + accounts_id: data.accounts_list[index].id, accounts_name: data.accounts_list[index].platform_name, }); } @@ -332,7 +336,7 @@ temp_data_list.push(temp_data[i]); } } - + this.setData({ data_list: temp_data_list, data_total: data.total, @@ -341,7 +345,7 @@ 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, @@ -369,11 +373,12 @@ // 账户打开 popup_accounts_open_event() { - if (!this.popup_operate_type_status && !this.popup_business_type_status && !this.popup_coin_type_status) { - this.setData({ - popup_accounts_status: !this.popup_accounts_status, - }); - } + this.setData({ + popup_accounts_status: !this.popup_accounts_status, + popup_operate_type_status: false, + popup_business_type_status: false, + popup_coin_type_status: false, + }); }, // 账户关闭 @@ -397,11 +402,12 @@ // 操作类型打开 popup_operate_type_open_event() { - if (!this.popup_accounts_status && !this.popup_business_type_status && !this.popup_coin_type_status) { - this.setData({ - popup_operate_type_status: !this.popup_operate_type_status, - }); - } + this.setData({ + popup_operate_type_status: !this.popup_operate_type_status, + popup_accounts_status: false, + popup_business_type_status: false, + popup_coin_type_status: false, + }); }, // 操作类型关闭 @@ -425,11 +431,12 @@ // 业务类型打开 popup_business_type_open_event() { - if (!this.popup_accounts_status && !this.popup_operate_type_status && !this.popup_coin_type_status) { - this.setData({ - popup_business_type_status: !this.popup_business_type_status, - }); - } + this.setData({ + popup_business_type_status: !this.popup_business_type_status, + popup_accounts_status: false, + popup_operate_type_status: false, + popup_coin_type_status: false, + }); }, // 业务类型关闭 @@ -453,11 +460,12 @@ // 币类型打开 popup_coin_type_open_event() { - if (!this.popup_accounts_status && !this.popup_operate_type_status && !this.popup_business_type_status) { - this.setData({ - popup_coin_type_status: !this.popup_coin_type_status, - }); - } + this.setData({ + popup_coin_type_status: !this.popup_coin_type_status, + popup_accounts_status: false, + popup_operate_type_status: false, + popup_business_type_status: false, + }); }, // 币类型关闭 diff --git a/pages/plugins/coin/transfer-list/transfer-list.vue b/pages/plugins/coin/transfer-list/transfer-list.vue index 27843f55fb241e9e1874b6185af2381aab9e23a0..9314c6f9f95fb6d6e43074a41f79586603100dd7 100644 --- a/pages/plugins/coin/transfer-list/transfer-list.vue +++ b/pages/plugins/coin/transfer-list/transfer-list.vue @@ -18,19 +18,19 @@ 转账单号: - {{ item.transfer_no }} + {{ item.transfer_no }} 收款人: - {{ item.receive_user.username }} + {{ item.receive_user.username }} 转账币: - {{ item.coin }} + {{ item.coin }} 转账备注: - {{ item.note }} + {{ item.note }} @@ -83,6 +83,8 @@ data_list_loding_status: 1, data_bottom_line_status: false, + params: null, + // 弹窗距离顶部距离 popup_top_height: 0, @@ -111,9 +113,11 @@ // 调用公共事件方法 app.globalData.page_event_onload_handle(params); // 设置参数 - this.setData({ - accounts_id: params.id, - }); + if (params !== null && params.id) { + this.setData({ + params: params, + }); + } }, onShow() { @@ -163,10 +167,11 @@ this.setData({ accounts_list: data.accounts_list || [], }); - if (data.accounts_list.length > 0) { - var index = data.accounts_list.findIndex((item) => item.id === this.accounts_id); + if (data.accounts_list.length > 0 && this.params !== null && this.params.id) { + var index = data.accounts_list.findIndex((item) => item.id === this.params.id); this.setData({ accounts_list_index: index, + accounts_id: data.accounts_list[index].id, accounts_name: data.accounts_list[index].platform_name, }); } diff --git a/pages/plugins/coin/user/user.vue b/pages/plugins/coin/user/user.vue index 1e69131fc490dd204e0b278a91bb20bbb2d42338..1ab73668bd643cfa2881bbbb244ea63b27fa2216 100644 --- a/pages/plugins/coin/user/user.vue +++ b/pages/plugins/coin/user/user.vue @@ -4,7 +4,7 @@ - + 总数量 {{ is_price_show ? accounts_summary : '***' }}