From 593e3cc33be7b4a5d29fd421d6c607641f9a0b84 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 27 Jun 2024 16:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=85=B1=E5=97=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/addClock.vue          |  31 +-
 pages/index/previousAdditions.vue | 648 ++++++++++++++++++++++++------
 2 files changed, 528 insertions(+), 151 deletions(-)

diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue
index 50a3d77..7586ee9 100644
--- a/pages/index/addClock.vue
+++ b/pages/index/addClock.vue
@@ -13,7 +13,7 @@
 			</view>
 			<view class="header-bottom">
 				<view class="header-bottom-money">
-					{{orderType=='2'?homePageCountData[0]:homePageCountData[1]}}
+					{{earnings}}
 				</view>
 				<view class="header-text">{{titleData}}</view>
 			</view>
@@ -26,15 +26,16 @@
 		</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-left">
+						<span class="view-title-left-shuxian"></span>
+						<span class="view-title-left-text">本期{{orderType=='2'?'已加钟':'已充值'}}订单</span>
+					</view>
+					<view class="view-title-right">加钟{{isSfwc}}订单数量: {{listData.length}}</view>
+				</view>
 				<!--本期加钟 充值 订单-->
 				<view class="mina-view" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)">
-					<view class="view-title">
-						<view class="view-title-left">
-							<span class="view-title-left-shuxian"></span>
-							<span class="view-title-left-text">本期{{orderType=='2'?'已加钟':'已充值'}}订单</span>
-						</view>
-						<view class="view-title-right">加钟订单数量: {{listData.length}}</view>
-					</view>
+					
 					<view class="mian-list">
 						<view class="mian-list-top">
 							<view class="mian-list-top-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
@@ -73,14 +74,7 @@
 					</view>
 				</view>
 				<!--本期未加钟 未充值 订单-->
-				<view class="mina-view" v-else v-for="item in listData" :key="item.id" @click="goOder(item)">
-					<view class="view-title">
-						<view class="view-title-left">
-							<span class="view-title-left-shuxian"></span>
-							<span class="view-title-left-text">本期{{orderType=='2'?'已加钟':'已充值'}}订单</span>
-						</view>
-						<view class="view-title-right">加钟订单数量: {{listData.length}}</view>
-					</view>
+				<view class="mina-view"  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>
@@ -148,6 +142,7 @@
 				],
 				isSfwc:'1',
 				homePageCountData:'',
+				earnings:'0',
 				
 			}
 		},
@@ -184,6 +179,7 @@
 				})
 			},
 			tabClick(isSfwc,index){
+				console.log('isSfwc--->',isSfwc);
 				this.tapNum=index;
 				this.isSfwc=isSfwc;
 				this.page=0;
@@ -241,6 +237,7 @@
 					if (res.code == 0) {
 						if (that.page == 1) that.listData = []; //如果是第一页需手动制空列表
 						that.listData = [...that.listData, ...res.data.list]; //追加新数据
+						that.earnings = res.earnings;
 					} else {
 						that.$queue.showToast(res.msg);
 					}
@@ -253,7 +250,7 @@
 			},
 			wangqi(){//往期 跳页
 				uni.navigateTo({
-					url:'/pages/index/previousAdditions'
+					url:'/pages/index/previousAdditions?type=2'
 				})
 			},
 		}
diff --git a/pages/index/previousAdditions.vue b/pages/index/previousAdditions.vue
index f1ba07b..6f83780 100644
--- a/pages/index/previousAdditions.vue
+++ b/pages/index/previousAdditions.vue
@@ -1,173 +1,553 @@
 <template>
 	<view class="content">
-		<view class="header"></view>
-		<table border="0" class="mian-table">
-			<tr class="mian-table-top">
-				<td>序号</td>
-				<td>开始日期</td>
-				<td>结束日期</td>
-				<td>金额</td>
-				<td>操作</td>
-			</tr>
-			<tr class="table-list">
-				<td>01</td>
-				<td>2024.01.01</td>
-				<td>2024.01.01</td>
-				<td>￥653.40</td>
-				<td class="mian-foot-btns" @click="detailTd">
-					详情
-				</td>
-			</tr>
-		
-			
-		</table>
-		<!-- <view class="mian">
-			<view class="mian-nav">
-				<view class="mian-nav-list xuhao">序号</view>
-				<view class="mian-nav-list riqi">开始日期</view>
-				<view class="mian-nav-list riqi">结束日期</view>
-				<view class="mian-nav-list jie">金额</view>
-				<view class="mian-nav-list caozuo">操作</view>
-			</view>
-			<view class="mian-foot">
-				<view class="mian-foot-view">
-					<view class="mian-foot-list xuhao">01</view>
-					<view class="mian-foot-list riqi">2024.01.01</view>
-					<view class="mian-foot-list riqi">2024.01.01</view>
-					<view class="mian-foot-list jie">￥653.40</view>
-					<view class="mian-foot-btn caozuo">详情</view>
+		<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>
+				<view class="header-top-btn" @click="wangqi">往期{{orderType=='2'?'加钟率':'充值率'}}</view>
 			</view>
