From 09ae6aa88fb4547884e827ab8f85b7449ecea794 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 27 Jun 2024 10:04:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=AF=E5=88=86=E5=8A=9F=E8=83=BD=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   4 +-
 pages/index/currentPoints.vue                 | 207 ++---
 pages/index/previousEarnings.vue              |   5 +-
 pages/index/previousPoints.vue                | 826 +++++++++++++++---
 .../u-action-sheet/u-action-sheet.vue         |   5 +-
 5 files changed, 804 insertions(+), 243 deletions(-)

diff --git a/App.vue b/App.vue
index 1bed1c0..d8fcdba 100644
--- a/App.vue
+++ b/App.vue
@@ -754,7 +754,9 @@ export default {
 @import 'components/colorui/icon.css';
 @import './static/css/common.css';
 @import './static/css/simplepro.css';
-
+/deep/.uni-scroll-view-content{
+		height: 350px !important;
+	}
 page {
 	background-color: #FFFFFF;
 	color: #343546;
diff --git a/pages/index/currentPoints.vue b/pages/index/currentPoints.vue
index 15d51c8..9f7ed6e 100644
--- a/pages/index/currentPoints.vue
+++ b/pages/index/currentPoints.vue
@@ -16,9 +16,15 @@
 				<view class="header-text">当前积分</view>
 			</view>
 		</view>
+		<view class="tapNav-list">
+			<view class="tapNav-view" v-for="(item,index) in tapNav" :key="index" @click="tabClick(index)">
+				<view class="tapNav-name">{{item.name}}</view>
+				<view class="tapNav-bor" v-if="tapNum==index"></view>
+			</view>
+		</view>
 		<view class="mina">
 			<!--业绩积分-->
-			<view class="mina-view">
+			<view class="mina-view" v-if="tapNum==0">
 				<view class="view-title">
 					<view class="view-title-left">
 						<span class="view-title-left-shuxian"></span>
@@ -26,7 +32,7 @@
 					</view>
 					<!-- <view class="view-title-right" @click="jieshi">更多</view> -->
 				</view>
-				<view class="mian-list" @click="wangqi" v-for="(item,index) in yjjfList" :key="index">
+				<view class="mian-list" @click="goOder(item)" v-for="(item,index) in yjjfList" :key="index">
 					<view class="mian-list-top">
 						<view class="mian-list-top-biao">已完成</view>
 						<view class="mian-list-top-time">
@@ -62,45 +68,12 @@
 						</view>
 					</view>
 				</view>
-				<!-- <view class="mian-list">
-					<view class="mian-list-top">
-						<view class="mian-list-top-biao">已完成</view>
-						<view class="mian-list-top-time">
-							<span>预约时间: </span>
-							<span>2024-01-02 14:00</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">中医推拿(测试)</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">
-								订单编号 : 202310311231559420
-							</view>
-							<view class="mian-foot-adder shouyi-text">
-								服务地址 : 吉林省长春市二道区欧亚万豪购物中心16-301
-							</view>
-							<view class="mian-bottom">
-								<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥298</view>
-								<view class="mian-bottom-shou">
-									<span class="shouyi-text">本单收益:  </span>
-									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥326.70</span>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view> -->
+				<view v-if="ddczList.yjjfList == 0" style="line-height: 80px;width:100%;text-align: center;">
+					<span >暂无数据</span>
+				</view>
 			</view>
 			<!--时长积分-->
-			<view class="mina-view">
+			<view class="mina-view" v-if="tapNum==1">
 				<view class="view-title">
 					<view class="view-title-left">
 						<span class="view-title-left-shuxian"></span>
@@ -111,32 +84,44 @@
 				<view class="mian-table">
 					<view class="table-view">
 						<span style="font-size: 22rpx;">序号</span>
-						<span>01</span>
-						<span>02</span>
-						<span>03</span>
+						<span v-for="(item , index) in zxscList">{{index+1}}</span>
 					</view>
 					<view class="table-view">
-						<span style="font-size: 22rpx;">上线时间</span>
-						<span>2024.01.01 10:00</span>
-						<span>2024.01.01 10:00</span>
-						<span>2024.01.01 10:00</span>
-					</view>
-					<view class="table-view">
-						<span style="font-size: 22rpx;">下线时间</span>
-						<span>2024.01.01 10:00</span>
-						<span>2024.01.01 10:00</span>
-						<span>2024.01.01 10:00</span>
+						<span style="font-size: 22rpx;">获取时间</span>
+						<span v-for="(item , index) in zxscList">{{item.jftime}}</span>
 					</view>
 					<view class="table-view">
 						<span style="font-size: 22rpx;">获取积分</span>
-						<span style="color: #029D88;">12</span>
-						<span style="color: #029D88;">12</span>
-						<span style="color: #029D88;">12</span>
+						<span v-for="(item , index) in zxscList">{{item.jifen}}</span>
+					</view>
+				</view>
+			</view>
+			<!--储值积分-->
+			<view class="mina-view" v-if="tapNum==2">
+				<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>
+					</view>
+					<!-- <view class="view-title-right" @click.stop="toggle('时长积分')">更多</view> -->
+				</view>
+				<view class="mian-table">
+					<view class="table-view">
+						<span style="font-size: 22rpx;">序号</span>
+						<span v-for="(item , index) in czjfList">{{index+1}}</span>
+					</view>
+					<view class="table-view">
+						<span style="font-size: 22rpx;">获取时间</span>
+						<span v-for="(item , index) in czjfList">{{item.jftime}}</span>
+					</view>
+					<view class="table-view">
+						<span style="font-size: 22rpx;">获取积分</span>
+						<span v-for="(item , index) in czjfList">{{item.jifen}}</span>
 					</view>
 				</view>
 			</view>
 			<!--充值积分-->
-			<view class="mina-view">
+			<view class="mina-view" v-if="tapNum==3">
 				<view class="view-title">
 					<view class="view-title-left">
 						<span class="view-title-left-shuxian"></span>
@@ -144,12 +129,12 @@
 					</view>
 					<!-- <view class="view-title-right" @click.stop="toggle('充值积分')">更多</view> -->
 				</view>
-				<view class="mian-list">
+				<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">
 							<span>预约时间: </span>
-							<span>2024-01-02 14:00</span>
+							<span>{{item.serveTime}}</span>
 						</view>
 					</view>
 					<view class="mian-foot">
@@ -158,63 +143,30 @@
 						</view>
 						<view class="mian-foot-list">
 							<view class="mian-foot-view">
-								<view class="mian-title">中医推拿(测试)</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>
+									<span class="shouyi-text">{{item.km}}km</span>
 								</view>
 							</view>
 							<view class="mian-foot-dan shouyi-text">
-								订单编号 : 202310311231559420
+								订单编号 : {{item.ordersNo}}
 							</view>
 							<view class="mian-foot-adder shouyi-text">
-								服务地址 : 吉林省长春市二道区欧亚万豪购物中心16-301
+								服务地址 : {{item.accomplishAddress}}
 							</view>
 							<view class="mian-bottom">
-								<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥298</view>
+								<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;">￥326.70</span>
+									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.sumArtificerMoney}}</span>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-				<view class="mian-list">
-					<view class="mian-list-top">
-						<view class="mian-list-top-biao">已完成</view>
-						<view class="mian-list-top-time">
-							<span>预约时间: </span>
-							<span>2024-01-02 14:00</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">中医推拿(测试)</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">
-								订单编号 : 202310311231559420
-							</view>
-							<view class="mian-foot-adder shouyi-text">
-								服务地址 : 吉林省长春市二道区欧亚万豪购物中心16-301
-							</view>
-							<view class="mian-bottom">
-								<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥298</view>
-								<view class="mian-bottom-shou">
-									<span class="shouyi-text">本单收益:  </span>
-									<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥326.70</span>
-								</view>
-							</view>
-						</view>
-					</view>
+				<view v-if="ddczList.length == 0" style="line-height: 80px;width:100%;text-align: center;">
+					<span >暂无数据</span>
 				</view>
 			</view>
 		</view>
