From c254a9049dbdc7bf117cac0b368ac755720fb22e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 3 Sep 2024 09:36:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/commission/index.vue           | 299 +++++++++++++++++++-----------
 my/fund/index.vue                 |  68 ++++++-
 pages/index/addClock.vue          |  37 ++--
 pages/index/currentIncome.vue     |  34 ++--
 pages/index/currentPoints.vue     |   5 +-
 pages/index/currentYeji.vue       |   2 +-
 pages/index/previousAdditions.vue |  72 ++++---
 pages/index/previousEarnings.vue  |  46 +++--
 pages/index/previousPoints.vue    | 116 +++++++-----
 9 files changed, 448 insertions(+), 231 deletions(-)

diff --git a/my/commission/index.vue b/my/commission/index.vue
index 39d431d..85b2a58 100644
--- a/my/commission/index.vue
+++ b/my/commission/index.vue
@@ -73,8 +73,7 @@
 					@change="confirmSelectedDate" v-model="selectedDate" @maskClick="maskClick" />
 			</view>
 			<view id="IntegralStatisticsBottom" :style="{height:domNeedHeight == 0? 420 + 'px' : domNeedHeight + 'px',top:0}">
-				<view class="optionsDetail">
-					<!-- 父元素列表 -->
+				<!-- <view class="optionsDetail">
 					<cc-nodata title="暂无数据" v-if="noDataScrollStatus"
 						:style="{width:100+'%',height:domNeedHeight == 0? 420 + 'px' : domNeedHeight + 'px'}"></cc-nodata>
 					
@@ -121,6 +120,54 @@
 					</view>
 					<uniLoadMore color="#999" :iconType="iconType" :status="loadingStatus" :marginBottom="20"
 						:marginTop="20" v-if="isShowLoadMore" />
+				</view> -->
+				<view class="optionsDetail">
+					<t-refresh class="mian" ref="refresh" v-if="commissionDetail.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0" >
+						<template slot="content" >
+							<view class="optionsDetailImport" v-for="(item,index) in commissionDetail" :key="index">
+								<view class="mian-head">
+									<view class="mian-head-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
+									<view class="mian-head-time">
+										<span class="shouyi-text">预约时间: </span>
+										<span>{{item.serveTime}}</span>
+									</view>
+								</view>
+								<view class="mian-foot">
+									<view class="mian-foot-img">
+										<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
+									</view>
+									<view class="mian-foot-list">
+										<view class="mian-foot-view">
+											<view class="mian-title">{{item.entryName}}</view>
+											<view class="mian-dingwei">
+												<image src="../../static/index/dangqian2.png" mode=""></image>
+												<span class="shouyi-text">{{item.km}}km</span>
+											</view>
+										</view>
+										<view class="mian-foot-dan od-number">
+											订单编号 : {{item.ordersNo}}
+										</view>
+										<view class="mian-foot-adder shouyi-text add-text">
+											服务地址 : {{item.address}}
+										</view>
+										<view class="mian-bottom">
+											<view class="mian-bottom-xiang shouyi-text">
+												项目金额 :
+												<span  style="color: #FF6000;font-weight: bold;">
+													￥{{item.priceTotal}}
+												</span>
+											</view>
+											<view class="mian-bottom-shou">
+												<span class="shouyi-text">本单收益:  </span>
+												<span class="shouyi-text">￥{{item.artificerMoneyTotal}}</span>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</template> 
+					</t-refresh>
+					<empty v-if="commissionDetail.length==0"></empty>
 				</view>
 			</view>
 		</view>
@@ -128,6 +175,8 @@
 </template>
 
 <script>
+	import empty from '@/components/empty.vue'
+	import tRefresh from "@/components/t-refresh/t-refresh.vue"
 	import * as websocketUtils from 'utils/websocketUtils.js';
 	import uniLoadMore from "@/uview-ui/components/u-loadmore/u-loadmore.vue";
 	import navBar from "@/components/navBar/navBar.vue";
@@ -176,7 +225,7 @@
 		},
 		onReady() {
 			//自适应改变列表高度
-			this.selfAdaptionChangeElemtHeight();
+			// this.selfAdaptionChangeElemtHeight();
 		},
 		//上拉触底
 		onReachBottom(e) {
@@ -222,6 +271,7 @@
 		},
 		data() {
 			return {
+				loadingType:0,
 				domNeedHeight: 0, //元素的所需高度
 				selectedDate: this.currentDate,
 				statusBarHeight: 20,
@@ -291,6 +341,25 @@
 					//TODO handle the exception
 				}
 			},
