diff --git a/api/person.js b/api/person.js
index 06f20e9..bf6db5f 100644
--- a/api/person.js
+++ b/api/person.js
@@ -1,4 +1,5 @@
 let personInfo = {// 用户信息模块
+	merchantManagement_todayData: "/yishoudan/statistics/agency/teamWithGroup",// 获取今日数据
   person_feedback: "/daotian/feedback/add",// 反馈与建议
   person_feedbackList: "/daotian/feedback/list",// 反馈与建议
 }
diff --git a/pages.json b/pages.json
index 566fcf0..439a7d7 100644
--- a/pages.json
+++ b/pages.json
@@ -20,7 +20,7 @@
     {
       "path": "pages/workBench/index",
       "style": {
-        "navigationBarTitleText": "工作台",
+        "navigationBarTitleText": "工单",
         "backgroundColor": "#ededed",
         "backgroundColorTop": "#ededed",
         "backgroundColorBottom": "#ededed"
@@ -79,6 +79,15 @@
     { // 个人中心二级页面
       "root": "root/person",
       "pages": [
+				{
+				  "path": "todayData",
+				  "style": {
+				    "navigationBarTitleText": "今日数据",
+				    "backgroundColor": "#ededed",
+				    "backgroundColorTop": "#ededed",
+				    "backgroundColorBottom": "#ededed"
+				  }
+				},
 				{
 				  "path": "billIndex",
 				  "style": {
@@ -570,7 +579,7 @@
   },
   "uniIdRouter": {},
   "tabBar": {
-    "color": "#333333",
+    "color": "#606266",
     "selectedColor": "#00B666",
     "borderStyle": "black",
     "backgroundColor": "#ffffff",
@@ -585,7 +594,7 @@
         "pagePath": "pages/workBench/index",
         "iconPath": "static/image/apply.png",
         "selectedIconPath": "static/image/apply-active.png",
-        "text": "工作台"
+        "text": "工单"
       },
       {
         "iconPath": "static/image/message.png",
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 064c0fc..9fb42f9 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -87,7 +87,18 @@
 						</div>
 
 						<div class="g_h_8"></div>
-						<g-list-job from="home" @uploadList="getList" bg="#ededed" class="g_h_all" :list="query.list" :active="tabInfo.active" @shareJob="shareJob" :loading="loading" :speed="speed" :query="query" :isShowLoginBtn="isLogin ? false : true" :emptyText="isLogin ? (tabInfo.active == 0 || tabInfo.active == 2 ? '嘿，这里还没有数据呢' : '您还未收藏职位，快去试试收藏职位吧') : '你好，此服务仅限人力资源行业受邀商家登录，请确认'" />
+						<g-list-job from="home" 
+												@uploadList="getList" 
+												bg="#ededed" 
+												class="g_h_all" 
+												:list="query.list" 
+												:active="tabInfo.active" 
+												@shareJob="shareJob" 
+												:loading="loading" 
+												:speed="speed" 
+												:query="query" 
+												:isShowLoginBtn="isLogin ? false : true" 
+												:emptyText="isLogin ? (tabInfo.active == 0 || tabInfo.active == 2 ? '嘿，这里还没有数据呢' : '您还未收藏职位，快去试试收藏职位吧') : '你好，此服务仅限人力资源行业受邀商家登录，请确认'" />
 					</div>
 
 					<!-- #endif -->
diff --git a/pages/person/index.vue b/pages/person/index.vue
index 4ebecc3..2b321ac 100644
--- a/pages/person/index.vue
+++ b/pages/person/index.vue
@@ -1,17 +1,6 @@
 <template>
 	<view class="p-person-inedx g_w_all g_bg_f_5 g_kuaishou">
 		<view :class="isLogin ? 'g_h_36' : 'g_h_10'"></view>
-		<!-- 基本信息 -->
-		<g-panel-card-info
-			:info="{
-				avatar: userInfo.avatar,
-				title: userInfo.name,
-				num: userInfo.tel,
-				isHaveOrder: isHaveOrder,
-			}"
-			@clickCard="goPage('/root/person/info')"
-			v-if="false"
-		/>
 		<view class="m-info g_p_16 g_bg_f g_m_10 g_radius_8 g_position_rela" v-if="isLogin" hover-class="none" style="margin-top: 0">
 			<view class="g_flex_row_start">
 				<view class="g_w_71">
@@ -25,7 +14,6 @@
 							<view class="g_flex_none g_ell_1 g_fs_20 g_fw_bold g_c_3" style="max-width: 240rpx">
 								{{ userInfo.name ? userInfo.name : "-" }}
 							</view>
-							<!-- <view class="g_ml_4 iconfont icon-gerenshiming g_fs_14" :class="userInfo.user.realName ? 'g_c_027' : 'g_c_8'"> </view> -->
 						</view>
 						<view class="g_flex_row_start flex_center g_fs_14 g_border_d g_radius_4 g_c_8 g_p_4" hover-class="thover" @click="goPage('/root/person/info?active=0')">
 							<i class="iconfont icon-edit g_fs_12 g_mr_4"></i>
@@ -48,81 +36,74 @@
 			<view class="g_fs_18 g_fw_600 g_mb_4"> 登录/注册 </view>
 			<view class="g_fs_14"> 劳务上下游收发单工具 </view>
 		</view>
-		<view class="g_flex_row_between g_m_10" v-if="false">
-			<g-panel-fond
-				style="width: 100%"
-				:showRemark="false"
-				:item="{
-					icon: 't-icon-fazhandaili',
-					title: '发展代理',
-					remark: '让更多代理关注我',
-					remarkFS: 14,
-				}"
-				themeColor="green"
-				btnText="去添加"
-				@clickCard="goPage('/root/bind/search?active=1')"
-			/>
-		</view>
-		<view class="m-set g_bg_f g_radius_8" v-if="false" @click="showToggle">
-			<view class="item g_flex_row_start" hover-class="g_bg_e" @click="handleClickItem" :style="{ padding: '19px 12px' }">
-				<view class="g_flex_1 g_flex_row_start flex_center g_pl_10">
-					<view class="t-icon g_h_22 g_w_22 g_pl_7 g_mr_5 t-icon-wodetuandui" style="width: 20px; height: 20px; background-repeat: no-repeat"></view>
-					<view class="g_flex_column_center g_c_3 g_fs_16">切换团队</view>
-					<!-- <view class="g_flex_row_start flex_center g_fs_11 g_ml_4" style="padding: 2px 6px; background-color: #f2fcf7; color: #00b666; border-radius: 10px" hover-class="none" hover-stop-propagation="false" @click="showToggle">
-						切换
-						<view class="iconfont icon-qiehuantuandui g_ml_4 g_fsi_10"></view>
-					</view> -->
+		<view class="g_mt_10" v-if="agencyInfo.supplierAccount == 1">
+			<view class="g_p_16 g_bg_f g_radius_8 g_flex_row_between flex_center g_ml_10 g_mr_10" hover-class="thover" @click="goPage('/root/bind/search?active=1')">
+				<view class="g_flex_row_start flex_center">
+					<img src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/fazhandaili0610.svg" class="g_w_48 g_h_48 g_radius_50" alt="" />
+					<view class="g_flex_column_between g_ml_10">
+						<view class="g_fs_16 g_c_0 g_fw_600 g_mb_6">发展代理</view>
+						<view class="g_c_9">邀请更多代理（粉丝）关注我</view>
+					</view>
 				</view>
-				<i class="iconfont icon-gengduo11 g_c_c"></i>
-				<!-- <view class="g_flex_row_end g_fs_16"> {{ userInfo.agencyName }} </view> -->
+				<view class="g_c_main g_bg_e7 g_radius_20" hover-class="thover" style="padding: 4px 12px">去邀请</view>
 			</view>
 		</view>
-		<!-- <g-panel-form-item :list="[{ icon: 'icon-my_setup', label: '创建发单号', result: '', path: '/root/person/order', tip: 'createOrder', pRow: 12 }]" @clickItem="handleClickItem" /> -->
-
-		<view class="g_mt_10" v-if="userInfo.admin">
-			<g-panel-form-item
-				:list="[
-					{
-						icon: 'icon-wodetuandui',
-						label: '团队管理',
-						result: agencyInfo.fullName || agencyInfo.agencyName || '设置企业信息',
-						path: '/root/person/teamManage',
-						pRow: 12,
-					},
-				]"
-				@clickItem="handleClickItem"
-			/>
-		</view>
 		<view class="g_mt_10">
-			<!-- 账单 -->
-			<view class="g_radius_8 g_p_16 g_bg_f g_text_c g_ml_10 g_mr_10" hover-class="thover" @click="goPage('/root/bind/order?active=0')">
-				<view class="g_fw_600 g_mb_10 g_fs_20 g_position_rela">
-					{{ userNum.upNum }}
-					<view class="g_w_6 g_h_6 g_radius_50 g_bg_f0a" v-if="!readed" style="position: absolute; left: calc(50% + 10px); top: 0"></view>
-				</view>
-				<view class="g_c_6">关注发单号</view>
-			</view>
-			<view class="g_mt_10" v-if="false">
-				<g-panel-card-num :list="orderDataList" :subhead="agencyInfo.fullName || ''" titleNav="/root/merchantManagement/orderManagement" :border="true" :speed="1" :marginBottom="16" cusType="num" :height="26" :num="5" cusTitle="我的发单号" :bottomBox="true" bottomNav="/root/merchantManagement/jobForm" @clickItem="handleClickNum" />
+			<view class="g_mt_10" v-if="userInfo.admin">
+				<g-panel-form-item
+					:list="[
+						{
+							icon: 'icon-wodetuandui',
+							label: '关注的发单号',
+							result: userNum.upNum,
+							path: '/root/person/teamManage',
+							pRow: 12,
+						},
+					]"
+					@clickItem="goPage('/root/bind/order?active=0')"
+				/>
 			</view>
-
 			<view class="g_mt_10">
-				<g-panel-card-num :list="billDataList" titleNav="/root/person/applyIndex" :border="true" :speed="1" :marginBottom="16" cusType="num" :height="26" :num="5" cusTitle="报名工单" @clickItem="goOrder" />
+				<g-panel-card-num :list="billDataList" 
+													titleNav="/root/person/applyIndex" 
+													:border="true" 
+													:speed="1" 
+													:marginBottom="16" 
+													cusType="num" 
+													:height="26" 
+													:num="5" 
+													cusTitle="报名工单" 
+													@clickItem="goOrder"
+													v-if="false"
+				/>
+				<g-panel-card-num :list="todayDataList" 
+													titleNav="/root/person/todayData"
+													:border="true" 
+													:speed="1" 
+													:marginBottom="16" 
+													cusType="num" 
+													:height="26" 
+													:num="5" 
+													cusTitle="今日数据 (我报的)" 
+													@clickItem="handleClickNus" 
+				/>
 			</view>
-			<view class="g_mt_24" v-if="agencyInfo.supplierAccount == 1">
-				<view class="g_p_16 g_bg_f g_radius_8 g_flex_row_between flex_center g_ml_10 g_mr_10" hover-class="thover" @click="goPage('/root/bind/search?active=1')">
-					<view class="g_flex_row_start flex_center">
-						<img src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/fazhandaili0610.svg" class="g_w_48 g_h_48 g_radius_50" alt="" />
-						<view class="g_flex_column_between g_ml_10">
-							<view class="g_fs_16 g_c_0 g_fw_600 g_mb_6">发展代理</view>
-							<view class="g_c_9">邀请更多代理（粉丝）关注我</view>
-						</view>
-					</view>
-					<view class="g_c_main g_bg_e7 g_radius_20" hover-class="thover" style="padding: 4px 12px">去邀请</view>
-				</view>
+			<view class="g_mt_10" v-if="userInfo.admin">
+				<g-panel-form-item
+					:list="[
+						{
+							icon: 'icon-wodetuandui',
+							label: '团队管理',
+							result: agencyInfo.fullName || agencyInfo.agencyName || '设置企业信息',
+							path: '/root/person/teamManage',
+							pRow: 12,
+						},
+					]"
+					@clickItem="handleClickItem"
+				/>
 			</view>
 		</view>
-		<view class="g_mt_24">
+		<view class="g_mt_10">
 			<g-panel-form-item
 				:list="[
 					{
@@ -795,6 +776,11 @@ export default {
 				fail: (res) => {},
 				complete: (res) => {},
 			})
+		},
+		handleClickNus(){
+			uni.navigateTo({
+				url:'/root/person/todayData'
+			})
 		}
 	
 	},