@@ -274,6 +226,13 @@
 				zxscjf:'0',
 				zxscList:[],
 				sumJf:'0',
+				tapNav:[
+					{name:'业绩积分',id:'0'},
+					{name:'时长积分',id:'1'},
+					{name:'储值积分',id:'2'},
+					{name:'充值积分',id:'3'}
+				],
+				tapNum:0,
 			}
 		},
 		onLoad(e) {
@@ -282,6 +241,20 @@
 			this.getData();
 		},
 		methods:{
+			goOder(item){
+				uni.navigateTo({
+					url:'/my/order/revenueDetails?ordersId='+item.ordersId
+				})
+			},
+			tabClick(index){
+				this.tapNum=index;
+				this.page=0;
+				this.listData = [];
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });
+				this.getData();
+			},
 			getTime(){
 				let now = new Date();
 				let year = now.getFullYear();
@@ -357,6 +330,39 @@
 </script>
 
 <style scoped>
+	.tapNav-name{
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #333333;
+	}
+	
+	.tapNav-bor{
+		width: 62px;
+		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%;
+		margin: 0 auto;
+		display: flex;
+		flex-direction:row;
+		align-items: center;
+		justify-content: space-between;
+		background-color: #fff;
+	}
+	.tapNav-view{
+		height: 40px;
+		width: 50%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+	}
 	.popup-mian-view span:nth-child(1){
 		color: #666666;
 	}
@@ -613,6 +619,7 @@
 	}
 	.mina{
 		width: 95%;
+		height: 300px;
 		display: flex;
 		flex-direction: column;
 	}
