diff --git a/components/wholesale-rules/wholesale-rules.vue b/components/wholesale-rules/wholesale-rules.vue index 9b0570c9..6419fb01 100644 --- a/components/wholesale-rules/wholesale-rules.vue +++ b/components/wholesale-rules/wholesale-rules.vue @@ -130,11 +130,7 @@ export default { margin-bottom: 0 !important; } .plugins-wholesale-container-rules-view .item .price > .unit { - border: 0.05rem solid #cdcdcd; color: #969696; - border-radius: 50%; - padding: 1rpx 6rpx; - vertical-align: middle; margin-left: 5rpx; } .plugins-wholesale-container-rules { diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue index 3cea07ee..1cb9b4f7 100644 --- a/pages/buy/buy.vue +++ b/pages/buy/buy.vue @@ -211,8 +211,8 @@ {{ item.platform_name }} - {{ item.default_symbol }}{{ item.default_coin }} - {{ item.platform_symbol }}{{ item.normal_coin }} + {{ item.default_symbol }} {{ item.default_coin }} + {{ item.platform_symbol }} {{ item.normal_coin }} diff --git a/pages/plugins/coin/cash-list/cash-list.vue b/pages/plugins/coin/cash-list/cash-list.vue index e1985c83..b9f44a0e 100644 --- a/pages/plugins/coin/cash-list/cash-list.vue +++ b/pages/plugins/coin/cash-list/cash-list.vue @@ -177,7 +177,7 @@ // 设置参数 this.setData({ params: params, - accounts_id: params.id || 0, + accounts_id: params.id || null, }); }, diff --git a/pages/plugins/coin/cash/cash.vue b/pages/plugins/coin/cash/cash.vue index 49afe93a..2dc13198 100644 --- a/pages/plugins/coin/cash/cash.vue +++ b/pages/plugins/coin/cash/cash.vue @@ -19,7 +19,7 @@ {{ accounts.normal_coin }} - {{ accounts.default_symbol }}{{ accounts.default_coin }} + {{ accounts.default_symbol }} {{ accounts.default_coin }} 提现明细 diff --git a/pages/plugins/coin/convert-list/convert-list.vue b/pages/plugins/coin/convert-list/convert-list.vue index 63ab40b2..e963cf6b 100644 --- a/pages/plugins/coin/convert-list/convert-list.vue +++ b/pages/plugins/coin/convert-list/convert-list.vue @@ -149,7 +149,7 @@ // 设置参数 this.setData({ params: params, - send_accounts_id: params.id || 0, + send_accounts_id: params.id || null, }); }, diff --git a/pages/plugins/coin/convert/convert.css b/pages/plugins/coin/convert/convert.css index a54c555c..9b105a3a 100644 --- a/pages/plugins/coin/convert/convert.css +++ b/pages/plugins/coin/convert/convert.css @@ -5,7 +5,7 @@ padding: 0 52rpx 0 20rpx; background: #F6F6F6; border-radius: 36rpx; - width: 168rpx; + width: 180rpx; } .coin-dropdown-icon { diff --git a/pages/plugins/coin/convert/convert.vue b/pages/plugins/coin/convert/convert.vue index 600fc0ef..501d1183 100644 --- a/pages/plugins/coin/convert/convert.vue +++ b/pages/plugins/coin/convert/convert.vue @@ -14,12 +14,12 @@ - 余额:{{ accounts_list[send_accounts_id_index]['platform_symbol'] }}{{ accounts_list[send_accounts_id_index]['normal_coin'] }} + 余额:{{ accounts_list[send_accounts_id_index]['platform_symbol'] }} {{ accounts_list[send_accounts_id_index]['normal_coin'] }} - {{ accounts_list[send_accounts_id_index]['platform_symbol'] }}{{ accounts_list[send_accounts_id_index]['default_coin'] }} + {{ accounts_list[send_accounts_id_index]['platform_symbol'] }} {{ accounts_list[send_accounts_id_index]['default_coin'] }} @@ -35,12 +35,12 @@ - 余额:{{ accounts_list[receive_accounts_id_index]['platform_symbol'] }}{{ accounts_list[receive_accounts_id_index]['normal_coin'] }} + 余额:{{ accounts_list[receive_accounts_id_index]['platform_symbol'] }} {{ accounts_list[receive_accounts_id_index]['normal_coin'] }} - {{ accounts_list[receive_accounts_id_index]['platform_symbol'] }}{{ accounts_list[receive_accounts_id_index]['default_coin'] }} + {{ accounts_list[receive_accounts_id_index]['platform_symbol'] }} {{ accounts_list[receive_accounts_id_index]['default_coin'] }} diff --git a/pages/plugins/coin/detail/detail.vue b/pages/plugins/coin/detail/detail.vue index 6eb67c91..635dda89 100644 --- a/pages/plugins/coin/detail/detail.vue +++ b/pages/plugins/coin/detail/detail.vue @@ -16,7 +16,7 @@ {{ is_price_show ? accounts.normal_coin : '***' }} - {{ accounts.default_symbol }}{{ accounts.default_coin }} + {{ accounts.default_symbol }} {{ accounts.default_coin }} @@ -186,11 +186,9 @@ // 调用公共事件方法 app.globalData.page_event_onload_handle(params); // 设置参数 - if (params !== null && params.id) { - this.setData({ - params: params, - }); - } + this.setData({ + params: params, + }); this.init(); }, @@ -219,7 +217,7 @@ uni.request({ url: app.globalData.get_request_url('detail', 'accounts', 'coin'), method: 'POST', - data: {id: this.accounts.id || this.params.id}, + data: {id: this.accounts.id || this.params.id || null}, dataType: 'json', success: (res) => { uni.stopPullDownRefresh(); diff --git a/pages/plugins/coin/recharge-list/recharge-list.vue b/pages/plugins/coin/recharge-list/recharge-list.vue index 0dd93813..105c6290 100644 --- a/pages/plugins/coin/recharge-list/recharge-list.vue +++ b/pages/plugins/coin/recharge-list/recharge-list.vue @@ -178,7 +178,7 @@ // 设置参数 this.setData({ params: params, - accounts_id: params.id || 0, + accounts_id: params.id || null, }); }, diff --git a/pages/plugins/coin/transaction-list/transaction-list.vue b/pages/plugins/coin/transaction-list/transaction-list.vue index f553a2d2..f9f6bd6f 100644 --- a/pages/plugins/coin/transaction-list/transaction-list.vue +++ b/pages/plugins/coin/transaction-list/transaction-list.vue @@ -206,7 +206,7 @@ // 设置参数 this.setData({ params: params, - accounts_id: params.id || 0, + accounts_id: params.id || null, }); }, diff --git a/pages/plugins/coin/transfer-list/transfer-list.vue b/pages/plugins/coin/transfer-list/transfer-list.vue index 8bee758c..cf109b12 100644 --- a/pages/plugins/coin/transfer-list/transfer-list.vue +++ b/pages/plugins/coin/transfer-list/transfer-list.vue @@ -114,7 +114,7 @@ // 设置参数 this.setData({ params: params, - accounts_id: params.id || 0, + accounts_id: params.id || null, }); }, diff --git a/pages/plugins/coin/transfer/transfer.vue b/pages/plugins/coin/transfer/transfer.vue index e7f91d98..bce75fd4 100644 --- a/pages/plugins/coin/transfer/transfer.vue +++ b/pages/plugins/coin/transfer/transfer.vue @@ -10,7 +10,7 @@ {{ accounts.platform_name }} - {{ accounts.platform_symbol }}{{ accounts.normal_coin }} + {{ accounts.platform_symbol }} {{ accounts.normal_coin }} @@ -33,7 +33,7 @@ 我的余额: - {{ accounts.platform_symbol }}{{ accounts.default_coin }} + {{ accounts.platform_symbol }} {{ accounts.default_coin }} diff --git a/pages/plugins/coin/user/user.vue b/pages/plugins/coin/user/user.vue index e5ffc761..c0d55ea2 100644 --- a/pages/plugins/coin/user/user.vue +++ b/pages/plugins/coin/user/user.vue @@ -49,8 +49,8 @@ {{ item.platform_name }} - {{ item.platform_symbol }}{{ item.normal_coin }} - {{ item.default_symbol }}{{ item.default_coin }} + {{ item.platform_symbol }} {{ item.normal_coin }} + {{ item.default_symbol }} {{ item.default_coin }}