+			// 加载更多
+			loadMore: async function() {
+				//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
+				if(this.loadingType==0){
+					this.loadingType=2
+					//模拟数据请求
+					setTimeout(()=>{
+						this.currentPage++;
+						this.loadingType=0;
+						this.getCommissionDataList({
+							artificerId: this.artificerId,
+							fundData: this.selectedDate,
+							fundType: this.activeRange,
+							limit: this.pageSize,
+							page: this.currentPage,
+						})
+					},1000)
+				}
+			},
 			//获取下方积分明细(列表)
 			getCommissionDataList(params, isScroll) {
 				this.loadingStatus = "loading";
@@ -318,8 +387,10 @@
 						// 	}
 						// 	this.commissionDetail.push(obj);
 						// })
-						this.commissionDetail=res.data.records||{};
-						console.log("this.commissionDetail",res.data.records)
+						// this.commissionDetail=res.data.records||{};
+						for (let i = 0; i < res.data?.records.length; i++) {
+							this.commissionDetail.push(res.data?.records[i]);
+						}
 						this.noDataScrollStatus = false;
 						this.isShowLoadMore = true;
 						if (this.commissionDetail.length < res.data.total) {
@@ -454,106 +525,126 @@
 		color: #7ea866;
 	}
 	.mian-bottom{
-			width: 100%;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			justify-content: space-between;
-			margin-top: 8rpx;
-		}
-		.mian-foot-adder{
-			margin: 3px 0px;
-		}
-		.mian-dingwei image{
-			width: 18.75rpx;
-			height:21.53rpx;
-			margin-right: 5px;
-		}
-		.mian-dingwei,.mian-bottom-shou{
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-		}
-		.mian-title{
-			font-weight: bold;
-			font-size: 31rpx;
-			color: #333333;
-		}
-		.mian-foot-view{
-			width: 100%;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			justify-content: space-between;
-			margin-bottom: 5px;
-		}
-		.mian-foot-list{
-			width: 72%;
-			display: flex;
-			flex-direction: column;
-		}
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		margin-top: 8rpx;
+	}
+	.mian-foot-adder{
+		margin: 3px 0px;
+	}
+	.mian-dingwei image{
+		width: 18.75rpx;
+		height:21.53rpx;
+		margin-right: 5px;
+	}
+	.mian-dingwei,.mian-bottom-shou{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.mian-title{
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #333333;
+	}
+	.mian-foot-view{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		margin-bottom: 5px;
+	}
+	.mian-foot-list{
+		width: 72%;
+		display: flex;
+		flex-direction: column;
+	}
 	.mian-foot-img image{
-			width: 100%;
-			height: 100%;
-			border-radius: 20rpx;
-		}
-		.mian-foot-img{
-			width: 160rpx;
-			height: 160rpx;
-			background: #E6E6E6;
-			border-radius: 30rpx;
-		}
-		
-		.mian-foot{
-			width: 100%;
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-		}
-		.shouyi-text{
-			color: #7D7D7D;
-			font-size: 26rpx;
-		}
-		.mian-head-time span:nth-child(2){
-			color: #11957C;
-			margin-top: 1px;
-		}
-		.mian-head-time{
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			font-weight: 400;
-			font-size: 26rpx;
-		}
-		.mian-head-biao{
-			width: 130rpx;
-			height: 47rpx;
-			line-height: 47rpx;
-			color: #fff;
-			font-size: 25rpx;
-			text-align: center;
-			background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-			border-radius:  8rpx 20rpx 20rpx 8rpx ;
-		}
-		.mian-head{
-			width: 100%;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			justify-content: space-between;
-			border-bottom: 1px solid #E5E5E5;
-			padding-bottom: 5px;
-			margin-bottom: 10px;
-		}
-		.mian-view{
-			width: 100%;
-			background-color: #fff;
-			padding:22rpx 26rpx;
-			border-radius: 24rpx;
-			display: flex;
-			flex-direction: column;
-			margin: 12rpx auto;
-		}
+		width: 100%;
+		height: 100%;
+		border-radius: 20rpx;
+	}
+	.mian-foot-img{
+		width: 160rpx;
+		height: 160rpx;
+		background: #E6E6E6;
+		border-radius: 30rpx;
+	}
+	
+	.mian-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+	.shouyi-text{
+		color: #7D7D7D;
+		font-size: 26rpx;
+	}
+	.mian-head-time span:nth-child(2){
+		color: #11957C;
+		margin-top: 1px;
+	}
+	.mian-head-time{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		font-weight: 400;
+		font-size: 26rpx;
+	}
+	.mian-head-biao{
+		width: 130rpx;
+		height: 47rpx;
+		line-height: 47rpx;
+		color: #fff;
+		font-size: 25rpx;
+		text-align: center;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		border-top-left-radius: 21rpx;
+		border-bottom-right-radius: 21rpx;
+	}
+	.mian-head{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		border-bottom: 1px solid #E5E5E5;
+		padding-bottom: 5px;
+		margin-bottom: 10px;
+	}
+	.mian-view{
+		width: 100%;
+		background-color: #fff;
+		padding:22rpx 26rpx;
+		border-radius: 24rpx;
+		display: flex;
+		flex-direction: column;
+		margin: 12rpx auto;
+	}
+	/deep/.refresh-body .content{
+		/* background-color: #f7f7f7; */
+	}
+	/deep/.refresh-body{
+		height:660px !important;
+		border-top: 2px solid #f7f7f7;
+	}
+	.content{
+		width: 100%;
+		/* height: 100vh; */
+		background-color: #f7f7f7;
+		overflow: hidden;
+	}
+	.mian{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
 </style>
 
 <style>
diff --git a/my/fund/index.vue b/my/fund/index.vue
index b4b7141..c7019f0 100644
--- a/my/fund/index.vue
+++ b/my/fund/index.vue
@@ -44,10 +44,9 @@
 						{{item.title}}
 					</view>
 				</view>
-				<view class="optionsDetail">
+				<!-- <view class="optionsDetail">
 					<cc-nodata title="暂无数据" v-if="noDataScrollStatus"
 						:style="{width:100+'%',height:domNeedHeight == 0? 420 + 'px' : domNeedHeight  + 'px'}"></cc-nodata>
-					<!-- 储值积分 -->
 					<view v-if="!noDataScrollStatus" v-for="(item,index) in fundDetail" :key="index"
 						class="optionsDetailImport">
 						<view class="storedIntegralTop">
@@ -66,6 +65,28 @@
 					</view>
 					<uniLoadMore color="#0cb598" :iconType="iconType" :status="loadingStatus" :marginBottom="20"
 						:marginTop="20" v-if="isShowLoadMore" />
+				</view> -->
+				<view class="optionsDetail">
+					<t-refresh class="mian" ref="refresh" v-if="fundDetail.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0" >
+						<template slot="content" >
+							<view class="optionsDetailImport" v-for="(item,index) in fundDetail" :key="index">
+								<view class="storedIntegralTop">
+									<view class="storedIntegralTopOfRight">
+										<view class="">{{item.type == 1 ?"收入":"支出"}}</view>
+										<view class=""><span v-if="item.type != 1">-</span>{{item.money}}元</view>
+									</view>
+								</view>
+								
+								<view class="storedIntegralMiddle">
+									<view class="">{{item.createTime}}</view>
+									<view class="storedIntegralMiddleofRight">余额:{{item.balance}}</view>
+								</view>
+								
+								<view class="storedIntegralBottom">备注: {{item.title}}</view>
+							</view>
+						</template> 
+					</t-refresh>
+					<empty v-if="fundDetail.length==0"></empty>
 				</view>
 			</view>
 		</view>
@@ -73,6 +94,8 @@
 </template>
 
 <script>
+	import empty from '@/components/empty.vue'
+	import tRefresh from "@/components/t-refresh/t-refresh.vue"
 	import * as websocketUtils from 'utils/websocketUtils.js';
 	import uniLoadMore from "@/uview-ui/components/u-loadmore/u-loadmore.vue";
 	import navBar from "@/components/navBar/navBar.vue";
@@ -120,7 +143,7 @@
 		},
 		onReady() {
 			//自适应改变列表高度
-			this.selfAdaptionChangeElemtHeight();
+			//this.selfAdaptionChangeElemtHeight();
 		},
 		//上拉触底
 		onReachBottom(e) {
@@ -165,6 +188,7 @@
 		},
 		data() {
 			return {
+				loadingType:0,
 				domNeedHeight: 0, //元素的所需高度
 				title: "资金明细",
 				backgroundcolor: "linear-gradient(to bottom, #294856, #1a615b)",
@@ -227,6 +251,25 @@
 				} catch (e) {
 					//TODO handle the exception
 				}
+			},// 加载更多
+			loadMore: async function() {
+				//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
+				if(this.loadingType==0){
+					this.loadingType=2
+					//模拟数据请求
+					setTimeout(()=>{
+						this.currentPage++;
+						this.loadingType=0;
+						this.getFundDataList({
+							artificerId: this.userId,
+							detailsType: this.activeIntegral,
+							fundData: this.selectedDate,
+							fundType: this.activeRange,
+							limit: this.pageSize,
+							page: this.currentPage
+						})
+					},1000)
+				}
 			},
 			//获取下方(列表)
 			getFundDataList(params, isScroll) {
@@ -363,4 +406,23 @@
 		background-color: #f1f1f1;
 		height: 100%;
 	}