@@ -656,7 +663,7 @@
 	}
 	.header{
 		width: 100%;
-		height: 300rpx;
+		height: 200rpx;
 		padding: 15px;
 		background-image: url('../../static/index/fun_banner4.png');
 		background-repeat: no-repeat;
diff --git a/pages/index/previousEarnings.vue b/pages/index/previousEarnings.vue
index 003a1c3..19f2970 100644
--- a/pages/index/previousEarnings.vue
+++ b/pages/index/previousEarnings.vue
@@ -14,8 +14,8 @@
 				<view class="header-text">当前收益</view>
 			</view>
 		</view>
-		<!-- 性别选择 -->
-		<u-action-sheet :list="wqlistData" v-model="wqsyshow" @click="wqlistCallback"></u-action-sheet>
+		<!-- 往期时间选择 -->
+		<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">
 			<template slot="content">
 				<view class="mian-view" v-for="(item,index) in listData" :key="index" @click="goOder(item)">
@@ -172,6 +172,7 @@
 </script>
 
 <style scoped>
+	
 	/deep/.refresh-body .content{
 		/* background-color: #f7f7f7; */
 	}
diff --git a/pages/index/previousPoints.vue b/pages/index/previousPoints.vue
index f1ba07b..f64dcbb 100644
--- a/pages/index/previousPoints.vue
+++ b/pages/index/previousPoints.vue
@@ -1,173 +1,721 @@
 <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 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">往期积分</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-bottom">
+				<view class="header-bottom-money">{{sumJf}}<text style="font-size: 23rpx;font-weight: 400;">分</text> </view>
+				<view class="header-text">当前积分</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(index)">
+				<view class="tapNav-name">{{item.name}}</view>
+				<view class="tapNav-bor" v-if="tapNum==index"></view>
+			</view>
+		</view>
+		<view class="mina">
+			<!--业绩积分-->
+			<view class="mina-view" v-if="tapNum==0">
+				<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">{{yjjf}}</text>(项目金额累计积分，兑换比例为1:1)</span>
+					</view>
+					<!-- <view class="view-title-right" @click="jieshi">更多</view> -->
+				</view>
+				<view class="mian-list" @click="goOder(item)" v-for="(item,index) in yjjfList" :key="index">
+					<view class="mian-list-top">
+						<view class="mian-list-top-biao">已完成</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">{{item.km}}km</span>
+								</view>
+							</view>
+							<view class="mian-foot-dan shouyi-text">
+								订单编号 : {{item.ordersNo}}
+							</view>
+							<view class="mian-foot-adder shouyi-text">
+								服务地址 : {{item.accomplishAddress}}
+							</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.sumArtificerMoney}}</span>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="ddczList.yjjfList == 0" style="line-height: 80px;width:100%;text-align: center;">
+					<span >暂无数据</span>
 				</view>
 			</view>