-		</view> -->
+			<view class="header-bottom">
+				<view class="header-bottom-money">
+					{{earnings}}
+				</view>
+				<view class="header-text">{{titleData}}</view>
+			</view>
+		</view>
+		
+		<!-- 往期时间选择 -->
+		<u-action-sheet :list="wqlistData"  v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
+		
+		<view class="tapNav-list">
+			<view class="tapNav-view" v-for="(item,index) in tapNav" :key="index" @click="tabClick(item.isSfwc,index)">
+				<view class="tapNav-name">{{item.name}}</view>
+				<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">
+			<template slot="content">
+					<view class="view-title">
+						<view class="view-title-left">
+							<span class="view-title-left-shuxian"></span>
+							<span class="view-title-left-text">本期{{orderType=='2'?'已加钟':'已充值'}}订单</span>
+						</view>
+						<view class="view-title-right">加钟订单数量: {{listData.length}}</view>
+					</view>
+				<!--本期加钟 充值 订单-->
+				<view class="mina-view" 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>
+							<view class="mian-list-top-time">
+								<span>预约时间: </span>
+								<span>{{item.serveTime}}</span>
+							</view>
+						</view>
+						<view class="mian-foot">
+							<view class="mian-foot-img">
+								<image src="../../my/static/bg6.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">0.8km</span>
+									</view>
+								</view>
+								<view class="mian-foot-dan shouyi-text">
+									订单编号 : {{item.ordersNo}}
+								</view>
+								<view class="mian-foot-adder shouyi-text">
+									服务地址 : {{item.address}}
+								</view>
+								<view class="mian-bottom">
+									<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.price}}</view>
+									<view class="mian-bottom-shou">
+										<span class="shouyi-text">本单收益:  </span>
+										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoney}}</span>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!--本期未加钟 未充值 订单-->
+				<view class="mina-view" 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>
+							<view class="mian-list-top-time">
+								<span>预约时间: </span>
+								<span>{{item.serveTime}}</span>
+							</view>
+						</view>
+						<view class="mian-foot">
+							<view class="mian-foot-img">
+								<image src="../../my/static/bg6.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">0.8km</span>
+									</view>
+								</view>
+								<view class="mian-foot-dan shouyi-text">
+									订单编号 : {{item.ordersNo}}
+								</view>
+								<view class="mian-foot-adder shouyi-text">
+									服务地址 : {{item.address}}
+								</view>
+								<view class="mian-bottom">
+									<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.price}}</view>
+									<view class="mian-bottom-shou">
+										<span class="shouyi-text">本单收益:  </span>
+										<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoney}}</span>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+						
+			</template>
+		</t-refresh>
+		<empty v-if="listData.length==0"></empty>
 	</view>
 </template>
 
 <script>