+	/deep/.refresh-body .content{
+		/* background-color: #f7f7f7; */
+	}
+	/deep/.refresh-body{
+		height:570px !important;
+		border-top: 2px solid #f7f7f7;
+	}
+	.content{
+		width: 100%;
+		/* height: 100vh; */
+		background-color: #f7f7f7;
+		overflow: hidden;
+	}
+	.mian{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue
index db90a20..5016bc5 100644
--- a/pages/index/addClock.vue
+++ b/pages/index/addClock.vue
@@ -28,7 +28,7 @@
 				<view class="tapNav-bor" v-if="tapNum==index"></view>
 			</view>
 		</view>
-		<t-refresh class="mian" ref="refresh"  v-if="listData.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
+		<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 tap-padding">
 					<view class="view-title-left">
@@ -39,8 +39,7 @@
 					<view class="view-title-right">订单数量: {{totalCount}}</view>
 				</view>
 				<!--本期加钟 充值 订单-->
-				<view class="mina-view tap-padding" 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">
 							<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
@@ -61,14 +60,14 @@
 										<span class="shouyi-text">0.8km</span>
 									</view> -->
 								</view>
-								<view class="mian-foot-dan od-number" >
+								<view class="mian-foot-dan shouyi-text od-number" >
 									订单编号 : {{item.ordersNo}}
 								</view>
-								<view class="mian-foot-adder add-text" >
+								<view class="mian-foot-adder shouyi-text add-text" >
 									服务地址 : {{item.address}}
 								</view>
 								<view class="mian-bottom">
-									<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.priceTotal}}</view>
+									<view class="shouyi-text">项目金额 : ￥{{item.priceTotal}}</view>
 									<view class="mian-bottom-shou">
 										<span class="shouyi-text">本单收益:  </span>
 										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