-		</view> -->
+			<!--时长积分-->
+			<view class="mina-view" v-if="tapNum==1">
+				<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">{{zxscjf}}</text>(在线时长10分钟可获取1积分)</span>
+					</view>
+					<!-- <view class="view-title-right" @click.stop="toggle('时长积分')">更多</view> -->
+				</view>
+				<view class="mian-table">
+					<view class="table-view">
+						<span style="font-size: 22rpx;">序号</span>
+						<span v-for="(item , index) in zxscList">{{index+1}}</span>
+					</view>
+					<view class="table-view">
+						<span style="font-size: 22rpx;">获取时间</span>
+						<span v-for="(item , index) in zxscList">{{item.jftime}}</span>
+					</view>
+					<view class="table-view">
+						<span style="font-size: 22rpx;">获取积分</span>
+						<span v-for="(item , index) in zxscList">{{item.jifen}}</span>
+					</view>
+				</view>
+			</view>
+			<!--储值积分-->
+			<view class="mina-view" v-if="tapNum==2">
+				<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>
+					</view>
+					<!-- <view class="view-title-right" @click.stop="toggle('时长积分')">更多</view> -->
+				</view>
+				<view class="mian-table">
+					<view class="table-view">
+						<span style="font-size: 22rpx;">序号</span>
+						<span v-for="(item , index) in czjfList">{{index+1}}</span>
+					</view>
+					<view class="table-view">
+						<span style="font-size: 22rpx;">获取时间</span>
+						<span v-for="(item , index) in czjfList">{{item.jftime}}</span>
+					</view>
+					<view class="table-view">
+						<span style="font-size: 22rpx;">获取积分</span>
+						<span v-for="(item , index) in czjfList">{{item.jifen}}</span>
+					</view>
+				</view>
+			</view>
+			<!--充值积分-->
+			<view class="mina-view" v-if="tapNum==3">
+				<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>
+					</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-top">
+						<view class="mian-list-top-biao">已完成</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">{{item.km}}km</span>
+								</view>
+							</view>
+							<view class="mian-foot-dan shouyi-text">
+								订单编号 : {{item.ordersNo}}
+							</view>
+							<view class="mian-foot-adder shouyi-text">
+								服务地址 : {{item.accomplishAddress}}
+							</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.sumArtificerMoney}}</span>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="ddczList.length == 0" style="line-height: 80px;width:100%;text-align: center;">
+					<span >暂无数据</span>
+				</view>
+			</view>
+		</view>
+		<view>
+			<!-- 普通弹窗 -->
+			<uni-popup ref="popup" background-color="#fff" @change="change">
+				<view class="popup-content">
+					<view class="popup-head">
+						<span>{{titleList}}</span>
+						<span @click="closePopup(type)">x</span>
+					</view>
+					<view class="popup-mian">
+						<view class="popup-mian-textarea">
+							<view class="popup-mian-view">
+								<span>原服务项目价格:</span>
+								<span>￥198元</span>
+							</view>
+							<view class="popup-mian-view">
+								<span>现服务项目价格:</span>
+								<span>￥298元</span>
+							</view>
+							<view class="popup-mian-view">
+								<span>改价需支付差价:</span>
+								<span>￥100元</span>
+							</view>
+						</view>
+						<view class="popup-mian-btn">
+							<span @click="closePopup(type)">
+								取消
+							</span>
+							<span>
+								确定
+							</span>
+						</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
 	</view>
 </template>
 
 <script>
 	export default{
 		data(){
-			return{}
+			return{
+				type:'center',
+				titleList:'',
+				startTime:'',
+				endTime:'',
+				userId:'',
+				czjf:'0',
+				czjfList:[],
+				ddczjf:'0',
+				ddczList:[],
+				yjjf:'0',
+				yjjfList:[],
+				zxscjf:'0',
+				zxscList:[],
+				sumJf:'0',
+				tapNav:[
+					{name:'业绩积分',id:'0'},
+					{name:'时长积分',id:'1'},
+					{name:'储值积分',id:'2'},
+					{name:'充值积分',id:'3'}
+				],
+				tapNum:0,
+				wqlistData:[],
+				wqsyshow:true,
+			}
+		},
+		onLoad(e) {
+			this.userId = uni.getStorageSync("artificerId");
+			this.getWangqiTime();
+			// this.getData();
 		},
 		methods:{
-			detailTd(){//详情 跳页
+			//
+			wqlistCallback(index){
+				console.log("wqlistCallback-->",index)
+				this.wqsyshow = false;
+				var startAndEnd = this.wqlistData[index].label.split(" 至 ");
+				console.log("startAndEnd---->",startAndEnd)
+				this.startTime = startAndEnd[0];
+				this.endTime = startAndEnd[1];
+				console.log("startTime>",this.startTime)
+				console.log("endTime>",this.endTime)
+				this.getData();
+			},
+			wangqi(){//往期收益 跳页
+				this.wqsyshow = true;
+				// uni.navigateTo({
+				// 	url:'/pages/index/previousEarnings'
+				// })
+			},
+			//获取往期集合
+			getWangqiTime(){
+				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);
+					}
+				});
+			},
+			goOder(item){
 				uni.navigateTo({
-					url:'/pages/index/revenueDetails'
+					url:'/my/order/revenueDetails?ordersId='+item.ordersId
 				})
-			}
+			},
+			tabClick(index){
+				this.tapNum=index;
+				this.page=0;
+				this.listData = [];
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });
+				this.getData();
+			},
+			getTime(){
+				let now = new Date();
+				let year = now.getFullYear();
+				let month = now.getMonth() + 1; // JavaScript中月份是从0开始计数，需加1
+				let monthJia=month<10?'0'+month:month;
+				let day = now.getDate();
+				let currentDate = year + '-' + monthJia + '-' + day;
+				let dayEnd = new Date(now.getFullYear(), monthJia, 0).getDate();
+				if(day>=1&&day<=10){
+					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 + '-' + dayEnd;
+				}
+				if(!this.orderType){
+					this.orderType = 1;
+				}
+			},
+			getData(){
+					var that=this;
+					let data = {
+						userId:that.userId,
+						startTime:that.startTime,
+						endTime:that.endTime,
+					}
+					that.$Request.getT('/app/artificer/getJifenList', data).then(res => {
+						console.log(res);
+						if (res.code == 0) {
+							that.czjf = res.czjf;
+							that.czjfList = res.czjfList;
+							that.ddczjf = res.ddczjf;
+							that.ddczList = res.ddczList;
+							that.yjjf = res.yjjf;
+							that.yjjfList = res.yjjfList;
+							that.zxscjf = res.zxscjf;
+							that.zxscList = res.zxscList;
+							that.sumJf = res.sumJf;
+							// that.listData = [...that.listData, ...res.data.list]; //追加新数据
+							// that.shouyiMoeny = res.earnings;//收益信息
+						} else {
+							that.$queue.showToast(res.msg);
+						}
+					});
+			},
+			jieshi(){
+				uni.navigateTo({
+					url:'/pages/index/currentPointsDetail'
+				})
+			},
+			change(e) {
+				console.log('当前模式：' + e.type + ',状态：' + e.show);
+			},
+			closePopup(type){//改价    关闭弹出框
+				this.type = type
+				this.$refs.popup.close(type);
+			},
+			toggle(type) {//改价 弹出框
+				this.titleList=type
+				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+				this.$refs.popup.open(this.type)
+			},
+			wangqi(){//往期收益 跳页
+				uni.navigateTo({
+					url:'/pages/index/previousPoints'
+				})
+			},
 		}
 	}
 </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;
