diff --git a/common/css/page.css b/common/css/page.css index 6420e9d4..356c7899 100644 --- a/common/css/page.css +++ b/common/css/page.css @@ -237,6 +237,9 @@ button:before { .radius { border-radius: 10rpx !important; } +.radius-md { + border-radius: 16rpx !important; +} .radius-lg { border-radius: 32rpx !important; } diff --git a/pages/plugins/coin/convert/convert.css b/pages/plugins/coin/convert/convert.css index e69de29b..abe7afed 100644 --- a/pages/plugins/coin/convert/convert.css +++ b/pages/plugins/coin/convert/convert.css @@ -0,0 +1,72 @@ +.coin-dropdown { + --height: 72rpx; + display: inline-block; + height: var(--height); + line-height: var(--height); + padding: 0 52rpx 0 20rpx; + background: #F6F6F6; + border-radius: 36rpx; + width: 168rpx; +} + +.coin-dropdown-icon { + right: -36rpx; + top: 2rpx; + padding: 0; +} + +.coin-list-img { + --size: 40rpx; + width: var(--size); + height: var(--size) !important; +} + +.coin-num { + --height: 72rpx; + display: inline-block; +} + +.num.input-br { + border: 2rpx solid #F6F6F6; +} + +.coin-num .num { + height: var(--height); + line-height: var(--height); + padding: 0 20rpx 0 20rpx; + border-radius: 36rpx; + width: 196rpx; +} + +.coin-center-convert { + --size: 82rpx; + left: 50%; + transform: translateX(-50%); + margin-top: -54rpx; + width: var(--size); + height: var(--size); + border: 2rpx solid #e1e1e1; + border-radius: 50%; + background-color: #fff; +} + +.convert-icon { + transition: all 0.5s ease-in-out; +} + +.convert_true { + transform: rotate3d(1, 0, 0, 180deg); +} + +.convert_false { + transform: rotate3d(1, 0, 0, 0deg); +} + +.convert-btn { + background: linear-gradient(107deg, #31B4FC 0%, #0842E2 100%); + transition: all 0.3s ease-in-out; +} + +.convert-btn:active { + background: linear-gradient( 107deg, #FC6F31 0%, #E22C08 100%); +} \ No newline at end of file diff --git a/pages/plugins/coin/convert/convert.vue b/pages/plugins/coin/convert/convert.vue index 77ea8e72..5b318db5 100644 --- a/pages/plugins/coin/convert/convert.vue +++ b/pages/plugins/coin/convert/convert.vue @@ -2,7 +2,64 @@ - 123 + + + + + + + + + {{ coin_list_old[coin_index_old]['name'] }} + + + + + + + 余额:23.234 + + + + $21.00 + + + + + + + + + + + + {{ coin_list_new[coin_index_new]['name'] }} + + + + + + + 余额:23.234 + + + + $21.00 + + + + + 1XRP = 2.45546 ($21.00) + + + + 支付密码 + + + + + + @@ -21,6 +78,32 @@ return { theme_view: app.globalData.get_theme_value_view(), wallet_static_url: wallet_static_url, + + // 虚拟币状态 + coin_index_old: 0, + coin_list_old: [ + { + name: 'BTC', + img: wallet_static_url + 'user-head-bg.png', + }, + { + name: 'USDT-polygon', + img: wallet_static_url + 'user-head-bg.png', + }, + ], + coin_index_new: 0, + coin_list_new: [ + { + name: 'BTC', + img: wallet_static_url + 'user-head-bg.png', + }, + { + name: 'USDT-polygon', + img: wallet_static_url + 'user-head-bg.png', + }, + ], + // 是否转换 + convert_bool: false, }; }, @@ -65,6 +148,31 @@ // 获取数据 get_data() {}, + // 虚拟币切换1 + coin_event_old(e) { + this.setData({ + coin_index_old: parseInt(e.detail.value || 0), + }); + }, + + // 虚拟币切换2 + coin_event_new(e) { + this.setData({ + coin_index_new: parseInt(e.detail.value || 0), + }); + }, + + // 虚拟货币调换 + coin_center_convert_event() { + var old_index = this.coin_index_old; + var new_index = this.coin_index_new; + this.setData({ + coin_index_new: old_index, + coin_index_old: new_index, + convert_bool: !this.convert_bool, + }); + }, + // 页面滚动监听 scroll_event(e) { uni.$emit('onPageScroll', e.detail); diff --git a/pages/plugins/coin/recharge/recharge.css b/pages/plugins/coin/recharge/recharge.css index a9144a8c..492a8317 100644 --- a/pages/plugins/coin/recharge/recharge.css +++ b/pages/plugins/coin/recharge/recharge.css @@ -19,17 +19,18 @@ border-radius: 12px; } +.coin-dropdown-icon { + right: -36rpx; + top: 2rpx; + padding: 0; +} + .recharge-qrcode { background-color: #fff; border-radius: 40rpx; text-align: center; padding: 30rpx 38rpx; } -.coin-dropdown-icon { - right: -36rpx; - top: 2rpx; - padding: 0; -} /* * 内容 @@ -71,7 +72,13 @@ .recharge-btn { background: linear-gradient(107deg, #31B4FC 0%, #0842E2 100%); + transition: all 0.3s ease-in-out; } + +.recharge-btn:active { + background: linear-gradient(107deg, #FC6F31 0%, #E22C08 100%); +} + .recharge-content-tips .item::before { content: ''; width: 12rpx; diff --git a/pages/plugins/coin/recharge/recharge.vue b/pages/plugins/coin/recharge/recharge.vue index e7dbc54d..0f477121 100644 --- a/pages/plugins/coin/recharge/recharge.vue +++ b/pages/plugins/coin/recharge/recharge.vue @@ -88,8 +88,7 @@ wallet_static_url: wallet_static_url, status_bar_height: bar_height, - // 是否显示虚拟币 - is_unit_arrow: false, + // 虚拟币状态 coin_index: 0, coin_list: [ { @@ -181,13 +180,13 @@ price_change() { this.setData({}); }, - // + // 虚拟币切换 coin_event(e) { this.setData({ coin_index: parseInt(e.detail.value || 0), }); }, - // 充币网络 + // 充币网络切换 recharge_event(e) { this.setData({ recharge_web_index: parseInt(e.detail.value || 0), diff --git a/pages/plugins/coin/user/user.vue b/pages/plugins/coin/user/user.vue index 35436195..cb9ccf5a 100644 --- a/pages/plugins/coin/user/user.vue +++ b/pages/plugins/coin/user/user.vue @@ -86,83 +86,11 @@ ], coin_data: [ { - img: wallet_static_url + 'title-bg.png', + img: wallet_static_url + 'user-head-bg.png', name: 'BTC', price: '¥20000', num: '200000', - }, - { - img: wallet_static_url + 'title-bg.png', - name: 'BTC', - price: '¥20000', - num: '200000', - }, - { - img: wallet_static_url + 'title-bg.png', - name: 'BTC', - price: '¥20000', - num: '200000', - }, - { - img: wallet_static_url + 'title-bg.png', - name: 'BTC', - price: '¥20000', - num: '200000', - }, - { - img: wallet_static_url + 'title-bg.png', - name: 'BTC', - price: '¥20000', - num: '200000', - }, - { - img: wallet_static_url + 'title-bg.png', - name: 'BTC', - price: '¥20000', - num: '200000', - }, - { - img: wallet_static_url + 'title-bg.png', - name: 'BTC', - price: '¥20000', - num: '200000', - }, - { - img: wallet_static_url + 'title-bg.png', - name: 'BTC', - price: '¥20000', - num: '200000', - }, - { - img: wallet_static_url + 'title-bg.png', - name: 'BTC', - price: '¥20000', - num: '200000', - }, - { - img: wallet_static_url + 'title-bg.png', - name: 'BTC', - price: '¥20000', - num: '200000', - }, - { - img: wallet_static_url + 'title-bg.png', - name: 'BTC', - price: '¥20000', - num: '200000', - }, - { - img: wallet_static_url + 'title-bg.png', - name: 'BTC', - price: '¥20000', - num: '200000', - }, - { - img: wallet_static_url + 'title-bg.png', - name: 'BTC', - price: '¥20000', - num: '200000', - }, + } ], }; }, diff --git a/static/icon/iconfont.css b/static/icon/iconfont.css index e29d8516..d4899814 100644 --- a/static/icon/iconfont.css +++ b/static/icon/iconfont.css @@ -18,15 +18,15 @@ content: "\e71e"; } -.icon-zhuanzhang:before { +.icon-transfer-count:before { content: "\e71b"; } -.icon-shoukuan:before { +.icon-collection:before { content: "\e71c"; } -.icon-zhuanhuan2:before { +.icon-convert2:before { content: "\e71d"; } diff --git a/static/icon/iconfont.ttf b/static/icon/iconfont.ttf index 39be6079..3d5f7664 100644 Binary files a/static/icon/iconfont.ttf and b/static/icon/iconfont.ttf differ