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] =?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 @@
 		<view class="header">
 			<view class="header-top">
 				<view class="header-top-left">
-					<image src="../../static/index/dangqian1.png" mode=""></image>
-					<span class="header-text" style="margin-right: 5px;">
-						当前周期 
-					</span>
-					<span class="header-text">{{startTime}}~{{endTime}}</span>
+					<view>
+						<span class="header-text"></image>当前周期</span>
+					</view>
+					<view>
+						<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
+					</view>
 				</view>
 				<view class="header-top-btn" @click="wangqi">往期{{orderType=='2'?'加钟率':'充值率'}}</view>
 			</view>
@@ -26,7 +27,7 @@
 		</view>
 		<t-refresh class="mian" ref="refresh"  v-if="listData.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
 			<template slot="content">
-				<view class="view-title">
+				<view class="view-title tap-padding">
 					<view class="view-title-left">
 						<span class="view-title-left-shuxian"></span>
 						<span class="view-title-left-text" v-if="orderType == 2">本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单</span>
@@ -35,7 +36,7 @@
 					<view class="view-title-right">订单数量: {{listData.totalCount}}</view>
 				</view>
 				<!--本期加钟 充值 订单-->
-				<view class="mina-view" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)">
+				<view class="mina-view tap-padding" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)">
 					
 					<view class="mian-list">
 						<view class="mian-list-top">
@@ -75,7 +76,7 @@
 					</view>
 				</view>
 				<!--本期未加钟 未充值 订单-->
-				<view class="mina-view"  v-if="isSfwc=='0'" v-for="item in listData" :key="item.id" @click="goOder(item)">
+				<view class="mina-view tap-padding"  v-if="isSfwc=='0'" v-for="item in listData" :key="item.id" @click="goOder(item)">
 					<view class="mian-list">
 						<view class="mian-list-top">
 							<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
@@ -286,7 +287,9 @@
 		font-size: 28rpx;
 		color: #333333;
 	}
-	
+	.tap-padding{
+		padding: 0 22rpx;
+	}
 	.tapNav-bor{
 		width: 100px;
 		height: 14rpx;
@@ -501,10 +504,18 @@
 	}
 	.header-text{
 		font-weight: 400;
-		font-size: 28rpx;
+		font-size: 26rpx;
 		color: #FFFFFF;
-		margin-top: 2px;
-		margin-bottom: 20rpx;
+		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;
@@ -515,7 +526,7 @@
 	.header-top-left{
 		display: flex;
 		flex-direction: row;
-		align-items: center;
+		justify-content: space-between;
 	}
 	.header-top{
 		width: 100%;
diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue
index 31b5439..4ae37d8 100644
--- a/pages/index/currentIncome.vue
+++ b/pages/index/currentIncome.vue
@@ -346,17 +346,6 @@
 		background: #fff;
 		padding: 1rpx 10rpx;
 	}
-	.header-top-left1 image{
-		width: 35rpx;
-		height:35rpx;
-		margin-right: 2px;
-		margin-top:3px;
-	}
-	.header-top-left1{
-		display: flex;
-		margin-bottom:12rpx;
-		justify-content: space-between;
-	}
 	.header-top-left{
 		display: flex;
 		flex-direction: row;
diff --git a/pages/index/previousAdditions.vue b/pages/index/previousAdditions.vue
index b3b57fd..6ecaa99 100644
--- a/pages/index/previousAdditions.vue
+++ b/pages/index/previousAdditions.vue
@@ -3,11 +3,12 @@
 		<view class="header">
 			<view class="header-top">
 				<view class="header-top-left">
-					<image src="../../static/index/dangqian1.png" mode=""></image>
-					<span class="header-text" style="margin-right: 5px;">
-						当前周期 
-					</span>
-					<span class="header-text">{{startTime}}~{{endTime}}</span>
+					<view>
+						<span class="header-text"></image>当前周期</span>
+					</view>
+					<view>
+						<span class="header-text1">{{startTime}}</span><span style="color: #fff; margin-right: 5rpx;">~</span><span class="header-text1">{{endTime}}</span>
+					</view>
 				</view>
 				<view class="header-top-btn" @click="wangqi">往期{{orderType=='2'?'加钟率':'充值率'}}</view>
 			</view>
@@ -290,7 +291,7 @@
 	}
 	.tapNav-name{
 		font-weight: bold;
-		font-size: 31rpx;
+		font-size: 28rpx;
 		color: #333333;
 	}
 	
@@ -509,9 +510,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;