diff --git a/root/person/todayData.vue b/root/person/todayData.vue
new file mode 100644
index 0000000..7f78a2f
--- /dev/null
+++ b/root/person/todayData.vue
@@ -0,0 +1,475 @@
+<template>
+	<view class="g_fs_16 g_pb_32">
+		<view class="g_border_e_b">
+			<u-tabs bg-color="#fff" from="index" :list="tabInfo.list" :is-scroll="false" :current="tabInfo.active" :active-color="globalData.themeColor" bar-width="64" bar-height="6" @change="handleUpdateTab" font-size="32" duration="0.05" height="76"></u-tabs>
+		</view>
+		<view v-if="tabInfo.active == 1">
+			<u-tabs bg-color="#fff" from="index" :list="tabInfo.list[tabInfo.active].children.list" :current="tabInfo.list[tabInfo.active].children.active" :active-color="globalData.themeColor" bar-width="64" bar-height="6" @change="onTabClick" font-size="32"></u-tabs>
+		</view>
+		<view class="g_flex_row_between flex_center g_p_10 g_fs_16">
+			<view class="g_flex_row_start">
+				<view v-for="item in dateList.list" :key="item.value" class="g_mr_20" :class="dateList.active == item.value ? 'g_c_main' : ''" @click="changeDate(item)">{{ item.name }}</view>
+			</view>
+			<view class="g_text_underline g_bg_f g_radius_8 g_p_8" :class="dateList.active == -1 && dateList.popActive == -1 ? 'g_c_main' : ''" @click="customDateShow = true">自定义</view>
+		</view>
+		<view class="g_bg_f g_ml_10 g_mr_10 g_radius_8" v-if="dataList.length > 0">
+			<view class="tableTitle g_fs_16">
+				<view class="show_all" style="width: 100px">姓名</view>
+				<view class="g_flex_1 g_flex_row_between">
+					<view class="dataNum">报名</view>
+					<view class="dataNum">到面</view>
+					<view class="dataNum">通过</view>
+					<view class="dataNum">入职</view>
+					<view class="dataNum leftLine">
+						在职
+						<!-- <i class="t-icon t-icon-zhuyi f14" @click="showToast"></i> -->
+					</view>
+				</view>
+			</view>
+			<view class="tableSub g_fs_16" v-for="(item, index) in dataList" :key="index">
+				<view class="g_text_l show_all" style>{{ index * 1 + 1 + " " }}{{ item.aliasName || item.agencyTeamName }}</view>
+				<view class="dataNum" hover-class="thover" @click="toDataDetail(item, 10)">{{ item.signUps }}</view>
+				<view class="dataNum" hover-class="thover" @click="toDataDetail(item, 20)">{{ item.arrived }}</view>
+				<view class="dataNum" hover-class="thover" @click="toDataDetail(item, 30)">{{ item.passed }}</view>
+				<view class="dataNum" hover-class="thover" @click="toDataDetail(item, 40)">{{ item.entry }}</view>
+				<view class="dataNum" hover-class="thover" @click="toDataDetail(item, 50)">{{ item.obJob }}</view>
+			</view>
+
+			<view class="tableSub g_fw_600 g_fs_16">
+				<view class="show_all g_pl_12" style="width: 100px; box-sizing: border-box">总计</view>
+				<view class="g_text_c g_flex_1">{{ totalObj.signUps }}</view>
+				<view class="g_text_c g_flex_1">{{ totalObj.arrived }}</view>
+				<view class="g_text_c g_flex_1">{{ totalObj.passed }}</view>
+				<view class="g_text_c g_flex_1">{{ totalObj.entry }}</view>
+				<view class="g_text_c g_flex_1">{{ totalObj.obJob }}</view>
+			</view>
+		</view>
+		<u-popup v-model="showPop" mode="bottom" uZindex="9999" border-radius="12" @close="showPop = false" :mask-close-able="true">
+			<view class="g_pb_32">
+				<view v-for="(item, index) in dateList.popList" :key="item.value" class="g_mr_20 g_text_c g_p_16" :class="[dateList.popActive == item.value ? 'g_c_main' : '', index > 0 ? 'g_border_e_t' : '']" @click="changeDate(item)">{{ item.name }}</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="customDateShow" mode="bottom" uZindex="9999" border-radius="12" @close="customDateShow = false" :mask-close-able="true">
+			<view class="g_flex_row_center flex_center dateSelect"  >
+				<view class="g_flex_row_start flex_center g_border_d g_radius_8 g_p_10">
+					<picker mode="date" :value="startTime" :end="notAllowTime" @change="changeDateTime($event, 'start')" style="color: #333">{{ !!startTime ? startTime : "----" }}</picker>
+					<i class="iconfont icon-rili g_fs_16 g_ml_10 g_c_9" style="line-height: 1"></i>
+				</view>
+				<view class="g_ml_8 g_mr_8"> - </view>
+				<view class="afterDate g_flex_row_start flex_center g_border_d g_radius_8 g_p_10">
+					<picker mode="date" :value="endTime" :end="notAllowTime" @change="changeDateTime($event, 'end')" style="color: #333">{{ !!endTime ? endTime : "----" }}</picker>
+					<i class="iconfont icon-rili g_fs_16 g_ml_10 g_c_9" style="line-height: 1"></i>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+import dayjs from "dayjs";
+import "dayjs/locale/zh-cn";
+import updateLocale from "dayjs/plugin/updateLocale"; //
+import localeData from "dayjs/plugin/localeData"; // 这个是可以查看国际化语言配置的插件，
+
+dayjs.extend(updateLocale);
+dayjs.extend(localeData);
+dayjs.locale("zh-cn");
+dayjs.updateLocale("zh-cn", {
+	weekStart: 1, // 配置为周一
+});
+export default {
+	onLoad() {
+		this.getGroupList();
+	},
+	data() {
+		return {
+			globalData: getApp().globalData,
+			dataList: [], // 数据列表
+			totalObj: {}, // 数据总计
+			currentGroup: {},
+			startTime: dayjs().format("YYYY-MM-DD"),
+			endTime: dayjs().format("YYYY-MM-DD"),
+			notAllowTime: dayjs().format("YYYY-MM-DD"),
+			tabInfo: {
+				list: [
+					{
+						name: "全部成员",
+						tip: "1",
+					},
+					{
+						name: "团队排序",
+						tip: "2",
+						children: {
+							list: [],
+							active: 0,
+						},
+					},
+				],
+				active: 0,
+			},
+			dateList: {
+				list: [
+					{
+						name: "今日",
+						value: 6,
+						type: "list",
+					},
+					{
+						name: "本周",
+						value: 2,
+						type: "list",
+					},
+					{
+						name: "本月",
+						value: 4,
+						type: "list",
+					},
+					{
+						name: "更多",
+						value: 8,
+						type: "list",
+					},
+				],
+				popList: [
+					{
+						name: "昨日",
+						value: 7,
+						type: "popList",
+					},
+					{
+						name: "上周",
+						value: 3,
+						type: "popList",
+					},
+					{
+						name: "上月",
+						value: 5,
+						type: "popList",
+					},
+					{
+						name: "近7日",
+						value: 0,
+						type: "popList",
+					},
+					{
+						name: "近30日",
+						value: 1,
+						type: "popList",
+					},
+				],
+				active: 6,
+				popActive: -1,
+			},
+			showPop: false,
+			customDateShow: false,
+		};
+	},
+
+	methods: {
+		handleUpdateTab(e) {
+			this.tabInfo.active = e;
+			this.getGroupList("all");
+		},
+		formatDate(tag) {
+			let start, end;
+			console.log("tag", tag);
+			let today = dayjs();
+			if (tag == 0) {
+				// 7天前
+				start = today.subtract(6, "day").format("YYYY-MM-DD");
+				end = today.format("YYYY-MM-DD");
+			} else if (tag == 1) {
+				// 30天前
+				start = today.subtract(29, "day").format("YYYY-MM-DD");
+				end = today.format("YYYY-MM-DD");
+			} else if (tag == 2) {
+				// 本周
+				start = today.startOf("week").format("YYYY-MM-DD");
+				end = today.format("YYYY-MM-DD");
+			} else if (tag == 3) {
+				// 上周
+				start = today.subtract(1, "week").startOf("week").format("YYYY-MM-DD");
+				end = today.subtract(1, "week").endOf("week").format("YYYY-MM-DD");
+				// return
+			} else if (tag == 4) {
+				// 本月
+				start = today.startOf("month").format("YYYY-MM-DD");
+				end = today.format("YYYY-MM-DD");
+			} else if (tag == 5) {
+				// 上月
+				start = today.subtract(1, "month").startOf("month").format("YYYY-MM-DD");
+				end = today.subtract(1, "month").endOf("month").format("YYYY-MM-DD");
+			} else if (tag == 6) {
+				// 今日
+				start = today.format("YYYY-MM-DD");
+				end = today.format("YYYY-MM-DD");
+			} else if (tag == 7) {
+				// 昨日
+				start = today.subtract(1, "day").format("YYYY-MM-DD");
+				end = today.subtract(1, "day").format("YYYY-MM-DD");
+			}
+			this.startTime = start;
+			this.endTime = end;
+			console.log(start);
+			console.log(end);
+			this.getGroupList();
+		},
+		changeDate(_item) {
+			if (_item.value != 8) {
+				this.dateList.active = -1;
+				this.dateList.popActive = -1;
+			}
+			if (_item.type == "list") {
+				if (_item.value != 8) {
+					this.dateList.active = _item.value;
+					this.dateList.list[3].name = "更多";
+					this.formatDate(this.dateList.active);
+				} else {
+					this.showPop = true;
+				}
+			} else {
+				this.dateList.list[3].name = _item.name;
+				this.dateList.popActive = _item.value;
+				this.dateList.active = 8;
+				this.formatDate(this.dateList.popActive);
+				this.showPop = false;
+			}
+		},
+		changeDateTime(e, type) {
+			console.log(e);
+			if (type == "start") {
+				this.startTime = e.detail.value;
+			} else if (type == "end") {
+				this.endTime = e.detail.value;
+			}
+			let time1 = new Date(this.startTime).getTime();
+			let time2 = new Date(this.endTime).getTime();
+			console.log(time1);
+			console.log(time2);
+			if (time1 > time2) {
+				uni.showToast({
+					duration: 2000,
+					title: "结束时间不能早于开始时间",
+					mask: true,
+					icon: "none",
+				});
+				return;
+			}
+			this.dateList.active = -1;
+			this.dateList.popActive = -1;
+			this.dateList.list[3].name = "更多";
+			this.getGroupList();
+			// this.getDataList();
+		},
+		/**
+		 * 详情跳转
+		 */
+		toDataDetail(_item, _type) {
+			let info = _item;
+			let type = _type;
+			console.log(type);
+			console.log(info);
+			let nav = true;
+			switch (type) {
+				case 10:
+					nav = _item.signUps == 0 ? false : true;
+					break;
+				case 20:
+					nav = _item.arrived == 0 ? false : true;
+					break;
+				case 30:
+					nav = _item.passed == 0 ? false : true;
+					break;
+				case 40:
+					nav = _item.entry == 0 ? false : true;
+					break;
+				case 50:
+					nav = _item.obJob == 0 ? false : true;
+					break;
+			}
+			if (nav) {
+				let data = { userId: info.id, type, start: this.startTime, end: this.endTime, agencyTeamId: info.agencyTeamId };
+				console.log(data);
+
+				uni.navigateTo({
+					url: "/root/person/dataDetail?info=" + JSON.stringify(data),
+				});
+			} else {
+				uni.showToast({
+					title: "该数据为空,没有详情",
+					icon: "none",
+				});
+			}
+			// console.log(e.currentTarget.dataset.info);
+			// console.log(JSON.parse(e.currentTarget.dataset.info));
+		},
+		/**
+		 * 获取团队列表
+		 */
+		getGroupList() {
+			let that = this;
+			uni.showLoading({
+				title: "加载中",
+				mask: true,
+			});
+			that.G.Post(that.api.merchantManagement_todayData, { start: this.startTime, end: this.endTime }, (res) => {
+				console.log("merchantManagement_todayData", res);
+				let list = res.list;
+				// res.list.forEach((item) => {
+				// 	list = list.concat(item.users);
+				// });
+
+				console.log(list);
+				let totalObj = {
+					arrived: 0,
+					entry: 0,
+					obJob: 0,
+					passed: 0,
+					signUps: 0,
+					finshedGPA: 0,
+					entryGPA: 0,
+				};
+				list.forEach((item, index) => {
+					console.log(item);
+					totalObj.arrived += item.arrived;
+					totalObj.entry += item.entry;
+					totalObj.obJob += item.obJob;
+					totalObj.passed += item.passed;
+					totalObj.signUps += item.signUps;
+					totalObj.finshedGPA += item.finshedGPA;
+					totalObj.entryGPA += item.entryGPA;
+					totalObj.index = index + 2;
+				});
+				that.totalObj = totalObj;
+				console.log("totalObj", totalObj);
+				let newList = [];
+				list.forEach((item, index) => {
+					newList = newList.concat(item.users);
+				});
+				console.log("newList", newList);
+				that.tabInfo.list[1].children.list = that.G.fullCopy(list);
+
+				that.tabInfo.list[1].children.list.forEach((item) => {
+					item.name = item.agencyTeamName;
+				});
+				that.tabInfo.list[1].children.list.unshift({
+					name: "全部部门",
+				});
+				if (that.tabInfo.active != 0) {
+					that.dataList = that.G.fullCopy(list);
+					if (JSON.stringify(that.currentGroup) != "{}") {
+						that.selectGroup(that.currentGroup);
+					}
+				} else {
+					newList.sort((a, b) => b.funnel - a.funnel);
+					that.dataList = that.G.fullCopy(newList);
+				}
+				console.log("that.dataList", that.dataList);
+
+				uni.hideLoading();
+			});
+		},
+		/**
+		 * 团队排序的分组点击
+		 */
+		onTabClick(e) {
+			let that = this;
+			console.log(e);
+			this.tabInfo.list[1].children.active = e;
+			if (e != 0) {
+				let val = that.tabInfo.list[1].children.list[e];
+				this.selectGroup(val);
+			} else {
+				this.selectGroup("all");
+			}
+		},
+		selectGroup(val) {
+			console.log("val", val);
+			console.log("typeof val", typeof val);
+			if (typeof val == "object") {
+				this.currentGroup = val;
+				this.tabInfo.list[1].children.list.forEach((item) => {
+					console.log("groupDataList", item);
+					console.log();
+					if (item.agencyTeamId == val.agencyTeamId) {
+						this.dataList = item.users;
+						this.totalObj.arrived = 0;
+						this.totalObj.entry = 0;
+						this.totalObj.obJob = 0;
+						this.totalObj.passed = 0;
+						this.totalObj.signUps = 0;
+						this.totalObj.finshedGPA = 0;
+						this.totalObj.entryGPA = 0;
+						this.dataList.forEach((item1) => {
+							this.totalObj.arrived += item1.arrived;
+							this.totalObj.entry += item1.entry;
+							this.totalObj.obJob += item1.obJob;
+							this.totalObj.passed += item1.passed;
+							this.totalObj.signUps += item1.signUps;
+							this.totalObj.finshedGPA += item1.finshedGPA;
+							this.totalObj.entryGPA += item1.entryGPA;
+						});
+					}
+				});
+				this.dataList.sort((a, b) => b.funnel - a.funnel);
+				console.log(this.dataList);
+			} else {
+				this.currentGroup = {};
+				this.getGroupList();
+			}
+		},
+	},
+};
+</script>
+
+<style lang="less" scoped>
+page {
+	background-color: #f5f5f5;
+}
+.tableTitle {
+	display: flex;
+	text-align: center;
+	justify-content: space-between;
+	align-items: center;
+	padding: 12px 20px;
+	// padding-right: 24px;
+}
+.tableSub {
+	display: flex;
+	text-align: center;
+	justify-content: space-between;
+	align-items: center;
+	padding: 12px;
+	border-top: 1px solid #f5f5f5;
+	/* overflow: hidden; */
+	.dataNum {
+		/* padding-left: 8px; */
+		flex: 1;
+		text-align: center;
+		color: #576b95;
+		text-decoration: underline;
+	}
+}
+.show_all {
+	width: 100px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	text-align: left;
+}
+.leftLine {
+	position: relative;
+	&:after {
+		content: "";
+		position: absolute;
+		left: -8px;
+		top: 3px;
+		width: 1px;
+		height: 18px;
+		background-color: #ddd;
+	}
+}
+.dateSelect {
+	padding: 30px 20px 60px;
+}
+</style>
diff --git a/static/image/apply-active.png b/static/image/apply-active.png
index 2f1a2fd..d5a0a74 100644
Binary files a/static/image/apply-active.png and b/static/image/apply-active.png differ
diff --git a/static/image/apply.png b/static/image/apply.png
index 7c4af28..a105aef 100644
Binary files a/static/image/apply.png and b/static/image/apply.png differ
diff --git a/static/image/home-active.png b/static/image/home-active.png
index 7c2068d..53c1a40 100644
Binary files a/static/image/home-active.png and b/static/image/home-active.png differ
diff --git a/static/image/home.png b/static/image/home.png
index ed05e05..250bc78 100644
Binary files a/static/image/home.png and b/static/image/home.png differ
diff --git a/static/image/message.png b/static/image/message.png
index f99dc8a..c3db319 100644
Binary files a/static/image/message.png and b/static/image/message.png differ
diff --git a/static/image/message_active.png b/static/image/message_active.png
index 09e5851..9c312c1 100644
Binary files a/static/image/message_active.png and b/static/image/message_active.png differ
diff --git a/static/image/person-active.png b/static/image/person-active.png
index 2395b31..c7b087c 100644
Binary files a/static/image/person-active.png and b/static/image/person-active.png differ
diff --git a/static/image/person.png b/static/image/person.png
index 6d06d12..85b109b 100644
Binary files a/static/image/person.png and b/static/image/person.png differ
diff --git a/utils/common.js b/utils/common.js
index 0abe804..1d24428 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -16,6 +16,9 @@ let data = {
       // #endif
     }
   },
+	fullCopy (data) {
+	  return JSON.parse(JSON.stringify(data))
+	},
   /* 清除登录信息存储
    */
   clearLocalStorage () {