@@ -97,19 +96,19 @@
 									<view class="mian-title">{{item.entryName}}</view>
 									<view class="mian-dingwei">
 										<image src="../../static/index/dangqian2.png" mode=""></image>
-										<span class="shouyi-text">0.8km</span>
+										<span class="shouyi-text">{{item.km}}km</span>
 									</view>
 								</view>
-								<view class="mian-foot-dan  od-number">
+								<view class="mian-foot-dan shouyi-text od-number">
 									订单编号 : {{item.ordersNo}}
 								</view>
-								<view class="mian-foot-adder add-text">
+								<view class="mian-foot-adder shouyi-text add-text">
 									服务地址 : {{item.address}}
 								</view>
 								<view class="mian-bottom">
-									<view class="mian-bottom-xiang add-text">项目金额 : ￥{{item.priceTotal}}</view>
+									<view class="shouyi-text">项目金额 : ￥{{item.priceTotal}}</view>
 									<view class="mian-bottom-shou">
-										<span class="add-text">本单收益:  </span>
+										<span class="shouyi-text">本单收益:  </span>
 										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
 									</view>
 								</view>
@@ -307,7 +306,7 @@
 		flex-direction:row;
 		align-items: center;
 		justify-content: space-between;
-		}
+	}
 	.tapNav-view{
 		height: 40px;
 		width: 50%;
@@ -387,7 +386,7 @@
 		display: flex;
 		flex-direction: column;
 	}
-.mian-foot-img image{
+	.mian-foot-img image{
 		width: 100%;
 		height: 100%;
 		border-radius: 20rpx;
@@ -405,6 +404,10 @@
 		flex-direction: row;
 		justify-content: space-between;
 	}
+	.shouyi-text{
+		color: #7D7D7D;
+		font-size: 26rpx;
+	}
 	.mian-list-top-time span{
 		font-size:26rpx;
 	}
@@ -555,11 +558,11 @@
 		font-family: Helvetica Neue, Helvetica, sans-serif;
 	}
 	.od-number{
-	    font-size: 12px;
-	    color: #7ea866;
+		font-size: 24rpx;
+		color: #7ea866;
 	}
 	.add-text{
-	    font-size: 13px;
-	    color: #999;
+		font-size: 26rpx;
+		color: #999;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/index/currentIncome.vue b/pages/index/currentIncome.vue
index d2aea04..9bc682d 100644
--- a/pages/index/currentIncome.vue
+++ b/pages/index/currentIncome.vue
@@ -91,8 +91,6 @@
 				limit:10,
 				shouyiMoeny:'',
 				wqsyshow:false,
-				
-				
 			}
 		},
 		onLoad(e) {
@@ -208,9 +206,15 @@
 		/* background-color: #f7f7f7; */
 	}
 	/deep/.refresh-body{
-		height: 100% !important;
+		height:640px !important;
 		border-top: 2px solid #f7f7f7;
 	}
+	.content{
+		width: 100%;
+		/* height: 100vh; */
+		background-color: #f7f7f7;
+		overflow: hidden;
+	}
 	.mian-bottom{
 		width: 100%;
 		display: flex;
@@ -218,7 +222,6 @@
 		align-items: center;
 		justify-content: space-between;
 		margin-top: 8rpx;
-		font-size: ;
 	}
 	.mian-foot-adder{
 		margin: 3px 0px;
@@ -251,7 +254,7 @@
 		display: flex;
 		flex-direction: column;
 	}
-.mian-foot-img image{
+	.mian-foot-img image{
 		width: 100%;
 		height: 100%;
 		border-radius: 20rpx;
@@ -322,17 +325,16 @@
 		flex-direction: column;
 		align-items: center;
 	}
-	
+	.header-bottom{
+		display: flex;
+		align-items: end;
+	}
 	.header-bottom-money{
 		font-weight: bold;
 		font-size: 49rpx;
 		color: #00b198;
 		margin-bottom: 3px;
 	}
-	.header-bottom{
-		display: flex;
-		align-items: end;
-	}
 	.header-top-btn{
 		width: 174rpx;
 		height: 49rpx;
@@ -356,6 +358,12 @@
 		margin-right: 8rpx;
 		border-radius: 30rpx;
 	}
+	.header-top-left image{
+		width: 24.31rpx;
+		height:22.92rpx;
+		margin-right: 2px;
+		margin-top: 3px;
+	}
 	.header-top-left{
 		margin-top:20rpx;
 		text-align: right;
@@ -378,11 +386,7 @@
 		justify-content: space-around;
 		/*border-radius: 24rpx;*/
 	}
-	.content{
-		width: 100%;
-		height: 100vh;
-		background-color: #f7f7f7;
-	}
+
 	.od-number{
 		font-size: 24rpx;
 		color: #7ea866;
diff --git a/pages/index/currentPoints.vue b/pages/index/currentPoints.vue
index 7624f36..7d9614e 100644
--- a/pages/index/currentPoints.vue
+++ b/pages/index/currentPoints.vue
@@ -19,9 +19,7 @@
 						<span>{{endTime}}</span>
 					</view>
 				</view>
-
 			</view>
-
 			<view class="flex justify-end">
 				<view  class="header-top-btn"  @click="wangqi">往期积分</view>
 			</view>
@@ -527,7 +525,6 @@
 		height: 160rpx;
 		background: #E6E6E6;
 		border-radius: 30rpx;
-
 	}
 
 	.mian-foot{
@@ -703,5 +700,5 @@
 	}
 	.mian-bottom-xiang{
 		color: #7D7D7D;
-		}
+	}
 </style>
