diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue index edb4698..db90a20 100644 --- a/pages/index/addClock.vue +++ b/pages/index/addClock.vue @@ -3,7 +3,7 @@ - + {{titleData}} {{earnings}} @@ -14,7 +14,7 @@ 当前周期 - {{startTime}}~{{endTime}} + {{startTime}}~{{endTime}} diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue index 491e8e5..d2aea04 100644 --- a/pages/index/currentIncome.vue +++ b/pages/index/currentIncome.vue @@ -3,18 +3,18 @@ - + - 当前收益 + 当前收益 {{shouyiMoeny}} - + 当前周期 - {{startTime}}~{{endTime}} + {{startTime}}~{{endTime}} diff --git a/pages/index/currentPoints.vue b/pages/index/currentPoints.vue index a73ac3c..cd1c4aa 100644 --- a/pages/index/currentPoints.vue +++ b/pages/index/currentPoints.vue @@ -2,19 +2,28 @@ - + + - 当前周期 - - - {{startTime}}~{{endTime}} + 当前积分 + {{sumJf}} - 往期积分 + + + 当前周期 + + + {{startTime}} + ~ + {{endTime}} + + + - - {{sumJf}} - 当前积分 + + + 往期积分 @@ -323,15 +332,13 @@ margin-bottom: 10px; } .tapNav-list{ - width: 96%; + width:100%; margin: 0 auto; display: flex; flex-direction:row; align-items: center; justify-content: space-between; background-color: #fff; - border-radius: 15rpx; - margin-top: -30px; padding: 10rpx 0; } .tapNav-view{ @@ -609,35 +616,38 @@ display: flex; flex-direction: column; } + .header-bottom{ + display: flex; + align-items: end; + } .header-bottom-money{ font-weight: bold; font-size: 49rpx; - color: #FFFFFF; + color: #00b198; + margin-bottom: 3px; } .header-top-btn{ width: 174rpx; height: 49rpx; - line-height: 49rpx; + line-height: 46rpx; text-align: center; font-size: 26rpx; - color: #333333; - background: #FFFFFF; + background: linear-gradient(90deg, #019C88, #0FA78B, #35C495); border-radius: 24rpx; + color: #fff; } .header-text{ font-weight: 400; font-size: 26rpx; - color: #FFFFFF; + color: #00b198; margin-right: 8rpx; } .header-text1{ font-weight: 400; font-size: 24rpx; - color: #019c88; + color: #00b198; margin-right: 8rpx; border-radius: 30rpx; - background: #fff; - padding: 1rpx 10rpx; } .header-top-left image{ width: 24.31rpx; @@ -645,10 +655,9 @@ margin-right: 2px; margin-top: 3px; } - .header-top-left{ - display: flex; - flex-direction: row; - align-items: center; + ..header-top-left{ + margin-top:40rpx; + text-align: right; } .header-top{ width: 100%; @@ -659,14 +668,15 @@ } .header{ width: 100%; - height: 300rpx; - padding: 5px 20px; - background:#f7f7f7 url('../../static/index/fun_banner4.png'); + height: 280rpx; + padding: 15px; + background:#f7f7f7 url('../../static/index/technician15.png'); background-repeat: no-repeat; - background-size: 100% 100%; + background-size: 100%; display: flex; flex-direction: column; justify-content: space-around; + /*border-radius: 24rpx;*/ } .content{ width: 100%; diff --git a/pages/index/currentYeji.vue b/pages/index/currentYeji.vue index 8dfae2a..ea6d0ac 100644 --- a/pages/index/currentYeji.vue +++ b/pages/index/currentYeji.vue @@ -35,7 +35,7 @@ {{startTime}} - ~ + ~ {{endTime}} diff --git a/pages/index/previousAdditions.vue b/pages/index/previousAdditions.vue index 8a5f131..8eb93b4 100644 --- a/pages/index/previousAdditions.vue +++ b/pages/index/previousAdditions.vue @@ -3,7 +3,7 @@ - + {{titleData}} @@ -16,7 +16,7 @@ 当前周期 - {{startTime}}~{{endTime}} + {{startTime}}~{{endTime}} diff --git a/pages/index/previousEarnings.vue b/pages/index/previousEarnings.vue index aa199f0..02952b8 100644 --- a/pages/index/previousEarnings.vue +++ b/pages/index/previousEarnings.vue @@ -20,9 +20,9 @@ - + - 当前业绩 + 当前收益 {{shouyiMoeny}} @@ -32,7 +32,7 @@ {{startTime}} - ~ + ~ {{endTime}} @@ -40,7 +40,7 @@ - 往期业绩 + 往期收益 @@ -710,7 +712,6 @@ display: flex; flex-direction: row; justify-content: space-between; - margin-bottom: 10px; } .header{ width: 100%; diff --git a/static/purse4.png b/static/purse4.png new file mode 100644 index 0000000..bbdc3ec Binary files /dev/null and b/static/purse4.png differ diff --git a/static/purse5.png b/static/purse5.png new file mode 100644 index 0000000..ad50918 Binary files /dev/null and b/static/purse5.png differ