+	.tapNav-name{
+		font-weight: bold;
+		font-size: 31rpx;
 		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{
-		width: 100%;
-		border-bottom: 1px solid #E5E5E5;
-		display: flex;
-		padding: 10px 0px;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
-	.mian-foot{
-		width: 100%;
-		display: flex;
-		flex-direction: column;
 	}
 	
-	.mian-nav{
+	.tapNav-bor{
+		width: 62px;
+		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;
 	}
+	.popup-mian-view span:nth-child(1){
+		color: #666666;
+	}
+	.popup-mian-view span:nth-child(2){
+		color: #333;
+		font-weight: bold;
+	}
+	.popup-mian-view span{
+		font-size: 29rpx;
+	}
+	.popup-mian-view{
+		width: 100%;
+		height: 35px;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		border-bottom: 1px solid #DCDCDC;
+	}
+	.popup-mian-textarea{
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+	.popup-mian-btn span:nth-child(1){
+		background: linear-gradient(90deg, #FE912E, #FF9970);
+	}
+	.popup-mian-btn span:nth-child(2){
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+	}
+	.popup-mian-btn span{
+		width: 247rpx;
+		height: 77rpx;
+		line-height: 77rpx;
+		text-align: center;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #FFFEFE;
+		border-radius: 39rpx;
+	}
+	.popup-mian-btn{
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 10px;
+	}
+	
+	.popup-mian{
+		width: 88%;
+		display: flex;
+		flex-direction: column;
+		margin: 5px auto 0px auto;
+	}
+	.popup-head span:nth-child(2){
+		width: 50rpx;
+		height: 50rpx;
+		line-height: 19px;
+		text-align: center;
+		font-size: 24px;
+		color: #15AB8D;
+		border-radius: 50%;
+		border: 3px solid #15AB8D;
+	}
+	.popup-head span:nth-child(1){
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #333333;
+	}
+	.popup-head{
+		width: 100%;
+		height: 99.38rpx;
+		background-color: rgba(21, 171, 141, 0.09);
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 15px;
+	}
+	.popup-content{
+		width: 613rpx;
+		height: 479rpx;
+		background: #FFFFFF;
+		border-radius: 56rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	.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%;
+		height: 300px;
+		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;
+	}
+	.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: 200rpx;
+		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
diff --git a/uview-ui/components/u-action-sheet/u-action-sheet.vue b/uview-ui/components/u-action-sheet/u-action-sheet.vue
index 1f23a4b..adaa849 100644
--- a/uview-ui/components/u-action-sheet/u-action-sheet.vue
+++ b/uview-ui/components/u-action-sheet/u-action-sheet.vue
@@ -17,7 +17,6 @@
 				<text class="u-action-sheet-item__subtext u-line-1" v-if="item.subText">{{item.subText}}</text>
 			</view>
 		</block>
-		<input class="chuzuinp" @input="chuzuInp" type="number" placeholder="出租车免费公里数">
 		<view class="u-gab" v-if="cancelBtn">
 		</view>
 		
@@ -77,6 +76,7 @@
 					}
 				}
 			},
+		
 			// 底部的取消按钮
 			cancelBtn: {
 				type: Boolean,
@@ -133,6 +133,9 @@
 				return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
 			}
 		},
+		mounted() {
+			console.log("listShow",this.listShow)
+		},
 		methods: {
 			chuzuInp(e){
 				this.chuzuValue=e.detail.value