diff --git a/pages/index/currentYeji.vue b/pages/index/currentYeji.vue
index 6a0081d..a58b368 100644
--- a/pages/index/currentYeji.vue
+++ b/pages/index/currentYeji.vue
@@ -281,7 +281,7 @@
 		display: flex;
 		flex-direction: column;
 	}
-.mian-foot-img image{
+	.mian-foot-img image{
 		width: 100%;
 		height: 100%;
 		border-radius: 20rpx;
diff --git a/pages/index/previousAdditions.vue b/pages/index/previousAdditions.vue
index 8eb93b4..96c97fa 100644
--- a/pages/index/previousAdditions.vue
+++ b/pages/index/previousAdditions.vue
@@ -35,18 +35,18 @@
 				<view class="tapNav-bor" v-if="tapNum==index"></view>
 			</view>
 		</view>
-		<t-refresh class="mian" ref="refresh"  v-if="listData.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
+		<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>
 							<span class="view-title-left-text" v-if="orderType==3">本期{{isSfwc=='1'?'已充值':'未充值'}}订单</span>
 						</view>
-						<view class="view-title-right">订单数量: {{listData.length}}</view>
+						<view class="view-title-right">订单数量: {{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">
 							<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
@@ -67,10 +67,10 @@
 										<span class="shouyi-text">0.8km</span>
 									</view> -->
 								</view>
-								<view class="mian-foot-dan shouyi-text">
+								<view class="mian-foot-dan od-number">
 									订单编号 : {{item.ordersNo}}
 								</view>
-								<view class="mian-foot-adder shouyi-text">
+								<view class="mian-foot-adder add-text">
 									服务地址 : {{item.address}}
 								</view>
 								<view class="mian-bottom">
@@ -85,7 +85,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>
@@ -101,19 +101,19 @@
 							<view class="mian-foot-list">
 								<view class="mian-foot-view">
 									<view class="mian-title">{{item.entryName}}</view>
-									<!-- <view class="mian-dingwei">
+									<view class="mian-dingwei">
 										<image src="../../static/index/dangqian2.png" mode=""></image>
-										<span class="shouyi-text">0.8km</span>
-									</view> -->
+										<span class="shouyi-text">{{item.km}}km</span>
+									</view>
 								</view>
-								<view class="mian-foot-dan shouyi-text">
+								<view class="mian-foot-dan shouyi-text od-number">
 									订单编号 : {{item.ordersNo}}
 								</view>
-								<view class="mian-foot-adder shouyi-text">
+								<view class="mian-foot-adder shouyi-text add-text">
 									服务地址 : {{item.address}}
 								</view>
 								<view class="mian-bottom">
-									<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.priceTotal}}</view>
+									<view class="shouyi-text">项目金额 : ￥{{item.priceTotal}}</view>
 									<view class="mian-bottom-shou">
 										<span class="shouyi-text">本单收益:  </span>
 										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
@@ -156,7 +156,7 @@
 				wqsyshow:true,
 				wqlistData:[],
 				earnings:'0%',
-				
+				totalCount:''
 			}
 		},
 		onLoad(e) {
@@ -252,6 +252,7 @@
 						if (that.page == 1) that.listData = []; //如果是第一页需手动制空列表
 						that.listData = [...that.listData, ...res.data.list]; //追加新数据
 						that.earnings = res.earnings;
+						that.totalCount=res.data.totalCount
 					} else {
 						that.$queue.showToast(res.msg);
 					}
@@ -284,6 +285,7 @@
 	}
 	/deep/.page-box{
 		width: 100%;
+		background: #f7f7f7;
 	}
 	/deep/.t-loading-box{
 		text-align: center;
@@ -300,7 +302,9 @@
 		font-size: 28rpx;
 		color: #333333;
 	}
