From fa9d512575e4b1a4c56a22225d9c4efcc2f0f496 Mon Sep 17 00:00:00 2001 From: kbing1981 <549711992@qq.com> Date: Fri, 12 Jul 2024 15:30:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/currentIncome.vue | 41 ++++++++++++++++++++++---------- pages/index/previousEarnings.vue | 26 ++++++++++++++------ 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue index d764b99..225453b 100644 --- a/pages/index/currentIncome.vue +++ b/pages/index/currentIncome.vue @@ -2,10 +2,13 @@ - - - 当前周期 - {{startTime}}~{{endTime}} + + + 当前周期 + + + {{startTime}}~{{endTime}} + 往期收益 @@ -330,21 +333,35 @@ } .header-text{ font-weight: 400; - font-size: 30rpx; + font-size: 26rpx; color: #FFFFFF; margin-right: 8rpx; } - .header-top-left image{ - width: 24.31rpx; - height:22.92rpx; + .header-text1{ + font-weight: 400; + font-size: 24rpx; + color: #019c88; + margin-right: 8rpx; + border-radius: 30rpx; + background: #fff; + padding: 1rpx 10rpx; + } + .header-top-left1 image{ + width: 35rpx; + height:35rpx; margin-right: 2px; - margin-top: 3px; + margin-top:3px; + } + .header-top-left1{ + display: flex; + margin-bottom:12rpx; + justify-content: space-between; } .header-top-left{ display: flex; flex-direction: row; - align-items: center; - align-items: flex-end; + justify-content: space-between; + margin-top: -10rpx; } .header-top{ width: 100%; @@ -356,7 +373,7 @@ width: 100%; height: 300rpx; padding: 15px; - background:#ffffff url('../../static/index/fun_banner4.png'); + background:#f7f7f7 url('../../static/index/fun_banner4.png'); background-repeat: no-repeat; background-size: 100% 100%; display: flex; diff --git a/pages/index/previousEarnings.vue b/pages/index/previousEarnings.vue index e64a6ff..630494f 100644 --- a/pages/index/previousEarnings.vue +++ b/pages/index/previousEarnings.vue @@ -3,13 +3,16 @@ - - 当前周期 - {{startTime}}~{{endTime}} + + 当前周期 + + + {{startTime}}~{{endTime}} + 往期收益 - + {{shouyiMoeny}} 当前收益 @@ -305,9 +308,18 @@ } .header-text{ font-weight: 400; - font-size: 28rpx; + font-size: 26rpx; color: #FFFFFF; - margin-top: 2px; + margin-right: 8rpx; + } + .header-text1{ + font-weight: 400; + font-size: 24rpx; + color: #019c88; + margin-right: 8rpx; + border-radius: 30rpx; + background: #fff; + padding: 1rpx 10rpx; } .header-top-left image{ width: 24.31rpx; @@ -318,7 +330,7 @@ .header-top-left{ display: flex; flex-direction: row; - align-items: center; + justify-content: space-between; } .header-top{ width: 100%; From 991f356f21eb6aa58212b27f615f9052b74aadea Mon Sep 17 00:00:00 2001 From: kbing1981 <549711992@qq.com> Date: Fri, 12 Jul 2024 15:47:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/addClock.vue | 37 ++++++++++++++++++++----------- pages/index/currentIncome.vue | 11 --------- pages/index/previousAdditions.vue | 26 +++++++++++++++------- 3 files changed, 42 insertions(+), 32 deletions(-) diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue index fabc2e2..bf9a4f2 100644 --- a/pages/index/addClock.vue +++ b/pages/index/addClock.vue @@ -3,11 +3,12 @@ - - - 当前周期 - - {{startTime}}~{{endTime}} + + 当前周期 + + + {{startTime}}~{{endTime}} + 往期{{orderType=='2'?'加钟率':'充值率'}} @@ -26,7 +27,7 @@