-	export default{
+	import empty from '@/components/empty.vue'
+	import tRefresh from "@/components/t-refresh/t-refresh.vue"
+	export default {
+		components:{tRefresh,empty},
 		data(){
-			return{}
+			return{
+				orderType:'',
+				userId:'',
+				startTime:'',
+				endTime:'',
+				listData:[],
+				titleData:'',
+				loadingType:0,
+				page:1,
+				limit:10,
+				tapNum:0,
+				tapNav:[
+					{name:'本期已加钟订单',isSfwc:'1'},
+					{name:'本期未加钟订单',isSfwc:'0'}
+				],
+				isSfwc:'1',
+				homePageCountData:'',
+				wqsyshow:true,
+				wqlistData:[],
+				earnings:'0%',
+				
+			}
+		},
+		onLoad(e) {
+			this.orderType=e.type;
+			this.homePageCountData=this.$queue.getData("homePageCountNumOne");
+			this.titleData=this.orderType=='2'?'往期加钟率':'往期充值率';
+			if(this.orderType=='2'){
+				this.tapNav=[
+					{name:'本期已加钟订单',isSfwc:'1'},
+					{name:'本期未加钟订单',isSfwc:'0'}
+				]
+			}else{
+				this.tapNav=[
+					{name:'本期已充值订单',isSfwc:'1'},
+					{name:'本期未充值订单',isSfwc:'0'}
+				]
+			}
+			this.userId = uni.getStorageSync("artificerId");
+			this.getTime()
+			// this.getData();
+			uni.setNavigationBarTitle({
+			      title: this.titleData
+			    });
+		},
+		onPullDownRefresh: function() {
+			this.page = 1;
+			this.getData();
 		},
 		methods:{
-			detailTd(){//详情 跳页
+			goOder(item){
+				uni.navigateTo({
+					url:'/my/order/revenueDetails?ordersId='+item.ordersId
+				})
+			},
+			tabClick(isSfwc,index){
+				this.tapNum=index;
+				this.isSfwc=isSfwc;
+				this.page=0;
+				this.listData = [];
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.getData();
+			},
+			// 加载更多
+			loadMore: async function() {
+				//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
+				if(this.loadingType==0){
+					this.loadingType=2
+					//模拟数据请求
+					setTimeout(()=>{
+						this.page++;
+						this.loadingType=0;
+						this.getData()
+					},1000)
+				}
+			},
+			getTime(){
+				var that=this;
+				let data = {
+					userId:that.userId,
+				}
+				that.$Request.getT('/app/artificer/getZqhzList', data).then(res => {
+					console.log('------>',res)
+					if (res.code == 0) {
+						 that.wqlistData = res.data;
+					} else {
+						that.$queue.showToast(res.msg);
+					}
+				});
+			},
+			wqlistCallback(index){
+				this.wqsyshow = false;
+				var startAndEnd = this.wqlistData[index].label.split(" 至 ");
+				this.startTime = startAndEnd[0];
+				this.endTime = startAndEnd[1];
+				this.getData();
+			},
+			getData(){
+				var that=this;
+				let data = {
+					userId:that.userId,
+					orderType:that.orderType,
+					startTime:that.startTime,
+					endTime:that.endTime,
+					page: that.page,
+					limit: that.limit,
+					isSfwc:that.isSfwc
+				}
+				that.$Request.getT('/app/artificer/getOrderTypeList', data).then(res => {
+					uni.hideLoading()
+					if (res.code == 0) {
+						if (that.page == 1) that.listData = []; //如果是第一页需手动制空列表
+						that.listData = [...that.listData, ...res.data.list]; //追加新数据
+						that.earnings = res.earnings;
+					} else {
+						that.$queue.showToast(res.msg);
+					}
+				});
+			},
+			details(){
 				uni.navigateTo({
 					url:'/pages/index/revenueDetails'
 				})
-			}
+			},
+			wangqi(){//往期 跳页
+				this.wqsyshow = true;
+				this.listData = [];
+				// uni.navigateTo({
+				// 	url:'/pages/index/previousAdditions?type=2'
+				// })
+			},
 		}
 	}
 </script>
 
 <style scoped>
-	.mian-foot-btns{
-		font-weight: 400;
-		font-size: 25rpx;
-		color: #11957C;
-	}
-	td{
-		text-align: center;
-	}
-	.table-list td{
-		border-bottom: 1px solid #E5E5E5;
-	}
-	.table-list{
-		height: 40px;
-	}
-	.mian-table-top{
-		height: 49rpx;
-		background: #EFEFEF;
-		border-radius: 14rpx;
-		border: 1px solid #EFEFEF;
-		opacity: 0.62;
-	}
-	.mian-table{
-		width: 95%;
-		background-color: #fff;
-		border-radius: 24rpx;
-		padding: 10px;
-		border-spacing: inherit;
-		position: absolute;
-		top: 0;
-		margin-top: 30px;
-	}
-	.xuhao{
-		width: 10%;
-	}
-	.mian-nav-list{
-		height: 100%;
-		text-align: center;
-		font-weight: 400;
-		font-size: 26rpx;
-		color: #333333;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-	.mian-foot-btn{
-		width: 83rpx;
-		height: 40rpx;
-		line-height: 40rpx;
-		text-align: center;
-		font-weight: 400;
-		font-size: 25rpx;
-		color: #11957C;
-		border-radius: 14rpx;
-		border: 1px solid #007B6A;
-	}
-	.mian-foot-list{
-		width: 25%;
-		height: 100%;
-		text-align: center;
-		font-weight: 400;
-		font-size: 25rpx;
-		color: #666666;
-	}
-	.mian-foot-view{
+	.view-title{
 		width: 100%;
-		border-bottom: 1px solid #E5E5E5;
+		padding: 0 5px;
 		display: flex;
-		padding: 10px 0px;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
 	}
-	.mian-foot{
+	/deep/.page-box{
 		width: 100%;
-		display: flex;
-		flex-direction: column;
+	}
+	/deep/.t-loading-box{
+		text-align: center;
+	}
+	/deep/.refresh-body .content{
+		/* background-color: #f7f7f7; */
+	}
+	/deep/.refresh-body{
+		height: 100% !important;
+		border-top: 2px solid #f7f7f7;
+	}
+	.tapNav-name{
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #333333;
 	}
 	
-	.mian-nav{
+	.tapNav-bor{
+		width: 100px;
+		height: 14rpx;
+		background: linear-gradient(-48deg, rgba(1, 156, 136, 0.35), rgba(45, 196, 142, 0.35));
+		border-radius: 7rpx;
+		position: absolute;
+		bottom: 0;
+		margin-bottom: 10px;
+	}
+	.tapNav-list{
 		width: 100%;
-		height: 49rpx;
-		background-color: rgba(239, 239, 239, 0.62);
-		border-radius: 14rpx;
+		margin: 0 auto;
 		display: flex;
-		flex-direction: row;
+		flex-direction:row;
 		align-items: center;
 		justify-content: space-between;
+		background-color: #fff;
 	}
-	.mian{
-		width: 95%;
-		height: 967rpx;
-		background: #FFFFFF;
-		border-radius: 24rpx;
-		overflow-y: scroll;
-		padding: 10px;
-		display: flex;
-		flex-direction: column;
-	}
-	.header{
-		width: 100%;
-		height: 228rpx;
-		background: linear-gradient(-36deg, #11957C, #20A98F, #019C88, #029D88);
-	}
-	.content{
-		width: 100%;
-		height: 100vh;
-		background-color: #f7f7f7;
+	.tapNav-view{
+		height: 40px;
+		width: 50%;
 		display: flex;
 		flex-direction: column;
+		justify-content: center;
 		align-items: center;
 		position: relative;
 	}
+	.table-view span{
+		font-weight: 400;
+		font-size: 19rpx;
+		color: #666666;
+	}
+	.table-view span:nth-child(1){
+		font-weight: bold;
+	}
+	.table-view span{
+		margin-bottom: 15px;
+	}
+	.table-view{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+	.mian-table{
+		width: 100%;
+		padding: 10px;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+		margin-bottom: 10px;
+	}
+	.view-num{
+		color: #029D88 !important;
+	}
+	.mian-bottom{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.mian-foot-adder{
+		margin: 2px 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: 75%;
+		display: flex;
+		flex-direction: column;
+	}
+	.mian-foot-img image{
+		width: 100%;
+		height: 100%;
+	}
+	.mian-foot-img{
+		width: 158rpx;
+		height: 188rpx;
+		background: #E6E6E6;
+		border-radius: 14rpx;
+	}
+	
+	.mian-foot{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.mian-list-top-time span{
+		font-size:25rpx;
+	}
+	.mian-list-top-time span:nth-child(1){
+		color: #7D7D7D;
+	}
+	.mian-list-top-time span:nth-child(2){
+		color: #11957C;
+	}
+	.mian-list-top-time{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.mian-list-top-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-list-top{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		padding-bottom: 10px;
+		border-bottom: 1px solid #E5E5E5;
+		margin-bottom: 10px;
+	}
+	.mian-list{
+		width: 100%;
+		padding: 10px;
+		display: flex;
+		flex-direction: column;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+		margin-bottom: 10px;
+	}
+	.view-title-right{
+		font-weight: 400;
+		font-size: 21rpx;
+		color: #666666;
+	}
+	.view-title-left-text{
+		font-weight: 400;
+		font-size: 25rpx;
+		color: #333333;
+		margin-left: 5px;
+	}
+	.view-title-left-shuxian{
+		width: 10rpx;
+		height: 29rpx;
+		background: #029D88;
+		border-radius: 5rpx;
+	}
+	.view-title-left{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin: 15px 0px;
+	}
+	.view-title{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.mina-view{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.mina{
+		width: 95%;
+		display: flex;
+		flex-direction: column;
+	}
+	.header-bottom-money{
+		font-weight: bold;
+		font-size: 49rpx;
+		color: #FFFFFF;
+	}
+	.header-top-btn{
+		width: 174rpx;
+		height: 49rpx;
+		line-height: 49rpx;
+		text-align: center;
+		font-size: 21rpx;
+		color: #333333;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+	}
+	.header-text{
+		font-weight: 400;
+		font-size: 22rpx;
+		color: #FFFFFF;
+		margin-top: 2px;
+	}
+	.header-top-left image{
+		width: 24.31rpx;
+		height:22.92rpx;
+		margin-right: 2px;
+		margin-top: 3px;
+	}
+	.header-top-left{
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.header-top{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		margin-bottom: 10px;
+	}
+	.header{
+		width: 100%;
+		height: 300rpx;
+		padding: 15px;
+		background-image: url('../../static/index/fun_banner4.png');
+		background-repeat: no-repeat;
+		background-size: 100% 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-around;
+	}
+	.content{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		height: 100vh;
+		background-color: #f7f7f7;
+		overflow: scroll;
+	}
 </style>
\ No newline at end of file