-	
+	.tap-padding{
+		padding: 0 22rpx;
+	}
 	.tapNav-bor{
 		width: 100px;
 		height: 14rpx;
@@ -311,13 +315,12 @@
 		margin-bottom: 10px;
 	}
 	.tapNav-list{
-		width: 100%;
-		margin: 0 auto;
+		background: #fff;
+		width:100%;
 		display: flex;
 		flex-direction:row;
 		align-items: center;
 		justify-content: space-between;
-		background-color: #fff;
 	}
 	.tapNav-view{
 		height: 40px;
@@ -365,6 +368,7 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
+		margin-top: 4px;
 	}
 	.mian-foot-adder{
 		margin: 2px 0px;
@@ -393,30 +397,34 @@
 		margin-bottom: 5px;
 	}
 	.mian-foot-list{
-		width: 75%;
+		width: 73%;
 		display: flex;
 		flex-direction: column;
 	}
 	.mian-foot-img image{
 		width: 100%;
 		height: 100%;
+		border-radius: 20rpx;
 	}
 	.mian-foot-img{
-		width: 158rpx;
-		height: 188rpx;
+		width: 160rpx;
+		height: 160rpx;
 		background: #E6E6E6;
-		border-radius: 14rpx;
+		border-radius: 30rpx;
 	}
 	
 	.mian-foot{
 		width: 100%;
 		display: flex;
 		flex-direction: row;
-		align-items: center;
 		justify-content: space-between;
 	}
+	.shouyi-text{
+		color: #7D7D7D;
+		font-size: 26rpx;
+	}
 	.mian-list-top-time span{
-		font-size:25rpx;
+		font-size:26rpx;
 	}
 	.mian-list-top-time span:nth-child(1){
 		color: #7D7D7D;
@@ -461,13 +469,12 @@
 	}
 	.view-title-right{
 		font-weight: 400;
-		font-size: 21rpx;
+		font-size: 26rpx;
 		color: #666666;
 	}
 	.view-title-left-text{
 		font-weight: 400;
-		font-size: 25rpx;
-		color: #333333;
+		font-size: 26rpx;
 		margin-left: 5px;
 	}
 	.view-title-left-shuxian{
@@ -563,4 +570,15 @@
 		background-color: #f7f7f7;
 		overflow: scroll;
 	}
+	.clock-padding{
+		font-family: Helvetica Neue, Helvetica, sans-serif;
+	}
+	.od-number{
+		font-size: 24rpx;
+		color: #7ea866;
+	}
+	.add-text{
+		font-size: 26rpx;
+		color: #999;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/previousEarnings.vue b/pages/index/previousEarnings.vue
index 02952b8..4f8e8c7 100644
--- a/pages/index/previousEarnings.vue
+++ b/pages/index/previousEarnings.vue
@@ -48,8 +48,7 @@
 			</view>
 			 性别选择 -->
 			<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
-		</view>
-		
+		</view>	
 		<!-- 往期时间选择 -->
 		<u-action-sheet :list="wqlistData"  v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
 		<t-refresh class="mian" ref="refresh"  v-if="listData.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
@@ -71,7 +70,7 @@
 								<view class="mian-title">{{item.entryName}}</view>
 								<view class="mian-dingwei">
 									<image src="../../static/index/dangqian2.png" mode=""></image>
-									<span class="shouyi-text">0.8km</span>
+									<span class="shouyi-text">{{item.km}}km</span>
 								</view>
 							</view>
 							<view class="mian-foot-dan shouyi-text">
@@ -81,7 +80,7 @@
 								服务地址 : {{item.address}}
 							</view>
 							<view class="mian-bottom">
-								<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.priceTotal}}</view>
+								<view class="mian-bottom-xiang shouyi-text">项目金额 :<span>￥{{item.priceTotal}}</span></view>
 								<view class="mian-bottom-shou">
 									<span class="shouyi-text">本单收益:  </span>
 									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
@@ -213,18 +212,25 @@
 		/* background-color: #f7f7f7; */
 	}
 	/deep/.refresh-body{
-		height: 100% !important;
+		height:640px !important;
 		border-top: 2px solid #f7f7f7;
 	}
+	.content{
+		width: 100%;
+		/* height: 100vh; */
+		background-color: #f7f7f7;
+		overflow: hidden;
+	}
 	.mian-bottom{
 		width: 100%;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
+		margin-top: 8rpx;
 	}
 	.mian-foot-adder{
-		margin: 2px 0px;
+		margin: 3px 0px;
 	}
 	.mian-dingwei image{
 		width: 18.75rpx;
@@ -250,19 +256,20 @@
 		margin-bottom: 5px;
 	}
 	.mian-foot-list{
-		width: 75%;
+		width: 73%;
 		display: flex;
 		flex-direction: column;
 	}
 	.mian-foot-img image{
 		width: 100%;
 		height: 100%;
+		border-radius: 20rpx;
 	}
 	.mian-foot-img{
-		width: 158rpx;
-		height: 188rpx;
+		width: 160rpx;
+		height: 160rpx;
 		background: #E6E6E6;
-		border-radius: 14rpx;
+		border-radius: 30rpx;
 	}
 	
 	.mian-foot{
@@ -274,7 +281,7 @@
 	}
 	.shouyi-text{
 		color: #7D7D7D;
-		font-size: 22rpx;
+		font-size: 26rpx;
 	}
 	.mian-head-time span:nth-child(2){
 		color: #11957C;
@@ -285,7 +292,7 @@
 		flex-direction: row;
 		align-items: center;
 		font-weight: 400;
-		font-size: 25rpx;
+		font-size: 26rpx;
 	}
 	.mian-head-biao{
 		width: 130rpx;
@@ -311,11 +318,11 @@
 	.mian-view{
 		width: 95%;
 		background-color: #fff;
-		padding: 10px;
+		padding: 12px;
 		border-radius: 24rpx;
 		display: flex;
 		flex-direction: column;
-		margin-top: 10px;
+		margin: 26rpx auto;
 	}
 	.mian{
 		width: 100%;
@@ -384,9 +391,12 @@
 		justify-content: space-around;
 		/*border-radius: 24rpx;*/
 	}
-	.content{
-		width: 100%;
-		height: 100vh;
-		background-color: #f7f7f7;
+	.od-number{
+		font-size: 24rpx;
+		color: #7ea866;
+	}
+	.add-text{
+		font-size: 26rpx;
+		color: #999;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/index/previousPoints.vue b/pages/index/previousPoints.vue
index d99ac1d..c30e31b 100644
--- a/pages/index/previousPoints.vue
+++ b/pages/index/previousPoints.vue
@@ -65,15 +65,15 @@
 						<view class="mian-foot-list">
 							<view class="mian-foot-view">
 								<view class="mian-title">{{item.entryName}}</view>
-								<!-- <view class="mian-dingwei">
+								<view class="mian-dingwei">
 									<image src="../../static/index/dangqian2.png" mode=""></image>
 									<span class="shouyi-text">{{item.km}}km</span>
-								</view> -->
+								</view>
 							</view>
-							<view class="mian-foot-dan shouyi-text">
+							<view class="mian-foot-dan od-number">
 								订单编号 : {{item.ordersNo}}
 							</view>
-							<view class="mian-foot-adder shouyi-text">
+							<view class="mian-foot-adder shouyi-text add-text">
 								服务地址 : {{item.accomplishAddress}}
 							</view>
 							<view class="mian-bottom">
@@ -101,16 +101,16 @@
 				</view>
 				<view class="mian-table">
 					<view class="table-view">
-						<span>序号</span>
-						<span v-for="(item , index) in zxscList">{{index+1}}</span>
+						<span style="font-weight: bold;">序号</span>
+						<span  class="table-view-child" v-for="(item , index) in zxscList">{{index+1}}</span>
 					</view>
 					<view class="table-view">
-						<span>获取时间</span>
-						<span v-for="(item , index) in zxscList">{{item.jftime}}</span>
+						<span style="font-weight: bold;">获取时间</span>
+						<span class="table-view-child" v-for="(item , index) in zxscList">{{item.jftime}}</span>
 					</view>
 					<view class="table-view">
-						<span>获取积分</span>
-						<span v-for="(item , index) in zxscList">{{item.jifen}}</span>
+						<span style="font-weight: bold;">获取积分</span>
+						<span  class="table-view-child" v-for="(item , index) in zxscList">{{item.jifen}}</span>
 					</view>
 				</view>
 			</view>
@@ -119,22 +119,24 @@
 				<view class="view-title">
 					<view class="view-title-left">
 						<span class="view-title-left-shuxian"></span>
-						<span class="view-title-left-text">储值积分: <text class="view-num">{{czjf}}</text>(为您充值累计积分，兑换比例为1:1)</span>
+						<span class="view-title-left-text">储值积分: <text class="view-num">{{czjf}}</text>
+						<!-- (为您充值累计积分，兑换比例为1:1) -->
+						</span>
 					</view>
 					<!-- <view class="view-title-right" @click.stop="toggle('时长积分')">更多</view> -->
 				</view>
 				<view class="mian-table">
 					<view class="table-view">
-						<span>序号</span>
-						<span v-for="(item , index) in czjfList">{{index+1}}</span>
+						<span style="font-weight: bold;">序号</span>
+						<span class="table-view-child" v-for="(item , index) in czjfList">{{index+1}}</span>
 					</view>
 					<view class="table-view">
-						<span>获取时间</span>
-						<span v-for="(item , index) in czjfList">{{item.jftime}}</span>
+						<span style="font-weight: bold;">获取时间</span>
+						<span class="table-view-child" v-for="(item , index) in czjfList">{{item.jftime}}</span>
 					</view>
 					<view class="table-view">
-						<span>获取积分</span>
-						<span v-for="(item , index) in czjfList">{{item.jifen}}</span>
+						<span style="font-weight: bold;">获取积分</span>
+						<span class="table-view-child" v-for="(item , index) in czjfList">{{item.jifen}}</span>
 					</view>
 				</view>
 			</view>
@@ -143,11 +145,13 @@
 				<view class="view-title">
 					<view class="view-title-left">
 						<span class="view-title-left-shuxian"></span>
-						<span class="view-title-left-text">充值积分: <text class="view-num">{{ddczjf}}</text>(充值积分比例为1:1)</span>
+						<span class="view-title-left-text">充值积分: <text class="view-num">{{ddczjf}}</text>
+						<!-- (充值积分比例为1:1) -->
+						</span>
 					</view>
 					<!-- <view class="view-title-right" @click.stop="toggle('充值积分')">更多</view> -->
 				</view>
-				<view class="mian-list" @click="goOder(item)" v-for="(item,index) in ddczList" :key="index">
+				<!-- <view class="mian-list" @click="goOder(item)" v-for="(item,index) in ddczList" :key="index">
 					<view class="mian-list-top">
 						<view class="mian-list-top-biao">已完成</view>
 						<view class="mian-list-top-time">
@@ -182,6 +186,20 @@
 							</view>
 						</view>
 					</view>
+				</view> -->
+				<view class="mian-table">
+					<view class="table-view">
+						<span style="font-weight: bold;">序号</span>
+						<span class="table-view-child" v-for="(item , index) in ddczList">{{index+1}}</span>
+					</view>
+					<view class="table-view">
+						<span style="font-weight: bold;">获取时间</span>
+						<span class="table-view-child" v-for="(item , index) in ddczList">{{item.jftime}}</span>
+					</view>
+					<view class="table-view">
+						<span style="font-weight: bold;">获取积分</span>
+						<span class="table-view-child" v-for="(item , index) in ddczList">{{item.jifen}}</span>
+					</view>
 				</view>
 				<view v-if="ddczList.length == 0" style="line-height: 80px;width:100%;text-align: center;">
 					<span >暂无数据</span>
@@ -316,14 +334,11 @@
 				let day = now.getDate();
 				let currentDate = year + '-' + monthJia + '-' + day;
 				let dayEnd = new Date(now.getFullYear(), monthJia, 0).getDate();
-				if(day>=1&&day<=10){
+				if(day>=1&&day<=15){
 					this.startTime=year + '-' + monthJia + '-01';
-					this.endTime=year + '-' + monthJia + '-' + 10;
-				}else if(day>=11&&day<=20){
-					this.startTime=year + '-' + monthJia + '-' + 11;
-					this.endTime=year + '-' + monthJia + '-' + 20;
-				}else if(day>=21&&day<=dayEnd){
-					this.startTime=year + '-' + monthJia + '-' + 21
+					this.endTime=year + '-' + monthJia + '-' + 15;
+				}else if(day>=16&&day<=dayEnd){
+					this.startTime=year + '-' + monthJia + '-' + 16
 					this.endTime=year + '-' + monthJia + '-' + dayEnd;
 				}
 				if(!this.orderType){
@@ -505,15 +520,17 @@
 		display: flex;
 		flex-direction: column;
 	}
-	.table-view span:nth-child(1){
+	.table-view span{
+		font-size: 27rpx;
+		}
+	.table-view-bold{
 		font-weight: bold;
-		font-size:26rpx;
 	}
-	.table-view span:nth-child(2){
-		font-size:26rpx;
+	.table-view-child{
+		color: #888;
 	}
 	.table-view span{
-		margin-bottom: 15px;
+		margin-bottom: 20px;
 	}
 	.table-view{
 		display: flex;
@@ -523,17 +540,19 @@
 	}
 	.mian-table{
 		width: 100%;
-		padding: 10px;
+		padding: 15px;
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
 		align-items: center;
 		background: #FFFFFF;
-		border-radius: 24rpx;
+		border-radius: 21rpx;
 		margin-bottom: 10px;
 	}
 	.view-num{
-		color: #029D88 !important;
+		color: #fb672b !important;
+		font-weight: bold;
+		font-size: 30rpx;
 	}
 	.mian-bottom{
 		width: 100%;
@@ -541,9 +560,10 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
+		margin-top: 8rpx;
 	}
 	.mian-foot-adder{
-		margin: 2px 0px;
+		margin: 3px 0px;
 	}
 	.mian-dingwei image{
 		width: 18.75rpx;
@@ -576,19 +596,19 @@
 	.mian-foot-img image{
 		width: 100%;
 		height: 100%;
+		border-radius: 20rpx;
 	}
 	.mian-foot-img{
-		width: 158rpx;
-		height: 188rpx;
+		width: 160rpx;
+		height: 160rpx;
 		background: #E6E6E6;
-		border-radius: 14rpx;
+		border-radius: 30rpx;
 	}
 	
 	.mian-foot{
 		width: 100%;
 		display: flex;
 		flex-direction: row;
-		align-items: center;
 		justify-content: space-between;
 	}
 	.mian-list-top-time span{
@@ -642,8 +662,8 @@
 	}
 	.view-title-left-text{
 		font-weight: 400;
-		font-size: 25rpx;
-		color: #333333;
+		font-size: 28rpx;
+		color: #019c88;
 		margin-left: 5px;
 	}
 	.view-title-left-shuxian{
@@ -671,7 +691,8 @@
 		flex-direction: column;
 	}
 	.mina{
-		width: 95%;
+		width: 94%;
+		margin: 0 auto;
 		height: 300px;
 		display: flex;
 		flex-direction: column;
@@ -747,4 +768,15 @@
 		background-color: #f7f7f7;
 		overflow: scroll;
 	}
+	.od-number{
+		font-size: 24rpx;
+		color: #7ea866;
+	}
+	.add-text{
+		font-size: 26rpx;
+		color: #999;
+	}
+	.mian-bottom-xiang{
+		color: #7D7D7D;
+	}
 </style>
\ No newline at end of file