diff --git a/src/App.vue b/src/App.vue
index a99d936..786236e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 	import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
-	import { NvpMerchService } from '@/Service/Nvp/NvpMerchService'
+	
 	onLaunch(() => {
 		console.log("App Launch");
 	});
diff --git a/src/Service/BaseConfig.ts b/src/Service/BaseConfig.ts
index 2140936..8a2e0b2 100644
--- a/src/Service/BaseConfig.ts
+++ b/src/Service/BaseConfig.ts
@@ -1,9 +1,11 @@
 export class BaseConfig {
-	// protected static servesUrl: string = "http://192.168.0.190:8806";//线下
+	protected static servesUrl: string = "http://192.168.0.142:5298";
+	protected static imgUrl: string = "http://192.168.0.142:5298";
+	protected static mediaUrl: string = "http://192.168.0.142:5298/";
 	
-	protected static servesUrl: string = "http://vp.xypays.cn";
-	protected static imgUrl: string = "http://vp.cloud.xypays.cn";
-	protected static mediaUrl: string = "http://byc1.xypays.cn/";
+	// protected static servesUrl: string = "http://vp.xypays.cn";
+	// protected static imgUrl: string = "http://vp.cloud.xypays.cn";
+	// protected static mediaUrl: string = "http://byc1.xypays.cn/";
 	protected static uploadUrl: string = "/TencentCos/GetUpLoadInfo";
-	protected static payuploadUrl: string = "http://pay.xypays.cn";
+	protected static payuploadUrl: string = "http://192.168.0.142:5298";
 }
\ No newline at end of file
diff --git a/src/Service/Nvp/NvpAddressService.ts b/src/Service/Nvp/NvpAddressService.ts
deleted file mode 100644
index 0d128a3..0000000
--- a/src/Service/Nvp/NvpAddressService.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Service } from '@/Service/Service';
-/*****登录接口*****/
-class NvpAddressService {
-	private static GetAddressListPath: string = '/Address/GetAddressList';
-	/*****收货地址*****/
-	static GetAddressList(page: number) {
-		var result = Service.Request(this.GetAddressListPath, "GET", { page });
-		return result;
-	}
-
-	private static DelUserAddressPath: string = '/Address/DelUserAddress';
-	/*****删除地址*****/
-	static DelUserAddress(uaId: string) {
-		var result = Service.Request(this.DelUserAddressPath, "POST", { uaId });
-		return result;
-	}
-
-	private static AddUserAddressPath: string = '/Address/AddUserAddress';
-	/*****添加地址*****/
-	static AddUserAddress(uaId: string, name: string, phone: string, province: string, city: string, county: string, address: string, isDefault: number) {
-		var result = Service.Request(this.AddUserAddressPath, "POST", { uaId, name, phone, province, city, county, address, isDefault });
-		return result;
-	}
-
-	private static UpdateUserAddressPath: string = '/Address/UpdateUserAddress';
-	/*****修改默认地址*****/
-	static UpdateUserAddress(uaId: string) {
-		var result = Service.Request(this.UpdateUserAddressPath, "POST", { uaId });
-		return result;
-	}
-
-}
-export {
-	Service,
-	NvpAddressService
-}
diff --git a/src/Service/Nvp/NvpAgentService.ts b/src/Service/Nvp/NvpAgentService.ts
deleted file mode 100644
index 0c8e719..0000000
--- a/src/Service/Nvp/NvpAgentService.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Service } from '@/Service/Service';
-/*****代理端接口*****/
-class NvpAgentService {
-	private static LoginPath: string = '/Agent/Login';
-	/*****登录接口*****/
-	static Login(name: string, pwd: string) {
-		var result = Service.Request(this.LoginPath, "POST", { name, pwd });
-		return result;
-	}
-
-	private static GetAgentAccInfoPath: string = '/Agent/GetAgentAccInfo';
-	/*****账户接口*****/
-	static GetAgentAccInfo() {
-		var result = Service.Request(this.GetAgentAccInfoPath, "GET", "");
-		return result;
-	}
-
-	private static GetAgentAccLogPath: string = '/Agent/GetAgentAccLog';
-	/*****账户记录*****/
-	static GetAgentAccLog(code: string, page: number) {
-		var result = Service.Request(this.GetAgentAccLogPath, "GET", { code, page });
-		return result;
-	}
-
-	private static GetAgentMerchPath: string = '/Agent/GetAgentMerch';
-	/*****获取代理开通商家*****/
-	static GetAgentMerch(type: number, page: number) {
-		var result = Service.Request(this.GetAgentMerchPath, "GET", { type, page });
-		return result;
-	}
-	
-	private static GetAgentHomePath: string = '/Agent/GetAgentHome';
-	/*****代理主页*****/
-	static GetAgentHome() {
-		var result = Service.Request(this.GetAgentHomePath, "GET", {  });
-		return result;
-	}
-
-}
-export {
-	Service,
-	NvpAgentService
-}
diff --git a/src/Service/Nvp/NvpApplyService.ts b/src/Service/Nvp/NvpApplyService.ts
deleted file mode 100644
index 9716c2d..0000000
--- a/src/Service/Nvp/NvpApplyService.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import { Service } from '@/Service/Service';
-/*****用户接口*****/
-class NvpApplyService {
-	// private static WithDrawPath: string = '/With/WithDraw';
-	// /*****佣金提现*****/
-	// static WithDraw(money: number, name: string, account: string) {
-	// 	var result = Service.Request(this.WithDrawPath, "POST", { money, name, account });
-	// 	return result;
-	// }
-
-	private static GetSiteMccCodeListPath: string = '/Apply/GetSiteMccCodeList';
-	/*****获取mcc列表*****/
-	static GetSiteMccCodeList(mercType:string, mchType: string) {
-		var result = Service.Request(this.GetSiteMccCodeListPath, "GET", {mercType, mchType });
-		return result;
-	}
-	
-	
-	
-	
-	
-	private static GetBankTypeListPath: string = '/Apply/GetBankTypeList';
-	/*****获取银行列表*****/
-	static GetBankTypeList(name:string) {
-		var result = Service.Request(this.GetBankTypeListPath, "GET", {name});
-		return result;
-	}
-	
-	
-	private static GetAreaListPath: string = '/Apply/GetAreaList';
-	/*****获取银行地区列表*****/
-	static GetAreaList(areaCode:string) {
-		var result = Service.Request(this.GetAreaListPath, "GET", {  areaCode});
-		return result;
-	}
-	
-	
-	
-	private static GetBankCodeListPath: string = '/Apply/GetBankCodeList';
-	/*****获取银行代码列表*****/
-	static GetBankCodeList(bankType:string,cityCode:string,name:string) {
-		var result = Service.Request(this.GetBankCodeListPath, "GET", {bankType,cityCode,name});
-		return result;
-	}
-	
-	
-	private static SendApplyMerchPath: string = '/Apply/SendApplyMerch';
-	/*****进价提交*****/
-	static SendApplyMerch(para:any) {
-		var result = Service.Request(this.SendApplyMerchPath, "POST", para);
-		return result;
-	}
-	
-	private static GetAgentMerchLogPath: string = '/Apply/GetAgentMerchLog';
-	/*****获取待审核*****/
-	static GetAgentMerchLog() {
-		var result = Service.Request(this.GetAgentMerchLogPath, "GET", {});
-		return result;
-	}
-	
-	
-	
-	private static AuditApplyPath: string = '/Apply/AuditApply';
-	/*****确认资料*****/
-	static AuditApply(outId:string) {
-		var result = Service.Request(this.AuditApplyPath, "POST", {outId});
-		return result;
-	}
-	
-	private static SetPayFeePath: string = '/Apply/SetPayFee';
-	/*****确认资料*****/
-	static SetPayFee(outId:string) {
-		var result = Service.Request(this.SetPayFeePath, "POST", {outId});
-		return result;
-	}
-	
-	
-	private static GetAssortListPath: string = '/Apply/GetAssortList';
-	/*****获取v派分类*****/
-	static GetAssortList(code:string) {
-		var result = Service.Request(this.GetAssortListPath, "GET", {code,parent:'0'});
-		return result;
-	}
-	
-	
-	private static GetAgentMerchPath: string = '/Agent/GetAgentMerch';
-	/*****获取已开通商家*****/
-	static GetAgentMerch(type:number,page:number) {
-		var result = Service.Request(this.GetAgentMerchPath, "GET", {type,page});
-		return result;
-	}
-	
-	
-	private static GetAppMerchInfoPath: string = '/Apply/GetAppMerchInfo';
-	/*****获取银盛已填写信息*****/
-	static GetAppMerchInfo(outId:string) {
-		var result = Service.Request(this.GetAppMerchInfoPath, "GET", {outId});
-		return result;
-	}
-	
-	
-	private static UpdateMerchPath: string = '/Apply/UpdateMerch';
-	/*****修改银盛信息*****/
-	static UpdateMerch(obj:any) {
-		var result = Service.Request(this.UpdateMerchPath, "POST", obj);
-		return result;
-	}
-	
-	
-	private static UploadImgPath: string = '/Apply/UploadImg';
-	/*****修改银盛图片*****/
-	static UploadImg(outId:string,picType:string,img:string) {
-		var result = Service.Request(this.UploadImgPath, "POST", {outId,picType,img});
-		return result;
-	}
-	
-	
-	private static GetAgentApplyPath: string = '/Apply/GetAgentApply';
-	/*****获取添加的商家*****/
-	static GetAgentApply(serch:string,page:number) {
-		var result = Service.Request(this.GetAgentApplyPath, "GET", {serch,page});
-		return result;
-	}
-	
-	private static GetCategoryPath: string = '/Apply/GetCategory';
-	/*****获取商家类型*****/
-	static GetCategory() {
-		var result = Service.Request(this.GetCategoryPath, "GET", {});
-		return result;
-	}
-	
-	
-	private static AddMerchInfoPath: string = '/Apply/AddMerchInfo';
-	/*****添加商户*****/
-	static AddMerchInfo(obj:any) {
-		var result = Service.Request(this.AddMerchInfoPath, "POST", obj);
-		return result;
-	}
-	
-	
-	private static BandAppIdPath: string = '/Agent/BandAppId';
-	/*****绑定appid*****/
-	static BandAppId(merchId:string) {
-		var result = Service.Request(this.BandAppIdPath, "POST", {merchId});
-		return result;
-	}
-	
-	
-	
-	
-
-}
-export {
-	Service,
-	NvpApplyService
-}
diff --git a/src/Service/Nvp/NvpBankService.ts b/src/Service/Nvp/NvpBankService.ts
deleted file mode 100644
index f07227e..0000000
--- a/src/Service/Nvp/NvpBankService.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { Service } from '@/Service/Service';
-/*****登录接口*****/
-class NvpBankService {
-	private static GetPageBankListPath: string = '/Bank/GetPageBankList';
-	/*****用户银行卡列表*****/
-	static GetPageBankList(page: number) {
-		var result = Service.Request(this.GetPageBankListPath, "GET", { page });
-		return result;
-	}
-
-	private static GetBankListPath: string = '/Bank/GetBankList';
-	/*****用户银行卡列表*****/
-	static GetBankList() {
-		var result = Service.Request(this.GetBankListPath, "GET", "");
-		return result;
-	}
-
-	private static GetUnitBankListPath: string = '/Bank/GetUnitBankList';
-	/*****银行卡列表*****/
-	static GetUnitBankList() {
-		var result = Service.Request(this.GetUnitBankListPath, "GET", "");
-		return result;
-	}
-
-	private static AddUserBankPath: string = '/Bank/AddUserBank';
-	/*****添加银行卡*****/
-	static AddUserBank(account: string, bank: string, name: string) {
-		var result = Service.Request(this.AddUserBankPath, "POST", { account, bank, name });
-		return result;
-	}
-
-	private static UpdateBankPath: string = '/Bank/UpdateBank';
-	/*****修改银行卡*****/
-	static UpdateBank(ubId: string, bank: string, name: string, account: string) {
-		var result = Service.Request(this.UpdateBankPath, "POST", { ubId, bank, name, account });
-		return result;
-	}
-
-	private static DelUserBankPath: string = '/Bank/DelUserBank';
-	/*****删除银行卡*****/
-	static DelUserBank(ubId: string) {
-		var result = Service.Request(this.DelUserBankPath, "POST", { ubId });
-		return result;
-	}
-
-}
-export {
-	Service,
-	NvpBankService
-}
diff --git a/src/Service/Nvp/NvpLoginService.ts b/src/Service/Nvp/NvpLoginService.ts
deleted file mode 100644
index a145c67..0000000
--- a/src/Service/Nvp/NvpLoginService.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Service } from '@/Service/Service';
-/*****登录接口*****/
-class NvpLoginService {
-	private static GetWxLoginOpenIdPath: string = '/Login/GetWxLoginOpenId';
-	/*****小程序根据code获取openId*****/
-	static GetWxLoginOpenId(code: string, type: number) {
-		var result = Service.Request(this.GetWxLoginOpenIdPath, "GET", { code, type });
-		return result;
-	}
-
-	private static AppletLoginPath: string = '/Login/AppletLogin';
-	/*****普通登陆接口(小程序)*****/
-	static AppletLogin(openId: string, channel: string) {
-		var result = Service.Request(this.AppletLoginPath, "POST", { openId, channel });
-		return result;
-	}
-
-	private static RegistPath: string = '/Login/Regist';
-	/*****注册接口*****/
-	static Regist(remNo: string, openId: string, uniopenId: string, channel: string, type: number) {
-		var result = Service.Request(this.RegistPath, "POST", { remNo, openId, uniopenId, channel, type });
-		return result;
-	}
-
-	private static GetNumberPhonePath: string = '/Login/GetNumberPhone';
-	/*****获取手机号*****/
-	static GetNumberPhone(code: string) {
-		var result = Service.Request(this.GetNumberPhonePath, "GET", { code });
-		return result;
-	}
-
-}
-export {
-	Service,
-	NvpLoginService
-}
diff --git a/src/Service/Nvp/NvpMachineService.ts b/src/Service/Nvp/NvpMachineService.ts
deleted file mode 100644
index 1de64bc..0000000
--- a/src/Service/Nvp/NvpMachineService.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Service } from '@/Service/Service';
-/*****设备接口*****/
-class NvpMachineService {
-	
-	private static GetMerchListPath: string = '/Machine/GetMerchList';
-	/*****商户设备*****/
-	static GetMerchList(merchId: string) {
-		var result = Service.Request(this.GetMerchListPath, "GET", { merchId });
-		return result;
-	}
-	
-	private static DelMerchMachinePath: string = '/Machine/DelMerchMachine';
-	/*****删除设备*****/
-	static DelMerchMachine(merchId: string, machineId: string) {
-		var result = Service.Request(this.DelMerchMachinePath, "POST", { merchId, machineId });
-		return result;
-	}
-	
-	private static AddMachinePath: string = '/Machine/AddMachine';
-	/*****添加设备*****/
-	static AddMachine(merchId: string, payCode: string) {
-		var result = Service.Request(this.AddMachinePath, "POST", { merchId, payCode });
-		return result;
-	}
-
-	
-
-}
-export {
-	Service,
-	NvpMachineService
-}
diff --git a/src/Service/Nvp/NvpMerchService.ts b/src/Service/Nvp/NvpMerchService.ts
deleted file mode 100644
index 04e3569..0000000
--- a/src/Service/Nvp/NvpMerchService.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { Service } from '@/Service/Service';
-/*****用户接口*****/
-class NvpMerchService {
-
-
-	private static GetMerchInfoPath: string = '/Merch/GetMerchInfo';
-	/*****获取商家信息*****/
-	static GetMerchInfo(merchId: string,lon:number,lat:number) {
-		var result = Service.Request(this.GetMerchInfoPath, "GET", { merchId,lon,lat});
-		return result;
-	}
-	
-	
-	private static GetMerchOrderPath: string = '/Merch/GetMerchOrder';
-	/*****获取商家营业数据*****/
-	static GetMerchOrder(merchId: string) {
-		var result = Service.Request(this.GetMerchOrderPath, "GET", { merchId });
-		return result;
-	}
-	
-	
-	private static UpdateMerchInfoPath: string = '/Merch/UpdateMerchInfo';
-	/*****修改商家信息*****/
-	static UpdateMerchInfo(merchId: string, logo: string ,name:string, phone:string,province:string,city:string,county:string,address:string,lon:string,lat:string,sTime:string,eTime:string,showImg:string) {
-		var result = Service.Request(this.UpdateMerchInfoPath, "POST", { merchId, logo,name ,phone,province,city,county,address,lon,lat,sTime,eTime,showImg});
-		return result;
-	}
-	
-	
-	
-	private static GetMerchAccPath: string = '/Merch/GetMerchAcc';
-	/*****获取商家佣金数据*****/
-	static GetMerchAcc(merchId: string) {
-		var result = Service.Request(this.GetMerchAccPath, "GET", { merchId });
-		return result;
-	}
-	
-	private static GetMerchAccLogPath: string = '/Merch/GetMerchAccLog';
-	/*****获取商家佣金记录*****/
-	static GetMerchAccLog(merchId: string,op:string,page:number) {
-		var result = Service.Request(this.GetMerchAccLogPath, "GET", { merchId,op,page });
-		return result;
-	}
-	
-	
-	
-	private static MerchWithDrawPath: string = '/Merch/MerchWithDraw';
-	/*****商家佣金提现*****/
-	static MerchWithDraw(merchId: string, money: number ,name:string, account:string) {
-		var result = Service.Request(this.MerchWithDrawPath, "POST", { merchId, money,name,account});
-		return result;
-	}
-	
-	
-	private static GetMerchWithLogPath: string = '/Merch/GetMerchWithLog';
-	/*****商家佣金提现记录*****/
-	static GetMerchWithLog(merchId: string) {
-		var result = Service.Request(this.GetMerchWithLogPath, "GET", { merchId });
-		return result;
-	}
-	
-	private static GetMerchTicketListPath: string = '/Merch/GetMerchTicketList';
-	/*****商家优惠券列表*****/
-	static GetMerchTicketList(merchId: string) {
-		var result = Service.Request(this.GetMerchTicketListPath, "GET", { merchId });
-		return result;
-	}
-	
-	
-	private static AddMerchTicketPath: string = '/Merch/AddMerchTicket';
-	/*****商家优惠券修改添加*****/
-	static AddMerchTicket(ticketId: string, merchId: string ,code:string, atkAcc:number,redAcc:number,count:number,useTime:Number,state:Number,addTime:string,endTime:string) {
-		var result = Service.Request(this.AddMerchTicketPath, "POST", { ticketId, merchId,code,atkAcc,redAcc,count,useTime,state,addTime,endTime});
-		return result;
-	}
-	
-	
-	
-	private static DelMerchTicketPath: string = '/Merch/DelMerchTicket';
-	/*****商家删除优惠券*****/
-	static DelMerchTicket(ticketId: string) {
-		var result = Service.Request(this.DelMerchTicketPath, "POST", { ticketId});
-		return result;
-	}
-	
-	
-	private static GetTicketInfoPath: string = '/Merch/GetTicketInfo';
-	/*****获取优惠券详情*****/
-	static GetTicketInfo(ticketId: string) {
-		var result = Service.Request(this.GetTicketInfoPath, "GET", { ticketId });
-		return result;
-	}
-	
-	
-	
-	private static GetAppVersionPath: string = '/Login/GetAppVersion';
-	/*****更新*****/
-	static GetAppVersion() {
-		var result = Service.Request(this.GetAppVersionPath, "GET", {type:2});
-		return result;
-	}
-}
-export {
-	Service,
-	NvpMerchService
-}
diff --git a/src/Service/Nvp/NvpPubService.ts b/src/Service/Nvp/NvpPubService.ts
deleted file mode 100644
index c130f10..0000000
--- a/src/Service/Nvp/NvpPubService.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Service } from '@/Service/Service';
-/*****公共接口*****/
-class NvpPubService {
-	private static GetIndexPath: string = '/Pub/GetIndex';
-	/*****主页信息*****/
-	static GetIndex() {
-		var result = Service.Request(this.GetIndexPath, "GET", "");
-		return result;
-	}
-
-	private static GetIndexDataPath: string = '/Pub/GetIndexData';
-	/*****获取首页数据*****/
-	static GetIndexData(lon: number, lat: number, city: string, county: string, sort: number, page: number) {
-		var result = Service.Request(this.GetIndexDataPath, "GET", { lon, lat, city, county, sort, page });
-		return result;
-	}
-
-	private static GetMenuDataPath: string = '/Pub/GetMenuData';
-	/*****获取分类*****/
-	static GetMenuData(type: string, parent: string) {
-		var result = Service.Request(this.GetMenuDataPath, "GET", { type, parent });
-		return result;
-	}
-
-	private static GetMerchDataPath: string = '/Pub/GetMerchData';
-	/*****获取店铺*****/
-	static GetMerchData(code: string, serch: string, assId: string, lon: number, lat: number, city: string, county: string, sort: number, page: number, limit: number) {
-		var result = Service.Request(this.GetMerchDataPath, "GET", { code, serch, assId, lon, lat, city, county, sort, page, limit });
-		return result;
-	}
-
-	private static GetRandomMerchPath: string = '/Pub/GetRandomMerch';
-	/*****随机获取商家*****/
-	static GetRandomMerch(count: number, lon: number, lat: number, city: string, county: string) {
-		var result = Service.Request(this.GetRandomMerchPath, "GET", { count, lon, lat, city, county });
-		return result;
-	}
-
-}
-export {
-	Service,
-	NvpPubService
-}
diff --git a/src/Service/Nvp/NvpTencentCosService.ts b/src/Service/Nvp/NvpTencentCosService.ts
deleted file mode 100644
index 22ded76..0000000
--- a/src/Service/Nvp/NvpTencentCosService.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Service } from '@/Service/Service';
-/*****腾讯云存储*****/
-class NvpTencentCosService {
-	private static GetAuthorizationPath: string = '/TencentCos/GetAuthorization';
-	/*****获取云存储配置*****/
-	static GetAuthorization() {
-		var result = Service.Request(this.GetAuthorizationPath, "GET", "");
-		return result;
-	}
-
-	private static GetUpLoadInfoPath: string = '/TencentCos/GetUpLoadInfo';
-	/*****获取上传地址*****/
-	static GetUpLoadInfo(code: string, fileName: string, desire: string) {
-		var result = Service.Request(this.GetUpLoadInfoPath, "GET", { code, fileName, desire });
-		return result;
-	}
-
-}
-export {
-	Service,
-	NvpTencentCosService
-}
diff --git a/src/Service/Nvp/NvpUserService.ts b/src/Service/Nvp/NvpUserService.ts
deleted file mode 100644
index 7b7edbc..0000000
--- a/src/Service/Nvp/NvpUserService.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Service } from '@/Service/Service';
-/*****用户接口*****/
-class NvpUserService {
-	private static GetUserInfoPath: string = '/User/GetUserInfo';
-	/*****用户基础信息*****/
-	static GetUserInfo() {
-		var result = Service.Request(this.GetUserInfoPath, "GET", "");
-		return result;
-	}
-
-	private static UpdateUserInfoPath: string = '/User/UpdateUserInfo';
-	/*****修改用户信息*****/
-	static UpdateUserInfo(par: string, smsCode: string, type: number) {
-		var result = Service.Request(this.UpdateUserInfoPath, "POST", { par, smsCode, type });
-		return result;
-	}
-
-	private static GetUserAccLogPath: string = '/User/GetUserAccLog';
-	/*****获取账户记录*****/
-	static GetUserAccLog(code: string, accType: string, page: number) {
-		var result = Service.Request(this.GetUserAccLogPath, "GET", { code, accType, page });
-		return result;
-	}
-
-	private static GetUserCommissionInfoPath: string = '/User/GetUserCommissionInfo';
-	/*****用户佣金账户*****/
-	static GetUserCommissionInfo() {
-		var result = Service.Request(this.GetUserCommissionInfoPath, "GET", "");
-		return result;
-	}
-
-	private static GetUserCommissionLogPath: string = '/User/GetUserCommissionLog';
-	/*****用户佣金记录*****/
-	static GetUserCommissionLog(code: string, accType: string, page: number) {
-		var result = Service.Request(this.GetUserCommissionLogPath, "GET", { code, accType, page });
-		return result;
-	}
-
-}
-export {
-	Service,
-	NvpUserService
-}
diff --git a/src/Service/Nvp/NvpWithService.ts b/src/Service/Nvp/NvpWithService.ts
deleted file mode 100644
index bd29371..0000000
--- a/src/Service/Nvp/NvpWithService.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Service } from '@/Service/Service';
-/*****用户接口*****/
-class NvpWithService {
-	private static WithDrawPath: string = '/With/WithDraw';
-	/*****佣金提现*****/
-	static WithDraw(money: number, name: string, account: string) {
-		var result = Service.Request(this.WithDrawPath, "POST", { money, name, account });
-		return result;
-	}
-
-	private static GetUserWithLogPath: string = '/With/GetUserWithLog';
-	/*****用户提现记录*****/
-	static GetUserWithLog(page: number) {
-		var result = Service.Request(this.GetUserWithLogPath, "GET", { page });
-		return result;
-	}
-
-}
-export {
-	Service,
-	NvpWithService
-}
diff --git a/src/Service/Service.ts b/src/Service/Service.ts
index 1a687d9..047a8f6 100644
--- a/src/Service/Service.ts
+++ b/src/Service/Service.ts
@@ -336,7 +336,7 @@ export class Service extends BaseConfig {
 	static uploadH5(path, dic, callback) {
 		console.log(this.payuploadUrl,'xxx')
 		uni.uploadFile({
-			url: this.payuploadUrl+'/Upload/UploadFile',
+			url: this.payuploadUrl+'/api/Upload/UploadImg',
 			method: "POST",
 			header: {
 				'Authorization': 'Bearer ' + Service.GetUserToken(),
diff --git a/src/Service/swimming/PlanService.ts b/src/Service/swimming/PlanService.ts
new file mode 100644
index 0000000..3130e9a
--- /dev/null
+++ b/src/Service/swimming/PlanService.ts
@@ -0,0 +1,49 @@
+import { Service } from '@/Service/Service';
+/*****项目接口*****/
+class PlanService {
+	private static GetPlanListPath : string = '/api/Plan/GetPlanList';
+	/*****计划列表接口*****/
+	static GetPlanList( planType:string, page:string) {
+		var result = Service.Request(this.GetPlanListPath, "GET", { planType, page});
+		return result;
+	}
+	
+	private static GetPlanInfoPath : string = '/api/Plan/GetPlanInfo';
+	/*****计划详情接口*****/
+	static GetPlanInfo(planId:string) {
+		var result = Service.Request(this.GetPlanInfoPath, "GET", {planId});
+		return result;
+	}
+	
+	
+	private static AddPlanPath : string = '/api/Plan/AddPlan';
+	/*****添加修改计划接口*****/
+	static AddPlan(data:any) {
+		var result = Service.Request(this.AddPlanPath, "POST", data);
+		return result;
+	}
+	
+	
+	private static DeletePlanPath : string = '/api/Plan/DeletePlan';
+	/*****删除计划接口*****/
+	static DeletePlan(planId:string) {
+		var result = Service.Request(this.DeletePlanPath, "POST", { planId});
+		return result;
+	}
+	
+	
+	
+	private static GetNoSelectStudentPath : string = '/api/Plan/GetNoSelectStudent';
+	/*****查询项目分组未选择的学生接口*****/
+	static GetNoSelectStudent(planId:string) {
+		var result = Service.Request(this.GetNoSelectStudentPath, "GET", { planId});
+		return result;
+	}
+	
+
+	
+}
+export {
+	Service,
+	PlanService
+}
\ No newline at end of file
diff --git a/src/Service/swimming/loginService.ts b/src/Service/swimming/loginService.ts
new file mode 100644
index 0000000..84f050f
--- /dev/null
+++ b/src/Service/swimming/loginService.ts
@@ -0,0 +1,14 @@
+import { Service } from '@/Service/Service';
+/*****登录接口*****/
+class loginService {
+	private static LoginPath : string = '/api/Login/Login';
+	/*****登录接口*****/
+	static Login(code : string) {
+		var result = Service.Request(this.LoginPath, "POST", { code });
+		return result;
+	}
+}
+export {
+	Service,
+	loginService
+}
\ No newline at end of file
diff --git a/src/Service/swimming/studentService.ts b/src/Service/swimming/studentService.ts
new file mode 100644
index 0000000..9fe6b7a
--- /dev/null
+++ b/src/Service/swimming/studentService.ts
@@ -0,0 +1,47 @@
+import { Service } from '@/Service/Service';
+/*****登录接口*****/
+class studentService {
+	private static GetStudentListPath : string = '/api/Student/GetStudentList';
+	/*****学生列表不分页接口*****/
+	static GetStudentList() {
+		var result = Service.Request(this.GetStudentListPath, "GET", {  });
+		return result;
+	}
+	
+	private static GetStudentInfoPath : string = '/api/Student/GetStudentInfo';
+	/*****学生详情接口*****/
+	static GetStudentInfo(studentId : string) {
+		var result = Service.Request(this.GetStudentInfoPath, "GET", { studentId });
+		return result;
+	}
+	
+	private static AddPath : string = '/api/Student/Add';
+	/*****添加学生接口*****/
+	static Add(data:any) {
+		var result = Service.Request(this.AddPath, "POST", data);
+		return result;
+	}
+	
+	
+	private static DeletePath : string = '/api/Student/Delete';
+	/*****删除学生接口*****/
+	static Delete(studentId:string) {
+		var result = Service.Request(this.DeletePath, "POST", {studentId });
+		return result;
+	}
+	
+	
+	private static GetStudentListPagePath : string = '/api/Student/GetStudentListPage';
+	/*****学生列表分页接口*****/
+	static GetStudentListPage(page : string) {
+		var result = Service.Request(this.GetStudentListPagePath, "GET", { page });
+		return result;
+	}
+	
+	
+	
+}
+export {
+	Service,
+	studentService
+}
\ No newline at end of file
diff --git a/src/Service/swimming/upLoadService.ts b/src/Service/swimming/upLoadService.ts
new file mode 100644
index 0000000..46dcc55
--- /dev/null
+++ b/src/Service/swimming/upLoadService.ts
@@ -0,0 +1,14 @@
+import { Service } from '@/Service/Service';
+/*****上传接口*****/
+class loginService {
+	private static UploadImgPath : string = '/api/Upload/UploadImg';
+	/*****上传接口*****/
+	static UploadImg(file : string,path:string) {
+		var result = Service.Request(this.UploadImgPath, "POST", { file, path});
+		return result;
+	}
+}
+export {
+	Service,
+	loginService
+}
\ No newline at end of file
diff --git a/src/Service/swimming/userService.ts b/src/Service/swimming/userService.ts
new file mode 100644
index 0000000..4cec73b
--- /dev/null
+++ b/src/Service/swimming/userService.ts
@@ -0,0 +1,37 @@
+import { Service } from '@/Service/Service';
+/*****用户接口*****/
+class userService {
+	private static GetUserInfoPath : string = '/api/User/GetUserInfo';
+	/*****获取用户信息接口*****/
+	static GetUserInfo() {
+		var result = Service.Request(this.GetUserInfoPath, "GET", {});
+		return result;
+	}
+	
+	
+	private static IsCheakUserVerifyPath : string = '/api/User/IsCheakUserVerify';
+	/*****是否可以使用接口*****/
+	static IsCheakUserVerify() {
+		var result = Service.Request(this.IsCheakUserVerifyPath, "GET", {});
+		return result;
+	}
+	
+	private static UpdateUserInfoPath : string = '/api/User/UpdateUserInfo';
+	/*****修改用户信息接口*****/
+	static UpdateUserInfo(name:string,phone:string,headImg:string) {
+		var result = Service.Request(this.UpdateUserInfoPath, "POST", {name,phone,headImg});
+		return result;
+	}
+	
+	
+	// private static GetStudentInfoPath : string = '/api/Student/GetStudentInfo';
+	// /*****根据学生id查详情接口*****/
+	// static GetStudentInfo(studentId:string) {
+	// 	var result = Service.Request(this.GetStudentInfoPath, "GET", {studentId});
+	// 	return result;
+	// }
+}
+export {
+	Service,
+	userService
+}
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 264bb20..b684ed2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -34,8 +34,7 @@
 			{
 				"path": "swiming",
 				"style": {
-					"navigationBarTitleText": "游泳项目",
-					"navigationStyle": "custom"
+					"navigationBarTitleText": "游泳项目"
 				}
 			},
 			{
@@ -77,8 +76,26 @@
 			{
 				"path": "project",
 				"style": {
-					"navigationBarTitleText": "包干",
-					"navigationStyle": "custom"
+					"navigationBarTitleText": "包干"
+					
+				}
+			},
+			{
+				"path": "plan",
+				"style": {
+					"navigationBarTitleText": "训练计划"
+				}
+			},
+			{
+				"path": "hunyang",
+				"style": {
+					"navigationBarTitleText": "混氧"
+				}
+			},
+			{
+				"path": "addHunyang",
+				"style": {
+					"navigationBarTitleText": "创建项目"
 				}
 			}
 		]
diff --git a/src/pages/dataAnalyze/Curve.vue b/src/pages/dataAnalyze/Curve.vue
index 3180c34..3704517 100644
--- a/src/pages/dataAnalyze/Curve.vue
+++ b/src/pages/dataAnalyze/Curve.vue
@@ -364,7 +364,7 @@
 			selectedStudentIds.value.push(studentId)
 		}
 	}
-
+	
 	const getStudentBestTime = (studentId : string) : number => {
 		const records = mockTrainingRecords[selectedProjectId.value] || []
 		const studentRecords = records.filter(r => r.studentId === studentId)
@@ -444,132 +444,132 @@
 			.subtitle {
 				font-size: 24rpx;
 				color: #999;
-
 			}
 		}
+	}
 
-		.section-header {
+	.section-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 20rpx;
+
+		.section-title {
+			font-size: 30rpx;
+			font-weight: 600;
+			color: #333;
+		}
+
+		.select-count {
+			font-size: 24rpx;
+			color: #52c41a;
+		}
+	}
+
+	.project-select-section {
+		background-color: #fff;
+		margin: 0 20rpx 20rpx;
+		border-radius: 16rpx;
+		padding: 28rpx;
+		box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
+
+		.picker-wrapper {
 			display: flex;
-			justify-content: space-between;
 			align-items: center;
-			margin-bottom: 20rpx;
+			justify-content: space-between;
+			padding: 20rpx 24rpx;
+			background-color: #f8f8f8;
+			border-radius: 12rpx;
+			border: 1rpx solid #e8e8e8;
+			transition: all 0.3s ease;
 
-			.section-title {
-				font-size: 30rpx;
-				font-weight: 600;
+			&:active {
+				background-color: #f0f0f0;
+				border-color: #52c41a;
+			}
+
+			.picker-text {
+				font-size: 28rpx;
 				color: #333;
 			}
+		}
+	}
 
-			.select-count {
-				font-size: 24rpx;
-				color: #52c41a;
-			}
+	.student-select-section {
+		background-color: #fff;
+		margin: 0 20rpx 20rpx;
+		border-radius: 16rpx;
+		padding: 28rpx;
+		box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
+
+		.section-header {
+			margin-bottom: 24rpx;
 		}
 
-		.project-select-section {
-			background-color: #fff;
-			margin: 0 20rpx 20rpx;
-			border-radius: 16rpx;
-			padding: 28rpx;
-			box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
+		.student-list {
+			display: grid;
+			grid-template-columns: repeat(4, 1fr);
+			gap: 16rpx;
 
-			.picker-wrapper {
+			.student-item {
 				display: flex;
+				flex-direction: column;
 				align-items: center;
-				justify-content: space-between;
-				padding: 20rpx 24rpx;
+				padding: 20rpx 10rpx;
 				background-color: #f8f8f8;
 				border-radius: 12rpx;
-				border: 1rpx solid #e8e8e8;
+				border: 2rpx solid transparent;
 				transition: all 0.3s ease;
+				position: relative;
 
 				&:active {
-					background-color: #f0f0f0;
+					transform: scale(0.95);
+				}
+
+				&.selected {
+					background-color: #f0f9eb;
 					border-color: #52c41a;
 				}
 
-				.picker-text {
-					font-size: 28rpx;
-					color: #333;
-				}
-			}
-		}
-
-		.student-select-section {
-			background-color: #fff;
-			margin: 0 20rpx 20rpx;
-			border-radius: 16rpx;
-			padding: 28rpx;
-			box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
-
-			.section-header {
-				margin-bottom: 24rpx;
-			}
-
-			.student-list {
-				display: grid;
-				grid-template-columns: repeat(4, 1fr);
-				gap: 16rpx;
-
-				.student-item {
+				.student-avatar {
+					width: 60rpx;
+					height: 60rpx;
+					background: linear-gradient(135deg, #52c41a 0%, #73d13d 100%);
+					border-radius: 50%;
 					display: flex;
-					flex-direction: column;
 					align-items: center;
-					padding: 20rpx 10rpx;
-					background-color: #f8f8f8;
-					border-radius: 12rpx;
-					border: 2rpx solid transparent;
-					transition: all 0.3s ease;
-					position: relative;
+					justify-content: center;
+					margin-bottom: 12rpx;
+					box-shadow: 0 2rpx 8rpx rgba(82, 196, 26, 0.3);
 
-					&:active {
-						transform: scale(0.95);
-					}
-
-					&.selected {
-						background-color: #f0f9eb;
-						border-color: #52c41a;
-					}
-
-					.student-avatar {
-						width: 60rpx;
-						height: 60rpx;
-						background: linear-gradient(135deg, #52c41a 0%, #73d13d 100%);
-						border-radius: 50%;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						margin-bottom: 12rpx;
-						box-shadow: 0 2rpx 8rpx rgba(82, 196, 26, 0.3);
-
-						.avatar-text {
-							font-size: 24rpx;
-							font-weight: 700;
-							color: #fff;
-						}
-					}
-
-					.student-name {
+					.avatar-text {
 						font-size: 24rpx;
-						color: #333;
-						text-align: center;
+						font-weight: 700;
+						color: #fff;
 					}
+				}
 
-					.check-icon {
-						position: absolute;
-						top: 8rpx;
-						right: 8rpx;
-						width: 28rpx;
-						height: 28rpx;
-						background-color: #52c41a;
-						border-radius: 50%;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-					}
+				.student-name {
+					font-size: 24rpx;
+					color: #333;
+					text-align: center;
+				}
+
+				.check-icon {
+					position: absolute;
+					top: 8rpx;
+					right: 8rpx;
+					width: 28rpx;
+					height: 28rpx;
+					background-color: #52c41a;
+					border-radius: 50%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
 				}
 			}
 		}
+	}
 
 
 
diff --git a/src/pages/dataAnalyze/paragraphAnalyze.vue b/src/pages/dataAnalyze/paragraphAnalyze.vue
index e75ba52..53b0466 100644
--- a/src/pages/dataAnalyze/paragraphAnalyze.vue
+++ b/src/pages/dataAnalyze/paragraphAnalyze.vue
@@ -2,14 +2,14 @@
 	<view class="paragraph-container">
 		<view class="header-section">
 			<view class="header-title">
-				<text class="title">">分段数据</text>
+				<text class="title">分段数据</text>
 				<text class="subtitle">学生分段训练成绩分析</text>
 			</view>
 		</view>
 
 		<view class="select-section">
 			<view class="select-label">
-				<text class="label-text">">选择项目</text>
+				<text class="label-text">选择项目</text>
 			</view>
 			<picker mode="selector" :range="projectOptions" range-key="name" :value="selectedProjectIndex"
 				@change="handleProjectChange">
@@ -192,18 +192,18 @@
 	const mockData: Record<string, Record<string, any[]>> = {
 		'1': {
 			'2026-03-12': [
-				{ name: '王小明', projectName: '100米'自由泳', segment20: 0.037, segment70: 0.128, segment120: 0.219, segment170: 0.311 },
-				{ name: '张小红', projectName: '100米'自由泳', segment20: 0.042, segment70: 0.145, segment120: 0.248, segment170: 0.352 },
-				{ name: '李小龙', projectName: '100米'自由泳', segment20: 0.032, segment70: 0.112, segment120: 0.192, segment170: 0.272 }
+				{ name: '王小明', projectName: '100米自由泳', segment20: 0.037, segment70: 0.128, segment120: 0.219, segment170: 0.311 },
+				{ name: '张小红', projectName: '100米自由泳', segment20: 0.042, segment70: 0.145, segment120: 0.248, segment170: 0.352 },
+				{ name: '李小龙', projectName: '100米自由泳', segment20: 0.032, segment70: 0.112, segment120: 0.192, segment170: 0.272 }
 			],
 			'2026-03-14': [
-				{ name: '王小明', projectName: '100米'自由泳', segment20: 0.035, segment70: 0.122, segment120: 0.209, segment170: 0.296 },
-				{ name: '张小红', projectName: '100米'自由泳', segment20: 0.040, segment70: 0.138, segment120: 0.236, segment170: 0.334 }
+				{ name: '王小明', projectName: '100米自由泳', segment20: 0.035, segment70: 0.122, segment120: 0.209, segment170: 0.296 },
+				{ name: '张小红', projectName: '100米自由泳', segment20: 0.040, segment70: 0.138, segment120: 0.236, segment170: 0.334 }
 			]
 		},
 		'2': {
 			'2026-03-16': [
-				{ name: '赵小芳', projectName: '200米'自由泳', segment20: 0.038, segment70: 0.133, segment120: 0.228, segment170: 0.323 }
+				{ name: '赵小芳', projectName: '200米自由泳', segment20: 0.038, segment70: 0.133, segment120: 0.228, segment170: 0.323 }
 			]
 		},
 		'3': {
@@ -213,7 +213,7 @@
 		},
 		'4': {
 			'2026-03-24': [
-				{ name: '周小丽', projectName: '100米'蝶泳', segment20: 0.041, segment70: 0.143, segment120: 0.245, segment170: 0.347 }
+				{ name: '周小丽', projectName: '100米蝶泳', segment20: 0.041, segment70: 0.143, segment120: 0.245, segment170: 0.347 }
 			]
 		}
 	}
@@ -503,7 +503,7 @@
 				border-radius: 20rpx;
 				margin-top: 16rpx;
 				transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-				box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06), 0 0 0 1rpx rgba(0, 0kt, 0, 0.04) inset;
+				box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06);
 				position: relative;
 				overflow: hidden;
 
@@ -613,7 +613,7 @@
 							}
 
 							&.female {
-								color	color: #fa8c16;
+								color: #fa8c16;
 								background: linear-gradient(135deg, rgba(250, 140, 22, 0.1) 0%, rgba(255, 169, 64, 0.05) 100%);
 							}
 						}
@@ -654,7 +654,7 @@
 		}
 
 		.table-header {
-			background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
+			// background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
 
 			.header-row {
 				display: flex;
@@ -664,7 +664,7 @@
 					padding: 24rpx 16rpx;
 					font-size: 28rpx;
 					font-weight: 700;
-					color: #fff;
+					// color: #fff;
 					text-align: center;
 					border-right: 1rpx solid rgba(255, 255, 255, 0.1);
 					flex-shrink: 0;
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index c3acdbb..4175b5e 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -29,7 +29,7 @@
 				</view>
 
 				<!-- 包干项目模块 -->
-				<view @click="showTimingProjectModal(2)" class="create-card package-card">
+				<view @click="Service.GoPage('/pages/userFunc/project')" class="create-card package-card">
 					<view class="card-icon">
 						<view class="icon-circle package-icon">
 							<u-icon name="grid" size="40" color="#fff"></u-icon>
@@ -45,7 +45,7 @@
 				</view>
 
 				<!-- 分段项目模块 -->
-				<view @click="createSegmentProject" class="create-card segment-card">
+				<view @click="showTimingProjectModal(2)" class="create-card segment-card">
 					<view class="card-icon">
 						<view class="icon-circle segment-icon">
 							<u-icon name="list" size="40" color="#fff"></u-icon>
@@ -59,6 +59,22 @@
 						<u-icon name="arrow-right" size="20" color="#1890ff"></u-icon>
 					</view>
 				</view>
+
+				<!-- 混氧项目模块 -->
+				<view @click="showTimingProjectModal(3)" class="create-card hunyang-card">
+					<view class="card-icon">
+						<view class="icon-circle hunyang-icon">
+							<u-icon name="grid" size="40" color="#fff"></u-icon>
+						</view>
+					</view>
+					<view class="card-info">
+						<text class="card-title">混氧项目</text>
+						<text class="card-desc">记录混氧训练的计时数据</text>
+					</view>
+					<view class="card-arrow">
+						<u-icon name="arrow-right" size="20" color="#1890ff"></u-icon>
+					</view>
+				</view>
 			</view>
 		</view>
 
@@ -66,15 +82,14 @@
 		<view v-if="showTimingModal" class="modal-overlay" @click="closeTimingProjectModal"></view>
 		<view v-if="showTimingModal" class="project-list-modal">
 			<view class="modal-header">
-				<text class="modal-title">计时项目</text>
+				<text class="modal-title"> {{ currentIndex==1?"计时项目":(currentIndex==2?"分段项目":"混氧项目") }} </text>
 				<view class="modal-close" @click="closeTimingProjectModal">
 					<u-icon name="close" size="20" color="#999"></u-icon>
 				</view>
 			</view>
 
 			<view class="modal-content">
-				<!-- 新增按钮 -->
-				<view v-if="currentIndex!==2" class="add-btn" @click="createTimingProject">
+				<view class="add-btn" @click="createTimingProject">
 					<u-icon name="plus" size="18" color="#1890ff"></u-icon>
 					<text class="add-btn-text">新增项目</text>
 				</view>
@@ -83,8 +98,8 @@
 				<view class="project-list">
 					<text class="list-title" v-if="projects.length > 0">项目列表</text>
 					<view v-if="projects.length > 0" class="list-container">
-						<view v-for="project in projects" :key="project.id" class="project-item"
-							@click="  goPageFunc() ">
+						<view v-for="project in projects" :key="project.planId" class="project-item"
+							@click="handleProjectClick(project)">
 							<view class="item-icon">
 								<view class="icon-bg">
 									<text class="icon-text">{{ project.name.charAt(0) }}</text>
@@ -92,7 +107,7 @@
 							</view>
 							<view class="item-info">
 								<text class="item-name">{{ project.name }}</text>
-								<text class="item-count">{{ project.studentCount }}人</text>
+								<text v-if="currentIndex!==3" class="item-count">{{ project.users.length }}人</text>
 							</view>
 						</view>
 					</view>
@@ -103,140 +118,131 @@
 			</view>
 		</view>
 
-		
+
 	</view>
 </template>
 
 <script setup lang="ts">
 	import { ref, onMounted, onUnmounted } from 'vue'
 	import { Service } from '@/Service/Service'
+	import { onLoad } from '@dcloudio/uni-app'
+	import { loginService } from '@/Service/swimming/loginService'
+	import { PlanService } from '@/Service/swimming/PlanService'
 
-	// 项目类型
-	interface Project {
-		id : string
-		name : string
-		startType : string // together | interval
-		intervalSeconds : string
-		laneType : string // single | multi
-		laneCount : string
-		lanePersonCount : string
-		studentCount : number
-		students : {
-			id : string
-			name : string
-			gender : string
-			age : string
-		}[]
-	}
+
+
+	let currentIndex = ref(0)
 	
-	let currentIndex=ref(0)
+	// 分页相关
+	let page = ref(1)
+	let status = ref('loadmore')
 	
 	// 模拟项目数据
-	const projects = ref<Project[]>([
-		{
-			id: '001',
-			name: '自由泳500米',
-			startType: 'together',
-			intervalSeconds: '',
-			laneType: 'multi',
-			laneCount: '4',
-			lanePersonCount: '2',
-			studentCount: 8,
-			students: [
-				{ id: 's1', name: '张三', gender: '男', age: '12' },
-				{ id: 's2', name: '李四', gender: '女', age: '13' },
-				{ id: 's3', name: '王五', gender: '男', age: '11' },
-				{ id: 's4', name: '赵六', gender: '女', age: '12' },
-				{ id: 's5', name: '钱七', gender: '男', age: '14' },
-				{ id: 's6', name: '孙八', gender: '女', age: '10' },
-				{ id: 's7', name: '周九', gender: '男', age: '13' },
-				{ id: 's8', name: '吴十', gender: '女', age: '12' }
-			]
-
-		},
-		{
-			id: '002',
-			name: '蛙泳200米',
-			startType: 'interval',
-			intervalSeconds: '30',
-			laneType: 'single',
-			laneCount: '',
-			lanePersonCount: '',
-			studentCount: 5,
-			students: [
-				{ id: 's1', name: '陈十一', gender: '男', age: '14' },
-				{ id: 's2', name: '林十二', gender: '女', age: '12' },
-				{ id: 's3', name: '黄十三', gender: '男', age: '11' },
-				{ id: 's4', name: '周十四', gender: '女', age: '13' },
-				{ id: 's5', name: '吴十五', gender: '男', age: '10' }
-			]
-		}
-	])
+	const projects = ref<Array<any>>([])
 
 	// 弹窗状态
 	const showTimingModal = ref(false)
-	const showDetailModal = ref(false)
-	const currentProject = ref<Project | null>(null)
-	
-	
-	// 生命周期
-	onMounted(() => {
-		// TODO: 实际应从接口获取项目列表
+
+	onLoad(() => {
+		if (!Service.GetUserToken()) {
+			login()
+		}
 	})
+
+	const login = () => {
+		uni.getProvider({
+			service: 'oauth',
+			success: function (res : any) {
+				uni.login({
+					onlyAuthorize: true,
+					provider: res.provider,
+					success: function (loginRes) {
+						loginService.Login(
+							loginRes.code,
+						).then(content => {
+							if (content.code == 0) {
+								Service.SetUserToken(content.data.token)
+							} else {
+								Service.Msg(content.msg)
+							}
+						})
+					},
+					fail: function (error) {
+
+					}
+				});
+			}
+		});
+	}
 	
-	onUnmounted(() => {
-		// 清理
-	})
+	// 获取项目列表数据
+	const getData = () => {
+		projects.value = []
+		page.value = 1
+		status.value = 'loadmore'
+		getList()
+	}
 	
+	// 获取项目列表
+	const getList = () => {
+		if (status.value == 'loading' || status.value == 'nomore') {
+			return
+		}
+		status.value = 'loading'
+		PlanService.GetPlanList(currentIndex.value==1?'计时项目':(currentIndex.value==2?'分段项目':'混氧项目'), page.value.toString()).then(res => {
+			if (res.code == 0) {
+				projects.value = [...projects.value, ...res.data]
+				status.value = res.data.length == 10 ? 'loadmore' : 'nomore'
+				page.value++
+			} else {
+				Service.Msg(res.msg)
+			}
+		})
+	}
+	
+
 	// 显示计时项目列表弹窗
-	const showTimingProjectModal = (index:any) => {
+	const showTimingProjectModal = (index : any) => {
+		uni.hideTabBar()
+
 		showTimingModal.value = true
-		currentIndex.value=index
+		currentIndex.value = index
+		getData()
 	}
 
 	// 关闭计时项目列表弹窗
 	const closeTimingProjectModal = () => {
 		showTimingModal.value = false
+		uni.showTabBar()
 	}
 
 	// 创建计时项目
 	const createTimingProject = () => {
-		Service.GoPage('/pages/userFunc/setCourse')
-	}
-
-	// 创建包干项目
-	const createPackageProject = () => {
-		Service.GoPage('/pages/userFunc/setCourse')
-	}
-
-	// 创建分段项目
-	const createSegmentProject = () => {
-		Service.GoPage('/pages/userFunc/setCourse')
-	}
-	
-	// 显示项目详情
-	const showProjectDetail = (project : Project) => {
-		currentProject.value = project
-		showTimingModal.value = false
-		showDetailModal.value = true
-	}
-
-	// 关闭弹窗
-	const closeDetailModal = () => {
-		showDetailModal.value = false
-		currentProject.value = null
-	}
-	
-	
-	const goPageFunc=()=>{
-		if(currentIndex.value==1){
-			Service.GoPage('/pages/userFunc/swiming')	
-		}else{
-			Service.GoPage('/pages/userFunc/project')	
+		if (currentIndex.value == 3) {
+			Service.GoPage('/pages/userFunc/addHunyang')
+		} else {
+			Service.GoPage('/pages/userFunc/setCourse?type=' + currentIndex.value)
+		}
+
+
+	}
+
+	// 处理项目点击事件
+	const handleProjectClick = (project:any) => {
+		if (currentIndex.value === 1) {
+			showTimingModal.value = false
+			Service.GoPage('/pages/userFunc/swiming?id='+project.planId)
+			
+		}
+		else if (currentIndex.value === 2) {
+			showTimingModal.value = false
+			Service.GoPage('/pages/userFunc/segmentation?id='+project.planId)
+		}
+		else {
+			showTimingModal.value = false
+			Service.GoPage('/pages/userFunc/hunyang?id='+project.planId)
 		}
-		
 	}
-	
 </script>
 
 <style lang="scss" scoped>
@@ -447,6 +453,11 @@
 			&.segment-icon {
 				background: linear-gradient(135deg, #52c41a 0%, #73d13d 50%, #389e0d 100%);
 			}
+
+			/* 混氧图标 - 紫色渐变 */
+			&.hunyang-icon {
+				background: linear-gradient(135deg, #722ed1 0%, #9254de 50%, #531dab 100%);
+			}
 		}
 
 		&::after {
@@ -483,7 +494,7 @@
 		line-height: 1.4;
 	}
 
-	
+
 
 	.card-arrow {
 		flex-shrink: 0;
@@ -550,7 +561,7 @@
 		}
 	}
 
-	
+
 
 	/* 计时项目列表弹窗 */
 	.project-list-modal {
@@ -934,4 +945,75 @@
 			transform: translate(-50%, -50%);
 		}
 	}
+
+	/* 包干项目选项样式 */
+	.package-options {
+		margin-bottom: 36rpx;
+	}
+
+	.form-group {
+		margin-bottom: 32rpx;
+	}
+
+	.form-label {
+		display: block;
+		font-size: 28rpx;
+		font-weight: 600;
+		color: #333;
+		margin-bottom: 16rpx;
+	}
+
+	.radio-group {
+		display: flex;
+		gap: 20rpx;
+	}
+
+	.radio-item {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		gap: 12rpx;
+		padding: 24rpx 20rpx;
+		background: #f5f5f5;
+		border-radius: 16rpx;
+		border: 2rpx solid transparent;
+		transition: all 0.3s ease;
+	}
+
+	.radio-item.active {
+		background: linear-gradient(135deg, #e6f7ff 0%, #bae7ff 100%);
+		border-color: #1890ff;
+	}
+
+	.radio-item:active {
+		transform: scale(0.98);
+	}
+
+	.radio-circle {
+		width: 36rpx;
+		height: 36rpx;
+		border-radius: 50%;
+		border: 3rpx solid #d9d9d9;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		transition: all 0.3s ease;
+	}
+
+	.radio-item.active .radio-circle {
+		border-color: #1890ff;
+	}
+
+	.radio-dot {
+		width: 18rpx;
+		height: 18rpx;
+		border-radius: 50%;
+		background: #1890ff;
+	}
+
+	.radio-label {
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #333;
+	}
 </style>
\ No newline at end of file
diff --git a/src/pages/index/user.vue b/src/pages/index/user.vue
index 40ea2de..618e1d9 100644
--- a/src/pages/index/user.vue
+++ b/src/pages/index/user.vue
@@ -3,15 +3,15 @@
 		<!-- 用户信息卡片 -->
 		<view class="user-card">
 			<view class="user-avatar">
-				<view class="avatar-circle">
+				<view class="avatar-circle" v-if="!userInfo.headImg">
 					<u-icon name="account" size="52" color="#fff"></u-icon>
 				</view>
-
+				<image v-else class="avatar-image" :src="Service.GetMateUrlByImg(userInfo.headImg)" mode="aspectFill"></image>
 			</view>
 			<view class="user-info">
-				<text class="user-nickname">游泳爱好者</text>
+				<text class="user-nickname">{{ userInfo.name }}</text>
 				<view class="user-phone-wrapper">
-					<text class="user-phone">138****8888</text>
+					<text class="user-phone">{{ userInfo.phone || '暂无手机号' }}</text>
 				</view>
 			</view>
 			<view @click="Service.GoPage('/pages/userFunc/set')" class="user-edit">
@@ -22,25 +22,17 @@
 		<!-- 统计数据区域 -->
 		<view class="stats-section">
 			<view class="stats-card">
-				<view class="stat-item" >
+				<view class="stat-item">
 
 					<view class="stat-info">
-						<text class="stat-value">12</text>
+						<text class="stat-value">{{ userInfo.projectCount || 0 }}</text>
 						<text class="stat-label">我的项目</text>
 					</view>
 				</view>
 				<view class="stat-divider"></view>
-				<view class="stat-item" >
-
+				<view class="stat-item">
 					<view class="stat-info">
-						<text class="stat-value">8</text>
-						<text class="stat-label">记录数</text>
-					</view>
-				</view>
-				<view class="stat-divider"></view>
-				<view class="stat-item" >
-					<view class="stat-info">
-						<text class="stat-value">8</text>
+						<text class="stat-value">{{ userInfo.studentCount || 0 }}</text>
 						<text class="stat-label">学员数</text>
 					</view>
 				</view>
@@ -50,6 +42,7 @@
 		<!-- 功能菜单区域 -->
 		<view class="menu-section">
 			<view class="menu-card">
+				<!-- 项目管理菜单项 -->
 				<view class="menu-item" @click="Service.GoPage('/pages/userFunc/projectList')">
 					<view class="menu-icon-bg project-icon-bg">
 						<u-icon name="list" size="28" color="#fff"></u-icon>
@@ -70,6 +63,8 @@
 
 				<view class="menu-divider"></view>
 
+
+				<!-- 学员管理菜单项 -->
 				<view class="menu-item" @click="Service.GoPage('/pages/userFunc/student')">
 					<view class="menu-icon-bg academy-icon-bg">
 						<u-icon name="grid" size="28" color="#fff"></u-icon>
@@ -90,6 +85,7 @@
 
 				<view class="menu-divider"></view>
 
+				<!-- 数据分析菜单项 -->
 				<view class="menu-item" @click="Service.GoPage('/pages/userFunc/analyze')">
 					<view class="menu-icon-bg analysis-icon-bg">
 						<u-icon name="order" size="28" color="#fff"></u-icon>
@@ -114,19 +110,43 @@
 
 <script setup lang="ts">
 	import { onShow, onLoad } from "@dcloudio/uni-app"
+	import { reactive, ref } from "vue"
 	import { Service } from '@/Service/Service'
+	import { userService } from '@/Service/swimming/userService'
 
+
+	let userInfo = ref<any>({})
+
+	
 	onLoad(() => {
-
+		loadUserInfo()
 	})
 
 	onShow(() => {
 
 	})
+	
+	const loadUserInfo = () => {
+		userService.GetUserInfo().then((content) => {
+			if (content.code == 0) {
+				userInfo.value=content.data.userInfo
+			} else {
+				Service.Msg(content.msg)
+			}
+		})
+	}
+	
 
-
-
-
+	/**
+	 * 跳转到训练计划页面
+	 * 点击"训练计划"菜单项时触发
+	 * 功能说明：
+	 * - 跳转到训练计划列表页面
+	 * - 用户可以查看、添加、编辑训练计划
+	 */
+	const goToTrainingPlans = () => {
+		Service.GoPage('/pages/userFunc/plan')
+	}
 
 	// 跳转到设置
 	const goToSettings = () => {
@@ -203,6 +223,15 @@
 			box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.1);
 		}
 
+		.avatar-image {
+			width: 130rpx;
+			height: 130rpx;
+			border-radius: 50%;
+			border: 5rpx solid rgba(255, 255, 255, 0.4);
+			backdrop-filter: blur(20rpx);
+			box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.1);
+		}
+
 		.avatar-badge {
 			position: absolute;
 			bottom: 0;
@@ -410,14 +439,22 @@
 				border-radius: 50%;
 			}
 
+			/* 项目管理图标背景色 - 蓝色渐变 */
 			&.project-icon-bg {
 				background: linear-gradient(135deg, #1890ff 0%, #40a9ff 50%, #096dd9 100%);
 			}
 
+			/* 训练计划图标背景色 - 紫色渐变 */
+			&.plan-icon-bg {
+				background: linear-gradient(135deg, #722ed1 0%, #9254de 50%, #531dab 100%);
+			}
+
+			/* 学员管理图标背景色 - 绿色渐变 */
 			&.academy-icon-bg {
 				background: linear-gradient(135deg, #52c41a 0%, #73d13d 50%, #389e0d 100%);
 			}
 
+			/* 数据分析图标背景色 - 橙色渐变 */
 			&.analysis-icon-bg {
 				background: linear-gradient(135deg, #faad14 0%, #ffc53d 50%, #d48806 100%);
 			}
@@ -454,16 +491,25 @@
 			font-size: 20rpx;
 			font-weight: 500;
 
+			/* 项目管理标签样式 - 蓝色 */
 			&.project-tag {
 				background: linear-gradient(135deg, rgba(24, 144, 255, 0.12) 0%, rgba(24, 144, 255, 0.08) 100%);
 				color: #1890ff;
 			}
 
+			/* 训练计划标签样式 - 紫色 */
+			&.plan-tag {
+				background: linear-gradient(135deg, rgba(114, 46, 209, 0.12) 0%, rgba(114, 46, 209, 0.08) 100%);
+				color: #722ed1;
+			}
+
+			/* 学员管理标签样式 - 绿色 */
 			&.academy-tag {
 				background: linear-gradient(135deg, rgba(82, 196, 26, 0.12) 0%, rgba(82, 196, 26, 0.08) 100%);
 				color: #52c41a;
 			}
 
+			/* 数据分析标签样式 - 橙色 */
 			&.analysis-tag {
 				background: linear-gradient(135deg, rgba(250, 173, 20, 0.12) 0%, rgba(250, 173, 20, 0.08) 100%);
 				color: #faad14;
diff --git a/src/pages/userFunc/addHunyang.vue b/src/pages/userFunc/addHunyang.vue
new file mode 100644
index 0000000..ebe60da
--- /dev/null
+++ b/src/pages/userFunc/addHunyang.vue
@@ -0,0 +1,577 @@
+<template>
+	<view class="add-hunyang-container">
+		<!-- 表单区域 -->
+		<view class="form-section">
+			<!-- 项目名称 -->
+			<view class="form-card">
+				<view class="form-title">项目信息</view>
+				<view class="form-group">
+					<text class="form-label">项目名称</text>
+					<input class="form-input" v-model="projectName" placeholder="请输入项目名称"
+						placeholder-class="input-placeholder" />
+				</view>
+
+				<!-- 计划总时长 -->
+				<view class="total-time-section">
+					<view class="total-time-label">计划总时长</view>
+					<view class="total-time-value">{{ formatTotalTime(totalDuration) }}</view>
+				</view>
+			</view>
+
+			<!-- 计划列表 -->
+			<view class="form-card">
+				<view class="form-title">计划列表</view>
+
+				<!-- 计划项列表 -->
+				<view v-for="(item, index) in planList" :key="index" class="plan-item">
+					<view class="plan-item-header">
+						<text class="plan-item-title">计划 {{ index + 1 }}</text>
+						<view class="delete-plan-btn" @click="deletePlanItem(index)">
+							<u-icon name="trash" size="16" color="#fff"></u-icon>
+						</view>
+					</view>
+
+					<view class="plan-item-content">
+						<!-- 目标时间 - 分秒选择 -->
+						<view class="input-group">
+							<text class="input-label">目标时间</text>
+							<view class="time-selector">
+								<view class="time-input-wrapper">
+									<input class="time-input" v-model="item.targetSeconds" type="number"
+										placeholder="" />
+									<text class="time-unit">秒</text>
+								</view>
+							</view>
+						</view>
+
+						<!-- 休息时长 - 秒选择 -->
+						<view class="input-group">
+							<text class="input-label">休息时长</text>
+							<view class="rest-selector">
+								<input class="rest-input" v-model="item.restTime" type="number" placeholder="请输入休息时长" />
+								<text class="time-unit">秒</text>
+							</view>
+						</view>
+
+						<!-- 圈数 -->
+						<view class="input-group">
+							<text class="input-label">圈数</text>
+							<view class="lap-selector">
+								<input class="lap-input" v-model="item.lapCount" type="number" placeholder="请输入圈数" />
+								<text class="time-unit">圈</text>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- 添加计划按钮 -->
+				<view class="add-plan-btn" @click="addPlanItem">
+					<u-icon name="plus-circle" size="20" color="#1890ff"></u-icon>
+					<text class="add-plan-text">添加计划</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 底部按钮区域 -->
+		<view class="bottom-actions">
+			<view class="action-buttons">
+				<button class="cancel-btn" @click="handleCancel">取消</button>
+				<button class="confirm-btn" @click="handleSave">保存</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, computed } from 'vue'
+	import { Service } from '@/Service/Service'
+	import { studentService } from '@/Service/swimming/studentService'
+	import { PlanService } from '@/Service/swimming/PlanService'
+	import { onLoad, onShow } from '@dcloudio/uni-app'
+	
+
+	// 计划项接口
+	interface PlanItem {
+		targetMinutes : string
+		targetSeconds : string
+		restTime : string
+		lapCount : string
+	}
+
+	// 项目名称
+	const projectName = ref('')
+
+	// 计划列表
+	const planList = ref<PlanItem[]>([])
+	let planId = ref('')
+
+	onLoad((data : any) => {
+		planId.value = data.id
+		if(planId.value ){
+			getPlanInfo()
+		}
+	})
+	
+	
+	
+	// 获取计划详情
+	const getPlanInfo = () => {
+		PlanService.GetPlanInfo(planId.value).then(res => {
+			if (res.code == 0) {
+				projectName.value=res.data.plan.name
+				JSON.parse(res.data.plan.project).map((item:any)=>{
+					planList.value.push({
+						targetMinutes:'',
+						targetSeconds : item.target,
+						restTime : item.rest,
+						lapCount : item.circle
+					})
+				})
+			} else {
+				// 显示错误信息
+				Service.Msg(res.msg)
+			}
+		})
+	}
+
+	// 计算计划总时长（秒）
+	const totalDuration = computed(() => {
+		let total = 0
+		planList.value.forEach(item => {
+			const targetMinutes = parseInt(item.targetMinutes) || 0
+			const targetSeconds = parseInt(item.targetSeconds) || 0
+			const targetTime = targetMinutes * 60 + targetSeconds
+			const restTime = parseInt(item.restTime) || 0
+			const lapCount = parseInt(item.lapCount) || 0
+
+			// 计算公式：(目标时间 + 休息时间) * 圈数
+			total += (targetTime + restTime) * lapCount
+		})
+		return total
+	})
+
+	// 格式化总时长显示（时:分:秒）
+	const formatTotalTime = (seconds : number) : string => {
+		if (seconds <= 0) return '00:00:00'
+
+		const hours = Math.floor(seconds / 3600)
+		const minutes = Math.floor((seconds % 3600) / 60)
+		const secs = Math.floor(seconds % 60)
+
+		return `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}`
+	}
+
+	// 生成唯一ID
+	const generateId = () : string => {
+		return Date.now().toString() + Math.random().toString(36).substr(2, 9)
+	}
+
+	// 添加计划项
+	const addPlanItem = () => {
+		const newItem : PlanItem = {
+			id: generateId(),
+			targetMinutes: '',
+			targetSeconds: '',
+			restTime: '',
+			lapCount: ''
+		}
+		planList.value.push(newItem)
+	}
+
+	// 删除计划项
+	const deletePlanItem = (index : number) => {
+		uni.showModal({
+			title: '确认删除',
+			content: '确定要删除该计划吗？',
+			success: (res) => {
+				if (res.confirm) {
+					planList.value.splice(index, 1)
+					Service.Msg('删除成功')
+				}
+			}
+		})
+	}
+
+	// 验证表单
+	const validateForm = () : boolean => {
+		if (!projectName.value.trim()) {
+			Service.Msg('请输入项目名称')
+			return false
+		}
+
+		if (planList.value.length === 0) {
+			Service.Msg('请至少添加一个计划')
+			return false
+		}
+
+		for (let i = 0; i < planList.value.length; i++) {
+			const item = planList.value[i]
+
+			if (!item.targetSeconds) {
+				Service.Msg(`计划 ${i + 1} 请输入目标时间`)
+				return false
+			}
+
+			const seconds = parseInt(item.targetSeconds) || 0
+			if (seconds === 0) {
+				Service.Msg(`计划 ${i + 1} 目标时间不能为0`)
+				return false
+			}
+
+			if (!item.restTime || parseInt(item.restTime) < 0) {
+				Service.Msg(`计划 ${i + 1} 请输入有效的休息时长`)
+				return false
+			}
+
+			if (!item.lapCount || parseInt(item.lapCount) <= 0) {
+				Service.Msg(`计划 ${i + 1} 请输入有效的圈数`)
+				return false
+			}
+		}
+
+		return true
+	}
+
+	// 保存
+	const handleSave = () => {
+		if (!validateForm()) {
+			return
+		}
+
+		let plan = planList.value.map(item => ({
+			target: (parseInt(item.targetMinutes) || 0) * 60 + (parseInt(item.targetSeconds) || 0),
+			rest: parseInt(item.restTime),
+			circle: parseInt(item.lapCount)
+		}))
+		// 整理数据
+		const data = {
+			planId: planId.value,
+			name: projectName.value,
+			planType: '混氧项目',
+			departType: '',
+			interval: '',
+			groupInt: '',
+			subsectionDistance: '',
+			subsectionInt: '',
+			users: '',
+			project: JSON.stringify(plan),
+			group: '',
+
+		}
+
+		console.log('保存的数据:', data)
+		PlanService.AddPlan(data).then(res => {
+			if (res.code == 0) {
+				Service.Msg('添加成功!')
+				setTimeout(() => {
+					Service.GoPageBack()
+				}, 1000)
+			} else {
+				Service.Msg(res.msg)
+			}
+		})
+	}
+
+	// 取消
+	const handleCancel = () => {
+		uni.showModal({
+			title: '确认取消',
+			content: '确定要取消吗？已输入的内容将不会保存。',
+			success: (res) => {
+				if (res.confirm) {
+					Service.GoPageBack()
+				}
+			}
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #f5f5f5;
+	}
+
+	.add-hunyang-container {
+		min-height: 100vh;
+		padding-bottom: 140rpx;
+	}
+
+	/* 表单区域 */
+	.form-section {
+		padding: 20rpx;
+	}
+
+	.form-card {
+		background-color: #fff;
+		border-radius: 24rpx;
+		padding: 32rpx 28rpx;
+		margin-bottom: 20rpx;
+		box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
+
+		.form-title {
+			font-size: 32rpx;
+			font-weight: 700;
+			color: #333;
+			margin-bottom: 28rpx;
+			display: block;
+		}
+	}
+
+	/* 表单输入 */
+	.form-group {
+		margin-bottom: 0;
+
+		.form-label {
+			display: block;
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333;
+			margin-bottom: 14rpx;
+		}
+
+		.form-input {
+			width: 100%;
+			height: 88rpx;
+			background-color: #f5f5f5;
+			border-radius: 16rpx;
+			padding: 0 24rpx;
+			font-size: 28rpx;
+			color: #333;
+			transition: all 0.2s ease;
+
+			&:focus {
+				background-color: #fff;
+				box-shadow: 0 0 0 4rpx rgba(24, 144, 255, 0.15);
+			}
+		}
+	}
+
+	/* 计划总时长 */
+	.total-time-section {
+		margin-top: 28rpx;
+		padding-top: 24rpx;
+		border-top: 2rpx solid #f0f0f0;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.total-time-label {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #666;
+		}
+
+		.total-time-value {
+			font-size: 36rpx;
+			font-weight: bold;
+			color: #1890ff;
+			font-family: 'DIN Alternate', 'Helvetica Neue', monospace;
+			letter-spacing: 2rpx;
+			background: linear-gradient(135deg, #e6f7ff 0%, #f0f9ff 100%);
+			padding: 12rpx 24rpx;
+			border-radius: 12rpx;
+			border: 2rpx solid #91d5ff;
+		}
+	}
+
+	/* 计划项 */
+	.plan-item {
+		background-color: #f9f9f9;
+		border-radius: 16rpx;
+		padding: 24rpx;
+		margin-bottom: 20rpx;
+		border: 2rpx solid #f0f0f0;
+
+		.plan-item-header {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 20rpx;
+
+			.plan-item-title {
+				font-size: 28rpx;
+				font-weight: 600;
+				color: #333;
+			}
+
+			.delete-plan-btn {
+				width: 44rpx;
+				height: 44rpx;
+				background: linear-gradient(135deg, #ff4d4f 0%, #d9363e 100%);
+				border-radius: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				box-shadow: 0 2rpx 8rpx rgba(255, 77, 79, 0.3);
+				transition: all 0.2s ease;
+
+				&:active {
+					transform: scale(0.95);
+				}
+			}
+		}
+
+		.plan-item-content {
+			display: flex;
+			flex-direction: column;
+			gap: 20rpx;
+		}
+	}
+
+	/* 输入组 */
+	.input-group {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.input-label {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #666;
+			min-width: 120rpx;
+		}
+	}
+
+	/* 时间选择器 */
+	.time-selector {
+		display: flex;
+		align-items: center;
+		gap: 8rpx;
+		flex: 1;
+
+		.time-input-wrapper {
+			display: flex;
+			align-items: center;
+			background-color: #fff;
+			border-radius: 12rpx;
+			padding: 0 16rpx;
+			height: 72rpx;
+			flex: 1;
+
+			.time-input {
+				flex: 1;
+				font-size: 28rpx;
+				color: #333;
+				text-align: right;
+			}
+
+			.time-unit {
+				font-size: 24rpx;
+				color: #999;
+				margin-left: 8rpx;
+			}
+		}
+
+		.time-separator {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #333;
+			padding: 0 4rpx;
+		}
+	}
+
+	/* 休息选择器 */
+	.rest-selector,
+	.lap-selector {
+		display: flex;
+		align-items: center;
+		background-color: #fff;
+		border-radius: 12rpx;
+		padding: 0 16rpx;
+		height: 72rpx;
+		flex: 1;
+
+		.rest-input,
+		.lap-input {
+			flex: 1;
+			font-size: 28rpx;
+			color: #333;
+			text-align: right;
+		}
+
+		.time-unit {
+			font-size: 24rpx;
+			color: #999;
+			margin-left: 12rpx;
+		}
+	}
+
+	/* 添加计划按钮 */
+	.add-plan-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 12rpx;
+		padding: 24rpx 32rpx;
+		margin-top: 20rpx;
+		background: linear-gradient(135deg, #f0f9ff 0%, #e6f7ff 100%);
+		border-radius: 16rpx;
+		border: 2rpx dashed #91d5ff;
+		transition: all 0.3s ease;
+
+		&:active {
+			transform: scale(0.98);
+			background: linear-gradient(135deg, #e6f7ff 0%, #d6f4ff 100%);
+		}
+
+		.add-plan-text {
+			font-size: 28rpx;
+			color: #1890ff;
+			font-weight: 500;
+		}
+	}
+
+	/* 底部操作按钮 */
+	.bottom-actions {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background-color: #fff;
+		padding: 20rpx 30rpx;
+		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+		border-top: 1rpx solid #f0f0f0;
+		box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.08);
+		z-index: 99;
+
+		.action-buttons {
+			display: flex;
+			gap: 16rpx;
+		}
+	}
+
+	.cancel-btn,
+	.confirm-btn {
+		flex: 1;
+		height: 88rpx;
+		border-radius: 16rpx;
+		border: none;
+		font-size: 30rpx;
+		font-weight: 600;
+		transition: all 0.25s ease;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.cancel-btn {
+		background-color: #f5f5f5;
+		color: #666;
+
+		&:active {
+			background-color: #e8e8e8;
+			transform: scale(0.96);
+		}
+	}
+
+	.confirm-btn {
+		background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
+		color: #fff;
+		box-shadow: 0 6rpx 16rpx rgba(24, 144, 255, 0.35);
+
+		&:active {
+			transform: scale(0.96);
+			box-shadow: 0 3rpx 8rpx rgba(24, 144, 255, 0.25);
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/userFunc/hunyang.vue b/src/pages/userFunc/hunyang.vue
new file mode 100644
index 0000000..7adca3b
--- /dev/null
+++ b/src/pages/userFunc/hunyang.vue
@@ -0,0 +1,693 @@
+<template>
+	<view class="hunyang-container">
+		<!-- 
+			混氧训练页面主容器
+			包含：头部信息、倒计时装置、底部控制按钮
+		-->
+
+		<!-- 项目信息头部 -->
+		<view class="card-section header-section" style="position: relative;">
+			<view class="header-content">
+				<!-- 训练项目名称 -->
+				<view class="project-name">{{ name }}</view>
+				<!-- 总训练时长显示 -->
+				<view class="total-duration">
+					<text class="duration-label">计划总时长:</text>
+					<!-- 格式化显示总时长 -->
+					<text class="duration-value">{{ formatTotalDuration(totalDuration) }}</text>
+				</view>
+			</view>
+			<view class="" style="position: absolute; top: 20rpx; right: 30rpx; ">
+				<up-icon @click="Service.GoPage('/pages/userFunc/addHunyang?id='+planId)" name="setting"
+					size="22"></up-icon>
+			</view>
+		</view>
+
+		<!-- 多个倒计时装置区域 -->
+		<view class="card-section timer-section">
+			<!-- 区域标题 -->
+			<view class="section-title">倒计时装置</view>
+
+			<view class="multi-timers-wrapper">
+				<!-- 
+					使用v-for循环渲染每个训练计划
+					:active类用于高亮当前正在执行的计划
+				-->
+				<view v-for="(plan, index) in plans" :key="plan.id" class="timer-item"
+					:class="{ active: currentPlanIndex === index }">
+					<view class="timer-horizontal">
+						<!-- 
+							训练状态显示区域
+							根据不同状态显示：休息中/已完成/计划X
+						-->
+						<view class="timer-status" :class="{ resting: timerStates[index].isResting }">
+							<text v-if="timerStates[index].isResting" class="status-label">休息中</text>
+							<text v-else-if="timerStates[index].isCompleted" class="status-label">已完成</text>
+							<text v-else class="status-label">计划{{ index + 1 }}</text>
+						</view>
+						<!-- 
+							倒计时显示区域
+							根据状态显示训练时间或休息时间
+						-->
+						<view class="timer-display" :class="{ resting: timerStates[index].isResting }">
+							<text v-if="timerStates[index].isResting"
+								class="display-time">{{ formatRestCountdown(timerStates[index].restCountdown) }}</text>
+							<text v-else class="display-time">{{ formatCountdown(timerStates[index].countdown) }}</text>
+						</view>
+						<!-- 
+							完成圈数显示
+							显示已完成的圈数/总圈数
+						-->
+						<view class="timer-laps">
+							<text class="laps-text">{{ timerStates[index].completedLaps }}/{{ plan.circle }}圈</text>
+						</view>
+					</view>
+
+					<!-- 计划详细信息 -->
+					<view class="plan-info-bar">
+						<view class="info-item">
+							<text class="info-label">目标:</text>
+							<text class="info-value">{{ plan.target }}秒</text>
+						</view>
+						<view class="info-item">
+							<text class="info-label">休息:</text>
+							<text class="info-value">{{ plan.rest }}秒</text>
+						</view>
+					</view>
+				</view>
+
+				<!-- 空状态提示 -->
+				<view v-if="plans.length === 0" class="empty-timer">
+					<text class="empty-text">暂无训练计划，请添加</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 底部控制按钮区域 -->
+		<view class="bottom-controls">
+			<view class="controls-inner">
+				<!-- 
+					开始按钮 - 仅在未运行时显示
+					点击开始所有训练计划
+				-->
+				<view v-if="!isRunning" class="control-btn start-btn" @click="startAll">
+					<u-icon name="play-circle" size="32" color="#fff"></u-icon>
+					<text class="btn-text">开始</text>
+				</view>
+				<!-- 
+					暂停按钮 - 仅在运行时显示
+					点击暂停所有训练
+				-->
+				<view v-else class="control-btn pause-btn" @click="pauseAll">
+					<u-icon name="pause-circle" size="32" color="#fff"></u-icon>
+					<text class="btn-text">暂停</text>
+				</view>
+				<!-- 
+					重置按钮
+					点击重置所有训练状态
+				-->
+				<view class="control-btn reset-btn" @click="resetAll">
+					<u-icon name="reload" size="32" color="#fff"></u-icon>
+					<text class="btn-text">重置</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 保存悬浮按钮 -->
+		<view class="save-float-btn" @click="saveData">
+			<text class="btn-text">保存</text>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 导入必要的Vue组合式API和项目服务
+	import { ref, computed, onUnmounted } from 'vue'
+	import { Service } from '@/Service/Service'
+	import { PlanService } from '@/Service/swimming/PlanService'
+	import { onLoad, onShow } from '@dcloudio/uni-app'
+
+	// 定义训练计划的数据结构接口
+	interface PlanItem {
+		id : string          // 计划唯一标识
+		targetTime : number  // 目标训练时间（秒）
+		restTime : number    // 休息时间（秒）
+		lapCount : number    // 训练圈数
+	}
+
+	// 定义计时器状态的数据结构接口
+	interface TimerState {
+		isRunning : boolean      // 是否正在运行
+		isResting : boolean      // 是否处于休息状态
+		isCompleted : boolean    // 是否已完成
+		countdown : number       // 倒计时（秒）
+		restCountdown : number   // 休息倒计时（秒）
+		completedLaps : number   // 已完成圈数
+	}
+
+	// 训练计划列表，使用ref实现响应式
+	const plans = ref<Array<any>>([
+	])
+
+	// 每个计划的计时器状态，与plans一一对应
+	const timerStates = ref<TimerState[]>([])
+	// 当前正在执行的训练计划索引
+	const currentPlanIndex = ref(0)
+	// 训练是否正在运行的状态
+	const isRunning = ref(false)
+	// 主计时器间隔ID，用于控制全局计时
+	const mainInterval = ref<number | null>(null)
+
+	// 训练计划ID，从页面参数获取
+	let planId = ref('')
+
+	let name = ref('')
+
+	// 页面加载时触发，获取训练计划信息
+	onLoad((data : any) => {
+		planId.value = data.id
+
+	})
+	onShow(() => {
+		getPlanInfo()
+	})
+
+	// 获取计划详情
+	// 通过PlanService获取指定ID的训练计划，并初始化计时器状态
+	const getPlanInfo = () => {
+		PlanService.GetPlanInfo(planId.value).then(res => {
+			if (res.code == 0) {
+				// 解析计划数据并初始化计时器状态
+				name.value = res.data.plan.name
+				plans.value = JSON.parse(res.data.plan.project)
+				initTimerStates()
+			} else {
+				// 显示错误信息
+				Service.Msg(res.msg)
+			}
+		})
+	}
+
+	// 初始化计时器状态
+	// 为每个计划创建对应的计时器状态对象，重置所有状态
+	const initTimerStates = () => {
+		timerStates.value = plans.value.map(() => ({
+			isRunning: false,
+			isResting: false,
+			isCompleted: false,
+			countdown: 0,
+			restCountdown: 0,
+			completedLaps: 0
+		}))
+	}
+
+	// 开始所有训练计划
+	// 检查是否有计划，如果没有则提示用户
+	// 设置运行状态并启动第一个计划
+	const startAll = () => {
+		if (plans.value.length === 0) {
+			Service.Msg('请先添加训练计划')
+			return
+		}
+
+		isRunning.value = true
+
+		// 启动指定索引的计划
+		const startPlan = (index : number) => {
+			// 如果索引超出范围，停止所有训练并显示完成消息
+			if (index >= plans.value.length) {
+				stopAll()
+				Service.Msg('所有计划训练完成！', 'success')
+				return
+			}
+
+			// 设置当前计划索引并获取对应的状态
+			currentPlanIndex.value = index
+			const plan = plans.value[index]
+			const state = timerStates.value[index]
+
+			// 设置计划为运行状态，并初始化倒计时
+			state.isRunning = true
+			if (state.countdown === 0 && !state.isResting) {
+				state.countdown = plan.target
+			}
+		}
+
+		// 启动当前计划
+		startPlan(currentPlanIndex.value)
+
+		// 设置主计时器，每10毫秒更新一次
+		mainInterval.value = setInterval(() => {
+			const index = currentPlanIndex.value
+			// 如果索引超出范围，停止所有训练
+			if (index >= plans.value.length) {
+				stopAll()
+				return
+			}
+
+			const plan = plans.value[index]
+			const state = timerStates.value[index]
+
+			// 如果处于休息状态，更新休息倒计时
+			if (state.isResting) {
+				state.restCountdown -= 0.01
+				if (state.restCountdown <= 0) {
+					// 休息结束，重置休息状态并开始训练
+					state.isResting = false
+					state.restCountdown = 0
+					state.countdown = plan.target
+				}
+			} else {
+				// 训练状态，更新训练倒计时
+				state.countdown -= 0.01
+				if (state.countdown <= 0) {
+					// 训练完成一圈，增加完成圈数
+					state.completedLaps += 1
+
+					// 如果达到总圈数，标记为已完成并启动下一个计划
+					if (state.completedLaps >= plan.circle) {
+						state.isRunning = false
+						state.isCompleted = true
+						currentPlanIndex.value += 1
+						startPlan(currentPlanIndex.value)
+					} else {
+						// 否则进入休息状态
+						state.isResting = true
+						state.restCountdown = plan.rest
+					}
+				}
+			}
+		}, 10)
+	}
+
+	// 暂停所有训练
+	// 调用stopAll方法暂停训练
+	const pauseAll = () => {
+		stopAll()
+	}
+
+	// 停止所有训练
+	// 重置运行状态，清除主计时器
+	const stopAll = () => {
+		isRunning.value = false
+		// 重置所有计划的运行状态
+		timerStates.value.forEach(state => {
+			state.isRunning = false
+		})
+		// 清除主计时器
+		if (mainInterval.value) {
+			clearInterval(mainInterval.value)
+			mainInterval.value = null
+		}
+	}
+
+	// 重置所有训练状态
+	// 停止训练，重置当前计划索引，重置所有计时器状态
+	const resetAll = () => {
+		stopAll()
+		currentPlanIndex.value = 0
+		// 重置所有计时器状态
+		timerStates.value.forEach(state => {
+			state.isResting = false
+			state.isCompleted = false
+			state.countdown = 0
+			state.restCountdown = 0
+			state.completedLaps = 0
+		})
+	}
+
+	// 格式化倒计时显示
+	// 将秒数格式化为"分:秒"格式
+	const formatCountdown = (seconds : number) : string => {
+		const totalSeconds = Math.max(0, Math.floor(seconds))
+		const minutes = Math.floor(totalSeconds / 60)
+		const secs = totalSeconds % 60
+		return `${minutes.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}`
+	}
+
+	// 格式化休息倒计时显示
+	// 将秒数格式化为"分:秒"格式
+	const formatRestCountdown = (seconds : number) : string => {
+		const totalSeconds = Math.max(0, Math.floor(seconds))
+		const minutes = Math.floor(totalSeconds / 60)
+		const secs = totalSeconds % 60
+		return `${minutes.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}`
+	}
+
+	// 格式化总时长显示
+	// 将秒数格式化为"分:秒"格式
+	const formatTotalDuration = (seconds : number) : string => {
+		if (seconds === 0) return '0分0秒'
+		const minutes = Math.floor(seconds / 60)
+		const secs = Math.floor(seconds % 60)
+		return `${minutes}分${secs}秒`
+	}
+
+
+
+	// 计算总训练时长
+	// 根据所有计划的训练时间和休息时间计算总时长
+	const totalDuration = computed(() => {
+		return plans.value.reduce((total, plan) => {
+			const planTime = plan.target * plan.circle
+			const restTime = plan.rest * (plan.circle - 1)
+			return total + planTime + restTime
+		}, 0)
+	})
+
+
+
+	// 保存数据
+	const saveData = () => {
+		if (plans.value.length === 0) {
+			Service.Msg('没有可保存的训练计划')
+			return
+		}
+
+		// 构建要保存的数据
+		const saveData = {
+			name: name.value,
+			project: JSON.stringify(plans.value),
+			totalDuration: totalDuration.value
+		}
+
+		
+	}
+
+
+	// 页面卸载时触发
+	// 确保停止所有训练，避免内存泄漏
+	onUnmounted(() => {
+		stopAll()
+	})
+
+	// 格式化总时长显示
+	// 将秒数格式化为"小时:分:秒"或"分:秒"或"秒"格式
+
+
+	// 页面卸载时触发
+	// 确保停止所有训练，避免内存泄漏
+	onUnmounted(() => {
+		stopAll()
+	})
+</script>
+
+<style lang="scss" scoped>
+	.hunyang-container {
+		min-height: 100vh;
+		background-color: #f8f9fa;
+		padding: 20rpx;
+		padding-bottom: 240rpx;
+	}
+
+	.card-section {
+		background-color: #ffffff;
+		border-radius: 12rpx;
+		padding: 24rpx;
+		margin-bottom: 20rpx;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+	}
+
+	.header-section {
+		background: #ffffff;
+		color: #333333;
+	}
+
+	.header-content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 12rpx;
+	}
+
+	.project-name {
+		font-size: 36rpx;
+		font-weight: 600;
+		letter-spacing: 2rpx;
+	}
+
+	.total-duration {
+		display: flex;
+		align-items: center;
+		gap: 8rpx;
+		background: #f0f0f0;
+		padding: 12rpx 20rpx;
+		border-radius: 20rpx;
+	}
+
+	.duration-label {
+		font-size: 24rpx;
+		color: #666666;
+	}
+
+	.duration-value {
+		font-size: 28rpx;
+		font-weight: 500;
+	}
+
+	.section-title {
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #333333;
+		margin-bottom: 20rpx;
+		position: relative;
+		padding-left: 16rpx;
+
+		&::before {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			width: 4rpx;
+			height: 20rpx;
+			background: #4a90e2;
+			border-radius: 2rpx;
+		}
+	}
+
+	.empty-timer {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 40rpx 20rpx;
+
+		.empty-text {
+			font-size: 24rpx;
+			color: #999999;
+		}
+	}
+
+	.timer-section {
+		background: #ffffff;
+	}
+
+	.multi-timers-wrapper {
+		display: flex;
+		flex-direction: column;
+		gap: 16rpx;
+	}
+
+	.timer-item {
+		background: #ffffff;
+		border-radius: 12rpx;
+		padding: 20rpx;
+		border: 1rpx solid #e0e0e0;
+		transition: all 0.2s ease;
+
+		&.active {
+			border-color: #4a90e2;
+			box-shadow: 0 0 0 2rpx rgba(74, 144, 226, 0.1);
+		}
+
+		&:active {
+			transform: scale(0.99);
+		}
+	}
+
+	.timer-horizontal {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		width: 100%;
+		margin-bottom: 12rpx;
+		gap: 12rpx;
+	}
+
+	.timer-status {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 8rpx 16rpx;
+		border-radius: 8rpx;
+		background: #e6f0ff;
+		border: 1rpx solid #d0e3ff;
+		min-width: 100rpx;
+
+		&.resting {
+			background: #fff8e6;
+			border-color: #ffe0b2;
+		}
+
+		.status-label {
+			font-size: 22rpx;
+			font-weight: 500;
+			color: #4a90e2;
+		}
+
+		&.resting .status-label {
+			color: #ff9800;
+		}
+	}
+
+	.timer-display {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		.display-time {
+			font-size: 56rpx;
+			font-weight: bold;
+			font-family: 'Helvetica Neue', monospace;
+			color: #4a90e2;
+			letter-spacing: 1rpx;
+		}
+
+		&.resting .display-time {
+			color: #ff9800;
+			animation: countdownFlash 0.5s ease-in-out infinite;
+		}
+	}
+
+	.timer-laps {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 8rpx 16rpx;
+		background: #f5f5f5;
+		border-radius: 8rpx;
+		min-width: 100rpx;
+
+		.laps-text {
+			font-size: 22rpx;
+			color: #666666;
+			font-weight: 400;
+		}
+	}
+
+	.bottom-controls {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background: #ffffff;
+		padding: 16rpx 24rpx 24rpx;
+		padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
+		z-index: 100;
+		border-top: 1rpx solid #e0e0e0;
+	}
+
+	.controls-inner {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		gap: 20rpx;
+		max-width: 750rpx;
+		margin: 0 auto;
+	}
+
+	.control-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 8rpx;
+		padding: 20rpx 16rpx;
+		border-radius: 8rpx;
+		transition: all 0.2s ease;
+		flex: 1;
+	}
+
+	.control-btn:active {
+		transform: scale(0.98);
+	}
+
+	.btn-text {
+		font-size: 22rpx;
+		font-weight: 500;
+		color: #ffffff;
+	}
+
+	.start-btn {
+		background-color: #4caf50;
+	}
+
+	.pause-btn {
+		background-color: #ff9800;
+	}
+
+	.reset-btn {
+		background-color: #2196f3;
+	}
+
+	.plan-info-bar {
+		display: flex;
+		justify-content: center;
+		gap: 30rpx;
+		padding-top: 10rpx;
+		border-top: 1rpx dashed #e0e0e0;
+
+		.info-item {
+			display: flex;
+			align-items: center;
+			gap: 6rpx;
+		}
+
+		.info-label {
+			font-size: 20rpx;
+			color: #666666;
+		}
+
+		.info-value {
+			font-size: 20rpx;
+			color: #333333;
+			font-weight: 500;
+		}
+	}
+
+	@keyframes countdownFlash {
+
+		0%,
+		100% {
+			opacity: 1;
+		}
+
+		50% {
+			opacity: 0.7;
+		}
+	}
+
+	/* 保存悬浮按钮样式 */
+	.save-float-btn {
+		position: fixed;
+		bottom: 240rpx;
+		right: 30rpx;
+		background-color: #2196f3;
+		padding: 40rpx;
+		border-radius: 50%;
+		box-shadow: 0 4rpx 12rpx rgba(33, 150, 243, 0.3);
+		z-index: 101;
+		transition: all 0.2s ease;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.save-float-btn:active {
+		transform: scale(0.95);
+	}
+
+	.save-float-btn .btn-text {
+		font-size: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pages/userFunc/plan.vue b/src/pages/userFunc/plan.vue
new file mode 100644
index 0000000..5e0984d
--- /dev/null
+++ b/src/pages/userFunc/plan.vue
@@ -0,0 +1,394 @@
+<template>
+	<view class="plan-container">
+		<!-- 训练计划列表 -->
+		<view class="plan-list-section">
+			<view class="section-header">
+				<text class="section-title">我的训练计划</text>
+				<text class="plan-count">{{ trainingPlans.length }}个计划</text>
+			</view>
+
+			<!-- 计划列表 -->
+			<view class="plan-list">
+				<view v-for="(plan, index) in trainingPlans" :key="plan.id" class="plan-card">
+					<!-- 计划信息 -->
+					<view class="plan-info">
+						<view class="plan-icon">
+							<view class="icon-circle">
+								<u-icon name="calendar" size="24" color="#fff"></u-icon>
+							</view>
+						</view>
+						<view class="plan-detail">
+							<text class="plan-name">{{ plan.name }}</text>
+							<view class="plan-meta">
+								<view class="meta-tag">
+									<text class="tag-text">{{ plan.laps }}圈</text>
+								</view>
+								<view class="meta-tag">
+									<text class="tag-text">混氧</text>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<!-- 删除按钮 -->
+					<view class="delete-btn">
+						<u-icon name="trash" size="20" color="#ff4d4f"></u-icon>
+					</view>
+				</view>
+
+				<!-- 空状态 -->
+				<view v-if="trainingPlans.length === 0" class="empty-state">
+					<view class="empty-icon">
+						<u-icon name="calendar" size="80" color="#d9d9d9"></u-icon>
+					</view>
+					<text class="empty-text">暂无训练计划</text>
+					<text class="empty-desc">点击下方按钮添加第一个训练计划</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 底部添加计划按钮 -->
+		<view class="bottom-section">
+			<view class="add-plan-btn" @click="Service.GoPage('/pages/userFunc/addplan')">
+				<u-icon name="plus" size="24" color="#fff"></u-icon>
+				<text class="add-btn-text">添加训练计划</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref } from 'vue'
+	import { Service } from '@/Service/Service'
+
+	interface TrainingPlan {
+		id : string
+		name : string
+		laps : string
+	}
+
+	const trainingPlans = ref<TrainingPlan[]>([
+		{
+			id: '1',
+			name: '自由泳500米基础训练',
+			laps: '10'
+		},
+		{
+			id: '2',
+			name: '蛙泳200米进阶训练',
+			laps: '4'
+		},
+		{
+			id: '3',
+			name: '混合泳1000米挑战',
+			laps: '20'
+		},
+		{
+			id: '4',
+			name: '蝶泳400米专项训练',
+			laps: '8'
+		}
+	])
+
+
+
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #f5f5f5;
+	}
+
+	.plan-container {
+		min-height: 100vh;
+		background-color: #f5f5f5;
+		padding-bottom: 180rpx;
+	}
+
+	/* 计划列表区域 */
+	.plan-list-section {
+		padding: 20rpx;
+	}
+
+	.section-header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-bottom: 24rpx;
+		padding: 0 8rpx;
+	}
+
+	.section-title {
+		font-size: 34rpx;
+		font-weight: 700;
+		color: #333;
+		position: relative;
+		padding-left: 16rpx;
+
+		/* 标题左侧装饰条 */
+		&::before {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			width: 6rpx;
+			height: 32rpx;
+			background: linear-gradient(180deg, #1890ff 0%, #096dd9 100%);
+			border-radius: 3rpx;
+		}
+	}
+
+	.plan-count {
+		font-size: 26rpx;
+		color: #1890ff;
+		font-weight: 600;
+		background: linear-gradient(135deg, rgba(24, 144, 255, 0.1) 0%, rgba(24, 144, 255, 0.05) 100%);
+		padding: 8rpx 20rpx;
+		border-radius: 20rpx;
+	}
+
+	/* 计划列表 */
+	.plan-list {
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+	}
+
+	/* 单个计划卡片 - 美化版 */
+	.plan-card {
+		background: linear-gradient(135deg, #fff 0%, #fafbfc 100%);
+		border-radius: 28rpx;
+		padding: 28rpx 24rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.08), 0 0 0 1rpx rgba(0, 0, 0, 0.04) inset;
+		transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+		position: relative;
+		overflow: hidden;
+
+		/* 卡片背景装饰 */
+		&::before {
+			content: '';
+			position: absolute;
+			top: 0;
+			right: 0;
+			width: 120rpx;
+			height: 120rpx;
+			background: radial-gradient(circle, rgba(24, 144, 255, 0.08) 0%, transparent 70%);
+			pointer-events: none;
+		}
+
+		&:active {
+			transform: scale(0.98) translateY(2rpx);
+			box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.06);
+		}
+	}
+
+	/* 左侧序号 */
+	.plan-index {
+		flex-shrink: 0;
+		width: 56rpx;
+		height: 56rpx;
+		border-radius: 50%;
+		background: linear-gradient(135deg, #1890ff 0%, #40a9ff 100%);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-right: 20rpx;
+		box-shadow: 0 4rpx 12rpx rgba(24, 144, 255, 0.3);
+	}
+
+	.index-text {
+		font-size: 26rpx;
+		font-weight: 700;
+		color: #fff;
+	}
+
+	/* 计划信息区域 */
+	.plan-info {
+		display: flex;
+		align-items: center;
+		gap: 20rpx;
+		flex: 1;
+		min-width: 0;
+	}
+
+	.plan-icon {
+		flex-shrink: 0;
+	}
+
+	.icon-circle {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 20rpx;
+		background: linear-gradient(135deg, #1890ff 0%, #40a9ff 50%, #096dd9 100%);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-shadow: 0 8rpx 20rpx rgba(24, 144, 255, 0.25);
+		transition: all 0.3s ease;
+		position: relative;
+		overflow: hidden;
+
+		&::after {
+			content: '';
+			position: absolute;
+			top: 8rpx;
+			right: 8rpx;
+			width: 16rpx;
+			height: 16rpx;
+			background: rgba(255, 255, 255, 0.3);
+			border-radius: 50%;
+		}
+	}
+
+	.plan-detail {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		flex-direction: column;
+		gap: 12rpx;
+	}
+
+	.plan-name {
+		font-size: 32rpx;
+		font-weight: 700;
+		color: #333;
+		line-height: 1.3;
+		background: linear-gradient(135deg, #333 0%, #666 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		background-clip: text;
+	}
+
+	.plan-meta {
+		display: flex;
+		align-items: center;
+		gap: 12rpx;
+	}
+
+	.meta-tag {
+		display: flex;
+		align-items: center;
+		gap: 8rpx;
+		padding: 8rpx 16rpx;
+		background: linear-gradient(135deg, rgba(24, 144, 255, 0.1) 0%, rgba(24, 144, 255, 0.05) 100%);
+		border-radius: 16rpx;
+		border: 1rpx solid rgba(24, 144, 255, 0.2);
+	}
+
+	.tag-text {
+		font-size: 24rpx;
+		color: #1890ff;
+		font-weight: 600;
+	}
+
+	/* 删除按钮 - 美化版 */
+	.delete-btn {
+		width: 72rpx;
+		height: 72rpx;
+		border-radius: 50%;
+		background: linear-gradient(135deg, rgba(255, 77, 79, 0.1) 0%, rgba(255, 77, 79, 0.05) 100%);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+		flex-shrink: 0;
+		border: 2rpx solid rgba(255, 77, 79, 0.2);
+
+		&:active {
+			background: linear-gradient(135deg, #ff4d4f 0%, #d9363e 100%);
+			transform: scale(0.9);
+			box-shadow: 0 4rpx 12rpx rgba(255, 77, 79, 0.4);
+			border-color: transparent;
+
+			u-icon {
+				color: #fff;
+			}
+		}
+	}
+
+	/* 空状态 */
+	.empty-state {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 140rpx 40rpx;
+		gap: 24rpx;
+	}
+
+	.empty-icon {
+		margin-bottom: 20rpx;
+		opacity: 0.6;
+	}
+
+	.empty-text {
+		font-size: 32rpx;
+		color: #8c8c8c;
+		font-weight: 600;
+	}
+
+	.empty-desc {
+		font-size: 26rpx;
+		color: #bfbfbf;
+	}
+
+	/* 底部添加计划按钮 */
+	.bottom-section {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background: linear-gradient(180deg, transparent 0%, rgba(245, 245, 245, 0.95) 20%, #f5f5f5 100%);
+		padding: 24rpx 20rpx 40rpx;
+		padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
+		z-index: 100;
+	}
+
+	.add-plan-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 16rpx;
+		width: 100%;
+		height: 100rpx;
+		background: linear-gradient(135deg, #1890ff 0%, #40a9ff 50%, #36cfc9 100%);
+		background-size: 200% 200%;
+		border-radius: 24rpx;
+		box-shadow: 0 12rpx 32rpx rgba(24, 144, 255, 0.35), 0 0 0 1rpx rgba(255, 255, 255, 0.5) inset;
+		transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+		position: relative;
+		overflow: hidden;
+
+		/* 光泽效果 */
+		&::before {
+			content: '';
+			position: absolute;
+			top: 0;
+			left: -100%;
+			width: 100%;
+			height: 100%;
+			background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.4), transparent);
+			animation: shimmer 3s infinite;
+		}
+
+		&:active {
+			transform: scale(0.96);
+			box-shadow: 0 6rpx 20rpx rgba(24, 144, 255, 0.25);
+		}
+	}
+
+	.add-btn-text {
+		font-size: 34rpx;
+		color: #fff;
+		font-weight: 700;
+		letter-spacing: 2rpx;
+		position: relative;
+		z-index: 1;
+	}
+
+
+</style>
\ No newline at end of file
diff --git a/src/pages/userFunc/project.vue b/src/pages/userFunc/project.vue
index c41c4d4..841eecc 100644
--- a/src/pages/userFunc/project.vue
+++ b/src/pages/userFunc/project.vue
@@ -1,94 +1,120 @@
 <template>
 	<view class="project-container">
-		<up-navbar title="自由泳500米" :placeholder='true' :autoBack="true" rightIcon='more-dot-fill' @rightIconClick="showConfigModal = true">
-		</up-navbar>
-		<!-- 训练计划 -->
-		<view class="card-section">
-			<view class="section-title">训练计划</view>
-			<view class="training-plan-display">
-				<view class="plan-item">
-					<view class="plan-icon">
-						<u-icon name="clock" size="20" color="#1890ff"></u-icon>
-					</view>
-					<view class="plan-info">
-						<text class="plan-label">最大速度</text>
-						<text class="plan-value">{{ configForm.maxSpeed || '--' }}秒/圈</text>
-					</view>
-				</view>
-				<view class="plan-divider"></view>
-				<view class="plan-item">
-					<view class="plan-icon">
-						<u-icon name="coffee" size="20" color="#faad14"></u-icon>
-					</view>
-					<view class="plan-info">
-						<text class="plan-label">休息时间</text>
-						<text class="plan-value">{{ configForm.restTime || '--' }}秒</text>
-					</view>
-				</view>
-				<view class="plan-divider"></view>
-				<view class="plan-item">
-					<view class="plan-icon">
-						<u-icon name="reload" size="20" color="#52c41a"></u-icon>
-					</view>
-					<view class="plan-info">
-						<text class="plan-label">圈数</text>
-						<text class="plan-value">{{ configForm.laps || '--' }}圈</text>
-					</view>
-				</view>
+		<!-- 项目选择 -->
+		<view class="project-select-section">
+			<view class="project-select-wrapper" @click="showProjectSelect = true">
+				<text class="project-select-text">{{ selectedProject?.name || '请选择项目' }}</text>
+				<u-icon name="arrow-down" size="16" color="#666"></u-icon>
 			</view>
 		</view>
-		
-		<!-- 计时器列表 -->
-		<view class="card-section">
-			<view class="section-header">
-				<text class="section-title">计时器列表</text>
-				<view class="add-btn" @click="addTimer">
-					<u-icon name="plus" size="18" color="#fff"></u-icon>
-					<text class="add-text">添加</text>
+
+		<!-- 全局计时器 -->
+		<view v-if="selectedProject" class="card-section global-timer-section">
+			<view class="global-timer-header">
+				<view class="global-timer-label">全局计时</view>
+				<view class="global-setting-btn" @click="showSetting = true">
+					<u-icon name="setting" size="18" color="#1890ff"></u-icon>
 				</view>
 			</view>
-			
+			<view class="global-timer-display">
+				<view class="global-timer-value">{{ formatGlobalTimer(globalTimerTime) }}</view>
+			</view>
+		</view>
+
+		<!-- 分组计时器列表 -->
+		<view v-for="group in groups" :key="group.id" class="card-section">
+			<view class="section-header">
+				<view class="group-title-wrapper">
+					<text class="section-title">{{ group.name }}</text>
+					<!-- 删除分组按钮 -->
+					<view class="delete-group-btn" @click="deleteGroup(group)">
+						<u-icon name="trash" size="16" color="#fff"></u-icon>
+					</view>
+				</view>
+				<view class="group-controls">
+					<!-- 设置按钮 -->
+					<view class="group-control-btn setting-btn" @click="openGroupSetting(group)">
+						<u-icon name="setting" size="18" color="#fff"></u-icon>
+					</view>
+					<!-- 分组开始/暂停按钮 -->
+					<view v-if="!isGroupAllRunning(group) && !isGroupAllCompleted(group)"
+						class="group-control-btn start-btn" @click="startGroup(group)">
+						<u-icon name="play-circle" size="18" color="#fff"></u-icon>
+					</view>
+					<view v-if="isGroupAllRunning(group)" class="group-control-btn pause-btn"
+						@click="pauseGroup(group)">
+						<u-icon name="pause-circle" size="18" color="#fff"></u-icon>
+					</view>
+				</view>
+			</view>
+
 			<view class="timers-grid">
-				<view v-for="(timer, index) in timers" :key="timer.id" class="timer-card-wrapper">
-					<view class="timer-circle" @click="openTimerDetail(timer)">
+				<view v-for="(timer, index) in group.timers" :key="timer.id" class="timer-card-wrapper">
+					<view class="timer-circle" :class="{ resting: timer.isResting }" @click=" recordTimer(timer) ">
 						<!-- 删除按钮 -->
 						<view class="delete-btn-wrapper">
-							<view class="delete-btn" @click.stop="deleteTimer(timer, index)">
+							<view class="delete-btn" @click.stop="deleteTimer(timer, group, index)">
 								<u-icon name="trash" size="16" color="#fff"></u-icon>
 							</view>
 						</view>
-						
+
 						<!-- 姓名在左上角 -->
-						<view class="timer-name-top-left">
+						<view class="timer-name-top-left" @click.stop="openTimerDetail(timer)">
 							<text class="name-text">{{ timer.studentName || '计时器 ' + (index + 1) }}</text>
 						</view>
-						
-						<view class="circle-content">
-							<view class="timer-target">目标: {{ formatTargetTime(timer.targetTime) }}</view>
-							<view class="timer-time">{{ formatTime(timer) }}</view>
-							<view class="timer-duration">{{ formatDuration(timer) }}</view>
+
+						<view class="circle-content-wrapper" style="margin-top: 20rpx;">
+							<view class="circle-content" :class="{ resting: timer.isResting }">
+								<view class="circle-inner">
+									<view class="timer-target" @click.stop="openTimerDetail(timer)">目标:
+										{{ formatTargetTime(timer.targetTime) }}
+									</view>
+									<view v-if="timer.isResting" class="timer-rest-countdown">
+										<text class="rest-label">休息中</text>
+										<text
+											class="rest-time">{{ formatRestCountdown(timer.restCountdown || 0) }}</text>
+									</view>
+									<view v-else class="timer-time">{{ formatTime(timer) }}</view>
+									<view class="timer-info" @click.stop="openTimerDetail(timer)">
+										<text
+											class="timer-duration">{{ timer.lapCount }}/{{ timer.totalLapCount || 4 }}圈</text>
+										<!-- <text v-if="timer.restTime && !timer.isResting" class="timer-rest">休息{{ timer.restTime }}秒</text> -->
+									</view>
+								</view>
+							</view>
 						</view>
-						
+
 						<view class="timer-controls">
-							<view class="" @click.stop="recordTimer(timer)">
+							<view class="" @click.stop="openTimerDetail(timer)">
 								<u-icon name="edit-pen" size="32" color="#22a6f2"></u-icon>
 							</view>
-							<view v-if="timer.status !== 'completed'" @click.stop="toggleTimer(timer)" class="">
-								<u-icon 
-									:name="timer.status === 'running' ? 'pause-circle' : 'play-circle'" size="32"
-									color="#22a6f2"></u-icon>
+
+							<view @click.stop="toggleTimer(timer)" class="">
+								<u-icon
+									:name="timer.status === 'running' || timer.status === 'resting' ? 'pause-circle' : 'play-circle'"
+									size="32" :color="timer.status === 'resting' ? '#faad14' : '#22a6f2'"></u-icon>
 							</view>
-							<view v-if="timer.status !== 'completed'" @click.stop="completeTimer(timer)" class="">
-								<u-icon  name="checkmark-circle" size="32"
-									color="#52c41a"></u-icon>
-							</view>
-							<u-icon v-else name="checkmark-circle" size="32" color="#52c41a"></u-icon>
+
 						</view>
 					</view>
 				</view>
 			</view>
+
+			<!-- 添加学生按钮 -->
+			<view class="add-student-btn" @click="addTimer(group)">
+				<u-icon name="plus-circle" size="20" color="#1890ff"></u-icon>
+				<text class="add-student-text">点击添加学生到本组</text>
+			</view>
 		</view>
-		
+
+		<!-- 添加分组按钮 -->
+		<view v-if="selectedProject" class="card-section add-group-section">
+			<view class="add-group-btn" @click="addGroup">
+				<u-icon name="plus" size="24" color="#fff"></u-icon>
+				<text class="add-group-text">添加分组</text>
+			</view>
+		</view>
+
 		<!-- 底部按钮区域 -->
 		<view class="bottom-buttons-section">
 			<view class="bottom-buttons">
@@ -114,101 +140,276 @@
 				</button>
 			</view>
 		</view>
-		
-		<!-- 配置弹窗 -->
-		<view v-if="showConfigModal" class="config-modal-overlay" @click="showConfigModal = false"></view>
-		<view v-if="showConfigModal" class="config-modal">
-			<view class="modal-header">
-				<text class="modal-title">训练配置</text>
-				<view class="modal-close" @click="showConfigModal = false">
-					<u-icon name="close" size="20" color="#999"></u-icon>
-				</view>
-			</view>
-			<view class="modal-content">
-				<view class="form-group">
-					<text class="form-label">最大速度（秒/圈）</text>
-					<input class="form-input" v-model="configForm.maxSpeed" placeholder="请输入最大速度" type="number" />
-				</view>
-				<view class="form-group">
-					<text class="form-label">休息时间（秒）</text>
-					<input class="form-input" v-model="configForm.restTime" placeholder="请输入休息时间" type="number" />
-				</view>
-				<view class="form-group">
-					<text class="form-label">圈数</text>
-					<input class="form-input" v-model="configForm.laps" placeholder="请输入圈数" type="number" />
-				</view>
-				<view class="form-group">
-					<text class="form-label">触发方式</text>
-					<view class="trigger-selector">
-						<view class="trigger-option" :class="{ active: configForm.triggerMode === 'interval' }" @click="configForm.triggerMode = 'interval'">
-							<view class="trigger-icon">
-								<u-icon name="clock" size="20" :color="configForm.triggerMode === 'interval' ? '#fff' : '#1890ff'"></u-icon>
-							</view>
-							<text>间隔触发</text>
-						</view>
-						<view class="trigger-option" :class="{ active: configForm.triggerMode === 'together' }" @click="configForm.triggerMode = 'together'">
-							<view class="trigger-icon">
-								<u-icon name="account" size="20" :color="configForm.triggerMode === 'together' ? '#fff' : '#52c41a'"></u-icon>
-							</view>
-							<text>一起触发</text>
-						</view>
-					</view>
-				</view>
-				<view class="form-group">
-					<text class="form-label">组别配置</text>
-					<view class="group-input-row">
-						<view class="input-wrapper">
-							<input class="form-input small-input" v-model="configForm.groupCount" placeholder="组数" type="number" />
-						</view>
-						<view class="input-wrapper">
-							<input class="form-input small-input" v-model="configForm.peoplePerGroup" placeholder="人数" type="number" />
-							<text class="input-suffix">人</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="modal-footer">
-				<button class="modal-cancel-btn" @click="showConfigModal = false">取消</button>
-				<button class="modal-confirm-btn" @click="saveConfig">确认</button>
-			</view>
-		</view>
-		
+
 		<!-- 底部弹出框 - 秒表详情 -->
 		<u-popup v-model:show="showTimerDetail" mode="bottom" :round="20" :closeable="true" closeOnClickOverlay>
 			<view class="timer-detail-popup">
-				<!-- 姓名显示 -->
-				<view class="detail-name">{{ selectedTimer?.studentName || '计时器' }}</view>
-				
-				<!-- 秒表显示 -->
-				<view class="stopwatch-display">
-					<text class="stopwatch-time">{{ formatStopwatchTime(selectedTimer?.currentTime || 0) }}</text>
-					<text class="stopwatch-millis">{{ formatMillis(selectedTimer?.currentTime || 0) }}</text>
+				<!-- 切换查看/编辑模式的标签 -->
+				<view class="mode-tabs">
+					<view class="mode-tab" :class="{ active: !isEditMode }" @click="isEditMode = false">
+						<text class="mode-tab-text">计时详情</text>
+					</view>
+					<view class="mode-tab" :class="{ active: isEditMode }" @click="isEditMode = true">
+						<text class="mode-tab-text">编辑设置</text>
+					</view>
 				</view>
-				
-				<!-- 记录列表 -->
-				<scroll-view scroll-y class="records-list"
-					v-if="selectedTimer?.records && selectedTimer.records.length > 0">
-					<view v-for="(record, idx) in selectedTimer.records" :key="idx" class="record-item">
-						<view class="record-info">
-							<text class="record-index">记录 {{ idx + 1 }}</text>
-							<text class="record-time">{{ formatAdjustedRecordTime(record.time, idx) }}</text>
+
+				<!-- 计时详情模式 -->
+				<view v-if="!isEditMode">
+					<!-- 姓名显示 -->
+					<view class="detail-name">{{ selectedTimer?.studentName || '计时器' }}</view>
+
+					<!-- 秒表显示 -->
+					<view class="stopwatch-display">
+						<text class="stopwatch-time">{{ formatStopwatchTime(selectedTimer?.currentTime || 0) }}</text>
+						<text class="stopwatch-millis">{{ formatMillis(selectedTimer?.currentTime || 0) }}</text>
+					</view>
+
+					<!-- 当前设置信息显示 -->
+					<view class="current-settings-info">
+						<view class="setting-info-item">
+							<text class="setting-info-label">目标时间:</text>
+							<text
+								class="setting-info-value">{{ formatTargetTime(selectedTimer?.targetTime || 0) }}</text>
+						</view>
+						<view class="setting-info-item">
+							<text class="setting-info-label">休息时间:</text>
+							<text class="setting-info-value">{{ selectedTimer?.restTime || 0 }}秒</text>
+						</view>
+						<view class="setting-info-item">
+							<text class="setting-info-label">总圈数:</text>
+							<text class="setting-info-value">{{ selectedTimer?.totalLapCount || 0 }}圈</text>
+						</view>
+					</view>
+
+					<!-- 记录列表 -->
+					<scroll-view scroll-y class="records-list"
+						v-if="selectedTimer?.records && selectedTimer.records.length > 0">
+						<view v-for="(record, idx) in selectedTimer.records" :key="idx" class="record-item">
+							<view class="record-info">
+								<text class="record-index">记录 {{ idx + 1 }}</text>
+								<text class="record-time">{{ formatAdjustedRecordTime(record.time, idx) }}</text>
+							</view>
+						</view>
+					</scroll-view>
+
+					<!-- 按钮组 -->
+					<view class="detail-buttons">
+						<view class="detail-btn detail-btn-reset" @click="resetSelectedTimer">
+							<u-icon name="reload" size="24" color="#fff"></u-icon>
+							<text class="btn-label">重置</text>
+						</view>
+						<view class="detail-btn detail-btn-main" @click="toggleSelectedTimer">
+							<u-icon :name="selectedTimer?.status === 'running' ? 'pause' : 'play-right'" size="32"
+								color="#fff"></u-icon>
+							<text class="btn-label">{{ selectedTimer?.status === 'running' ? '暂停' : '开始' }}</text>
+						</view>
+						<view class="detail-btn detail-btn-record" @click="recordLap"
+							:class="{ disabled: selectedTimer?.status !== 'running' }">
+							<u-icon name="edit-pen" size="24"
+								:color="selectedTimer?.status === 'running' ? '#fff' : '#bfbfbf'"></u-icon>
+							<text class="btn-label">记录</text>
+						</view>
+					</view>
+				</view>
+
+				<!-- 编辑设置模式 -->
+				<view v-else>
+					<view class="edit-form">
+						<!-- 学生姓名显示（只读） -->
+						<view class="form-group">
+							<text class="form-label">学生姓名</text>
+							<view class="form-input-readonly">{{ selectedTimer?.studentName || '计时器' }}</view>
+						</view>
+
+						<!-- 最大速度+几秒 -->
+						<view class="form-group">
+							<text class="form-label">最大速度+几秒（秒）</text>
+							<input class="form-input" v-model="editForm.additionalTime" type="number"
+								placeholder="请输入最大速度+几秒" />
+						</view>
+
+						<!-- 休息时间 -->
+						<view class="form-group">
+							<text class="form-label">休息时间（秒）</text>
+							<input class="form-input" v-model="editForm.restTime" type="number" placeholder="请输入休息时间" />
+						</view>
+
+						<!-- 圈数 -->
+						<view class="form-group">
+							<text class="form-label">圈数</text>
+							<input class="form-input" v-model="editForm.lapCount" type="number" placeholder="请输入圈数" />
+						</view>
+
+						<!-- 提示信息 -->
+						<view class="form-hint">
+							<text class="hint-text">目标时间 = 学生最快速度 + 最大速度+几秒</text>
+						</view>
+					</view>
+
+					<!-- 编辑模式按钮组 -->
+					<view class="edit-buttons">
+						<view class="edit-btn edit-btn-cancel" @click="cancelEdit">
+							<text class="edit-btn-text">取消</text>
+						</view>
+						<view class="edit-btn edit-btn-save" @click="saveEdit">
+							<text class="edit-btn-text">保存</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+
+		<!-- 添加计时器弹窗 -->
+		<u-popup v-model:show="showAddTimerModal" mode="center" :round="20" :closeable="true" closeOnClickOverlay>
+			<view class="add-timer-modal">
+				<view class="modal-title">添加学生到本组</view>
+
+				<!-- 学生选择 - 与添加分组样式一致（单选模式） -->
+				<view class="form-group">
+					<text class="form-label">选择学生</text>
+					<view class="student-selector">
+						<view v-for="student in studentNames" :key="student" class="student-option"
+							:class="{ selected: selectedStudent === student }" @click="selectAddTimerStudent(student)">
+							<view class="student-checkbox">
+								<u-icon v-if="selectedStudent === student" name="checkmark" size="16"
+									color="#fff"></u-icon>
+							</view>
+							<text class="student-name">{{ student }}</text>
+						</view>
+					</view>
+				</view>
+
+				<!-- 最快时间+几秒输入框 -->
+				<view class="form-group">
+					<text class="form-label">最快时间＋几秒（秒）</text>
+					<input class="form-input" v-model="targetTimeInput" type="number" placeholder="请输入最快时间+几秒" />
+				</view>
+
+				<!-- 休息时间输入框 -->
+				<view class="form-group">
+					<text class="form-label">休息时间（秒）</text>
+					<input class="form-input" v-model="restTimeInput" type="number" placeholder="请输入休息时间" />
+				</view>
+
+				<!-- 圈数输入框 -->
+				<view class="form-group">
+					<text class="form-label">圈数</text>
+					<input class="form-input" v-model="lapCountInput" type="number" placeholder="请输入圈数" />
+				</view>
+
+				<!-- 按钮组 -->
+				<view class="modal-buttons">
+					<view class="modal-btn cancel-btn" @click="showAddTimerModal = false">取消</view>
+					<view class="modal-btn confirm-btn" @click="confirmAddTimer">确认添加</view>
+				</view>
+			</view>
+		</u-popup>
+
+		<!-- 项目选择弹窗 -->
+		<u-popup v-model:show="showProjectSelect" mode="bottom" :round="16" :closeable="true" closeOnClickOverlay>
+			<view class="project-select-popup">
+				<view class="popup-title">选择项目</view>
+				<scroll-view scroll-y class="project-list-scroll">
+					<view class="project-list">
+						<view v-for="project in projects" :key="project.id" class="project-item"
+							:class="{ active: selectedProject?.planId === project.planId }"
+							@click="selectProject(project)">
+							<text class="project-name">{{ project.name }}</text>
+							<u-icon v-if="selectedProject?.planId === project.planId" name="checkmark" size="20"
+								color="#1890ff"></u-icon>
 						</view>
 					</view>
 				</scroll-view>
-				
+			</view>
+		</u-popup>
+
+		<!-- 全局设置弹窗 -->
+		<u-popup v-model:show="showSetting" mode="center" :round="16" :closeable="true" closeOnClickOverlay>
+			<view class="setting-modal">
+				<view class="setting-title">出发设置</view>
+
+				<!-- 一起出发 -->
+				<view class="setting-item" :class="{ active: setting.mode === 'together' }"
+					@click="setting.mode = 'together'">
+					<view class="setting-radio">
+						<view v-if="setting.mode === 'together'" class="radio-dot"></view>
+					</view>
+					<text class="setting-text">一起出发</text>
+				</view>
+
+				<!-- 间隔出发 -->
+				<view class="setting-item" :class="{ active: setting.mode === 'interval' }"
+					@click="setting.mode = 'interval'">
+					<view class="setting-radio">
+						<view v-if="setting.mode === 'interval'" class="radio-dot"></view>
+					</view>
+					<text class="setting-text">间隔出发</text>
+					<view v-if="setting.mode === 'interval'" class="interval-input-box">
+						<input class="interval-input" v-model="setting.interval" type="number" placeholder="5" />
+						<text class="interval-unit">秒</text>
+					</view>
+				</view>
+
+				<!-- 确认按钮 -->
+				<view class="setting-confirm" @click="saveSetting">确定</view>
+			</view>
+		</u-popup>
+
+		<!-- 组别设置弹窗（添加/编辑分组共用） -->
+		<u-popup v-model:show="showGroupSettingModal" mode="center" :round="20" :closeable="true" closeOnClickOverlay>
+			<view class="group-setting-modal">
+				<!-- 根据模式显示不同标题 -->
+				<view class="modal-title">{{ groupSettingMode === 'add' ? '添加分组' : '组别设置' }}</view>
+
+				<scroll-view scroll-y class="setting-scroll">
+					<!-- 组名输入 -->
+					<view class="form-group">
+						<text class="form-label">组名</text>
+						<input class="form-input" v-model="editingGroupName" placeholder="请输入组名" />
+					</view>
+
+					<!-- 学生选择 -->
+					<view class="form-group">
+						<text class="form-label">学生选择</text>
+						<view class="student-selector">
+							<view v-for="student in studentNames" :key="student" class="student-option"
+								:class="{ selected:  editingGroupStudents.some(item => item ===  student.studentId) }"
+								@click="toggleEditingGroupStudent(student)">
+								<view class="student-checkbox">
+									<u-icon v-if="editingGroupStudents.some(item => item ===  student.studentId)" name="checkmark" size="16"
+										color="#fff"></u-icon>
+								</view>
+								<text class="student-name">{{ student.name }}</text>
+							</view>
+						</view>
+					</view>
+
+					<!-- 最快时间+几秒 -->
+					<view class="form-group">
+						<text class="form-label">最快时间＋几秒（秒）</text>
+						<input class="form-input" v-model="editingTargetTime" type="number" placeholder="请输入最快时间+几秒" />
+					</view>
+
+					<!-- 休息时间 -->
+					<view class="form-group">
+						<text class="form-label">休息时间（秒）</text>
+						<input class="form-input" v-model="editingRestTime" type="number" placeholder="请输入休息时间" />
+					</view>
+
+					<!-- 圈数 -->
+					<view class="form-group">
+						<text class="form-label">圈数</text>
+						<input class="form-input" v-model="editingLapCount" type="number" placeholder="请输入圈数" />
+					</view>
+				</scroll-view>
+
 				<!-- 按钮组 -->
-				<view class="detail-buttons">
-					<view class="detail-btn detail-btn-reset" @click="resetSelectedTimer">
-						<u-icon name="reload" size="24" color="#fff"></u-icon>
-						<text class="btn-label">重置</text>
-					</view>
-					<view class="detail-btn detail-btn-main" @click="toggleSelectedTimer">
-						<u-icon :name="selectedTimer?.status === 'running' ? 'pause' : 'play-right'" size="32" color="#fff"></u-icon>
-						<text class="btn-label">{{ selectedTimer?.status === 'running' ? '暂停' : '开始' }}</text>
-					</view>
-					<view class="detail-btn detail-btn-record" @click="recordLap" :class="{ disabled: selectedTimer?.status !== 'running' }">
-						<u-icon name="edit-pen" size="24" :color="selectedTimer?.status === 'running' ? '#fff' : '#bfbfbf'"></u-icon>
-						<text class="btn-label">记录</text>
+				<view class="modal-buttons">
+					<view class="modal-btn cancel-btn" @click="showGroupSettingModal = false">取消</view>
+					<!-- 根据模式显示不同按钮文字 -->
+					<view class="modal-btn confirm-btn" @click="confirmGroupSetting">
+						{{ groupSettingMode === 'add' ? '确认添加' : '确认' }}
 					</view>
 				</view>
 			</view>
@@ -219,27 +420,101 @@
 <script setup lang="ts">
 	import { ref, onUnmounted, computed } from 'vue'
 	import { Service } from '@/Service/Service'
-	
+	import { PlanService } from '@/Service/swimming/PlanService'
+	import { onLoad } from '@dcloudio/uni-app'
+
+
+	// 记录项接口
 	interface RecordItem {
 		time : number
 	}
-	
+
+	// 计时器项接口
 	interface TimerItem {
 		id : string
 		currentTime : number
-		status : 'idle' | 'running' | 'paused' | 'completed'
+		status : 'idle' | 'running' | 'paused' | 'completed' | 'resting'
 		studentName : string
 		records ?: RecordItem[]
 		lapCount : number
 		targetTime : number
 		lastLapTime : number
+		groupId : string
+		hasStarted ?: boolean
+		restTime ?: number
+		totalLapCount ?: number
+		restCountdown ?: number
+		isResting ?: boolean
 	}
-	
+
+	// 分组接口
+	interface Group {
+		id : string
+		name : string
+		timers : TimerItem[]
+		hasStarted ?: boolean
+		targetTime ?: number
+		restTime ?: number
+		lapCount ?: number
+		students ?: string[]
+	}
+
+	// 项目接口
+	interface Project {
+		id : string
+		name : string
+	}
+
+	// 项目列表数据
+	const projects = ref<Array<any>>([])
+	// 组别数据
+	let groupContentr = ref([
+		{
+			groupId: '',   //组别id
+			gruopName: '',  //组别名称
+			group: [
+				// 学生列表
+				{
+					studentId: '',  //学生id
+					name: '',      //学生名称
+					pb: '',			//学生最大时间加几秒
+					rest: '',		//学生休息时间
+					circle: '',		//圈数	
+					quicklyTime: ''  //学生最大时间
+				}
+			]
+		}
+	])
+
+
+	// 分页相关
+	let page = ref(1)
+	let status = ref('loadmore')
+
+
+
+
+
+
+	// 当前选中的项目
+	const selectedProject = ref<any>(null)
+
+	// 项目选择弹窗显示状态
+	const showProjectSelect = ref(false)
+
+	// 选择项目
+	const selectProject = (project : Project) => {
+		selectedProject.value = project
+		showProjectSelect.value = false
+		Service.Msg(`已选择: ${project.name}`)
+		getProjectData()
+	}
+
 	// 学生列表（用于选择学生）
-	const studentNames = ['张三', '李四', '王五', '赵六', '钱七', '孙八']
-	
+	const studentNames = ref<Array<any>>([])
+
 	// 每个学生的目标时间（单位：秒）
-	const studentTargetTimes: Record<string, number> = {
+	const studentTargetTimes : Record<string, number> = {
 		'张三': 10,
 		'李四': 30,
 		'王五': 35,
@@ -247,45 +522,392 @@
 		'钱七': 32,
 		'孙八': 27
 	}
-	
+
 	// 默认目标时间（30秒，单位：秒）
 	const DEFAULT_TARGET_TIME = 30
 
-	// 计时器列表
-	const timers = ref<TimerItem[]>([
-		{ id: '1', currentTime: 0, status: 'idle', studentName: studentNames[0], records: [], lapCount: 0, targetTime: studentTargetTimes[studentNames[0]] || DEFAULT_TARGET_TIME, lastLapTime: 0 },
-		{ id: '2', currentTime: 0, status: 'idle', studentName: studentNames[1], records: [], lapCount: 0, targetTime: studentTargetTimes[studentNames[1]] || DEFAULT_TARGET_TIME, lastLapTime: 0 }
-	])
-	
+	let projectData = ref<any>({})
+
+	// 分组计数器，用于生成默认分组名称
+	let groupCounter = 1
+
+	// 分组列表（替代原有的timers）
+	const groups = ref<Group[]>([])
+
+	// 全局设置
+	const showSetting = ref(false)
+	const setting = ref({
+		mode: 'together', // 'together' 一起出发, 'interval' 间隔出发
+		interval: '5' // 间隔时间（秒）
+	})
+
+	const saveSetting = () => {
+		if (setting.value.mode === 'interval') {
+			const t = parseInt(setting.value.interval)
+			if (isNaN(t) || t <= 0) {
+				Service.Msg('请输入有效的间隔时间')
+				return
+			}
+		}
+		const data = {
+			planId: selectedProject.value.planId,
+			name: selectedProject.value.name,
+			planType: '计时项目',
+			departType: setting.value.mode == 'together' ? '一起出发' : '间隔出发',
+			interval: setting.value.mode == 'together' ? 0 : setting.value.interval,
+			groupInt: projectData.value.groupInt,
+			subsectionDistance: '',
+			subsectionInt: '',
+			users: JSON.stringify(projectData.value.users),
+			project: '',
+			group: JSON.stringify(projectData.value.group),
+		}
+
+		PlanService.AddPlan(data).then(res => {
+			if (res.code == 0) {
+				Service.Msg('修改成功!')
+				setTimeout(() => {
+					Service.GoPageBack()
+				}, 1000)
+			} else {
+				Service.Msg(res.msg)
+			}
+		})
+		showSetting.value = false
+	}
+
 	// 底部弹出框相关
 	const showTimerDetail = ref(false)
 	const selectedTimer = ref<TimerItem | null>(null)
-	
-	// 配置弹窗相关
-	const showConfigModal = ref(false)
-	const configForm = ref({
-		maxSpeed: '45',
-		speedBonus: '3',
-		restTime: '60',
-		laps: '9',
-		triggerMode: 'interval',
-		groupCount: '',
-		peoplePerGroup: ''
+
+	// 编辑模式相关
+	const isEditMode = ref(false)
+	const editForm = ref({
+		additionalTime: '',
+		restTime: '',
+		lapCount: ''
 	})
-	
+
+	// 添加计时器弹窗相关
+	const showAddTimerModal = ref(false)
+	const currentGroup = ref<Group | null>(null)
+	const selectedStudent = ref('')
+	const targetTimeInput = ref('30')
+	const restTimeInput = ref('10')
+	const lapCountInput = ref('4')
+
+	// 组别设置弹窗相关
+	const showGroupSettingModal = ref(false)
+	// 弹窗模式：'add' 添加分组，'edit' 编辑分组
+	const groupSettingMode = ref<'add' | 'edit'>('add')
+	// 正在编辑的分组（编辑模式时使用）
+	const editingGroup = ref<Group | null>(null)
+	// 表单数据
+	const editingGroupName = ref('')
+	const editingGroupStudents = ref<string[]>([])
+	const editingTargetTime = ref('')
+	const editingRestTime = ref('')
+	const editingLapCount = ref('')
+
 	// 计时器间隔 - 主计时器
 	const timerIntervals = ref<Map<string, { interval : number, startTime : number }>>(new Map())
-	
+
+	// 全局计时器相关
+	const globalTimerRunning = ref(false)
+	const globalTimerTime = ref(0)
+	let globalTimerInterval : number | null = null
+
+	// 获取所有计时器的辅助函数（用于兼容原有功能）
+	const getAllTimers = computed(() : TimerItem[] => {
+		return groups.value.flatMap(group => group.timers)
+	})
+
 	// 计算是否有正在运行的计时器
 	const hasRunningTimers = computed(() => {
-		return timers.value.some(timer => timer.status === 'running')
+		return getAllTimers.value.some(timer => timer.status === 'running' || timer.status === 'resting')
 	})
-	
+
 	// 计算是否所有计时器都已完成
 	const allTimersCompleted = computed(() => {
-		return timers.value.length > 0 && timers.value.every(timer => timer.status === 'completed')
+		return getAllTimers.value.length > 0 && getAllTimers.value.every(timer => timer.status === 'completed')
 	})
+
+	onLoad(() => {
+		getData()
+	})
+
+	// 获取项目列表数据
+	const getData = () => {
+		projects.value = []
+		page.value = 1
+		status.value = 'loadmore'
+		getList()
+	}
+
+	// 获取项目列表
+	const getList = () => {
+		if (status.value == 'loading' || status.value == 'nomore') {
+			return
+		}
+		status.value = 'loading'
+		PlanService.GetPlanList('计时项目', page.value.toString()).then(res => {
+			if (res.code == 0) {
+				projects.value = [...projects.value, ...res.data]
+				status.value = res.data.length == 10 ? 'loadmore' : 'nomore'
+				page.value++
+			} else {
+				Service.Msg(res.msg)
+			}
+		})
+	}
+
+
+	const getProjectData = () => {
+		PlanService.GetPlanInfo(selectedProject.value.planId).then(res => {
+			if (res.code == 0) {
+				groupContentr.value=res.data.plan.group
+				
+				projectData.value = res.data.plan
+				setting.value.mode = res.data.plan.departType == '间隔出发' ? 'interval' : 'together'
+				setting.value.interval = res.data.plan.interval
+			} else {
+				Service.Msg(res.msg)
+			}
+		})
+	}
 	
+	// 获取添加分组的学生
+	const GetNoSelectStudent=()=>{
+		PlanService.GetNoSelectStudent(selectedProject.value.planId).then(res => {
+			if (res.code == 0) {
+				studentNames.value=res.data.studentList
+			} else {
+				Service.Msg(res.msg)
+			}
+		})
+	}
+	
+
+
+	// 判断分组内所有计时器是否都在运行
+	const isGroupAllRunning = (group : Group) : boolean => {
+		if (group.timers.length === 0) return false
+		return group.timers.every(timer => timer.status === 'running' || timer.status === 'resting')
+	}
+
+	// 判断分组内所有计时器是否都已完成
+	const isGroupAllCompleted = (group : Group) : boolean => {
+		if (group.timers.length === 0) return false
+		return group.timers.every(timer => timer.status === 'completed')
+	}
+
+	// 开始分组内所有计时器
+	const startGroup = (group : Group) => {
+		group.timers.forEach(timer => {
+			if (timer.status !== 'completed' && timer.status !== 'running' && timer.status !== 'resting') {
+				startTimer(timer)
+			}
+		})
+		Service.Msg(`${group.name} 已开始`)
+	}
+
+	// 暂停分组内所有计时器
+	const pauseGroup = (group : Group) => {
+		group.timers.forEach(timer => {
+			if (timer.status === 'running' || timer.status === 'resting') {
+				stopSingleTimer(timer)
+			}
+		})
+		Service.Msg(`${group.name} 已暂停`)
+	}
+
+	/**
+	 * 打开添加分组弹窗
+	 * 点击"添加分组"按钮时触发
+	 * 功能说明：
+	 * - 设置模式为添加
+	 * - 重置表单数据为默认值
+	 * - 打开组别设置弹窗
+	 */
+	const addGroup = () => {
+		// 设置模式为添加
+		groupSettingMode.value = 'add'
+		editingGroup.value = null
+		// 设置默认值
+		editingGroupName.value = ''
+		editingGroupStudents.value = []
+		editingTargetTime.value = '5' // 最快时间+几秒的默认值
+		editingRestTime.value = '10'
+		editingLapCount.value = '4'
+		// 打开弹窗
+		showGroupSettingModal.value = true
+		GetNoSelectStudent()
+	}
+
+	// 删除分组
+	const deleteGroup = (group : Group) => {
+		uni.showModal({
+			title: '确认删除分组',
+			content: `确定要删除 ${group.name} 吗？该分组内的所有计时器也将被删除。`,
+			success: (res) => {
+				if (res.confirm) {
+					// 先停止该分组内所有正在运行的计时器
+					group.timers.forEach(timer => {
+						if (timer.status === 'running' || timer.status === 'resting') {
+							stopSingleTimer(timer)
+						}
+					})
+					// 从分组列表中删除该分组
+					groups.value = groups.value.filter(g => g.id !== group.id)
+					Service.Msg('删除分组成功')
+				}
+			},
+		})
+	}
+
+	/**
+	 * 打开组别设置弹窗（编辑模式）
+	 * 点击组别的设置按钮时触发
+	 * 功能说明：
+	 * - 设置模式为编辑
+	 * - 填充表单数据为该分组的当前值
+	 * - 打开组别设置弹窗
+	 */
+	const openGroupSetting = (group : Group) => {
+		// 设置模式为编辑
+		groupSettingMode.value = 'edit'
+		editingGroup.value = group
+		// 填充当前值
+		editingGroupName.value = group.name
+		editingGroupStudents.value = group.students || []
+		editingTargetTime.value = String(group.targetTime || 5) // 最快时间+几秒的值
+		editingRestTime.value = String(group.restTime || 10)
+		editingLapCount.value = String(group.lapCount || 4)
+		
+		// 打开弹窗
+		showGroupSettingModal.value = true
+	}
+
+	/**
+	 * 切换编辑组别的学生选择
+	 * @param student 学生姓名
+	 * 点击学生选项时触发
+	 * 功能说明：
+	 * - 如果学生已选中，则取消选中
+	 * - 如果学生未选中，则选中
+	 */
+	const toggleEditingGroupStudent = (student : any) => {
+		const index = editingGroupStudents.value.indexOf(student.studentId)
+		if (index > -1) {
+			editingGroupStudents.value.splice(index, 1)
+		} else {
+			editingGroupStudents.value.push(student.studentId)
+		}
+
+		console.log(editingGroupStudents.value);
+	}
+
+	/**
+	 * 确认组别设置
+	 * 点击弹窗确认按钮时触发
+	 * 功能说明：
+	 * - 根据模式（添加/编辑）执行不同逻辑
+	 * - 添加模式：创建新分组
+	 * - 编辑模式：更新现有分组
+	 * - 每个学生的目标时间 = 学生默认最快时间 + 最快时间+几秒的秒数
+	 */
+	const confirmGroupSetting = () => {
+		// 表单验证
+		if (!editingGroupName.value.trim()) {
+			Service.Msg('请输入组名')
+			return
+		}
+
+		const additionalTime = parseFloat(editingTargetTime.value)
+		if (isNaN(additionalTime) || additionalTime <= 0) {
+			Service.Msg('请输入有效的最快时间+几秒')
+			return
+		}
+
+		const restTime = parseFloat(editingRestTime.value)
+		if (isNaN(restTime) || restTime < 0) {
+			Service.Msg('请输入有效的休息时间')
+			return
+		}
+
+		const lapCount = parseInt(editingLapCount.value)
+		if (isNaN(lapCount) || lapCount <= 0) {
+			Service.Msg('请输入有效的圈数')
+			return
+		}
+		console.log(editingGroupStudents.value);
+
+
+
+		// 根据模式执行不同逻辑
+		if (groupSettingMode.value === 'add') {
+			// 添加模式：创建新分组
+			const newGroup : Group = {
+				id: Date.now().toString(),
+				name: editingGroupName.value.trim(),
+				hasStarted: false,
+				students: [...editingGroupStudents.value],
+				targetTime: additionalTime,
+				restTime: restTime,
+				lapCount: lapCount,
+				timers: []
+			}
+
+			// 为选中的学生创建计时器 - 每个学生的目标时间 = 学生最快时间 + additionalTime
+			editingGroupStudents.value.forEach(student => {
+				// 获取学生的默认最快时间，如果没有则使用默认值30秒
+				const studentFastestTime = studentTargetTimes[student] || DEFAULT_TARGET_TIME
+				// 计算该学生的目标时间 = 最快时间 + 追加时间
+				const studentTargetTime = studentFastestTime + additionalTime
+
+				newGroup.timers.push({
+					id: `${newGroup.id}-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+					currentTime: 0,
+					status: 'idle',
+					studentName: student,
+					records: [],
+					lapCount: 0,
+					targetTime: studentTargetTime,
+					lastLapTime: 0,
+					groupId: newGroup.id,
+					hasStarted: false,
+					restTime: restTime,
+					totalLapCount: lapCount
+				})
+			})
+
+			groupCounter++
+			groups.value.push(newGroup)
+			showGroupSettingModal.value = false
+			Service.Msg('添加分组成功', 'success')
+		} else {
+			// 编辑模式：更新现有分组
+			if (!editingGroup.value) return
+
+			editingGroup.value.name = editingGroupName.value.trim()
+			editingGroup.value.students = [...editingGroupStudents.value]
+			editingGroup.value.targetTime = additionalTime
+			editingGroup.value.restTime = restTime
+			editingGroup.value.lapCount = lapCount
+
+			// 更新该组内所有计时器的目标时间 - 重新计算每个学生的目标时间
+			editingGroup.value.timers.forEach(timer => {
+				const studentFastestTime = studentTargetTimes[timer.studentName] || DEFAULT_TARGET_TIME
+				timer.targetTime = studentFastestTime + additionalTime
+				timer.restTime = restTime
+				timer.totalLapCount = lapCount
+			})
+
+			showGroupSettingModal.value = false
+			Service.Msg('修改成功', 'success')
+		}
+	}
+
 	// 格式化时间显示（时:分:秒）
 	const formatTime = (timer : TimerItem) : string => {
 		const hours = Math.floor(timer.currentTime / 3600)
@@ -301,25 +923,27 @@
 		const millis = Math.floor((seconds % 1) * 100)
 		return `${mins.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}:${millis.toString().padStart(2, '0')}`
 	}
-	
-	// 格式化持续时间（显示圈数）
-	const formatDuration = (timer : TimerItem) : string => {
-		return `${timer.lapCount}圈`
+
+	// 格式化休息倒计时显示
+	const formatRestCountdown = (seconds : number) : string => {
+		const secs = Math.floor(seconds)
+		const millis = Math.floor((seconds % 1) * 100)
+		return `${secs.toString().padStart(2, '0')}.${millis.toString().padStart(2, '0')}`
 	}
-	
+
 	// 格式化秒表显示 (MM:SS)
 	const formatStopwatchTime = (seconds : number) : string => {
 		const mins = Math.floor(seconds / 60)
 		const secs = Math.floor(seconds % 60)
 		return `${mins.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}`
 	}
-	
+
 	// 格式化毫秒显示
 	const formatMillis = (seconds : number) : string => {
 		const millis = Math.floor((seconds % 1) * 100)
 		return `.${millis.toString().padStart(2, '0')}`
 	}
-	
+
 	// 格式化完整时间 (MM:SS.xx)
 	const formatFullTime = (seconds : number) : string => {
 		const mins = Math.floor(seconds / 60)
@@ -328,6 +952,14 @@
 		return `${mins.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}.${millis.toString().padStart(2, '0')}`
 	}
 
+	// 格式化全局计时器显示
+	const formatGlobalTimer = (seconds : number) : string => {
+		const mins = Math.floor(seconds / 60)
+		const secs = Math.floor(seconds % 60)
+		const millis = Math.floor((seconds % 1) * 100)
+		return `${mins.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}.${millis.toString().padStart(2, '0')}`
+	}
+
 	// 格式化调整后的记录时间（每个记录减去前一个记录的时间，计算单圈时间）
 	const formatAdjustedRecordTime = (seconds : number, index : number) : string => {
 		let adjustedTime = seconds
@@ -338,133 +970,261 @@
 		}
 		return formatFullTime(adjustedTime)
 	}
-	
-	// 添加计时器
-	const addTimer = () => {
-		const nextIndex = timers.value.length % studentNames.length
-		const studentName = studentNames[nextIndex]
-		timers.value.push({
-			id: Date.now().toString(),
+
+	/**
+	 * 添加计时器（向指定分组添加）
+	 * 点击"点击添加学生到本组"按钮时触发
+	 * 功能说明：
+	 * - 保存当前分组引用
+	 * - 重置表单数据为默认值
+	 * - 打开添加计时器弹窗
+	 */
+	const addTimer = (group : Group) => {
+		currentGroup.value = group
+		selectedStudent.value = ''
+		targetTimeInput.value = '5' // 最快时间+几秒的默认值
+		restTimeInput.value = '10'
+		lapCountInput.value = '4'
+		showAddTimerModal.value = true
+	}
+
+	/**
+	 * 选择添加计时器的学生（单选）
+	 * 点击添加计时器弹窗中的学生选项时触发
+	 * 功能说明：
+	 * - 设置选中的学生（单选模式）
+	 */
+	const selectAddTimerStudent = (student : string) => {
+		selectedStudent.value = student
+	}
+
+	/**
+	 * 确认添加计时器
+	 * 点击添加计时器弹窗的"确认添加"按钮时触发
+	 * 功能说明：
+	 * - 验证表单数据
+	 * - 计算学生目标时间 = 学生最快时间 + 最快时间+几秒
+	 * - 创建新的计时器对象
+	 * - 将计时器添加到当前分组
+	 * - 关闭弹窗并显示成功提示
+	 */
+	const confirmAddTimer = () => {
+		if (!currentGroup.value) return
+
+		if (!selectedStudent.value) {
+			Service.Msg('请选择学生')
+			return
+		}
+
+		const additionalTime = parseFloat(targetTimeInput.value)
+		if (isNaN(additionalTime) || additionalTime <= 0) {
+			Service.Msg('请输入有效的最快时间+几秒')
+			return
+		}
+
+		const restTime = parseFloat(restTimeInput.value)
+		if (isNaN(restTime) || restTime < 0) {
+			Service.Msg('请输入有效的休息时间')
+			return
+		}
+
+		const totalLapCount = parseInt(lapCountInput.value)
+		if (isNaN(totalLapCount) || totalLapCount <= 0) {
+			Service.Msg('请输入有效的圈数')
+			return
+		}
+
+		// 计算该学生的目标时间 = 学生最快时间 + 追加时间
+		const studentFastestTime = studentTargetTimes[selectedStudent.value] || DEFAULT_TARGET_TIME
+		const studentTargetTime = studentFastestTime + additionalTime
+
+		const newTimer : TimerItem = {
+			id: `${currentGroup.value.id}-${Date.now().toString()}`,
 			currentTime: 0,
 			status: 'idle',
-			studentName: studentName,
+			studentName: selectedStudent.value,
 			records: [],
 			lapCount: 0,
-			targetTime: studentTargetTimes[studentName] || DEFAULT_TARGET_TIME,
-			lastLapTime: 0
-		})
+			targetTime: studentTargetTime,
+			lastLapTime: 0,
+			groupId: currentGroup.value.id,
+			hasStarted: false,
+			restTime: restTime,
+			totalLapCount: totalLapCount
+		}
+		currentGroup.value.timers.push(newTimer)
+		showAddTimerModal.value = false
 		Service.Msg('添加成功', 'success')
 	}
-	
-	// 删除计时器
-	const deleteTimer = (timer : TimerItem, index : number) => {
+
+	// 删除计时器（修改为从指定分组删除）
+	const deleteTimer = (timer : TimerItem, group : Group, index : number) => {
 		uni.showModal({
 			title: '确认删除',
 			content: `确定要删除 ${timer.studentName || '计时器 ' + (index + 1)} 吗？`,
 			success: (res) => {
 				if (res.confirm) {
-					if (timer.status === 'running') {
+					if (timer.status === 'running' || timer.status === 'resting') {
 						stopSingleTimer(timer)
 					}
-					timers.value = timers.value.filter(t => t.id !== timer.id)
+					group.timers = group.timers.filter(t => t.id !== timer.id)
 					Service.Msg('删除成功')
 				}
 			},
 		})
 	}
-	
+
 	// 开始主计时器
 	const startTimer = (timer : TimerItem) => {
-		if (timer.status === 'running') return
-		
+		if (timer.status === 'running' || timer.status === 'resting') return
+
 		timer.status = 'running'
+		timer.isResting = false
+		timer.hasStarted = true
 		let currentStartTime = Date.now() - timer.currentTime * 1000
-		const targetLaps = parseInt(configForm.value.laps) || 9
-		let hasShownCompleteMsg = false
-		
+
 		const interval = setInterval(() => {
 			const elapsed = (Date.now() - currentStartTime) / 1000
 			timer.currentTime = elapsed
-			
-			// 检查是否超过目标时间，自动增加圈数（不记录到 records），但不超过目标圈数
-			if (timer.lapCount < targetLaps) {
-				const currentLapTarget = (timer.lapCount + 1) * timer.targetTime
-				if (timer.currentTime >= currentLapTarget && timer.currentTime > timer.lastLapTime) {
-					timer.lapCount += 1
-					timer.lastLapTime = timer.currentTime
-				}
-			}
-			
-			// 检查是否达到目标圈数，只提示一次但不停止计时器
-			if (timer.lapCount >= targetLaps && !hasShownCompleteMsg) {
-				hasShownCompleteMsg = true
-				Service.Msg(`${timer.studentName} 已完成 ${targetLaps} 圈！`, 'success')
-			}
 		}, 10)
-		
+
 		timerIntervals.value.set(timer.id, { interval, startTime: currentStartTime })
 	}
-	
+
+	// 休息倒计时定时器存储
+	const restIntervals = ref<Map<string, number>>(new Map())
+
 	// 停止单个主计时器
 	const stopSingleTimer = (timer : TimerItem) => {
-		if (timer.status !== 'running') return
-		
+		if (timer.status !== 'running' && timer.status !== 'resting') return
+
 		timer.status = 'paused'
-		
+
 		const timerData = timerIntervals.value.get(timer.id)
 		if (timerData) {
 			clearInterval(timerData.interval)
 			timerIntervals.value.delete(timer.id)
 		}
+
+		// 停止休息倒计时
+		const restInterval = restIntervals.value.get(timer.id)
+		if (restInterval) {
+			clearInterval(restInterval)
+			restIntervals.value.delete(timer.id)
+			timer.isResting = false
+		}
 	}
-	
-	// 停止所有计时器
-	const stopAllTimers = () => {
-		timers.value.forEach(timer => {
-			if (timer.status === 'running') {
-				stopSingleTimer(timer)
-			}
-		})
-	}
-	
+
 	// 全部开始
 	const startAllTimers = () => {
-		timers.value.forEach(timer => {
-			if (timer.status !== 'completed' && timer.status !== 'running') {
+		if (setting.value.mode === 'together') {
+			// 一起出发模式：同时启动所有计时器
+			getAllTimers.value.forEach(timer => {
+				if (timer.status !== 'completed' && timer.status !== 'running' && timer.status !== 'resting') {
+					startTimer(timer)
+				}
+			})
+			// 标记所有分组已出发
+			groups.value.forEach(group => {
+				group.hasStarted = true
+			})
+			Service.Msg('全部已开始')
+		} else {
+			// 间隔出发模式：使用全局计时器控制组别出发
+			startGlobalTimer()
+		}
+	}
+
+	// 启动全局计时器（间隔出发模式）
+	const startGlobalTimer = () => {
+		// 清理之前的定时器
+		clearGlobalTimer()
+		clearGroupStartInterval()
+
+		globalTimerRunning.value = true
+
+		const intervalTime = parseInt(setting.value.interval) || 5
+
+		// 首先启动所有已经出发过的计时器（hasStarted === true）
+		getAllTimers.value.forEach(timer => {
+			if (timer.hasStarted && timer.status !== 'completed' && timer.status !== 'running' && timer.status !== 'resting') {
 				startTimer(timer)
 			}
 		})
-		Service.Msg('全部已开始')
+
+		// 启动全局计时器，每10毫秒更新一次
+		globalTimerInterval = setInterval(() => {
+			globalTimerTime.value += 0.01
+
+			// 根据时间判断哪个分组应该出发
+			groups.value.forEach((group, index) => {
+				// 该分组的出发时间 = 索引 * 间隔时间
+				const groupStartTime = index * intervalTime
+
+				// 如果全局时间 >= 分组出发时间，且该分组还没出发过
+				if (globalTimerTime.value >= groupStartTime && !group.hasStarted) {
+					// 标记分组已出发
+					group.hasStarted = true
+
+					// 启动该分组内所有未出发且未完成且未运行的计时器
+					group.timers.forEach(timer => {
+						if (!timer.hasStarted && timer.status !== 'completed' && timer.status !== 'running' && timer.status !== 'resting') {
+							startTimer(timer)
+						}
+					})
+
+					Service.Msg(`${group.name} 已开始`)
+				}
+			})
+		}, 10)
 	}
-	
+
+	// 停止全局计时器
+	const stopGlobalTimer = () => {
+		globalTimerRunning.value = false
+		if (globalTimerInterval) {
+			clearInterval(globalTimerInterval)
+			globalTimerInterval = null
+		}
+	}
+
+	// 清理全局计时器
+	const clearGlobalTimer = () => {
+		if (globalTimerInterval) {
+			clearInterval(globalTimerInterval)
+			globalTimerInterval = null
+		}
+		globalTimerRunning.value = false
+	}
+
+	// 清理分组间隔定时器
+	const clearGroupStartInterval = () => {
+		// 该函数保留用于兼容，虽然 groupStartInterval 变量已删除
+	}
+
 	// 全部暂停
 	const pauseAllTimers = () => {
-		timers.value.forEach(timer => {
-			if (timer.status === 'running') {
+		// 清理分组间隔定时器和全局计时器
+		clearGroupStartInterval()
+		stopGlobalTimer()
+		getAllTimers.value.forEach(timer => {
+			if (timer.status === 'running' || timer.status === 'resting') {
 				stopSingleTimer(timer)
 			}
 		})
 		Service.Msg('全部已暂停')
 	}
-	
+
 	// 切换计时器状态
 	const toggleTimer = (timer : TimerItem) => {
 		if (timer.status === 'completed') return
-		if (timer.status === 'running') {
+		if (timer.status === 'running' || timer.status === 'resting') {
 			stopSingleTimer(timer)
 		} else {
 			startTimer(timer)
 		}
 	}
-	
-	// 完成计时器
-	const completeTimer = (timer : TimerItem) => {
-		stopSingleTimer(timer)
-		timer.status = 'completed'
-		stopAllTimers()
-		Service.Msg('已完成，所有计时器已暂停', 'success')
-	}
-	
+
 	// 记录计时
 	const recordTimer = (timer : TimerItem) => {
 		if (timer.status !== 'running') {
@@ -476,9 +1236,19 @@
 		}
 		timer.records.push({ time: timer.currentTime })
 		timer.lapCount += 1
-		Service.Msg('已记录')
+
+		// 检查是否达到设定的圈数
+		const totalLaps = timer.totalLapCount || 4
+		if (timer.lapCount >= totalLaps) {
+			// 达到总圈数，完成计时
+			stopSingleTimer(timer)
+			timer.status = 'completed'
+			Service.Msg(`${timer.studentName} 已完成`)
+		} else {
+			Service.Msg('已记录')
+		}
 	}
-	
+
 	// 重置计时器
 	const resetTimer = (timer : TimerItem) => {
 		stopSingleTimer(timer)
@@ -487,110 +1257,159 @@
 		timer.records = []
 		timer.lapCount = 0
 		timer.lastLapTime = 0
+		timer.hasStarted = false
+		timer.isResting = false
+		timer.restCountdown = 0
 		Service.Msg('已重置')
 	}
-	
+
 	// 打开计时器详情
 	const openTimerDetail = (timer : TimerItem) => {
 		selectedTimer.value = timer
+		isEditMode.value = false
+
+		// 初始化编辑表单数据
+		const studentFastestTime = studentTargetTimes[timer.studentName] || DEFAULT_TARGET_TIME
+		const currentAdditionalTime = timer.targetTime - studentFastestTime
+
+		editForm.value = {
+			additionalTime: String(currentAdditionalTime > 0 ? currentAdditionalTime : 0),
+			restTime: String(timer.restTime || 0),
+			lapCount: String(timer.totalLapCount || 4)
+		}
+
 		showTimerDetail.value = true
 	}
-	
+
+	// 取消编辑
+	const cancelEdit = () => {
+		isEditMode.value = false
+	}
+
+	// 保存编辑
+	const saveEdit = () => {
+		if (!selectedTimer.value) return
+
+		const additionalTime = parseFloat(editForm.value.additionalTime)
+		if (isNaN(additionalTime) || additionalTime < 0) {
+			Service.Msg('请输入有效的最大速度+几秒')
+			return
+		}
+
+		const restTime = parseFloat(editForm.value.restTime)
+		if (isNaN(restTime) || restTime < 0) {
+			Service.Msg('请输入有效的休息时间')
+			return
+		}
+
+		const lapCount = parseInt(editForm.value.lapCount)
+		if (isNaN(lapCount) || lapCount <= 0) {
+			Service.Msg('请输入有效的圈数')
+			return
+		}
+
+		// 计算新的目标时间 = 学生最快时间 + 最大速度+几秒
+		const studentFastestTime = studentTargetTimes[selectedTimer.value.studentName] || DEFAULT_TARGET_TIME
+		selectedTimer.value.targetTime = studentFastestTime + additionalTime
+		selectedTimer.value.restTime = restTime
+		selectedTimer.value.totalLapCount = lapCount
+
+		Service.Msg('保存成功', 'success')
+		isEditMode.value = false
+	}
+
 	// 记录圈数
 	const recordLap = () => {
 		if (!selectedTimer.value) {
 			Service.Msg('未选择计时器')
 			return
 		}
-		
+
 		if (selectedTimer.value.status !== 'running') {
 			Service.Msg('请先开始计时器')
 			return
 		}
-		
+
 		if (!selectedTimer.value.records) {
 			selectedTimer.value.records = []
 		}
-		
+
 		selectedTimer.value.records.push({
 			time: selectedTimer.value.currentTime
 		})
 		selectedTimer.value.lapCount += 1
-		Service.Msg('已记录')
+
+		// 检查是否达到设定的圈数
+		const totalLaps = selectedTimer.value.totalLapCount || 4
+		if (selectedTimer.value.lapCount >= totalLaps) {
+			// 达到总圈数，完成计时
+			stopSingleTimer(selectedTimer.value)
+			selectedTimer.value.status = 'completed'
+			Service.Msg(`${selectedTimer.value.studentName} 已完成`)
+		} else {
+			Service.Msg('已记录')
+		}
 	}
-	
+
 	// 切换选中的计时器
 	const toggleSelectedTimer = () => {
 		if (selectedTimer.value) {
 			toggleTimer(selectedTimer.value)
 		}
 	}
-	
+
 	// 重置选中的计时器
 	const resetSelectedTimer = () => {
 		if (selectedTimer.value) {
 			resetTimer(selectedTimer.value)
 		}
 	}
-	
+
 	// 重置所有计时器
 	const resetAllTimers = () => {
-		timers.value.forEach(timer => {
+		// 清理分组间隔定时器和全局计时器
+		clearGroupStartInterval()
+		clearGlobalTimer()
+		globalTimerTime.value = 0
+		// 重置所有分组的 hasStarted 标记
+		groups.value.forEach(group => {
+			group.hasStarted = false
+		})
+		getAllTimers.value.forEach(timer => {
 			resetTimer(timer)
 		})
 		Service.Msg('已全部重置')
 	}
-	
+
 	// 提交数据
 	const submitData = () => {
 		pauseAllTimers()
-		
-		const hasData = timers.value.some(timer => timer.currentTime > 0)
+
+		const hasData = getAllTimers.value.some(timer => timer.currentTime > 0)
 		if (!hasData) {
 			Service.Msg('暂无数据可提交')
 			return
 		}
-		
+
 		Service.Msg('提交成功', 'success')
-		
+
 		setTimeout(() => {
 			Service.GoPageBack()
 		}, 1000)
 	}
-	
-	// 保存配置
-	const saveConfig = () => {
-		if (!configForm.value.maxSpeed.trim()) {
-			Service.Msg('请输入最大速度')
-			return
-		}
-		if (!configForm.value.restTime.trim()) {
-			Service.Msg('请输入休息时间')
-			return
-		}
-		if (!configForm.value.laps.trim()) {
-			Service.Msg('请输入圈数')
-			return
-		}
-		if (!configForm.value.groupCount.trim()) {
-			Service.Msg('请输入组数')
-			return
-		}
-		if (!configForm.value.peoplePerGroup.trim()) {
-			Service.Msg('请输入每组人数')
-			return
-		}
-		
-		console.log('保存配置:', configForm.value)
-		Service.Msg('配置已保存', 'success')
-		showConfigModal.value = false
-	}
-	
+
 	// 页面卸载时清理所有计时器
 	onUnmounted(() => {
+		// 清理分组间隔定时器和全局计时器
+		clearGroupStartInterval()
+		clearGlobalTimer()
 		timerIntervals.value.forEach(({ interval }) => {
 			clearInterval(interval)
 		})
+		// 清理所有休息倒计时定时器
+		restIntervals.value.forEach(interval => {
+			clearInterval(interval)
+		})
 	})
 </script>
 
@@ -601,7 +1420,85 @@
 		padding: 20rpx 20rpx;
 		padding-bottom: 200rpx;
 	}
-	
+
+	/* 项目选择区域 */
+	.project-select-section {
+		margin-bottom: 20rpx;
+	}
+
+	.project-select-wrapper {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		background-color: #fff;
+		border-radius: 16rpx;
+		padding: 24rpx 28rpx;
+		box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
+		transition: all 0.2s ease;
+
+		&:active {
+			transform: scale(0.98);
+		}
+	}
+
+	.project-select-text {
+		font-size: 30rpx;
+		font-weight: 600;
+		color: #333;
+	}
+
+	/* 项目选择弹窗 */
+	.project-select-popup {
+		padding: 30rpx 0 40rpx;
+		max-height: 60vh;
+	}
+
+	.popup-title {
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+		text-align: center;
+		margin-bottom: 24rpx;
+		padding: 0 30rpx;
+	}
+
+	.project-list-scroll {
+		max-height: 500rpx;
+		padding: 0 30rpx;
+	}
+
+	.project-list {
+		display: flex;
+		flex-direction: column;
+		gap: 12rpx;
+	}
+
+	.project-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 24rpx 20rpx;
+		background-color: #f5f5f5;
+		border-radius: 12rpx;
+		transition: all 0.2s ease;
+		border: 2rpx solid transparent;
+
+		&.active {
+			background-color: #e6f7ff;
+			border-color: #1890ff;
+		}
+
+		&:active {
+			transform: scale(0.98);
+		}
+	}
+
+	.project-name {
+		font-size: 28rpx;
+		color: #333;
+		font-weight: 500;
+	}
+
 	/* 卡片区域 */
 	.card-section {
 		background-color: #fff;
@@ -610,7 +1507,62 @@
 		margin-bottom: 24rpx;
 		box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
 	}
-	
+
+	/* 添加分组的卡片区域 */
+	.add-group-section {
+		background-color: transparent;
+		box-shadow: none;
+		padding: 0;
+	}
+
+	/* 分组标题包装器 */
+	.group-title-wrapper {
+		display: flex;
+		align-items: center;
+		gap: 16rpx;
+	}
+
+	/* 删除分组按钮 */
+	.delete-group-btn {
+		width: 40rpx;
+		height: 40rpx;
+		background: linear-gradient(135deg, #ff4d4f 0%, #d9363e 100%);
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-shadow: 0 2rpx 8rpx rgba(255, 77, 79, 0.3);
+		transition: all 0.2s ease;
+
+		&:active {
+			transform: scale(0.95);
+		}
+	}
+
+	/* 添加分组按钮 */
+	.add-group-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 16rpx;
+		background: linear-gradient(135deg, #52c41a 0%, #389e0d 100%);
+		padding: 24rpx 32rpx;
+		border-radius: 24rpx;
+		box-shadow: 0 4rpx 12rpx rgba(82, 196, 26, 0.3);
+		transition: all 0.3s ease;
+
+		&:active {
+			transform: scale(0.98);
+			box-shadow: 0 2rpx 8rpx rgba(82, 196, 26, 0.2);
+		}
+
+		.add-group-text {
+			font-size: 30rpx;
+			color: #fff;
+			font-weight: 600;
+		}
+	}
+
 	.section-title {
 		font-size: 30rpx;
 		font-weight: 600;
@@ -618,7 +1570,7 @@
 		margin-bottom: 28rpx;
 		position: relative;
 		padding-left: 20rpx;
-		
+
 		&::before {
 			content: '';
 			position: absolute;
@@ -631,167 +1583,203 @@
 			border-radius: 3rpx;
 		}
 	}
-	
+
 	.section-header {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		margin-bottom: 32rpx;
-		
+
 		.section-title {
 			margin-bottom: 0;
 		}
-		
-		.add-btn {
+
+		.group-controls {
 			display: flex;
 			align-items: center;
-			gap: 10rpx;
-			background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
-			padding: 14rpx 28rpx;
-			border-radius: 32rpx;
-			box-shadow: 0 4rpx 12rpx rgba(24, 144, 255, 0.3);
+			gap: 12rpx;
+		}
+
+		.group-control-btn {
+			width: 56rpx;
+			height: 56rpx;
+			border-radius: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 			transition: all 0.3s ease;
-			
+			box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.15);
+
 			&:active {
 				transform: scale(0.95);
-				box-shadow: 0 2rpx 8rpx rgba(24, 144, 255, 0.2);
-			}
-			
-			.add-text {
-				font-size: 26rpx;
-				color: #fff;
-				font-weight: 500;
 			}
 		}
+
+		.group-control-btn.start-btn {
+			background: linear-gradient(135deg, #52c41a 0%, #389e0d 100%);
+			box-shadow: 0 4rpx 12rpx rgba(82, 196, 26, 0.3);
+		}
+
+		.group-control-btn.pause-btn {
+			background: linear-gradient(135deg, #faad14 0%, #d48806 100%);
+			box-shadow: 0 4rpx 12rpx rgba(250, 173, 20, 0.3);
+		}
+
+		.group-control-btn.setting-btn {
+			background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
+			box-shadow: 0 4rpx 12rpx rgba(24, 144, 255, 0.3);
+		}
 	}
-	
-	/* 训练计划显示 */
-	.training-plan-display {
-		padding: 28rpx;
-		background: linear-gradient(135deg, #f0f5ff 0%, #e6f7ff 100%);
-		border-radius: 20rpx;
-		border: 2rpx solid #bae7ff;
+
+	/* 全局计时器 */
+	.global-timer-section {
+		background: #fff;
+		border: none;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 40rpx 32rpx;
 		position: relative;
-		overflow: hidden;
-		
-		&::before {
-			content: '';
-			position: absolute;
-			top: -50%;
-			right: -50%;
-			width: 100%;
-			height: 200%;
-			background: linear-gradient(
-				45deg,
-				transparent 40%,
-				rgba(255, 255, 255, 0.3) 50%,
-				transparent 60%
-			);
-			animation: shimmer 3s infinite;
-		}
-		
-		@keyframes shimmer {
-			0% {
-				transform: translateX(-100%);
-			}
-			100% {
-				transform: translateX(100%);
-			}
-		}
-		
-		.plan-item {
-			display: flex;
-			align-items: center;
-			gap: 16rpx;
-			position: relative;
-			z-index: 1;
-			
-			.plan-icon {
-				width: 56rpx;
-				height: 56rpx;
-				background: rgba(255, 255, 255, 0.8);
-				border-radius: 16rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				flex-shrink: 0;
-				box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
-			}
-			
-			.plan-info {
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				gap: 4rpx;
-				
-				.plan-label {
-					font-size: 22rpx;
-					color: #8c8c8c;
-					font-weight: 500;
-				}
-				
-				.plan-value {
-					font-size: 32rpx;
-					font-weight: 700;
-					color: #1890ff;
-					font-family: 'DIN Alternate', 'Helvetica Neue', monospace;
-				}
-			}
-			
-			.plan-plus {
-				padding: 8rpx 16rpx;
-				background: linear-gradient(135deg, #52c41a 0%, #389e0d 100%);
-				border-radius: 12rpx;
-				
-				.plus-text {
-					font-size: 24rpx;
-					color: #fff;
-					font-weight: 600;
-				}
-			}
-		}
-		
-		.plan-divider {
-			height: 1rpx;
-			background: linear-gradient(90deg, transparent 0%, rgba(24, 144, 255, 0.2) 50%, transparent 100%);
-			margin: 20rpx 0;
+	}
+
+	.global-timer-header {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+		margin-bottom: 20rpx;
+	}
+
+	.global-timer-label {
+		font-size: 24rpx;
+		color: #bfbfbf;
+		font-weight: 400;
+		letter-spacing: 4rpx;
+		text-transform: uppercase;
+	}
+
+	.global-setting-btn {
+		position: absolute;
+		right: 0;
+		top: 50%;
+		transform: translateY(-50%);
+		width: 48rpx;
+		height: 48rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background: #f5f5f5;
+		border-radius: 50%;
+		transition: all 0.2s ease;
+
+		&:active {
+			transform: translateY(-50%) scale(0.95);
+			background: #e8e8e8;
 		}
 	}
-	
+
+	.global-timer-display {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 0;
+	}
+
+	.global-timer-value {
+		font-size: 80rpx;
+		font-weight: 200;
+		color: #262626;
+		font-family: 'DIN Alternate', 'Helvetica Neue', 'SF Pro Display', -apple-system, monospace;
+		letter-spacing: 10rpx;
+		line-height: 1;
+		font-variant-numeric: tabular-nums;
+	}
+
 	/* 计时器网格 */
 	.timers-grid {
 		display: grid;
 		grid-template-columns: repeat(2, 1fr);
 		gap: 15rpx;
 	}
-	
+
+	/* 添加学生按钮 */
+	.add-student-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		gap: 12rpx;
+		padding: 24rpx 32rpx;
+		margin-top: 20rpx;
+		background: linear-gradient(135deg, #f0f9ff 0%, #e6f7ff 100%);
+		border-radius: 16rpx;
+		border: 2rpx dashed #91d5ff;
+		transition: all 0.3s ease;
+
+		&:active {
+			transform: scale(0.98);
+			background: linear-gradient(135deg, #e6f7ff 0%, #d6f4ff 100%);
+		}
+
+		.add-student-text {
+			font-size: 28rpx;
+			color: #1890ff;
+			font-weight: 500;
+		}
+	}
+
 	/* 计时器卡片包装器 */
 	.timer-card-wrapper {
 		display: flex;
 		justify-content: center;
+		width: 100%;
 	}
-	
+
 	/* 计时器圆形 */
 	.timer-circle {
-		width: 320rpx;
-		min-height: 380rpx;
+		width: 100%;
+		max-width: 360rpx;
 		border-radius: 20rpx;
 		background-color: #fff;
 		display: flex;
-		padding: 10rpx;
+		padding: 20rpx 10rpx;
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
 		position: relative;
 		box-shadow: 0 4rpx 16rpx rgba(250, 140, 22, 0.3);
-		
+		transition: all 0.3s ease;
+
+		&.resting {
+			box-shadow: 0 4rpx 20rpx rgba(255, 120, 117, 0.4);
+			animation: cardPulse 1.5s ease-in-out infinite;
+		}
+
+		/* 姓名标签 - 左上角 */
+		.timer-name-top-left {
+			position: absolute;
+			top: 16rpx;
+			left: 16rpx;
+			z-index: 10;
+
+			.name-text {
+				font-size: clamp(18rpx, 3vw, 24rpx);
+				font-weight: 600;
+				color: #333;
+				background-color: rgba(255, 255, 255, 0.9);
+				padding: 4rpx 10rpx;
+				border-radius: 8rpx;
+				box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+			}
+		}
+
 		/* 删除按钮包装器 */
 		.delete-btn-wrapper {
 			position: absolute;
 			top: 16rpx;
 			right: 16rpx;
 			z-index: 10;
-			
+
 			.delete-btn {
 				width: 56rpx;
 				height: 56rpx;
@@ -802,82 +1790,161 @@
 				justify-content: center;
 				box-shadow: 0 4rpx 12rpx rgba(255, 77, 79, 0.4);
 				transition: all 0.2s ease;
-				
+
 				&:active {
 					transform: scale(0.95);
 				}
 			}
 		}
-		
+
+		.circle-content-wrapper {
+			width: 100%;
+			max-width: 280rpx;
+			position: relative;
+		}
+
 		.circle-content {
-			padding: 40rpx;
+			width: 100%;
+			aspect-ratio: 1;
 			border-radius: 50%;
-			border: 14rpx solid #faad14;
+			border: 10rpx solid #faad14;
+			position: relative;
+			transition: all 0.3s ease;
+			box-sizing: border-box;
+
+			&.resting {
+				border-color: #ff7875;
+				animation: pulse 1.5s ease-in-out infinite;
+			}
+
+			.circle-inner {
+				position: absolute;
+				top: 0;
+				left: 0;
+				right: 0;
+				bottom: 0;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				gap: 8rpx;
+				padding: 10rpx;
+			}
+		}
+
+		.timer-rest-countdown {
 			display: flex;
 			flex-direction: column;
 			align-items: center;
-			justify-content: center;
-			gap: 14rpx;
-		}
-		
-		.timer-sound {
-			display: flex;
-			align-items: center;
 			gap: 8rpx;
-			padding: 8rpx 16rpx;
-			background-color: rgba(255, 255, 255, 0.2);
-			border-radius: 20rpx;
-			
-			.sound-text {
-				font-size: 22rpx;
-				font-weight: 500;
-				color: #333;
+
+			.rest-label {
+				font-size: 24rpx;
+				color: #ff7875;
+				font-weight: 600;
+				background-color: #fff1f0;
+				padding: 6rpx 16rpx;
+				border-radius: 8rpx;
+				border: 1rpx solid #ffa39e;
+			}
+
+			.rest-time {
+				font-size: 48rpx;
+				font-weight: bold;
+				color: #ff7875;
+				animation: countdownFlash 0.5s ease-in-out infinite;
 			}
 		}
-		
+
 		.timer-target {
-			font-size: 20rpx;
+			font-size: clamp(14rpx, 2.5vw, 20rpx);
 			color: #666;
 			font-weight: 500;
 			background-color: #f0f5ff;
-			padding: 4rpx 12rpx;
-			border-radius: 8rpx;
+			padding: 2rpx 8rpx;
+			border-radius: 6rpx;
 			border: 1rpx solid #bae7ff;
+			white-space: nowrap;
 		}
-		
+
 		.timer-time {
-			font-size: 42rpx;
+			font-size: clamp(28rpx, 5vw, 42rpx);
 			font-weight: bold;
 			color: #333;
+			line-height: 1.2;
 		}
-		
+
+		.timer-rest-countdown {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			gap: 4rpx;
+
+			.rest-label {
+				font-size: clamp(16rpx, 3vw, 24rpx);
+				color: #ff7875;
+				font-weight: 600;
+				background-color: #fff1f0;
+				padding: 2rpx 10rpx;
+				border-radius: 6rpx;
+				border: 1rpx solid #ffa39e;
+				white-space: nowrap;
+			}
+
+			.rest-time {
+				font-size: clamp(32rpx, 6vw, 48rpx);
+				font-weight: bold;
+				color: #ff7875;
+				animation: countdownFlash 0.5s ease-in-out infinite;
+			}
+		}
+
 		.timer-duration {
-			font-size: 22rpx;
+			font-size: clamp(14rpx, 2.5vw, 22rpx);
 			opacity: 0.9;
 			background-color: #f6f6f6;
-			padding: 4rpx 12rpx;
+			padding: 2rpx 8rpx;
 			border-radius: 4rpx;
 			color: #666;
+			white-space: nowrap;
 		}
-		
+
+		.timer-info {
+			display: flex;
+			align-items: center;
+			gap: 8rpx;
+			flex-wrap: wrap;
+		}
+
+		.timer-rest {
+			font-size: 20rpx;
+			background-color: #fff7e6;
+			padding: 4rpx 12rpx;
+			border-radius: 4rpx;
+			color: #fa8c16;
+			border: 1rpx solid #ffe58f;
+		}
+
 		.timer-controls {
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
-			width: 260rpx;
+			width: 100%;
+			max-width: 280rpx;
 			margin-top: 16rpx;
-			
+			padding: 0 10rpx;
+
 			u-icon {
 				cursor: pointer;
 				transition: all 0.2s ease;
-				
+
 				&:hover {
 					transform: scale(1.1);
 				}
 			}
 		}
 	}
-	
+
 	/* 底部按钮区域 */
 	.bottom-buttons-section {
 		position: fixed;
@@ -891,11 +1958,11 @@
 		box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.08);
 		z-index: 100;
 	}
-	
+
 	.bottom-buttons {
 		display: flex;
 		gap: 20rpx;
-		
+
 		.bottom-btn {
 			flex: 1;
 			height: 88rpx;
@@ -909,45 +1976,45 @@
 			font-weight: 600;
 			box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
 			transition: all 0.2s ease;
-			
+
 			&:active {
 				transform: scale(0.98);
 			}
-			
+
 			.btn-text {
 				font-size: 28rpx;
 				color: #fff;
 				font-weight: 600;
 			}
 		}
-		
+
 		.start-all-btn {
 			background: linear-gradient(135deg, #52c41a 0%, #389e0d 100%);
 		}
-		
+
 		.pause-all-btn {
 			background: linear-gradient(135deg, #faad14 0%, #d48806 100%);
 		}
-		
+
 		.submit-btn {
 			background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
 		}
-		
+
 		.reset-all-btn {
 			background: linear-gradient(135deg, #722ed1 0%, #531dab 100%);
 		}
 	}
-	
+
 	/* 计时器卡片可点击 */
 	.timer-circle {
 		cursor: pointer;
 		transition: all 0.2s ease;
-		
+
 		&:active {
 			transform: scale(0.98);
 		}
 	}
-	
+
 	/* 底部弹出框样式 - 简洁版 */
 	.timer-detail-popup {
 		padding: 50rpx 40rpx;
@@ -957,7 +2024,7 @@
 		display: flex;
 		flex-direction: column;
 	}
-	
+
 	/* 详情姓名 */
 	.detail-name {
 		text-align: center;
@@ -967,7 +2034,7 @@
 		margin-bottom: 40rpx;
 		letter-spacing: 2rpx;
 	}
-	
+
 	/* 秒表显示 */
 	.stopwatch-display {
 		display: flex;
@@ -975,7 +2042,7 @@
 		justify-content: center;
 		margin-bottom: 50rpx;
 	}
-	
+
 	.stopwatch-time {
 		font-size: 100rpx;
 		font-weight: 300;
@@ -983,7 +2050,7 @@
 		font-family: 'DIN Alternate', 'Helvetica Neue', monospace;
 		letter-spacing: 2rpx;
 	}
-	
+
 	.stopwatch-millis {
 		font-size: 48rpx;
 		font-weight: 300;
@@ -991,7 +2058,7 @@
 		font-family: 'DIN Alternate', 'Helvetica Neue', monospace;
 		margin-left: 4rpx;
 	}
-	
+
 	/* 记录列表 */
 	.records-list {
 		flex: 1;
@@ -1001,7 +2068,7 @@
 		border-radius: 16rpx;
 		padding: 0 20rpx;
 	}
-	
+
 	.record-item {
 		padding: 20rpx 24rpx;
 		margin-bottom: 12rpx;
@@ -1009,20 +2076,20 @@
 		border-radius: 12rpx;
 		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
 		transition: all 0.2s ease;
-		
+
 		&:active {
 			transform: scale(0.98);
 			box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.08);
 		}
 	}
-	
+
 	.record-info {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		margin-bottom: 8rpx;
 	}
-	
+
 	.record-index {
 		font-size: 24rpx;
 		color: #8c8c8c;
@@ -1031,14 +2098,14 @@
 		padding: 4rpx 14rpx;
 		border-radius: 8rpx;
 	}
-	
+
 	.record-time {
 		font-size: 32rpx;
 		font-weight: 600;
 		color: #262626;
 		font-family: 'DIN Alternate', 'Helvetica Neue', monospace;
 	}
-	
+
 	/* 详情按钮 */
 	.detail-buttons {
 		display: flex;
@@ -1046,7 +2113,7 @@
 		align-items: center;
 		gap: 50rpx;
 	}
-	
+
 	.detail-btn {
 		width: 120rpx;
 		height: 120rpx;
@@ -1060,7 +2127,7 @@
 		cursor: pointer;
 		position: relative;
 		overflow: hidden;
-		
+
 		&::before {
 			content: '';
 			position: absolute;
@@ -1071,31 +2138,31 @@
 			background: linear-gradient(135deg, rgba(255, 255, 255, 0.2) 0%, transparent 50%);
 			pointer-events: none;
 		}
-		
+
 		&:active {
 			transform: scale(0.95);
 		}
-		
+
 		.btn-label {
 			font-size: 22rpx;
 			font-weight: 500;
 		}
 	}
-	
+
 	/* 重置按钮 */
 	.detail-btn-reset {
 		background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
 		box-shadow: 0 8rpxpx 24rpx rgba(24, 144, 255, 0.4);
-		
+
 		&:active {
 			box-shadow: 0 4rpx 12rpx rgba(24, 144, 255, 0.3);
 		}
-		
+
 		.btn-label {
 			color: #fff;
 		}
 	}
-	
+
 	/* 主按钮（开始/暂停） */
 	.detail-btn-main {
 		width: 160rpx;
@@ -1104,117 +2171,51 @@
 		background: linear-gradient(135deg, #faad14 0%, #d48806 100%);
 		box-shadow: 0 8rpx 24rpx rgba(250, 140, 22, 0.4);
 		gap: 8rpx;
-		
+
 		&:active {
 			box-shadow: 0 4rpx 12rpx rgba(250, 140, 22, 0.3);
 		}
-		
+
 		.btn-label {
 			color: #fff;
 			font-size: 26rpx;
 			font-weight: 600;
 		}
 	}
-	
+
 	/* 记录按钮 */
 	.detail-btn-record {
 		background: linear-gradient(135deg, #52c41a 0%, #389e0d 100%);
 		box-shadow: 0 8rpx 24rpx rgba(82, 196, 26, 0.4);
-		
+
 		&:active {
 			box-shadow: 0 4rpx 12rpx rgba(82, 196, 26, 0.3);
 		}
-		
+
 		.btn-label {
 			color: #fff;
 		}
 	}
-	
+
 	/* 记录按钮禁用状态 */
 	.detail-btn-record.disabled {
 		background: #d9d9d9;
 		box-shadow: none;
 		pointer-events: none;
-		
+
 		.btn-label {
 			color: #8c8c8c;
 		}
 	}
-	
-	/* 配置弹窗 */
-	.config-modal-overlay {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.5);
-		z-index: 998;
-		animation: fadeIn 0.2s ease;
-	}
-	
-	.config-modal {
-		position: fixed;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		width: 90%;
-		max-width: 640rpx;
-		background-color: #fff;
-		border-radius: 28rpx;
-		z-index: 999;
-		animation: slideUp 0.3s ease;
-		overflow: hidden;
-		box-shadow: 0 20rpx 60rpx rgba(0, 0, 0, 0.2);
-		
-		.modal-header {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 32rpx 30rpx;
-			border-bottom: 1rpx solid #f0f0f0;
-			
-			.modal-title {
-				font-size: 32rpx;
-				font-weight: 700;
-				color: #333;
-			}
-			
-			.modal-close {
-				width: 56rpx;
-				height: 56rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				border-radius: 50%;
-				transition: background-color 0.2s ease;
-				
-				&:active {
-					background-color: #f5f5f5;
-				}
-			}
-		}
-		
-		.modal-content {
-			padding: 36rpx 30rpx;
-		}
-		
-		.modal-footer {
-			display: flex;
-			gap: 16rpx;
-			padding: 24rpx 30rpx 36rpx;
-			border-top: 1rpx solid #f0f0f0;
-		}
-	}
-	
+
 	/* 表单样式 */
 	.form-group {
 		margin-bottom: 32rpx;
-		
+
 		&:last-child {
 			margin-bottom: 0;
 		}
-		
+
 		.form-label {
 			display: block;
 			font-size: 28rpx;
@@ -1222,7 +2223,7 @@
 			color: #333;
 			margin-bottom: 14rpx;
 		}
-		
+
 		.form-input {
 			width: 100%;
 			height: 88rpx;
@@ -1232,69 +2233,18 @@
 			font-size: 28rpx;
 			color: #333;
 			transition: all 0.2s ease;
-			
+
 			&.small-input {
 				flex: 1;
 			}
 		}
 	}
-	
-	/* 触发方式选择器 */
-	.trigger-selector {
-		display: flex;
-		gap: 20rpx;
-		
-		.trigger-option {
-			flex: 1;
-			height: 100rpx;
-			background-color: #f5f5f5;
-			border-radius: 20rpx;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			gap: 8rpx;
-			font-size: 26rpx;
-			color: #666;
-			transition: all 0.3s ease;
-			border: 2rpx solid transparent;
-			position: relative;
-			overflow: hidden;
-			
-			&:active {
-				transform: scale(0.96);
-			}
-			
-			&.active {
-				font-weight: 600;
-				background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
-				border-color: #1890ff;
-				color: #fff;
-				box-shadow: 0 6rpx 16rpx rgba(24, 144, 255, 0.3);
-				
-				.trigger-icon {
-					background-color: rgba(255, 255, 255, 0.2);
-				}
-			}
-			
-			.trigger-icon {
-				width: 56rpx;
-				height: 56rpx;
-				background-color: #e6f7ff;
-				border-radius: 50%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				transition: all 0.3s ease;
-			}
-		}
-	}
-	
+
 	/* 组别输入行 */
 	.group-input-row {
 		display: flex;
 		gap: 20rpx;
-		
+
 		.input-wrapper {
 			flex: 1;
 			display: flex;
@@ -1304,26 +2254,26 @@
 			padding: 0 16rpx;
 			height: 88rpx;
 			transition: all 0.2s ease;
-			
+
 			&:focus-within {
 				background-color: #fff;
 				box-shadow: 0 0 0 4rpx rgba(24, 144, 255, 0.15);
 			}
-			
+
 			.input-prefix,
 			.input-suffix {
 				font-size: 26rpx;
 				color: #999;
 			}
-			
+
 			.input-prefix {
 				margin-right: 8rpx;
 			}
-			
+
 			.input-suffix {
 				margin-left: 8rpx;
 			}
-			
+
 			.form-input {
 				flex: 1;
 				background-color: transparent;
@@ -1333,58 +2283,740 @@
 			}
 		}
 	}
-	
-	/* 弹窗按钮 */
-	.modal-cancel-btn,
-	.modal-confirm-btn {
-		flex: 1;
-		height: 88rpx;
-		border-radius: 16rpx;
-		border: none;
-		font-size: 30rpx;
-		font-weight: 600;
-			transition: all 0.25s ease;
-	}
-	
-	.modal-cancel-btn {
-		background-color: #f5f5f5;
-		color: #666;
-		
-		&:active {
-			background-color: #e8e8e8;
-			transform: scale(0.96);
-		}
-	}
-	
-	.modal-confirm-btn {
-		background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
-		color: #fff;
-		box-shadow: 0 6rpx 16rpx rgba(24, 144, 255, 0.35);
-		
-		&:active {
-			transform: scale(0.96);
-			box-shadow: 0 3rpx 8rpx rgba(24, 144, 255, 0.25);
-		}
-	}
-	
+
 	/* 动画 */
 	@keyframes fadeIn {
 		from {
 			opacity: 0;
 		}
+
 		to {
 			opacity: 1;
 		}
 	}
-	
+
 	@keyframes slideUp {
 		from {
 			opacity: 0;
 			transform: translate(-50%, -45%);
 		}
+
 		to {
 			opacity: 1;
 			transform: translate(-50%, -50%);
 		}
 	}
+
+	@keyframes pulse {
+
+		0%,
+		100% {
+			box-shadow: 0 0 0 0 rgba(255, 120, 117, 0.4);
+		}
+
+		50% {
+			box-shadow: 0 0 20rpx 10rpx rgba(255, 120, 117, 0.2);
+		}
+	}
+
+	@keyframes countdownFlash {
+
+		0%,
+		100% {
+			opacity: 1;
+		}
+
+		50% {
+			opacity: 0.6;
+		}
+	}
+
+	@keyframes cardPulse {
+
+		0%,
+		100% {
+			transform: scale(1);
+		}
+
+		50% {
+			transform: scale(0.98);
+		}
+	}
+
+	/* 添加分组弹窗样式 */
+	.add-group-modal {
+		padding: 40rpx 32rpx;
+		width: 600rpx;
+	}
+
+	.add-group-modal .modal-title {
+		font-size: 36rpx;
+		font-weight: 700;
+		color: #333;
+		text-align: center;
+		margin-bottom: 40rpx;
+		background: linear-gradient(135deg, #333 0%, #1890ff 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		background-clip: text;
+	}
+
+	.add-group-modal .form-group {
+		margin-bottom: 32rpx;
+	}
+
+	.add-group-modal .form-label {
+		display: block;
+		font-size: 30rpx;
+		font-weight: 600;
+		color: #333;
+		margin-bottom: 16rpx;
+	}
+
+	.add-group-modal .form-input {
+		width: 100%;
+		height: 88rpx;
+		background: linear-gradient(135deg, #fafbfc 0%, #f5f5f5 100%);
+		border-radius: 16rpx;
+		padding: 0 24rpx;
+		font-size: 28rpx;
+		color: #333;
+		transition: all 0.3s ease;
+		border: 2rpx solid transparent;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04) inset;
+
+		&:focus {
+			background: #fff;
+			border-color: #1890ff;
+			box-shadow: 0 0 0 6rpx rgba(24, 144, 255, 0.1), 0 2rpx 8rpx rgba(0, 0, 0, 0.04) inset;
+		}
+	}
+
+	/* 学生选择器样式 */
+	.student-selector {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 16rpx;
+	}
+
+	.student-option {
+		display: flex;
+		align-items: center;
+		gap: 12rpx;
+		padding: 20rpx 24rpx;
+		background: #f5f5f5;
+		border-radius: 16rpx;
+		border: 2rpx solid transparent;
+		transition: all 0.3s ease;
+
+		&.selected {
+			background: linear-gradient(135deg, #e6f7ff 0%, #bae7ff 100%);
+			border-color: #1890ff;
+		}
+
+		&:active {
+			transform: scale(0.96);
+		}
+	}
+
+	.student-checkbox {
+		width: 36rpx;
+		height: 36rpx;
+		border-radius: 8rpx;
+		border: 3rpx solid #d9d9d9;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		transition: all 0.3s ease;
+
+		.student-option.selected & {
+			background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
+			border-color: #1890ff;
+		}
+	}
+
+	.student-name {
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #333;
+	}
+
+	/* 弹窗按钮组 */
+	.add-group-modal .modal-buttons {
+		display: flex;
+		gap: 16rpx;
+		margin-top: 40rpx;
+	}
+
+	.add-group-modal .modal-btn {
+		flex: 1;
+		height: 88rpx;
+		border-radius: 16rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 30rpx;
+		font-weight: 600;
+		transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+
+		&:active {
+			transform: scale(0.96);
+		}
+	}
+
+	.add-group-modal .cancel-btn {
+		background: linear-gradient(135deg, #f5f5f5 0%, #e8e8e8 100%);
+		color: #666;
+		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
+	}
+
+	.add-group-modal .confirm-btn {
+		background: linear-gradient(135deg, #1890ff 0%, #40a9ff 50%, #096dd9 100%);
+		color: #fff;
+		box-shadow: 0 8rpx 24rpx rgba(24, 144, 255, 0.35);
+	}
+
+	/* 添加计时器弹窗样式 */
+	.add-timer-modal {
+		padding: 40rpx 32rpx;
+		width: 600rpx;
+	}
+
+	.add-timer-modal .modal-title {
+		font-size: 36rpx;
+		font-weight: 700;
+		color: #333;
+		text-align: center;
+		margin-bottom: 40rpx;
+		background: linear-gradient(135deg, #333 0%, #1890ff 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		background-clip: text;
+	}
+
+	.add-timer-modal .form-group {
+		margin-bottom: 32rpx;
+	}
+
+	.add-timer-modal .form-label {
+		display: block;
+		font-size: 30rpx;
+		font-weight: 600;
+		color: #333;
+		margin-bottom: 16rpx;
+	}
+
+	/* 选择器包装器 */
+	.picker-wrapper {
+		width: 100%;
+		height: 88rpx;
+		background: linear-gradient(135deg, #fafbfc 0%, #f5f5f5 100%);
+		border-radius: 16rpx;
+		padding: 0 24rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		border: 2rpx solid transparent;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04) inset;
+		transition: all 0.3s ease;
+
+		&:active {
+			background: #fff;
+			border-color: #1890ff;
+			box-shadow: 0 0 0 6rpx rgba(24, 144, 255, 0.1), 0 2rpx 8rpx rgba(0, 0, 0, 0.04) inset;
+		}
+
+		.picker-text {
+			font-size: 28rpx;
+			color: #333;
+		}
+	}
+
+	.add-timer-modal .modal-buttons {
+		display: flex;
+		gap: 16rpx;
+		margin-top: 40rpx;
+	}
+
+	.add-timer-modal .modal-btn {
+		flex: 1;
+		height: 88rpx;
+		border-radius: 16rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 30rpx;
+		font-weight: 600;
+		transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+
+		&:active {
+			transform: scale(0.96);
+		}
+	}
+
+	.add-timer-modal .cancel-btn {
+		background: linear-gradient(135deg, #f5f5f5 0%, #e8e8e8 100%);
+		color: #666;
+		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
+	}
+
+	.add-timer-modal .confirm-btn {
+		background: linear-gradient(135deg, #1890ff 0%, #40a9ff 50%, #096dd9 100%);
+		color: #fff;
+		box-shadow: 0 8rpx 24rpx rgba(24, 144, 255, 0.35);
+	}
+
+	.add-timer-modal .form-input {
+		width: 100%;
+		height: 88rpx;
+		background: linear-gradient(135deg, #fafbfc 0%, #f5f5f5 100%);
+		border-radius: 16rpx;
+		padding: 0 24rpx;
+		font-size: 28rpx;
+		color: #333;
+		transition: all 0.3s ease;
+		border: 2rpx solid transparent;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04) inset;
+
+		&:focus {
+			background: #fff;
+			border-color: #1890ff;
+			box-shadow: 0 0 0 6rpx rgba(24, 144, 255, 0.1), 0 2rpx 8rpx rgba(0, 0, 0, 0.04) inset;
+		}
+	}
+
+	/* 组别设置弹窗样式 */
+	.group-setting-modal {
+		padding: 40rpx 32rpx;
+		width: 650rpx;
+		max-height: 80vh;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.group-setting-modal .modal-title {
+		font-size: 36rpx;
+		font-weight: 700;
+		color: #333;
+		text-align: center;
+		margin-bottom: 30rpx;
+		background: linear-gradient(135deg, #333 0%, #1890ff 100%);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		background-clip: text;
+	}
+
+	.group-setting-modal .setting-scroll {
+		flex: 1;
+		max-height: 55vh;
+		overflow-y: auto;
+	}
+
+	.group-setting-modal .form-group {
+		margin-bottom: 28rpx;
+	}
+
+	.group-setting-modal .form-label {
+		display: block;
+		font-size: 30rpx;
+		font-weight: 600;
+		color: #333;
+		margin-bottom: 16rpx;
+	}
+
+	.group-setting-modal .form-input {
+		width: 100%;
+		height: 88rpx;
+		background: linear-gradient(135deg, #fafbfc 0%, #f5f5f5 100%);
+		border-radius: 16rpx;
+		padding: 0 24rpx;
+		font-size: 28rpx;
+		color: #333;
+		transition: all 0.3s ease;
+		border: 2rpx solid transparent;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04) inset;
+
+		&:focus {
+			background: #fff;
+			border-color: #1890ff;
+			box-shadow: 0 0 0 6rpx rgba(24, 144, 255, 0.1), 0 2rpx 8rpx rgba(0, 0, 0, 0.04) inset;
+		}
+	}
+
+	.group-setting-modal .student-selector {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 12rpx;
+	}
+
+	.group-setting-modal .student-option {
+		display: flex;
+		align-items: center;
+		gap: 10rpx;
+		padding: 16rpx 20rpx;
+		background: #f5f5f5;
+		border-radius: 12rpx;
+		border: 2rpx solid transparent;
+		transition: all 0.3s ease;
+
+		&.selected {
+			background: linear-gradient(135deg, #e6f7ff 0%, #bae7ff 100%);
+			border-color: #1890ff;
+		}
+
+		&:active {
+			transform: scale(0.96);
+		}
+	}
+
+	.group-setting-modal .student-checkbox {
+		width: 32rpx;
+		height: 32rpx;
+		border-radius: 6rpx;
+		border: 2rpx solid #d9d9d9;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		transition: all 0.3s ease;
+
+		.group-setting-modal .student-option.selected & {
+			background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
+			border-color: #1890ff;
+		}
+	}
+
+	.group-setting-modal .student-name {
+		font-size: 26rpx;
+		font-weight: 500;
+		color: #333;
+	}
+
+	/* 添加计时器弹窗 - 学生选择器样式（与添加分组保持一致） */
+	.add-timer-modal .student-selector {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 12rpx;
+	}
+
+	.add-timer-modal .student-option {
+		display: flex;
+		align-items: center;
+		gap: 10rpx;
+		padding: 16rpx 20rpx;
+		background: #f5f5f5;
+		border-radius: 12rpx;
+		border: 2rpx solid transparent;
+		transition: all 0.3s ease;
+
+		&.selected {
+			background: linear-gradient(135deg, #e6f7ff 0%, #bae7ff 100%);
+			border-color: #1890ff;
+		}
+
+		&:active {
+			transform: scale(0.96);
+		}
+	}
+
+	.add-timer-modal .student-checkbox {
+		width: 32rpx;
+		height: 32rpx;
+		border-radius: 6rpx;
+		border: 2rpx solid #d9d9d9;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		transition: all 0.3s ease;
+
+		.add-timer-modal .student-option.selected & {
+			background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
+			border-color: #1890ff;
+		}
+	}
+
+	.add-timer-modal .student-name {
+		font-size: 26rpx;
+		font-weight: 500;
+		color: #333;
+	}
+
+	.group-setting-modal .modal-buttons {
+		display: flex;
+		gap: 16rpx;
+		margin-top: 30rpx;
+	}
+
+	.group-setting-modal .modal-btn {
+		flex: 1;
+		height: 88rpx;
+		border-radius: 16rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 30rpx;
+		font-weight: 600;
+		transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+
+		&:active {
+			transform: scale(0.96);
+		}
+	}
+
+	.group-setting-modal .cancel-btn {
+		background: linear-gradient(135deg, #f5f5f5 0%, #e8e8e8 100%);
+		color: #666;
+		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
+	}
+
+	.group-setting-modal .confirm-btn {
+		background: linear-gradient(135deg, #1890ff 0%, #40a9ff 50%, #096dd9 100%);
+		color: #fff;
+		box-shadow: 0 8rpx 24rpx rgba(24, 144, 255, 0.35);
+	}
+
+	/* 编辑模式标签页 */
+	.mode-tabs {
+		display: flex;
+		background-color: #f5f5f5;
+		border-radius: 16rpx;
+		padding: 6rpx;
+		margin-bottom: 32rpx;
+	}
+
+	.mode-tab {
+		flex: 1;
+		height: 72rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 12rpx;
+		transition: all 0.3s ease;
+
+		&.active {
+			background-color: #fff;
+			box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
+		}
+
+		&:active {
+			transform: scale(0.98);
+		}
+	}
+
+	.mode-tab-text {
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #666;
+
+		.mode-tab.active & {
+			color: #1890ff;
+			font-weight: 600;
+		}
+	}
+
+	/* 当前设置信息显示 */
+	.current-settings-info {
+		display: flex;
+		flex-direction: column;
+		gap: 12rpx;
+		margin-bottom: 24rpx;
+		padding: 20rpx;
+		background: linear-gradient(135deg, #f6ffed 0%, #f0f9ff 100%);
+		border-radius: 12rpx;
+		border: 2rpx solid #b7eb8f;
+	}
+
+	.setting-info-item {
+		display: flex;
+		align-items: center;
+		gap: 12rpx;
+	}
+
+	.setting-info-label {
+		font-size: 24rpx;
+		color: #666;
+		min-width: 140rpx;
+	}
+
+	.setting-info-value {
+		font-size: 26rpx;
+		color: #333;
+		font-weight: 600;
+		font-family: 'DIN Alternate', 'Helvetica Neue', monospace;
+	}
+
+	/* 编辑表单 */
+	.edit-form {
+		margin-bottom: 32rpx;
+	}
+
+	.form-input-readonly {
+		width: 100%;
+		height: 88rpx;
+		background-color: #fafafa;
+		border-radius: 16rpx;
+		padding: 0 24rpx;
+		font-size: 28rpx;
+		color: #999;
+		display: flex;
+		align-items: center;
+		border: 2rpx solid #e8e8e8;
+	}
+
+	.form-hint {
+		margin-top: 16rpx;
+		padding: 16rpx 20rpx;
+		background: linear-gradient(135deg, #fff7e6 0%, #fffbe6 100%);
+		border-radius: 12rpx;
+		border-left: 6rpx solid #faad14;
+	}
+
+	.hint-text {
+		font-size: 24rpx;
+		color: #8c8c8c;
+		line-height: 1.6;
+	}
+
+	/* 编辑模式按钮组 */
+	.edit-buttons {
+		display: flex;
+		gap: 16rpx;
+	}
+
+	.edit-btn {
+		flex: 1;
+		height: 88rpx;
+		border-radius: 16rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 30rpx;
+		font-weight: 600;
+		transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+
+		&:active {
+			transform: scale(0.96);
+		}
+	}
+
+	.edit-btn-cancel {
+		background: linear-gradient(135deg, #f5f5f5 0%, #e8e8e8 100%);
+		color: #666;
+		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
+	}
+
+	.edit-btn-save {
+		background: linear-gradient(135deg, #52c41a 0%, #73d13d 50%, #389e0d 100%);
+		color: #fff;
+		box-shadow: 0 8rpx 24rpx rgba(82, 196, 26, 0.35);
+	}
+
+	.edit-btn-text {
+		font-size: 30rpx;
+		font-weight: 600;
+	}
+
+	/* 简洁设置弹窗样式 */
+	.setting-modal {
+		width: 560rpx;
+		padding: 40rpx 32rpx 32rpx;
+	}
+
+	.setting-title {
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+		text-align: center;
+		margin-bottom: 32rpx;
+	}
+
+	.setting-item {
+		display: flex;
+		align-items: center;
+		padding: 24rpx 20rpx;
+		background-color: #f5f5f5;
+		border-radius: 12rpx;
+		margin-bottom: 16rpx;
+		transition: all 0.2s ease;
+		border: 2rpx solid transparent;
+
+		&.active {
+			background-color: #e6f7ff;
+			border-color: #1890ff;
+		}
+
+		&:active {
+			transform: scale(0.98);
+		}
+	}
+
+	.setting-radio {
+		width: 36rpx;
+		height: 36rpx;
+		border-radius: 50%;
+		border: 3rpx solid #d9d9d9;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-right: 16rpx;
+		transition: all 0.2s ease;
+
+		.setting-item.active & {
+			border-color: #1890ff;
+		}
+	}
+
+	.radio-dot {
+		width: 18rpx;
+		height: 18rpx;
+		border-radius: 50%;
+		background-color: #1890ff;
+	}
+
+	.setting-text {
+		font-size: 28rpx;
+		color: #333;
+		font-weight: 500;
+		flex: 1;
+	}
+
+	.interval-input-box {
+		display: flex;
+		align-items: center;
+		background-color: #fff;
+		border-radius: 8rpx;
+		padding: 8rpx 16rpx;
+		margin-left: 16rpx;
+		border: 2rpx solid #e8e8e8;
+	}
+
+	.interval-input {
+		width: 100rpx;
+		font-size: 26rpx;
+		color: #333;
+		text-align: center;
+	}
+
+	.interval-unit {
+		font-size: 24rpx;
+		color: #999;
+		margin-left: 8rpx;
+	}
+
+	.setting-confirm {
+		margin-top: 24rpx;
+		height: 88rpx;
+		background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
+		border-radius: 12rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 30rpx;
+		font-weight: 600;
+		color: #fff;
+		transition: all 0.2s ease;
+
+		&:active {
+			transform: scale(0.98);
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/src/pages/userFunc/projectList.vue b/src/pages/userFunc/projectList.vue
index f3a389a..b55ce14 100644
--- a/src/pages/userFunc/projectList.vue
+++ b/src/pages/userFunc/projectList.vue
@@ -19,7 +19,7 @@
 			</view>
 
 			<view v-else class="projects-list">
-				<view v-for="(project, index) in projects" :key="project.id" class="project-card"
+				<view v-for="(project, index) in projects" :key="project.planId" class="project-card"
 					@click="viewProjectDetail(project)">
 					<view class="project-delete" @click.stop="deleteProject(project, index)">
 						<u-icon name="trash" size="18" color="#ff4d4f"></u-icon>
@@ -35,7 +35,7 @@
 						<view class="project-stats">
 							<view class="stat-badge">
 								<u-icon name="account" size="14" color="#1890ff"></u-icon>
-								<text class="badge-text">{{ project.studentCount }}位学员</text>
+								<text class="badge-text">{{ project.users.length }}位学员</text>
 							</view>
 						</view>
 					</view>
@@ -46,7 +46,7 @@
 						</view>
 						<view class="project-time">
 							<u-icon name="clock" size="14" color="#999"></u-icon>
-							<text class="time-text">{{ project.createTime }}</text>
+							<text class="time-text">{{ Service.formatDate(project.addTime,1) }}</text>
 						</view>
 
 					</view>
@@ -57,69 +57,25 @@
 </template>
 
 <script setup lang="ts">
-	import { onShow, onLoad } from "@dcloudio/uni-app"
+	import { onShow, onLoad, onReachBottom } from "@dcloudio/uni-app"
 	import { Service } from '@/Service/Service'
+	import { PlanService } from '@/Service/swimming/PlanService'
 	import { ref } from "vue"
-	// 定义项目类型
-	interface Project {
-		id : string
-		name : string
-		mode : '计时' | '包干' | '分段'
-		createTime : string
-		studentCount : number
-		recordCount : number
-	}
+
+
+	// 分页相关
+	let page = ref(1)
+	let status = ref('loadmore')
 
 	// 项目列表数据
-	const projects = ref<Project[]>([
-		{
-			id: '001',
-			name: '自由泳50米',
-			mode: '计时',
-			createTime: '2024-01-15 14:30',
-			studentCount: 8,
-			recordCount: 24
-		},
-		{
-			id: '002',
-			name: '蛙泳100米',
-			mode: '包干',
-			createTime: '2024-01-14 10:15',
-			studentCount: 6,
-			recordCount: 18
-		},
-		{
-			id: '003',
-			name: '仰泳200米',
-			mode: '分段',
-			createTime: '2024-01-13 16:45',
-			studentCount: 5,
-			recordCount: 20
-		},
-		{
-			id: '004',
-			name: '蝶泳50米',
-			mode: '计时',
-			createTime: '2024-01-12 09:20',
-			studentCount: 4,
-			recordCount: 12
-		},
-		{
-			id: '005',
-			name: '混合泳100米',
-			mode: '包干',
-			createTime: '2024-01-11 15:00',
-			studentCount: 7,
-			recordCount: 21
-		}
-	])
+	const projects = ref<Array<any>>([])
 
 	onLoad(() => {
-
+		getData()
 	})
 
-	onShow(() => {
-
+	onReachBottom(() => {
+		getList()
 	})
 
 	// 获取模式对应的样式类
@@ -133,15 +89,46 @@
 	}
 
 	// 查看项目详情
-	const viewProjectDetail = (project : Project) => {
+	const viewProjectDetail = (project : any) => {
 		Service.Msg(`查看「${project.name}」详情`)
 	}
 
 	// 删除项目
-	const deleteProject = (project : Project, index : number) => {
+	const deleteProject = (project : any, index : number) => {
 		Service.Confirm(`确定要删除「${project.name}」吗？`, () => {
-			projects.value.splice(index, 1)
-			Service.Msg('删除成功')
+			PlanService.DeletePlan(project.planId).then(res => {
+				if (res.code == 0) {
+					getData()
+					Service.Msg('删除成功')
+				} else {
+					Service.Msg(res.msg)
+				}
+			})
+		})
+	}
+
+	// 获取项目列表数据
+	const getData = () => {
+		projects.value = []
+		page.value = 1
+		status.value = 'loadmore'
+		getList()
+	}
+
+	// 获取项目列表
+	const getList = () => {
+		if (status.value == 'loading' || status.value == 'nomore') {
+			return
+		}
+		status.value = 'loading'
+		PlanService.GetPlanList( '', page.value.toString()).then(res => {
+			if (res.code == 0) {
+				projects.value = [...projects.value, ...res.data]
+				status.value = res.data.length == 10 ? 'loadmore' : 'nomore'
+				page.value++
+			} else {
+				Service.Msg(res.msg)
+			}
 		})
 	}
 
diff --git a/src/pages/userFunc/segmentation.vue b/src/pages/userFunc/segmentation.vue
index 9c436be..4bb5b19 100644
--- a/src/pages/userFunc/segmentation.vue
+++ b/src/pages/userFunc/segmentation.vue
@@ -1,20 +1,24 @@
 <template>
 	<view class="segmentation-container">
+		<!-- 配置区域 -->
+		<view class="config-section">
+			<view class="config-header">
+				<text class="config-title">分段设置</text>
+
+				<u-icon @click="Service.GoPage('/pages/userFunc/setCourse?id='+planId+'&type=2')" name="setting" size="24"
+					color="#1890ff"></u-icon>
+			</view>
+
+
+			<view class="config-info">
+				<text class="info-text">总距离: {{ totalDistance }}米 ({{ segmentCount }}段 × {{ segmentDistance }}米)</text>
+			</view>
+		</view>
+
 		<!-- 总计时器区域 -->
 		<view class="total-time-section">
-			<view class="timer-circle">
-				<view class="circle-content">
-					<view class="timer-sound">
-						<text class="sound-text">计时器</text>
-					</view>
-					<view class="timer-time">{{ formatTime(currentTime) }}</view>
-					<view class="timer-duration">{{ formatDuration(currentTime) }}</view>
-				</view>
-				<view class="timer-controls">
-					<u-icon name="reload" size="32" color="#22a6f2" @click="resetAll"></u-icon>
-					<u-icon :name="isRunning ? 'pause-circle' : 'play-circle'" size="32" color="#22a6f2"
-						@click="toggleTimer"></u-icon>
-				</view>
+			<view class="timer-bar">
+				<view class="timer-time">{{ formatTime(currentTime) }}</view>
 			</view>
 		</view>
 
@@ -26,96 +30,180 @@
 			</view>
 
 			<view class="students-list">
-				<view v-for="(student, index) in students" :key="student.id" class="student-item">
+				<view v-for="(student, index) in students" :key="student.id" class="student-item"
+					:class="{ 'not-started': !student.hasStarted }">
 					<view class="student-header">
-						<view class="student-number">{{ student.number }}</view>
+						<view class="student-number" :class="{ 'started': student.hasStarted }">{{ student.number }}
+						</view>
 						<view class="student-info">
 							<text class="student-name">{{ student.name }}</text>
-							<text class="student-lane">{{ student.lane }}</text>
+							<!-- <view class="start-status" v-if="startMode === 1 && !student.hasStarted">
+								<text class="status-text">等待</text>
+							</view> -->
+							<text class="total-time-text"
+								v-if="student.segments.length > 0">{{ formatSimpleTime(getLastSegmentTime(student)) }}</text>
+							<view class="record-badge"
+								:class="{ 'completed': student.segments.length >= Number(segmentCount) }">
+								<text class="badge-text">{{ student.segments.length }}/{{ segmentCount }}</text>
+							</view>
 						</view>
 						<view class="student-buttons">
-							<button class="record-btn" @click="recordStudentSegment(student)">
-								<u-icon name="checkmark" size="18" color="#fff"></u-icon>
+							<button class="record-btn" :disabled="!student.hasStarted"
+								@click="recordStudentSegment(student)">
+
 								<text class="btn-text">记录</text>
 							</button>
+							<button class="view-btn" @click="showStudentRecords(student)">
+
+								<text class="btn-text">详情</text>
+							</button>
 							<button class="reset-btn" @click="resetStudent(student)">
-								<u-icon name="reload" size="18" color="#fff"></u-icon>
+
 								<text class="btn-text">重置</text>
 							</button>
 						</view>
 					</view>
-
-					<!-- 分段时间块 -->
-					<view class="segments-list">
-						<view v-for="(segment, segIndex) in student.segments" :key="segIndex" class="segment-item">
-							<text class="segment-label">第{{ segIndex + 1 }}段</text>
-							<text class="segment-time">{{ segment.time ? formatTime(segment.time) : '--:--.--' }}</text>
-						</view>
-						<view  v-if="student.segments.length<4"  class="segment-item empty">
-							<text class="segment-label">第{{ student.segments.length + 1 }}段</text>
-							<text class="segment-time">--:--.--</text>
-						</view>
-					</view>
 				</view>
 			</view>
 		</view>
 
-		<!-- 保存按钮 -->
-		<view class="save-btn-wrapper">
-			<button class="save-btn" @click="saveData">
-				<text class="btn-text">保存</text>
-			</button>
+		<!-- 底部操作栏 -->
+		<view class="bottom-actions">
+			<view class="action-btn reset-action" @click="resetAll">
+				<u-icon name="reload" size="24" color="#fff"></u-icon>
+				<text class="action-text">重置</text>
+			</view>
+			<view class="action-btn timer-action" :class="{ 'running': isRunning }" @click="toggleTimer">
+				<u-icon :name="isRunning ? 'pause-circle' : 'play-circle'" size="28" color="#fff"></u-icon>
+				<text class="action-text">{{ isRunning ? '暂停' : '开始' }}</text>
+			</view>
+			<view class="action-btn save-action" @click="saveData">
+				<u-icon name="checkmark" size="24" color="#fff"></u-icon>
+				<text class="action-text">保存</text>
+			</view>
 		</view>
+
+		<!-- 记录弹窗 -->
+		<u-popup :show="showRecordPopup" mode="bottom" :round="20" @close="closeRecordPopup">
+			<view class="record-popup">
+				<view class="popup-header">
+					<text class="popup-title">{{ currentStudent?.name }} - 分段记录</text>
+					<view class="close-btn" @click="closeRecordPopup">
+						<u-icon name="close" size="24" color="#999"></u-icon>
+					</view>
+				</view>
+
+				<view class="popup-summary">
+					<view class="summary-item">
+						<text class="summary-label">总距离</text>
+						<text class="summary-value">{{ totalDistance }}米</text>
+					</view>
+					<view class="summary-item">
+						<text class="summary-label">已记录</text>
+						<text
+							class="summary-value">{{ currentStudent?.segments?.length || 0 }}/{{ segmentCount }}段</text>
+					</view>
+				</view>
+
+				<view class="record-list"
+					v-if="currentStudent && currentStudent.segments && currentStudent.segments.length > 0">
+					<view class="record-header">
+						<text class="record-cell header-cell">分段</text>
+						<text class="record-cell header-cell">距离</text>
+						<text class="record-cell header-cell">累计时间</text>
+						<text class="record-cell header-cell">分段用时</text>
+					</view>
+					<view v-for="(segment, index) in currentStudent.segments" :key="index" class="record-item">
+						<text class="record-cell">第{{ index + 1 }}段</text>
+						<text class="record-cell">{{ segmentDistance }}米</text>
+						<text class="record-cell time-cell">{{ formatTime(segment.time) }}</text>
+						<text class="record-cell time-cell">{{ formatTimeDiff(index, segment.time) }}</text>
+					</view>
+				</view>
+
+				<view class="empty-record" v-else>
+					<u-icon name="info-circle" size="48" color="#ccc"></u-icon>
+					<text class="empty-text">暂无记录数据</text>
+				</view>
+
+				<view class="popup-footer">
+					<button class="popup-btn close-popup" @click="closeRecordPopup">关闭</button>
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
 <script setup lang="ts">
-	import { ref, onUnmounted } from 'vue'
+	import { ref, onUnmounted, computed } from 'vue'
 	import { Service } from '@/Service/Service'
+	import { onLoad, onShow } from '@dcloudio/uni-app'
+	import { PlanService } from '@/Service/swimming/PlanService'
 
+	// 分段配置
+	const segmentDistance = ref(50)
+	const segmentCount = ref(4)
 
-	
+	// 出发模式: 0-一起出发, 1-间隔出发
+	const startMode = ref(0)
+	// 间隔时间(秒)
+	const intervalTime = ref(10)
 
-	// 最大分段数
-	const maxSegments = 4
+	// 计算总距离
+	const totalDistance = computed(() => {
+		return Number(segmentDistance.value) * Number(segmentCount.value)
+	})
 
 	// 学生列表
-	const students = ref<Array<any>>([
-		{
-			id: '1',
-			number: '01',
-			name: '张三',
-			lane: '第一泳道',
-			segments: []
-		},
-		{
-			id: '2',
-			number: '02',
-			name: '李四',
-			lane: '第二泳道',
-			segments: []
-		},
-		{
-			id: '3',
-			number: '03',
-			name: '王五',
-			lane: '第三泳道',
-			segments: []
-		},
-		{
-			id: '4',
-			number: '04',
-			name: '赵六',
-			lane: '第四泳道',
-			segments: []
-		}
-	])
+	const students = ref<Array<any>>([])
+
+	// 弹窗状态
+	const showRecordPopup = ref(false)
+	const currentStudent = ref<any>(null)
 
 	// 计时器状态
 	const isRunning = ref(false)
 	const currentTime = ref(0)
 	let timerInterval : number | null = null
 	let startTime : number = 0
+	let intervalStartTimer : number | null = null
+
+	let planId = ref('')
+	onLoad((data : any) => {
+		planId.value = data.id
+		
+	})
+	
+	onShow(()=>{
+		getPlanInfo()
+	})
+
+	// 获取计划详情
+	const getPlanInfo = () => {
+		PlanService.GetPlanInfo(planId.value).then(res => {
+			if (res.code == 0) {
+				// planName.value = res.data.plan.name
+				segmentDistance.value=res.data.plan.subsectionDistance/res.data.plan.subsectionInt
+				segmentCount.value=res.data.plan.subsectionInt
+				// 将计划数据转换为选手数据
+				// athletes.value = res.data.plan.users.
+				students.value=res.data.plan.users.map((item:any,index:any)=>{
+					return {
+						id: item.studentId,
+						number: index+1,
+						name: item.name,
+						segments: [],
+						hasStarted: res.data.plan.departType == '间隔出发'?false:true,
+						startTime: 0
+					}
+				})
+				startMode.value = res.data.plan.departType == '间隔出发' ? 1 : 0
+				intervalTime.value = res.data.plan.interval
+			} else {
+				Service.Msg(res.msg)
+			}
+		})
+	}
 
 	// 格式化时间显示
 	const formatTime = (seconds : number) : string => {
@@ -142,6 +230,34 @@
 		return result
 	}
 
+	// 格式化时间差
+	const formatTimeDiff = (index : number, currentTime : number) : string => {
+		if (index === 0) {
+			return '00:00:00'
+		}
+		if (!currentStudent.value || !currentStudent.value.segments[index - 1]) {
+			return '00:00:00'
+		}
+		const prevTime = currentStudent.value.segments[index - 1].time
+		const diff = currentTime - prevTime
+		return formatTime(diff)
+	}
+
+	// 获取学生最后一次记录的累计时间
+	const getLastSegmentTime = (student : any) : number => {
+		if (!student.segments || student.segments.length === 0) {
+			return 0
+		}
+		return student.segments[student.segments.length - 1].time
+	}
+
+	// 简化时间格式化（分:秒）
+	const formatSimpleTime = (seconds : number) : string => {
+		const mins = Math.floor(seconds / 60)
+		const secs = Math.floor(seconds % 60)
+		return `${mins.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}`
+	}
+
 	// 开始计时
 	const startTimer = () => {
 		if (isRunning.value) return
@@ -153,6 +269,32 @@
 			const elapsed = (Date.now() - startTime) / 1000
 			currentTime.value = elapsed
 		}, 10)
+
+		// 间隔出发模式
+		if (startMode.value === 1) {
+			// 第一个学生立即出发
+			if (students.value.length > 0) {
+				students.value[0].hasStarted = true
+				students.value[0].startTime = 0
+			}
+
+			// 设置间隔出发定时器
+			const interval = intervalTime.value * 1000
+			let startedCount = 1
+
+			intervalStartTimer = setInterval(() => {
+				if (startedCount < students.value.length) {
+					const student = students.value[startedCount]
+					student.hasStarted = true
+					student.startTime = (Date.now() - startTime) / 1000
+					startedCount++
+					Service.Msg(`${student.name} 已出发`)
+				} else {
+					clearInterval(intervalStartTimer as number)
+					intervalStartTimer = null
+				}
+			}, interval)
+		}
 	}
 
 	// 停止计时
@@ -164,6 +306,10 @@
 			clearInterval(timerInterval)
 			timerInterval = null
 		}
+		if (intervalStartTimer) {
+			clearInterval(intervalStartTimer)
+			intervalStartTimer = null
+		}
 	}
 
 	// 切换计时器状态
@@ -176,27 +322,42 @@
 	}
 
 	// 记录学生分段
-	const recordStudentSegment = (student : Student) => {
+	const recordStudentSegment = (student : any) => {
+		console.log(22222);
 		if (!isRunning.value) {
 			Service.Msg('请先开始计时')
 			return
 		}
 
-		if (student.segments.length >= maxSegments) {
-			Service.Msg('已达到最大分段数')
+		if (!student.hasStarted) {
+			Service.Msg('该学生尚未出发')
 			return
 		}
 
+		const maxSeg = Number(segmentCount.value)
+		if (student.segments.length >= maxSeg) {
+			Service.Msg(`已达到最大分段数(${maxSeg}段)`)
+			return
+		}
+
+		let recordTime = currentTime.value
+		// 间隔出发模式下，使用学生自己的开始时间
+		if (startMode.value === 1) {
+			recordTime = currentTime.value - student.startTime
+		}
+
 		student.segments.push({
-			time: currentTime.value
+			time: recordTime
 		})
 
 		Service.Msg(`${student.name} 第${student.segments.length}段已记录`)
 	}
 
 	// 重置学生
-	const resetStudent = (student : Student) => {
+	const resetStudent = (student : any) => {
 		student.segments = []
+		student.hasStarted = false
+		student.startTime = 0
 		Service.Msg(`${student.name} 已重置`)
 	}
 
@@ -206,6 +367,8 @@
 		currentTime.value = 0
 		students.value.forEach(student => {
 			student.segments = []
+			student.hasStarted = startMode.value == 1?false:true,
+			student.startTime = 0
 		})
 		Service.Msg('已全部重置')
 	}
@@ -228,11 +391,26 @@
 		}, 1000)
 	}
 
+	// 显示学生记录弹窗
+	const showStudentRecords = (student : any) => {
+		currentStudent.value = student
+		showRecordPopup.value = true
+	}
+
+	// 关闭记录弹窗
+	const closeRecordPopup = () => {
+		showRecordPopup.value = false
+		currentStudent.value = null
+	}
+
 	// 页面卸载时清理计时器
 	onUnmounted(() => {
 		if (timerInterval) {
 			clearInterval(timerInterval)
 		}
+		if (intervalStartTimer) {
+			clearInterval(intervalStartTimer)
+		}
 	})
 </script>
 
@@ -241,83 +419,65 @@
 		min-height: 100vh;
 		background-color: #f6f6f6;
 		padding: 20rpx 20rpx;
-		padding-bottom: 200rpx;
+		padding-bottom: 180rpx;
+	}
+
+	/* 配置区域 */
+	.config-section {
+		background-color: #fff;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		margin-bottom: 30rpx;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+
+		.config-header {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 24rpx;
+
+			.config-title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333;
+			}
+		}
+
+
+
+		.config-info {
+			background-color: #e6f7ff;
+			border-radius: 8rpx;
+			padding: 16rpx 20rpx;
+
+			.info-text {
+				font-size: 26rpx;
+				color: #1890ff;
+				font-weight: 500;
+			}
+		}
 	}
 
 	/* 总计时器区域 */
 	.total-time-section {
 		margin-top: 20rpx;
-		margin-bottom: 40rpx;
-		display: flex;
-		justify-content: center;
+		margin-bottom: 30rpx;
 	}
 
-	.timer-circle {
-		width: 350rpx;
-		height: 360rpx;
-		border-radius: 20rpx;
+	.timer-bar {
 		background-color: #fff;
+		border-radius: 20rpx;
+		padding: 30rpx;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
 		display: flex;
-		padding: 20rpx;
-		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		position: relative;
-		box-shadow: 0 4rpx 16rpx rgba(250, 140, 22, 0.3);
-
-		.circle-content {
-			// background-color: #faad14;
-			padding: 30rpx;
-			border-radius: 50%;
-			border: 16rpx solid #faad14;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			gap: 16rpx;
-		}
-
-		.timer-sound {
-			display: flex;
-			align-items: center;
-			gap: 8rpx;
-			padding: 8rpx 16rpx;
-			background-color: rgba(255, 255, 255, 0.2);
-			border-radius: 20rpx;
-
-			.sound-text {
-				font-size: 24rpx;
-				font-weight: 500;
-			}
-		}
 
 		.timer-time {
-			font-size: 48rpx;
+			font-size: 80rpx;
 			font-weight: bold;
-		}
-
-		.timer-duration {
-			font-size: 24rpx;
-			opacity: 0.9;
-			background-color: #f6f6f6;
-			padding: 4rpx 12rpx;
-			border-radius: 4rpx;
-		}
-
-		.timer-controls {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			width: 280rpx;
-
-			u-icon {
-				cursor: pointer;
-				transition: all 0.2s ease;
-
-				&:hover {
-					transform: scale(1.1);
-				}
-			}
+			color: #ff4d4f;
+			font-family: 'DIN Alternate', monospace;
 		}
 	}
 
@@ -354,10 +514,13 @@
 				margin-bottom: 20rpx;
 				box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
 
+				&.not-started {
+					opacity: 0.6;
+				}
+
 				.student-header {
 					display: flex;
 					align-items: center;
-					margin-bottom: 24rpx;
 
 					.student-number {
 						width: 56rpx;
@@ -371,22 +534,62 @@
 						align-items: center;
 						justify-content: center;
 						margin-right: 20rpx;
+
+						&.started {
+							background-color: #52c41a;
+							color: #fff;
+						}
 					}
 
 					.student-info {
 						flex: 1;
+						display: flex;
+						align-items: center;
+						gap: 12rpx;
 
 						.student-name {
 							font-size: 30rpx;
 							font-weight: 500;
 							color: #333;
-							margin-bottom: 4rpx;
-							display: block;
 						}
 
-						.student-lane {
+						.start-status {
+							background-color: #faad14;
+							border-radius: 8rpx;
+							padding: 4rpx 12rpx;
+
+							.status-text {
+								font-size: 22rpx;
+								color: #fff;
+								font-weight: 500;
+							}
+						}
+
+						.total-time-text {
 							font-size: 24rpx;
 							color: #999;
+							font-family: 'DIN Alternate', monospace;
+							font-weight: 500;
+						}
+
+						.record-badge {
+							background-color: #f0f0f0;
+							border-radius: 12rpx;
+							padding: 4rpx 12rpx;
+
+							.badge-text {
+								font-size: 22rpx;
+								color: #999;
+								font-weight: 500;
+							}
+
+							&.completed {
+								background-color: #52c41a;
+
+								.badge-text {
+									color: #fff;
+								}
+							}
 						}
 					}
 
@@ -395,6 +598,7 @@
 						gap: 12rpx;
 
 						.record-btn,
+						.view-btn,
 						.reset-btn {
 							height: 56rpx;
 							padding: 0 20rpx;
@@ -415,6 +619,15 @@
 
 						.record-btn {
 							background-color: #52c41a;
+
+							&:disabled {
+								background-color: #d9d9d9;
+								opacity: 0.6;
+							}
+						}
+
+						.view-btn {
+							background-color: #1890ff;
 						}
 
 						.reset-btn {
@@ -422,91 +635,201 @@
 						}
 					}
 				}
+			}
+		}
+	}
 
-				/* 分段时间列表 */
-				.segments-list {
-					display: flex;
-					flex-wrap: wrap;
-					gap: 16rpx;
+	/* 记录弹窗 */
+	.record-popup {
+		background-color: #fff;
+		border-radius: 20rpx 20rpx 0 0;
+		max-height: 80vh;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
 
-					.segment-item {
-						flex: 1;
-						min-width: 140rpx;
-						background-color: #f5f5f5;
-						border-radius: 12rpx;
-						padding: 20rpx 16rpx;
-						text-align: center;
+		.popup-header {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 30rpx;
+			border-bottom: 1rpx solid #f0f0f0;
 
-						&.empty {
-							opacity: 0.5;
-						}
+			.popup-title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333;
+			}
 
-						.segment-label {
-							font-size: 22rpx;
-							color: #666;
-							display: block;
-							margin-bottom: 8rpx;
-						}
+			.close-btn {
+				padding: 10rpx;
+				cursor: pointer;
+			}
+		}
 
-						.segment-time {
-							font-size: 26rpx;
-							font-weight: 600;
-							color: #333;
-							font-family: 'DIN Alternate', monospace;
-						}
+		.popup-summary {
+			display: flex;
+			gap: 20rpx;
+			padding: 20rpx 30rpx;
+			background-color: #f6f6f6;
+
+			.summary-item {
+				flex: 1;
+				background-color: #fff;
+				border-radius: 12rpx;
+				padding: 20rpx;
+				text-align: center;
+
+				.summary-label {
+					font-size: 24rpx;
+					color: #999;
+					display: block;
+					margin-bottom: 8rpx;
+				}
+
+				.summary-value {
+					font-size: 32rpx;
+					font-weight: 600;
+					color: #333;
+				}
+			}
+		}
+
+		.record-list {
+			flex: 1;
+			overflow-y: auto;
+			padding: 0 30rpx 20rpx;
+
+			.record-header {
+				display: flex;
+				background-color: #f5f5f5;
+				border-radius: 8rpx;
+				margin-bottom: 16rpx;
+				margin-top: 20rpx;
+
+				.record-cell {
+					flex: 1;
+					text-align: center;
+					font-size: 26rpx;
+					padding: 16rpx 8rpx;
+					color: #666;
+				}
+
+				.header-cell {
+					font-weight: 600;
+					color: #333;
+				}
+			}
+
+			.record-item {
+				display: flex;
+				background-color: #fff;
+				border-radius: 8rpx;
+				margin-bottom: 12rpx;
+				border: 1rpx solid #f0f0f0;
+
+				.record-cell {
+					flex: 1;
+					text-align: center;
+					font-size: 26rpx;
+					padding: 20rpx 8rpx;
+					color: #333;
+
+					&.time-cell {
+						font-family: 'DIN Alternate', monospace;
+						font-weight: 600;
+						color: #1890ff;
 					}
 				}
 			}
 		}
-	}
 
-	/* 保存按钮 */
-	.save-btn-wrapper {
-		position: fixed;
-		bottom: 40rpx;
-		right: 30rpx;
-		z-index: 100;
-
-		.save-btn {
-			width: 140rpx;
-			height: 140rpx;
-			background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
-			border-radius: 50%;
-			border: none;
+		.empty-record {
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			justify-content: center;
-			gap: 8rpx;
-			box-shadow: 0 8rpx 24rpx rgba(24, 144, 255, 0.5),
-				0 4rpx 12rpx rgba(24, 144, 255, 0.3);
-			transition: all 0.3s ease;
-			position: relative;
-			overflow: hidden;
+			padding: 80rpx 0;
 
-			&::before {
-				content: '';
-				position: absolute;
-				top: 0;
-				left: 0;
-				right: 0;
-				bottom: 0;
-				background: linear-gradient(135deg, rgba(255, 255, 255, 0.2) 0%, transparent 50%);
-				pointer-events: none;
+			.empty-text {
+				font-size: 28rpx;
+				color: #999;
+				margin-top: 20rpx;
+			}
+		}
+
+		.popup-footer {
+			padding: 20rpx 30rpx 40rpx;
+			border-top: 1rpx solid #f0f0f0;
+
+			.popup-btn {
+				height: 80rpx;
+				border-radius: 12rpx;
+				border: none;
+				font-size: 30rpx;
+				font-weight: 500;
+				display: flex;
+				align-items: center;
+				justify-content: center;
 			}
 
-			&:active {
-				transform: scale(0.95);
-				box-shadow: 0 4rpx 12rpx rgba(24, 144, 255, 0.4),
-					0 2rpx 6rpx rgba(24, 144, 255, 0.2);
-			}
-
-			.btn-text {
-				font-size: 26rpx;
-				color: #fff;
-				font-weight: 600;
-				letter-spacing: 1rpx;
+			.close-popup {
+				background-color: #f5f5f5;
+				color: #666;
 			}
 		}
 	}
+
+	/* 底部操作栏 */
+	.bottom-actions {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background-color: #fff;
+		padding: 20rpx 30rpx 40rpx;
+		display: flex;
+		gap: 20rpx;
+		box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.08);
+		z-index: 100;
+
+		.action-btn {
+			flex: 1;
+			height: 80rpx;
+			border-radius: 12rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			gap: 10rpx;
+			cursor: pointer;
+			transition: all 0.2s ease;
+
+			.action-text {
+				font-size: 28rpx;
+				color: #fff;
+				font-weight: 500;
+			}
+
+			&:active {
+				transform: scale(0.98);
+			}
+		}
+
+		.reset-action {
+			background-color: #faad14;
+		}
+
+		.timer-action {
+			background-color: #52c41a;
+			flex: 1.5;
+
+			&.running {
+				background-color: #ff4d4f;
+			}
+		}
+
+		.save-action {
+			background-color: #1890ff;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/src/pages/userFunc/set.vue b/src/pages/userFunc/set.vue
index 505a68c..6796005 100644
--- a/src/pages/userFunc/set.vue
+++ b/src/pages/userFunc/set.vue
@@ -8,7 +8,7 @@
 			<view class="avatar-section">
 				<view class="avatar-wrapper">
 					<view class="avatar-circle">
-						<u-icon name="account" size="64" color="#fff"></u-icon>
+						<img :src="Service.GetMateUrlByImg(userInfo.headImg)" alt="" style="width: 100%; height: 100%;" />
 					</view>
 					<view class="avatar-edit" @click="changeAvatar">
 						<u-icon name="camera" size="20" color="#fff"></u-icon>
@@ -67,24 +67,32 @@
 	import {  onShow, onLoad } from "@dcloudio/uni-app"
 	import { Service } from '@/Service/Service'
 	import { ref } from 'vue'
-	// 用户信息
-	interface UserInfo {
-		name: string
-		phone: string
-	}
-
-	const userInfo = ref<UserInfo>({
-		name: '游泳爱好者',
-		phone: '13888888888'
+	import { userService } from '@/Service/swimming/userService'
+	
+	const userInfo = ref<any>({
+		headImg:'',
+		name: '',
+		phone: ''
 	})
 
 	onLoad(() => {
-		// 可以在这里从本地存储加载用户信息
+		loadUserInfo()
 	})
 
 	onShow(() => {
 
 	})
+	
+	
+	const loadUserInfo = () => {
+		userService.GetUserInfo().then((content) => {
+			if (content.code == 0) {
+				userInfo.value=content.data.userInfo
+			} else {
+				Service.Msg(content.msg)
+			}
+		})
+	}
 
 	// 更换头像
 	const changeAvatar = () => {
@@ -93,12 +101,15 @@
 			sizeType: ['compressed'],
 			sourceType: ['album', 'camera'],
 			success: (res) => {
-				Service.Msg('头像更换成功', 'success')
+				let path = res.tempFiles[0].path
+				Service.uploadH5(path, 'Avatar', data => {
+					userInfo.value.headImg = data
+				})
 			}
 		})
 	}
 
-	// 保存用户信息
+// 保存用户信息
 	const saveUserInfo = () => {
 		if (!userInfo.value.name.trim()) {
 			Service.Msg('请输入用户姓名')
@@ -117,13 +128,17 @@
 			return
 		}
 
-		// 模拟保存成功
-		Service.Msg('保存成功', 'success')
-
-		// 保存成功后可以返回上一页
-		setTimeout(() => {
-			Service.GoPageBack()
-		}, 1000)
+		// 调用UpdateUserInfo接口
+		userService.UpdateUserInfo(userInfo.value.name, userInfo.value.phone, userInfo.value.headImg).then((content) => {
+			if (content.code == 0) {
+				Service.Msg('保存成功', 'success')
+				setTimeout(() => {
+					Service.GoPageBack()
+				}, 1000)
+			} else {
+				Service.Msg(content.msg)
+			}
+		})
 	}
 </script>
 
@@ -198,6 +213,7 @@
 				align-items: center;
 				justify-content: center;
 				box-shadow: 0 8rpx 24rpx rgba(24, 144, 255, 0.3);
+				overflow: hidden;
 			}
 
 			.avatar-edit {
diff --git a/src/pages/userFunc/setCourse.vue b/src/pages/userFunc/setCourse.vue
index f1c62c6..01b8375 100644
--- a/src/pages/userFunc/setCourse.vue
+++ b/src/pages/userFunc/setCourse.vue
@@ -41,38 +41,14 @@
 				</view>
 			</view>
 
-			<!-- 泳道设置 -->
-			<view class="form-card">
-				<view class="form-title">泳道设置</view>
-				<view class="radio-group">
-					<view class="radio-item" :class="{ active: courseData.laneType === 'single' }"
-						@click="selectSingleLane">
-						<view class="radio-icon">
-							<view v-if="courseData.laneType === 'single'" class="radio-inner"></view>
-						</view>
-						<text>一个泳道</text>
-					</view>
-					<view class="radio-item" :class="{ active: courseData.laneType === 'multi' }"
-						@click="selectMultiLane">
-						<view class="radio-icon">
-							<view v-if="courseData.laneType === 'multi'" class="radio-inner"></view>
-						</view>
-						<text>多个泳道</text>
-					</view>
-				</view>
-				<view v-if="courseData.laneType === 'multi'" class="multi-lane-options">
-					<view class="lane-input-wrapper">
-						<text class="lane-label">泳道个数</text>
-						<view class="lane-input">
-							<input class="number-input" v-model="courseData.laneCount" type="number"
-								placeholder="请输入泳道个数" />
-							<text class="unit-text">个</text>
-						</view>
-					</view>
+			<!-- 组别设置 -->
+			<view v-if="type==1" class="form-card">
+				<view class="form-title">组别设置</view>
+				<view class="group-options">
 					<view class="person-input-wrapper">
-						<text class="person-label">一个泳道人数</text>
+						<text class="person-label">每组人数</text>
 						<view class="person-input">
-							<input class="number-input" v-model="courseData.lanePersonCount" type="number"
+							<input class="number-input" v-model="courseData.groupPersonCount" type="number"
 								placeholder="请输入人数" />
 							<text class="unit-text">人</text>
 						</view>
@@ -80,11 +56,34 @@
 				</view>
 			</view>
 
+			<!-- 分段设置 -->
+			<view v-if="type==2" class="form-card">
+				<view class="form-title">分段设置</view>
+				<view class="segment-options">
+					<view class="segment-input-wrapper">
+						<text class="segment-label">分段距离</text>
+						<view class="segment-input">
+							<input class="number-input" v-model="courseData.segmentDistance" type="number"
+								placeholder="请输入距离" />
+							<text class="unit-text">米</text>
+						</view>
+					</view>
+					<view class="segment-count-wrapper">
+						<text class="segment-count-label">分段数</text>
+						<view class="segment-count-input">
+							<input class="number-input" v-model="courseData.segmentCount" type="number"
+								placeholder="请输入段数" />
+							<text class="unit-text">段</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
 			<!-- 学生列表 -->
 			<view class="form-card">
 				<view class="student-header">
 					<view class="header-left">
-						<text class="form-title">选择学生</text>
+						<text class="form-title" style="margin-bottom: 0;">选择学生</text>
 						<text class="student-count">已选({{ selectedStudentIds.length }}/{{ allStudents.length }})</text>
 					</view>
 					<view class="header-actions">
@@ -111,11 +110,12 @@
 				</view>
 
 				<view v-else class="student-list">
-					<view v-for="student in allStudents" :key="student.id" class="student-item"
-						:class="{ checked: selectedStudentIds.includes(student.id) }"
-						@click="toggleStudentSelect(student.id)">
-						<view class="student-checkbox" :class="{ checked: selectedStudentIds.includes(student.id) }">
-							<u-icon v-if="selectedStudentIds.includes(student.id)" name="checkmark" size="14"
+					<view v-for="student in allStudents" :key="student.studentId" class="student-item"
+						:class="{ checked: selectedStudentIds.includes(student.studentId) }"
+						@click="toggleStudentSelect(student.studentId)">
+						<view class="student-checkbox"
+							:class="{ checked: selectedStudentIds.includes(student.studentId) }">
+							<u-icon v-if="selectedStudentIds.includes(student.studentId)" name="checkmark" size="14"
 								color="#fff"></u-icon>
 						</view>
 						<view class="student-avatar">
@@ -123,12 +123,6 @@
 						</view>
 						<view class="student-info">
 							<view class="student-name">{{ student.name }}</view>
-							<view class="student-meta">
-								<text class="gender-badge" :class="student.gender === '男' ? 'male' : 'female'">
-									{{ student.gender }}
-								</text>
-								<text class="age-text">{{ student.age }}岁</text>
-							</view>
 						</view>
 					</view>
 				</view>
@@ -139,10 +133,10 @@
 						<text class="preview-title">已选学生</text>
 					</view>
 					<view class="preview-list">
-						<view v-for="(student, index) in selectedStudents" :key="student.id" class="preview-item">
+						<view v-for="(student, index) in selectedStudents" :key="student.studentId" class="preview-item">
 							<text class="preview-index">{{ index + 1 }}</text>
 							<text class="preview-name">{{ student.name }}</text>
-							<view class="preview-remove" @click.stop="removeSelectedStudent(student.id)">
+							<view class="preview-remove" @click.stop="removeSelectedStudent(student.studentId)">
 								<u-icon name="close" size="14" color="#ff4d4f"></u-icon>
 							</view>
 						</view>
@@ -150,7 +144,9 @@
 				</view>
 			</view>
 		</view>
+		<view class="" style="width: 100%; height: 80rpx;">
 
+		</view>
 		<!-- 底部按钮区域 -->
 		<view class="bottom-actions">
 			<view class="action-buttons">
@@ -164,29 +160,24 @@
 	import { ref, computed } from 'vue'
 	import { Service } from '@/Service/Service'
 	import { onLoad } from '@dcloudio/uni-app'
+	import { PlanService } from '@/Service/swimming/PlanService'
+	import { studentService } from '@/Service/swimming/studentService'
+
+
 
-	// 学生类型
-	interface Student {
-		id : string
-		name : string
-		gender : string
-		age : string
-		school ?: string
-		address ?: string
-	}
 
 	// 课程数据
 	const courseData = ref({
 		projectName: '',
 		startType: 'together', // together | interval
 		intervalSeconds: '',
-		laneType: 'single', // single | multi
-		laneCount: '',
-		lanePersonCount: ''
+		groupPersonCount: '',
+		segmentDistance: '',
+		segmentCount: ''
 	})
 
 	// 所有学生列表
-	const allStudents = ref<Student[]>([])
+	const allStudents = ref<Array<any>>([])
 
 	// 已选学生ID列表
 	const selectedStudentIds = ref<string[]>([])
@@ -194,60 +185,62 @@
 	// 加载状态
 	const loading = ref(false)
 
-	onLoad(() => {
+	let type = ref('')
+	let planId=ref('')
+	onLoad((data : any) => {
+		type.value = data.type
+		if(data.id){
+			planId.value=data.id
+			getPlanInfo()
+		}
 		getStudentList()
 	})
-
+	
+	
+	// 获取计划详情
+	const getPlanInfo = () => {
+		PlanService.GetPlanInfo(planId.value).then(res => {
+			if (res.code == 0) {
+				selectedStudentIds.value=res.data.plan.users.map((item:any)=>{
+					return item.studentId
+				})
+				courseData.value.groupPersonCount=res.data.plan.groupInt
+				courseData.value.segmentDistance=res.data.plan.subsectionDistance
+				courseData.value.segmentCount=res.data.plan.subsectionInt
+				courseData.value.projectName=res.data.plan.name
+				courseData.value.startType = res.data.plan.departType == '间隔出发' ? 'interval' : 'together'
+				courseData.value.intervalSeconds = res.data.plan.interval
+			} else {
+				Service.Msg(res.msg)
+			}
+		})
+	}
+	
+	
 	// 是否全选
 	const allSelected = computed(() => {
-		return allStudents.value.length > 0 && allStudents.value.every(s => selectedStudentIds.value.includes(s.id))
+		return allStudents.value.length > 0 && allStudents.value.every(s => selectedStudentIds.value.includes(s.studentId))
 	})
 
 	// 已选学生列表（按选择顺序排序）
 	const selectedStudents = computed(() => {
 		return selectedStudentIds.value
-			.map(id => allStudents.value.find(s => s.id === id))
+			.map(id => allStudents.value.find(s => s.studentId === id))
 			.filter((s) : s is Student => s !== undefined)
 	})
 
-	// 选择单泳道
-	const selectSingleLane = () => {
-		courseData.value.laneType = 'single'
-	}
-
-	// 选择多泳道
-	const selectMultiLane = () => {
-		courseData.value.laneType = 'multi'
-	}
-
 	// 获取学生列表（模拟接口）
 	const getStudentList = async () => {
 		loading.value = true
-		try {
-			// TODO: 实际项目中应从接口获取
-			// const res = await Service.Request('/api/students', 'GET', {})
-			// allStudents.value = res.data
 
-			// 模拟接口延迟
-			await new Promise(resolve => setTimeout(resolve, 500))
-
-			// 假数据
-			allStudents.value = [
-				{ id: '001', name: '张三', gender: '男', age: '12', school: '第一小学' },
-				{ id: '002', name: '李四', gender: '女', age: '13', school: '第二小学' },
-				{ id: '003', name: '王五', gender: '男', age: '11', school: '第一小学' },
-				{ id: '004', name: '赵六', gender: '女', age: '12', school: '第三小学' },
-				{ id: '005', name: '钱七', gender: '男', age: '14', school: '第二小学' },
-				{ id: '006', name: '孙八', gender: '女', age: '10', school: '第一小学' },
-				{ id: '007', name: '周九', gender: '男', age: '13', school: '第四小学' },
-				{ id: '008', name: '吴十', gender: '女', age: '12', school: '第二小学' }
-			]
-		} catch (error) {
-			Service.Msg('获取学生列表失败')
-			console.error(error)
-		} finally {
-			loading.value = false
-		}
+		studentService.GetStudentList().then(res => {
+			if (res.code == 0) {
+				allStudents.value = res.data
+				loading.value = false
+			} else {
+				Service.Msg(res.msg)
+			}
+		})
 	}
 
 	// 切换学生选中状态
@@ -267,7 +260,7 @@
 			selectedStudentIds.value = []
 		} else {
 			// 全选
-			selectedStudentIds.value = allStudents.value.map(s => s.id)
+			selectedStudentIds.value = allStudents.value.map(s => s.studentId)
 		}
 	}
 
@@ -279,11 +272,70 @@
 		}
 	}
 
-	
+
 
 	// 保存项目
 	const confirmCreate = () => {
+		if (!courseData.value.projectName) {
+			Service.Msg('请输入项目名称!')
+			return
+		}
+
+		if (courseData.value.startType == 'interval' && !courseData.value.intervalSeconds) {
+			Service.Msg('请输入正确时间间隔!')
+			return
+		}
+
+		if (!courseData.value.groupPersonCount && type.value=='1') {
+			Service.Msg('请输入每组人数!')
+			return
+		}
 		
+		if (!courseData.value.segmentDistance && type.value=='2') {
+			Service.Msg('请输入分段距离')
+			return
+		}
+		
+		if (!courseData.value.segmentCount && type.value=='2') {
+			Service.Msg('请输入分段数')
+			return
+		}
+
+		let users=[]
+		selectedStudents.value.map((item:any)=>{
+			users.push({
+				studentId:item.studentId,
+				name:item.name
+			})
+		})
+		
+		const data = {
+			planId: planId.value,
+			name: courseData.value.projectName,
+			planType:type.value=='1'?'计时项目':'分段项目',
+			departType: courseData.value.startType=='together'?'一起出发':'间隔出发',
+			interval: courseData.value.startType=='together'?0:courseData.value.intervalSeconds,
+			groupInt: courseData.value.groupPersonCount?courseData.value.groupPersonCount:'',
+			subsectionDistance: courseData.value.segmentDistance?courseData.value.segmentDistance:'',
+			subsectionInt: courseData.value.segmentCount?courseData.value.segmentCount:'',
+			users: JSON.stringify(users),
+			project: '',
+			group: '',
+		}
+		console.log(data);
+		
+		PlanService.AddPlan(data).then(res=>{
+			if(res.code==0){
+				Service.Msg('添加成功!')
+				setTimeout(()=>{
+					Service.GoPageBack()
+				},1000)
+			}else{
+				Service.Msg(res.msg)
+			}
+		})
+
+
 	}
 </script>
 
@@ -446,15 +498,14 @@
 		}
 	}
 
-	/* 多泳道选项 */
-	.multi-lane-options {
-		padding-top: 20rpx;
+	/* 组别选项 */
+	.group-options {
 		display: flex;
 		flex-direction: column;
 		gap: 16rpx;
 	}
 
-	.lane-input-wrapper,
+	.group-input-wrapper,
 	.person-input-wrapper {
 		background-color: #f5f5f5;
 		border-radius: 16rpx;
@@ -463,7 +514,7 @@
 		align-items: center;
 		justify-content: space-between;
 
-		.lane-label,
+		.group-label,
 		.person-label {
 			font-size: 28rpx;
 			font-weight: 600;
@@ -471,7 +522,7 @@
 		}
 	}
 
-	.lane-input,
+	.group-input,
 	.person-input {
 		flex: 1;
 		margin-left: 24rpx;
@@ -495,6 +546,54 @@
 		}
 	}
 
+	/* 分段设置选项 */
+	.segment-options {
+		display: flex;
+		flex-direction: column;
+		gap: 16rpx;
+	}
+
+	.segment-input-wrapper,
+	.segment-count-wrapper {
+		background-color: #f5f5f5;
+		border-radius: 16rpx;
+		padding: 24rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.segment-label,
+		.segment-count-label {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333;
+		}
+	}
+
+	.segment-input,
+	.segment-count-input {
+		flex: 1;
+		margin-left: 24rpx;
+		display: flex;
+		align-items: center;
+		background-color: #fff;
+		border-radius: 12rpx;
+		padding: 0 20rpx;
+		height: 72rpx;
+
+		.number-input {
+			flex: 1;
+			font-size: 28rpx;
+			color: #333;
+		}
+
+		.unit-text {
+			font-size: 24rpx;
+			color: #999;
+			margin-left: 12rpx;
+		}
+	}
+
 	/* 学生列表头部 */
 	.student-header {
 		display: flex;
@@ -785,7 +884,7 @@
 
 	.cancel-btn,
 	.confirm-btn {
-		flex:  1;
+		flex: 1;
 		height: 88rpx;
 		border-radius: 16rpx;
 		border: none;
diff --git a/src/pages/userFunc/setCourse.vue.bak b/src/pages/userFunc/setCourse.vue.bak
deleted file mode 100644
index a359733..0000000
--- a/src/pages/userFunc/setCourse.vue.bak
+++ /dev/null
@@ -1,902 +0,0 @@
-<template>
-	<view class="course-container">
-		<!-- 表单区域 -->
-		<view class="form-section">
-			<!-- 项目名称 -->
-			<view class="form-card">
-				<view class="form-title">项目信息</view>
-				<view class="form-group">
-					<text class="form-label">项目名称</text>
-					<input class="form-input" v-model="courseData.projectName" placeholder="请输入项目名称" placeholder-class="input-placeholder" />
-				</view>
-			</view>
-
-			<!-- 出发方式 -->
-			<view class="form-card">
-				<view class="form-title">出发方式</view>
-				<view class="radio-group">
-					<view class="radio-item" :class="{ active: courseData.startType === 'together' }" @click="courseData.startType = 'together'">
-						<view class="radio-icon">
-							<view v-if="courseData.startType === 'together'" class="radio-inner"></view>
-						</view>
-						<text>一起出发</text>
-					</view>
-					<view class="radio-item" :class="{ active: courseData.startType === 'interval' }" @click="courseData.startType = 'interval'">
-						<view class="radio-icon">
-							<view v-if="courseData.startType === 'interval'" class="radio-inner"></view>
-						</view>
-						<text>间隔出发</text>
-					</view>
-				</view>
-				<view v-if="courseData.startType === 'interval'" class="interval-input-wrapper">
-					<text class="interval-label">间隔时间</text>
-					<view class="interval-input">
-						<input class="number-input" v-model="courseData.intervalSeconds" type="digit" placeholder="请输入秒数" />
-						<text class="unit-text">秒</text>
-					</view>
-				</view>
-			</view>
-
-			<!-- 泳道设置 -->
-			<view class="form-card">
-				<view class="form-title">泳道设置</view>
-				<view class="radio-group">
-					<view class="radio-item" :class="{ active: courseData.laneType === 'single' }" @click="selectSingleLane">
-						<view class="radio-icon">
-							<view v-if="courseData.laneType === 'single'" class="radio-inner"></view>
-						</view>
-						<text>一个泳道</text>
-					</view>
-					<view class="radio-item" :class="{ active: courseData.laneType === 'multi' }" @click="selectMultiLane">
-						<view class="radio-icon">
-							<view v-if="courseData.laneType === 'multi'" class="radio-inner"></view>
-						</view>
-						<text>多个泳道</text>
-					</view>
-				</view>
-				<view v-if="courseData.laneType === 'multi'" class="multi-lane-options">
-					<view class="sub-option-item" :class="{ active: courseData.multiLaneMode === 'onePerson' }" @click="courseData.multiLaneMode = 'onePerson'">
-						<view class="sub-option-icon">
-							<view v-if="courseData.multiLaneMode === 'onePerson'" class="option-inner"></view>
-						</view>
-						<text>一个泳道一个人</text>
-					</view>
-					<view class="sub-option-item" :class="{ active: courseData.multiLaneMode === 'multiPerson' }" @click="courseData.multiLaneMode = 'multiPerson'">
-						<view class="sub-option-icon">
-							<view v-if="courseData.multiLaneMode === 'multiPerson'" class="option-inner"></view>
-						</view>
-						<text>一个泳道几个人</text>
-					</view>
-					<view v-if="courseData.multiLaneMode === 'multiPerson'" class="multi-person-input-wrapper">
-						<text class="multi-label">每个泳道人数</text>
-						<view class="multi-input">
-							<input class="number-input" v-model="courseData.lanePersonCount" type="number" placeholder="请输入人数" />
-							<text class="unit-text">人</text>
-						</view>
-					</view>
-				</view>
-			</view>
-
-			<!-- 学生列表 -->
-			<view class="form-card">
-				<view class="student-header">
-					<view class="header-left">
-						<text class="form-title">选择学生</text>
-						<text class="student-count">已选({{ selectedStudentIds.length }}/{{ allStudents.length }})</text>
-					</view>
-					<view class="header-actions">
-						<view class="select-all-btn" @click="toggleSelectAll">
-							<view class="checkbox-icon" :class="{ checked: allSelected }">
-								<u-icon v-if="allSelected" name="checkmark" size="14" color="#fff"></u-icon>
-							</view>
-							<text class="select-all-text">{{ allSelected ? '取消全选' : '全选' }}</text>
-						</view>
-					</view>
-				</view>
-
-				<view v-if="loading" class="loading-state">
-					<view class="loading-spinner"></view>
-					<text class="loading-text">加载中...</text>
-				</view>
-
-				<view v-else-if="allStudents.length === 0" class="empty-student-state">
-					<view class="empty-icon">
-						<u-icon name="account" size="48" color="#ddd"></u-icon>
-					</view>
-					<text class="empty-text">暂无学生</text>
-					<text class="empty-desc">请先在学员管理中添加学生</text>
-				</view>
-
-				<view v-else class="student-list">
-					<view v-for="student in allStudents" :key="student.id" class="student-item" @click="toggleStudentSelect(student.id)">
-						<view class="student-checkbox" :class="{ checked: selectedStudentIds.includes(student.id) }">
-							<u-icon v-if="selectedStudentIds.includes(student.id)" name="checkmark" size="14" color="#fff"></u-icon>
-						</view>
-						<view class="student-avatar">
-							<text class="avatar-text">{{ student.name.charAt(0) }}</text>
-						</view>
-						<view class="student-info">
-							<view class="student-name">{{ student.name }}</view>
-							<view class="student-meta">
-								<text class="gender-badge" :class="student.gender === '男' ? 'male' : 'female'">
-									{{ student.gender }}
-								</text>
-								<text class="age-text">{{ student.age }}岁</text>
-							</view>
-						</view>
-					</view>
-				</view>
-
-				<!-- 已选学生预览 -->
-				<view v-if="selectedStudents.length > 0" class="selected-preview">
-					<view class="preview-header">
-						<text class="preview-title">已选学生</text>
-					</view>
-					<view class="preview-list">
-						<view v-for="(student, index) in selectedStudents" :key="student.id" class="preview-item">
-							<text class="preview-index">{{ index + 1 }}</text>
-							<text class="preview-name">{{ student.name }}</text>
-							<view class="preview-remove" @click.stop="removeSelectedStudent(student.id)">
-								<u-icon name="close" size="14" color="#ff4d4f"></u-icon>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 底部按钮区域 -->
-		<view class="bottom-actions">
-			<view class="action-buttons">
-				<button class="cancel-btn" @click="goBack">取消</button>
-				<button class="confirm-btn" @click="confirmCreate">创建项目</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup lang="ts">
-	import { ref, computed, onMounted } from 'vue'
-	import { Service } from '@/Service/Service'
-
-	// 学生类型
-	interface Student {
-		id: string
-		name: string
-		gender: string
-		age: string
-		school?: string
-		address?: string
-	}
-
-	// 课程数据
-	const courseData = ref({
-		projectName: '',
-		startType: 'together', // together | interval
-		intervalSeconds: '',
-		intervalSeconds: '',
-		laneType: 'single', // single | multi
-		multiLaneMode: 'onePerson', // onePerson | multiPerson
-		lanePersonCount: ''
-	})
-
-	// 所有学生列表
-	const allStudents = ref<Student[]>([])
-
-	// 已选学生ID列表
-	const selectedStudentIds = ref<string[]>([])
-
-	// 加载状态
-	const loading = ref(false)
-
-	// 是否全选
-	const allSelected = computed(() => {
-		return allStudents.value.length > 0 && allStudents.value.every(s => selectedStudentIds.value.includes(s.id))
-	})
-
-	// 已选学生列表
-	const selectedStudents = computed(() => {
-		return allStudents.value.filter(s => selectedStudentIds.value.includes(s.id))
-	})
-
-	// 选择单泳道
-	const selectSingleLane = () => {
-		courseData.value.laneType = 'single'
-		courseData.value.multiLaneMode = 'onePerson'
-	}
-
-	// 选择多泳道
-	const selectMultiLane = () => {
-		courseData.value.laneType = 'multi'
-	}
-
-	// 获取学生列表（模拟接口）
-	const getStudentList = async () => {
-		loading.value = true
-		try {
-			// TODO: 实际项目中应从接口获取
-			// const res = await Service.Request('/api/students', 'GET', {})
-			// allStudents.value = res.data
-
-			// 模拟接口延迟
-			await new Promise(resolve => setTimeout(resolve, 500))
-
-			// 假数据
-			allStudents.value = [
-				{ id: '001', name: '张三', gender: '男', age: '12', school: '第一小学' },
-				{ id: '002', name: '李四', gender: '女', age: '13', school: '第二小学' },
-				{ id: '003', name: '王五', gender: '男', age: '11', school: '第一小学' },
-				{ id: '004', name: '赵六', gender: '女', age: '12', school: '第三小学' },
-				{ id: '005', name: '钱七', gender: '男', age: '14', school: '第二小学' },
-				{ id: '006', name: '孙八', gender: '女', age: '10', school: '第一小学' },
-				{ id: '007', name: '周九', gender: '男', age: '13', school: '第四小学' },
-				{ id: '008', name: '吴十', gender: '女', age: '12', school: '第二小学' }
-			]
-		} catch (error) {
-			Service.Msg('获取学生列表失败')
-			console.error(error)
-		} finally {
-			loading.value = false
-		}
-	}
-
-	// 切换学生选中状态
-	const toggleStudentSelect = (id: string) => {
-		const index = selectedStudentIds.value.indexOf(id)
-		if (index > -1) {
-			selectedStudentIds.value.splice(index, 1)
-		} else {
-			selectedStudentIds.value.push(id)
-		}
-	}
-
-	// 全选/取消全选
-	const toggleSelectAll = () => {
-		if (allSelected.value) {
-			// 取消全选
-			selectedStudentIds.value = []
-		} else {
-			// 全选
-			selectedStudentIds.value = allStudents.value.map(s => s.id)
-		}
-	}
-
-	// 移除已选学生
-	const removeSelectedStudent = (id: string) => {
-		const index = selectedStudentIds.value.indexOf(id)
-		if (index > -1) {
-			selectedStudentIds.value.splice(index, 1)
-		}
-	}
-
-	// 返回
-	const goBack = () => {
-		Service.GoPageBack()
-	}
-
-	// 创建项目
-	const confirmCreate = () => {
-		if (!courseData.value.projectName.trim()) {
-			Service.Msg('请输入项目名称')
-			return
-		}
-
-		if (courseData.value.startType === 'interval' && !courseData.value.intervalSeconds.trim()) {
-			Service.Msg('请输入间隔秒数')
-			return
-		}
-
-		if (courseData.value.laneType === 'multi' && courseData.value.multiLaneMode === 'multiPerson' && !courseData.value.lanePersonCount.trim()) {
-			Service.Msg('请输入每个泳道人数')
-			return
-		}
-
-		if (selectedStudentIds.value.length === 0) {
-			Service.Msg('请至少选择一位学生')
-			return
-		}
-
-		// TODO: 调用API创建项目
-		console.log('创建项目数据:', {
-			course: courseData.value,
-			studentIds: selectedStudentIds.value,
-			students: selectedStudents.value
-		})
-
-		Service.Msg('创建成功', 'success')
-		setTimeout(() => {
-			Service.GoPageBack()
-		}, 1500)
-	}
-
-	// 页面加载时获取学生列表
-	onMounted(() => {
-		getStudentList()
-	})
-</script>
-
-<style lang="scss" scoped>
-	page {
-		background-color: #f5f5f5;
-	}
-
-	.course-container {
-		min-height: 100vh;
-		padding-bottom: 140rpx;
-	}
-
-	/* 表单区域 */
-	.form-section {
-		padding: 20rpx;
-	}
-
-	.form-card {
-		background-color: #fff;
-		border-radius: 24rpx;
-		padding: 32rpx 28rpx;
-		margin-bottom: 20rpx;
-		box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
-
-		.form-title {
-			font-size: 32rpx;
-			font-weight: 700;
-			color: #333;
-			margin-bottom: 28rpx;
-			display: block;
-		}
-	}
-
-	/* 表单输入 */
-	.form-group {
-		margin-bottom: 32rpx;
-
-		&:last-child {
-			margin-bottom: 0;
-		}
-
-		.form-label {
-			display: block;
-			font-size: 28rpx;
-			font-weight: 600;
-			color: #333;
-			margin-bottom: 14rpx;
-		}
-
-		.form-input {
-			width: 100%;
-			height: 88rpx;
-			background-color: #f5f5f5;
-			border-radius: 16rpx;
-			padding: 0 24rpx;
-			font-size: 28rpx;
-			color: #333;
-			transition: all 0.2s ease;
-
-			&:focus {
-				background-color: #fff;
-				box-shadow: 0 0 0 4rpx rgba(24, 144, 255, 0.15);
-			}
-		}
-	}
-
-	/* 单选按钮组 */
-	.radio-group {
-		display: flex;
-		gap: 20rpx;
-		margin-bottom: 24rpx;
-
-		.radio-item {
-			flex: 1;
-			height: 88rpx;
-			background-color: #f5f5f5;
-			border-radius: 16rpx;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			gap: 12rpx;
-			font-size: 28rpx;
-			color: #666;
-			transition: all 0.25s ease;
-			border: 2rpx solid transparent;
-
-			&:active {
-				transform: scale(0.96);
-			}
-
-			&.active {
-				font-weight: 600;
-				background-color: #e6f7ff;
-				border-color: #1890ff;
-				color: #1890ff;
-			}
-
-			.radio-icon {
-				width: 32rpx;
-				height: 32rpx;
-				border-radius: 50%;
-				border: 3rpx solid #d9d9d9;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				transition: all 0.2s ease;
-			}
-
-			&.active .radio-icon {
-				border-color: #1890ff;
-				background-color: #1890ff;
-			}
-
-			.radio-inner {
-				width: 12rpx;
-				height: 12rpx;
-				background-color: #fff;
-				border-radius: 50%;
-			}
-		}
-	}
-
-	/* 间隔时间输入 */
-	.interval-input-wrapper {
-		background-color: #f5f5f5;
-		border-radius: 16rpx;
-		padding: 24rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-
-		.interval-label {
-			font-size: 28rpx;
-			font-weight: 600;
-			color: #333;
-		}
-
-		.interval-input {
-			flex: 1;
-			margin-left: 24rpx;
-			display: flex;
-			align-items: center;
-			background-color: #fff;
-			border-radius: 12rpx;
-			padding: 0 20rpx;
-			height: 72rpx;
-
-			.number-input {
-				flex: 1;
-				font-size: 28rpx;
-				color: #333;
-			}
-
-			.unit-text {
-				font-size: 24rpx;
-				color: #999;
-				margin-left: 12rpx;
-			}
-		}
-	}
-
-	/* 多泳道选项 */
-	.multi-lane-options {
-		padding-top: 20rpx;
-
-		.sub-option-item {
-			padding: 20rpx 24rpx;
-			background-color: #f5f5f5;
-			border-radius: 16rpx;
-			display: flex;
-			align-items: center;
-			gap: 12rpx;
-			font-size: 26rpx;
-			color: #666;
-			margin-bottom: 16rpx;
-			transition: all 0.2s ease;
-			border: 2rpx solid transparent;
-
-			&:active {
-				transform: scale(0.98);
-			}
-
-			&.active {
-				font-weight: 600;
-				background-color: #e6f7ff;
-				border-color: #1890ff;
-				color: #1890ff;
-			}
-
-			&:last-child {
-				margin-bottom: 0;
-			}
-
-			.sub-option-icon {
-				width: 28rpx;
-				height: 28rpx;
-				border-radius: 50%;
-				border: 2rpx solid #d9d9d9;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				transition: all 0.2s ease;
-			}
-
-			&.active .sub-option-icon {
-				border-color: #1890ff;
-				background-color: #1890ff;
-			}
-
-			.option-inner {
-				width: 10rpx;
-				height: 10rpx;
-				background-color: #fff;
-				border-radius: 50%;
-			}
-		}
-	}
-
-	/* 多泳道人数输入 */
-	.multi-person-input-wrapper {
-		margin-top: 20rpx;
-		background-color: #f5f5f5;
-		border-radius: 16rpx;
-		padding: 24rpx;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-
-		.multi-label {
-			font-size: 28rpx;
-			font-weight: 600;
-			color: #333;
-		}
-
-		.multi-input {
-			flex: 1;
-			margin-left: 24rpx;
-			display: flex;
-			align-items: center;
-			background-color: #fff;
-			border-radius: 12rpx;
-			padding: 0 20rpx;
-			height: 72rpx;
-
-			.number-input {
-				flex: 1;
-				font-size: 28rpx;
-				color: #333;
-			}
-
-			.unit-text {
-				font-size: 24rpx;
-				color: #999;
-				margin-left: 12rpx;
-			}
-		}
-	}
-
-	/* 学生列表头部 */
-	.student-header {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin-bottom: 24rpx;
-
-		.header-left {
-			display: flex;
-			align-items: center;
-			gap: 8rpx;
-
-			.student-count {
-				font-size: 26rpx;
-				color: #999;
-				font-weight: 500;
-			}
-		}
-
-		.header-actions {
-			.select-all-btn {
-				display: flex;
-				align-items: center;
-				gap: 8rpx;
-				padding: 8rpx 16rpx;
-				border-radius: 12rpx;
-				transition: all 0.2s ease;
-
-				&:active {
-					transform: scale(0.96);
-				}
-
-				.checkbox-icon {
-					width: 32rpx;
-					height: 32rpx;
-					border-radius: 50%;
-					border: 2rpx solid #d9d9d9;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					transition: all 0.2s ease;
-
-					&.checked {
-						border-color: #1890ff;
-						background-color: #1890ff;
-					}
-				}
-
-				.select-all-text {
-					font-size: 24rpx;
-					color: #666;
-				}
-			}
-		}
-	}
-
-	/* 加载状态 */
-	.loading-state {
-		padding: 80rpx 40rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		.loading-spinner {
-			width: 60rpx;
-			height: 60rpx;
-			border: 4rpx solid #f0f0f0;
-			border-top-color: #1890ff;
-			border-radius: 50%;
-			animation: spin 1s linear infinite;
-			margin-bottom: 20rpx;
-		}
-
-		.loading-text {
-			font-size: 26rpx;
-			color: #999;
-		}
-	}
-
-	/* 空状态 */
-	.empty-student-state {
-		padding: 60rpx 40rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		.empty-icon {
-			margin-bottom: 20rpx;
-			opacity: 0.6;
-		}
-
-		.empty-text {
-			font-size: 28rpx;
-			font-weight: 600;
-			color: #666;
-			margin-bottom: 10rpx;
-		}
-
-		.empty-desc {
-			font-size: 24rpx;
-			color: #999;
-		}
-	}
-
-	/* 学生列表 */
-	.student-list {
-		display: flex;
-		flex-direction: column;
-		gap: 12rpx;
-
-		.student-item {
-			display: flex;
-			align-items: center;
-			gap: 16rpx;
-			padding: 20rpx;
-			background-color: #f5f5f5;
-			border-radius: 16rpx;
-			transition: all 0.2s ease;
-
-			&:active {
-				transform: scale(0.98);
-				background-color: #e8e8e8;
-			}
-
-			.student-checkbox {
-				width: 36rpx;
-				height: 36rpx;
-				border-radius: 50%;
-				border: 2rpx solid #d9d9d9;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				flex-shrink: 0;
-				transition: all 0.2s ease;
-
-				&.checked {
-					border-color: #1890ff;
-					background-color: #1890ff;
-				}
-			}
-
-			.student-avatar {
-				width: 64rpx;
-				height: 64rpx;
-				background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
-				border-radius: 14rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				flex-shrink: 0;
-
-				.avatar-text {
-					color: #fff;
-					font-size: 28rpx;
-					font-weight: 700;
-				}
-			}
-
-			.student-info {
-				flex: 1;
-				min-width: 0;
-
-				.student-name {
-					font-size: 28rpx;
-					font-weight: 600;
-					color: #333;
-					margin-bottom: 6rpx;
-					display: block;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-				}
-
-				.student-meta {
-					display: flex;
-					align-items: center;
-					gap: 12rpx;
-
-					.gender-badge {
-						font-size: 22rpx;
-						padding: 4rpx 10rpx;
-						border-radius: 8rpx;
-						font-weight: 500;
-
-						&.male {
-							color: #1890ff;
-							background-color: #e6f7ff;
-						}
-
-						&.female {
-							color: #fa8c16;
-							background-color: #fff7e6;
-						}
-					}
-
-					.age-text {
-						font-size: 22rpx;
-						color: #999;
-					}
-				}
-			}
-		}
-	}
-
-	/* 已选学生预览 */
-	.selected-preview {
-		margin-top: 32rpx;
-		padding-top: 24rpx;
-		border-top: 1rpx solid #f0f0f0;
-
-		.preview-header {
-			margin-bottom: 16rpx;
-
-			.preview-title {
-				font-size: 26rpx;
-				font-weight: 600;
-				color: #666;
-			}
-		}
-
-		.preview-list {
-			display: flex;
-			flex-wrap: wrap;
-			gap: 12rpx;
-		}
-
-		.preview-item {
-			display: flex;
-			align-items: center;
-			gap: 8rpx;
-			padding: 10rpx 16rpx;
-			background-color: #e6f7ff;
-			border-radius: 12rpx;
-
-			.preview-index {
-				width: 24rpx;
-				height: 24rpx;
-				background-color: #1890ff;
-				color: #fff;
-				font-size: 18rpx;
-				font-weight: 600;
-				border-radius: 50%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-
-			.preview-name {
-				font-size: 26rpx;
-				color: #1890ff;
-				font-weight: 500;
-			}
-
-			.preview-remove {
-				width: 32rpx;
-				height: 32rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				transition: all 0.2s ease;
-
-				&:active {
-					transform: scale(0.9);
-				}
-			}
-		}
-	}
-
-	/* 底部操作按钮 */
-	.bottom-actions {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		background-color: #fff;
-		padding: 20rpx 30rpx;
-		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
-		border-top: 1rpx solid #f0f0f0;
-		box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.08);
-		z-index: 99;
-
-		.action-buttons {
-			display: flex;
-			gap: 16rpx;
-		}
-	}
-
-	.cancel-btn,
-	.confirm-btn {
-		flex: 1;
-		height: 88rpx;
-		border-radius: 16rpx;
-		border: none;
-		font-size: 30rpx;
-		font-weight: 600;
-		transition: all 0.25s ease;
-	}
-
-	.cancel-btn {
-		background-color: #f5f5f5;
-		color: #666;
-
-		&:active {
-			background-color: #e8e8e8;
-			transform: scale(0.96);
-		}
-	}
-
-	.confirm-btn {
-		background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
-		color: #fff;
-		box-shadow: 0 6rpx 16rpx rgba(24, 144, 255, 0.35);
-
-		&:active {
-			transform: scale(0.96);
-			box-shadow: 0 3rpx 8rpx rgba(24, 144, 255, 0.25);
-		}
-	}
-
-	/* 动画 */
-	@keyframes spin {
-		from {
-			transform: rotate(0deg);
-		}
-		to {
-			transform: rotate(360deg);
-		}
-	}
-</style>
diff --git a/src/pages/userFunc/student.vue b/src/pages/userFunc/student.vue
index 4681250..dc7905b 100644
--- a/src/pages/userFunc/student.vue
+++ b/src/pages/userFunc/student.vue
@@ -27,18 +27,18 @@
 						<view class="student-details">
 							<view class="detail-row">
 								<text class="student-name">{{ student.name }}</text>
-								<view class="student-gender" :class="student.gender === '男' ? 'male' : 'female'">
-									<u-icon :name="student.gender === '男' ? 'man' : 'woman'" size="14"></u-icon>
-									{{ student.gender }}
+								<view class="student-gender" :class="student.sex === '男' ? 'male' : 'female'">
+									<u-icon :name="student.sex === '男' ? 'man' : 'woman'" size="14"></u-icon>
+									{{ student.sex }}
 								</view>
 							</view>
 							<view class="detail-row">
 								<text class="detail-label">出生日期：</text>
-								<text class="detail-value">{{ student.birthDate }}</text>
+								<text class="detail-value">{{ student.birthday }}</text>
 							</view>
 							<view class="detail-row">
 								<text class="detail-label">年龄：</text>
-								<text class="detail-value">{{ student.age }}岁</text>
+								<text class="detail-value">{{ calculateAge(student.birthday) }}岁</text>
 							</view>
 							<view v-if="student.school" class="detail-row">
 								<text class="detail-label">学校：</text>
@@ -54,14 +54,14 @@
 						<view class="action-btn edit-btn" @click="openEditModal(student)">
 							<u-icon name="edit-pen" size="18" color="#1890ff"></u-icon>
 						</view>
-						<view class="action-btn delete-btn" @click="confirmDelete(student)">
-							<u-icon name="trash" size="18" color="#ff4d4f"></u-icon>
-						</view>
+						
 					</view>
 				</view>
 			</view>
 		</view>
-
+		<view class="" style="width: 100%; height: 100rpx;" >
+			
+		</view>
 		<!-- 底部添加按钮 -->
 		<view class="bottom-add-btn">
 			<button class="add-btn" @click="showAddModal = true">
@@ -143,54 +143,37 @@
 </template>
 
 <script setup lang="ts">
-	import { onShow, onLoad } from "@dcloudio/uni-app"
+	import { onShow, onLoad, onReachBottom } from "@dcloudio/uni-app"
 	import { Service } from '@/Service/Service'
+	import { studentService } from '@/Service/swimming/studentService'
 	import { ref } from "vue"
 
 	
-	// 定义学员类型
-	interface Student {
-		id : string
-		name : string
-		gender : string
-		age : string
-		birthDate : string
-		school : string
-		address : string
-	}
+
+
+	// 分页相关
+	let page = ref(1)
+	let status = ref('loadmore')
 
 	// 学员列表
-	const students = ref<Student[]>([
-		{ id: '001', name: '张三', gender: '男', age: '12', birthDate: '2012-05-15', school: '第一小学', address: '北京市朝阳区' },
-		{ id: '002', name: '李四', gender: '女', age: '13', birthDate: '2011-08-20', school: '', address: '' },
-		{ id: '003', name: '王五', gender: '男', age: '11', birthDate: '2013-03-10', school: '第二小学', address: '' },
-		{ id: '004', name: '赵六', gender: '女', age: '12', birthDate: '2012-11-25', school: '', address: '上海市浦东新区' }
-	])
+	const students = ref<Array<any>>([])
 
 	// 弹窗状态
 	const showAddModal = ref(false)
 	const showEditModal = ref(false)
 
 	// 表单数据
-	const formData = ref({
-		id: '',
-		name: '',
-		gender: '男',
-		age: '',
-		birthDate: '',
-		school: '',
-		address: ''
-	})
+	const formData = ref<any>({})
 
 	// 当前编辑的学员
-	const editingStudent = ref<Student | null>(null)
+	const editingStudent = ref<any>({})
 
 	onLoad(() => {
-
+		getData()
 	})
 
-	onShow(() => {
-
+	onReachBottom(() => {
+		getList()
 	})
 
 	// 计算年龄
@@ -213,14 +196,13 @@
 	}
 
 	// 打开编辑弹窗
-	const openEditModal = (student : Student) => {
+	const openEditModal = (student :any) => {
 		editingStudent.value = student
 		formData.value = {
-			id: student.id,
+			id: student.studentId,
 			name: student.name,
-			gender: student.gender,
-			age: student.age,
-			birthDate: student.birthDate,
+			gender: student.sex?student.sex: '男',
+			birthDate: student.birthday,
 			school: student.school,
 			address: student.address
 		}
@@ -243,9 +225,34 @@
 		}
 	}
 
+	// 获取学员列表数据
+	const getData = () => {
+		students.value = []
+		page.value = 1
+		status.value = 'loadmore'
+		getList()
+	}
+
+	// 获取学员列表
+	const getList = () => {
+		if (status.value == 'loading' || status.value == 'nomore') {
+			return
+		}
+		status.value = 'loading'
+		studentService.GetStudentListPage(page.value.toString()).then(res => {
+			if (res.code == 0) {
+				students.value = [...students.value, ...res.data]
+				status.value = res.data.length == 10 ? 'loadmore' : 'nomore'
+				page.value++
+			} else {
+				Service.Msg(res.msg)
+			}
+		})
+	}
+
 	// 保存学员
 	const saveStudent = () => {
-		if (!formData.value.name.trim()) {
+		if (!formData.value.name) {
 			Service.Msg('请输入学员姓名')
 			return
 		}
@@ -255,35 +262,26 @@
 			return
 		}
 
-		if (showAddModal.value) {
-			// 添加新学员
-			const newStudent : Student = {
-				id: Date.now().toString().slice(-6),
-				name: formData.value.name.trim(),
-				gender: formData.value.gender,
-				age: formData.value.age,
-				birthDate: formData.value.birthDate,
-				school: formData.value.school.trim(),
-				address: formData.value.address.trim()
-			}
-			students.value.push(newStudent)
-			Service.Msg('添加成功', 'success')
-		} else if (showEditModal.value && editingStudent.value) {
-			// 编辑学员
-			const index = students.value.findIndex(s => s.id === editingStudent.value!.id)
-			if (index !== -1) {
-				students.value[index] = {
-					...students.value[index],
-					name: formData.value.name.trim(),
-					gender: formData.value.gender,
-					age: formData.value.age,
-					birthDate: formData.value.birthDate,
-					school: formData.value.school.trim(),
-					address: formData.value.address.trim()
-				}
-				Service.Msg('修改成功', 'success')
-			}
+		// 构造接口请求数据
+		const requestData = {
+			studentId:formData.value.id,
+			name: formData.value.name,
+			sex: formData.value.gender,
+			birthday: formData.value.birthDate,
+			school: formData.value.school ,
+			address: formData.value.address 
 		}
+		console.log(requestData);
+		
+		// 调用添加学员接口
+		studentService.Add(requestData).then((content) => {
+			if (content.code == 0) {
+				Service.Msg('添加成功')
+				getData()
+			} else {
+				Service.Msg(content.msg)
+			}
+		})
 
 		closeModal()
 	}
@@ -304,8 +302,14 @@
 
 	// 删除学员
 	const deleteStudent = (id : string) => {
-		students.value = students.value.filter(s => s.id !== id)
-		Service.Msg('删除成功', 'success')
+		studentService.Delete(id).then(res => {
+			if (res.code == 0) {
+				students.value = students.value.filter(s => s.id !== id)
+				Service.Msg('删除成功', 'success')
+			} else {
+				Service.Msg(res.msg)
+			}
+		})
 	}
 </script>
 
@@ -793,8 +797,7 @@
 		left: 0;
 		right: 0;
 		background-color: #fff;
-		padding: 20rpx 30rpx;
-		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+		padding: 20rpx 20rpx;
 		border-top: 1rpx solid #f0f0f0;
 		box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.08);
 		z-index: 100;
diff --git a/src/pages/userFunc/swiming.vue b/src/pages/userFunc/swiming.vue
index 67764d5..fe1f371 100644
--- a/src/pages/userFunc/swiming.vue
+++ b/src/pages/userFunc/swiming.vue
@@ -1,44 +1,62 @@
 <template>
 	<view class="swim-timer-container">
-		<up-navbar title="自由泳500米" :placeholder='true' :autoBack="true" @click="rightClick()" rightIcon='more-dot-fill'>
-		</up-navbar>
+		<!-- 固定在顶部的计时栏 -->
 		<view class="total-time-section">
-			<text class="time-label">当前总用时</text>
 			<view class="" style="position: relative;">
 				<view class="total-time">{{ formatTime(currentTime) }}</view>
+				<view class="" @click="Service.GoPage('/pages/userFunc/setCourse?type=1'+'&id='+planId)"
+					style="position: absolute; top: 0; right: 20rpx; ">
+					<up-icon name="setting" size="22"></up-icon>
+				</view>
+			</view>
+			<!-- 计划信息 -->
+			<view class="plan-info" v-if="planId">
+				<text class="plan-title">项目名称: {{ planName }}</text>
 			</view>
 		</view>
 
 		<!-- 选手列表 -->
 		<view class="athletes-section">
 			<view class="section-header">
-				<text class="section-title">选手列表</text>
+				<text class="section-title">间隔出发·{{ groupedAthletes.length }}组</text>
 				<text class="athlete-count">{{ athletes.length }}位选手</text>
 			</view>
 
 			<view class="athletes-list">
-				<view v-for="(athlete, index) in athletes" :key="athlete.id" @longpress="deleStu(athlete.id)"
-					class="athlete-item" :class="{ finished: athlete.finished }">
-					<view class="athlete-number">{{ index+1 }}</view>
-					<view class="athlete-info">
-						<text class="athlete-name">{{ athlete.name }}</text>
-						<text class="athlete-lane">{{ athlete.gender }} · {{ athlete.age }}岁</text>
-					</view>
-					<view class="time-wrapper">
-						<text class="athlete-time">{{ formatTime(athlete.time) }}</text>
-						<text class="best-time">最快: {{ athlete.bestTime !== null ? formatTime(athlete.bestTime) : '无' }}</text>
-					</view>
-					<view class="" style="display: flex;align-items: center; gap: 10rpx;">
-						<view @click="handleAthleteFirstButton(athlete, index)">
-							<u-icon name="pause-circle" bold="true" size="22" color="#1890ff"></u-icon>
+				<view v-for="group in groupedAthletes" :key="group.groupNumber" class="group-wrapper">
+					<view class="group-header">
+						<view class="group-title">
+							<u-icon name="grid" size="18" color="#1890ff"></u-icon>
+							<text class="group-label">第{{ group.groupNumber }}组</text>
 						</view>
-						<view @click="resetAthleteTime(athlete)">
-							<u-icon name="reload" bold="true" size="24" color="#1890ff"></u-icon>
+						<text class="group-count">{{ group.athletes.length }}人</text>
+					</view>
+
+					<view class="group-athletes">
+						<view v-for="(athlete, indexInGroup) in group.athletes" :key="athlete.id"
+							@click="handleAthleteFirstButton(athlete, athletes.indexOf(athlete))" class="athlete-item"
+							:class="{ finished: athlete.finished }">
+							<view class="athlete-number">{{ athletes.indexOf(athlete) + 1 }}</view>
+							<view class="athlete-info">
+								<text class="athlete-name">{{ athlete.name }}</text>
+							</view>
+							<view class="time-wrapper">
+								<text class="athlete-time">{{ !athlete.time? ' 00:00:00 ':formatTime(athlete.time) }}</text>
+								<text class="best-time">最快:
+									{{ athlete.bestTime !== null ? formatTime(athlete.quicklyTime) : '无' }}</text>
+							</view>
+							<view class="" style="display: flex;align-items: center; gap: 10rpx;">
+
+								<view @click.stop="resetAthleteTime(athlete)">
+									<u-icon name="reload" :bold="true" size="24" color="#1890ff"></u-icon>
+								</view>
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+		<view class="" style="width: 100%; height: 100rpx;"></view>
 
 		<!-- 底部控制按钮 -->
 		<view class="control-buttons">
@@ -47,7 +65,7 @@
 					<u-icon name="play-right" size="24" color="#fff"></u-icon>
 					<text class="btn-text">开始</text>
 				</button>
-				
+
 				<button v-if="isRunning" class="record-btn" @click="recordNextAthlete">
 					<u-icon name="checkmark-circle" size="24" color="#fff"></u-icon>
 					<text class="btn-text">记录</text>
@@ -64,152 +82,14 @@
 				</button>
 			</view>
 		</view>
-
-		<!-- 更多选项弹出框 -->
-		<view v-if="showMoreModal" class="modal-overlay" @click="closeMoreModal"></view>
-		<view v-if="showMoreModal" class="more-modal">
-			<view class="modal-item" @click="showStopwatchModal = true; showMoreModal = false">
-				<u-icon name="clock" size="24" color="#1890ff"></u-icon>
-				<text class="modal-item-text">调试秒表模式</text>
-				<u-icon name="arrow-right" size="16" color="#ccc"></u-icon>
-			</view>
-			<view class="modal-item" @click="showAddStudentModal = true; showMoreModal = false">
-				<u-icon name="plus-circle" size="24" color="#52c41a"></u-icon>
-				<text class="modal-item-text">添加学生</text>
-				<u-icon name="arrow-right" size="16" color="#ccc"></u-icon>
-			</view>
-			<view class="modal-item" @click="showGroupModal = true; showMoreModal = false">
-				<u-icon name="grid" size="24" color="#fa8c16"></u-icon>
-				<text class="modal-item-text">修改组别</text>
-				<u-icon name="arrow-right" size="16" color="#ccc"></u-icon>
-			</view>
-			<view class="modal-cancel" @click="closeMoreModal">
-				取消
-			</view>
-		</view>
-
-		<!-- 秒表模式弹出框 --> 
-		<view v-if="showStopwatchModal" class="modal-overlay" @click="closeStopwatchModal"></view>
-		<view v-if="showStopwatchModal" class="stopwatch-modal">
-			<view class="modal-header">
-				<text class="modal-title">秒表模式</text>
-				<view class="modal-close" @click="closeStopwatchModal">
-					<u-icon name="close" size="20" color="#999"></u-icon>
-				</view>
-			</view>
-			<view class="modal-content">
-				<view class="stopwatch-option" :class="{ active: stopwatchMode === 'interval' }"
-					@click="stopwatchMode = 'interval'">
-					<view class="option-radio">
-						<view v-if="stopwatchMode === 'interval'" class="option-dot"></view>
-					</view>
-					<text class="option-text">间隔出发</text>
-				</view>
-				<view v-if="stopwatchMode === 'interval'" class="interval-input-wrapper">
-					<view class="form-group">
-						<text class="form-label">间隔时间（秒）</text>
-						<input class="form-input" v-model="intervalTime" placeholder="请输入间隔时间" type="number" />
-					</view>
-				</view>
-				<view class="stopwatch-option" :class="{ active: stopwatchMode === 'together' }"
-					@click="stopwatchMode = 'together'">
-					<view class="option-radio">
-						<view v-if="stopwatchMode === 'together'" class="option-dot"></view>
-					</view>
-					<text class="option-text">一起出发</text>
-				</view>
-			</view>
-			<view class="modal-footer">
-				<button class="modal-confirm-btn" @click="confirmStopwatchMode">确定</button>
-			</view>
-		</view>
-
-		<!-- 添加学生弹出框 -->
-		<view v-if="showAddStudentModal" class="modal-overlay" @click="closeAddStudentModal"></view>
-		<view v-if="showAddStudentModal" class="add-student-modal">
-			<view class="modal-header">
-				<text class="modal-title">添加学生</text>
-				<view class="modal-close" @click="closeAddStudentModal">
-					<u-icon name="close" size="20" color="#999"></u-icon>
-				</view>
-			</view>
-			<view class="modal-content">
-				<view class="form-group">
-					<text class="form-label">姓名</text>
-					<input class="form-input" v-model="newStudentName" placeholder="请输入姓名" type="text" />
-				</view>
-				<view class="form-group">
-					<text class="form-label">性别</text>
-					<radio-group class="radio-group" @change="onGenderChange">
-						<label class="radio-item">
-							<radio value="男" :checked="newStudentGender === '男'" color="#1890ff" />
-							<text class="radio-text">男</text>
-						</label>
-						<label class="radio-item">
-							<radio value="女" :checked="newStudentGender === '女'" color="#1890ff" />
-							<text class="radio-text">女</text>
-						</label>
-					</radio-group>
-				</view>
-				<view class="form-group">
-					<text class="form-label">出生日期</text>
-					<view class="date-picker-wrapper" @click="openDatePicker">
-						<view class="date-value" :class="{ placeholder: !newStudentBirthday }">
-							{{ Service.formatDate(newStudentBirthday,2) || '请选择出生日期' }}
-						</view>
-						<u-icon name="calendar" size="20" color="#999"></u-icon>
-					</view>
-				</view>
-				<view class="form-group">
-					<text class="form-label">年龄</text>
-					<input class="form-input" v-model="newStudentAge" placeholder="自动计算" type="text" disabled />
-				</view>
-			</view>
-			<view class="modal-footer">
-				<button class="modal-cancel-btn" @click="closeAddStudentModal">取消</button>
-				<button class="modal-confirm-btn" @click="addNewStudent">添加</button>
-			</view>
-		</view>
-
-		<!-- 修改组别弹出框 -->
-		<view v-if="showGroupModal" class="modal-overlay" @click="closeGroupModal"></view>
-		<view v-if="showGroupModal" class="group-modal">
-			<view class="modal-header">
-				<text class="modal-title">修改组别</text>
-				<view class="modal-close" @click="closeGroupModal">
-					<u-icon name="close" size="20" color="#999"></u-icon>
-				</view>
-			</view>
-			<view class="modal-content">
-				<view class="form-group">
-					<text class="form-label">组别个数</text>
-					<input class="form-input" v-model="groupCount" placeholder="请输入组别个数" type="number" />
-				</view>
-				<view class="form-group">
-					<text class="form-label">一组多少人</text>
-					<input class="form-input" v-model="groupSize" placeholder="请输入一组多少人" type="number" />
-				</view>
-			</view>
-			<view class="modal-footer">
-				<button class="modal-cancel-btn" @click="closeGroupModal">取消</button>
-				<button class="modal-confirm-btn" @click="confirmGroupSettings">确定</button>
-			</view>
-		</view>
-
-		<!-- 悬浮保存按钮 -->
-		<view class="float-save-btn" style="color: #fff; font-size: 24rpx;" @click="saveData">
-			保存
-		</view>
-
-		<!-- 日期选择器 -->
-		<u-datetime-picker v-model="newStudentBirthday" :show="showDatePicker" mode="date" @confirm="onDateConfirm"
-			@cancel="showDatePicker = false" />
 	</view>
 </template>
 
 <script setup lang="ts">
-	import { ref, onUnmounted, computed } from 'vue'
-	import { Service } from '@/Service/Service';
+	import { ref, onUnmounted, computed, onMounted } from 'vue'
+	import { Service } from '@/Service/Service'
+	import { PlanService } from '@/Service/swimming/PlanService'
+	import { onLoad, onShow } from '@dcloudio/uni-app'
 
 	// 定义选手类型
 	interface Athlete {
@@ -222,73 +102,108 @@
 		time : number
 		bestTime : number | null
 		finished : boolean
+		startOffset ?: number
 	}
 
-	// 选手列表
-	const athletes = ref<Athlete[]>([
-		{ id: '1', number: '01', name: '张三', gender: '男', age: '18', birthday: '2006-01-01', time: 0, bestTime: null, finished: false },
-		{ id: '2', number: '02', name: '李四', gender: '女', age: '17', birthday: '2007-01-01', time: 0, bestTime: null, finished: false },
-		{ id: '3', number: '03', name: '王五', gender: '男', age: '19', birthday: '2005-01-01', time: 0, bestTime: null, finished: false },
-		{ id: '4', number: '04', name: '赵六', gender: '女', age: '18', birthday: '2006-01-01', time: 0, bestTime: null, finished: false }
-	])
+	// 定义分组类型
+	interface Group {
+		groupNumber : number
+		athletes : Athlete[]
+	}
 
+	// 计划ID
+	const planId = ref('')
+	// 项目名称
+	let planName=ref('')
+	
+	// 选手列表
+	const athletes = ref<Array<any>>([])
+
+	// 分组设置
+	const groupSize = ref('0')
+	
+	
 	// 计时器状态
 	const isRunning = ref(false)
 	const currentTime = ref(0)
 	let timerInterval : number | null = null
 	let startTime : number = 0
-
+	
 	// 当前要记录的选手索引
 	const currentAthleteIndex = ref(0)
-
+	
 	// 秒表模式
 	const stopwatchMode = ref<'interval' | 'together'>('interval')
 	// 间隔时间（秒）
-	const intervalTime = ref('')
+	const intervalTime = ref('0')
 
-	// 弹出框状态
-	const showMoreModal = ref(false)
-	const showStopwatchModal = ref(false)
-	const showAddStudentModal = ref(false)
-	const showGroupModal = ref(false)
+	onLoad((data : any) => {
+		planId.value = data.id
+		
+	})
+	
+	onShow(()=>{
+		getPlanInfo()
+	})
+	
+	// 获取计划详情
+	const getPlanInfo = () => {
+		PlanService.GetPlanInfo(planId.value).then(res => {
+			if (res.code == 0) {
+				planName.value = res.data.plan.name
+				// 将计划数据转换为选手数据
+				athletes.value = res.data.plan.users
+				groupSize.value=res.data.plan.groupInt
+				stopwatchMode.value=res.data.plan.departType=='间隔出发'?'interval':'together'
+				intervalTime.value=res.data.plan.interval
+			} else {
+				Service.Msg(res.msg)
+			}
+		})
+	}
 
-	// 组别设置
-	const groupCount = ref('')
-	const groupSize = ref('')
+	// 计算分组
+	const groupedAthletes = computed<Group[]>(() => {
+		const size = parseInt(groupSize.value) || 2
+		const groups : Group[] = []
+		let currentGroup : Group | null = null
 
-	// 新学生信息
-	const newStudentName = ref('')
-	const newStudentGender = ref('男')
-	const newStudentBirthday = ref('')
-	const newStudentAge = ref('')
+		athletes.value.forEach((athlete, index) => {
+			if (index % size === 0) {
+				currentGroup = {
+					groupNumber: groups.length + 1,
+					athletes: []
+				}
+				groups.push(currentGroup)
+			}
+			if (currentGroup) {
+				currentGroup.athletes.push(athlete)
+			}
+		})
 
-	// 日期选择器相关
-	const showDatePicker = ref(false)
-	const currentDate = ref('')
+		return groups
+	})
+
+	// 计算选手的时间偏移量
+	const getAthleteOffset = (athlete : any) : number => {
+		if (stopwatchMode.value !== 'interval') {
+			return 0
+		}
+
+		const index = athletes.value.findIndex(a => a.studentId === athlete.studentId)
+		const interval = parseFloat(intervalTime.value) || 10
+		const size = parseInt(groupSize.value) || 2
+		
+		// 根据分组计算偏移：第n组偏移 (n-1) * interval
+		const groupNumber = Math.floor(index / size)
+		return groupNumber * interval
+	}
 
 	// 计算已完成的选手
 	const finishedAthletes = computed(() => {
 		return athletes.value.filter(a => a.finished)
 	})
 
-	const deleStu = (id : any) => {
-		uni.showModal({
-			title: '提示', // 对话框标题
-			content: '是否删除该学生', // 显示的内容
-			showCancel: true, // 是否显示取消按钮
-			success: function (res) {
-				if (res.confirm) {
-					let index = athletes.value.findIndex((item) => {
-						return item.id == id
-					})
-					athletes.value.splice(index, 1)
-				} else if (res.cancel) {
-
-				}
-			}
-		});
-	}
-
 	// 格式化时间显示
 	const formatTime = (seconds : number) : string => {
 		const mins = Math.floor(seconds / 60)
@@ -308,10 +223,11 @@
 			const elapsed = (Date.now() - startTime) / 1000
 			currentTime.value = elapsed
 
-			// 更新未完成选手的时间
+			// 更新未完成选手的时间（考虑偏移量）
 			athletes.value.forEach(athlete => {
 				if (!athlete.finished) {
-					athlete.time = elapsed
+					const offset = getAthleteOffset(athlete)
+					athlete.time = Math.max(0, elapsed - offset)
 				}
 			})
 		}, 10)
@@ -342,13 +258,16 @@
 		}
 
 		if (currentAthleteIndex.value >= athletes.value.length) {
+			stopTimer()
 			Service.Msg('所有选手已完成')
 			return
 		}
 
 		const athlete = athletes.value[currentAthleteIndex.value]
+		const offset = getAthleteOffset(athlete)
 		athlete.finished = true
-		athlete.time = currentTime.value
+		athlete.time = Math.max(0, currentTime.value - offset)
+		athlete.startOffset = offset
 
 		currentAthleteIndex.value++
 
@@ -363,6 +282,7 @@
 	const resetAthleteTime = (athlete : Athlete) => {
 		athlete.time = 0
 		athlete.finished = false
+		athlete.startOffset = undefined
 
 		// 重新排序索引
 		reorderAthletes()
@@ -376,8 +296,10 @@
 			return
 		}
 
+		const offset = getAthleteOffset(athlete)
 		athlete.finished = true
-		athlete.time = currentTime.value
+		athlete.time = Math.max(0, currentTime.value - offset)
+		athlete.startOffset = offset
 
 		// 检查是否所有选手都完成了
 		const allFinished = athletes.value.every(a => a.finished)
@@ -415,168 +337,19 @@
 
 	// 重置所有
 	const resetAll = () => {
-		stopTimer()
-		currentTime.value = 0
-		currentAthleteIndex.value = 0
+		Service.Confirm('确定要重置所有计时吗？', () => {
+			stopTimer()
+			currentTime.value = 0
+			currentAthleteIndex.value = 0
 
-		athletes.value.forEach(athlete => {
-			athlete.time = 0
-			athlete.finished = false
+			athletes.value.forEach(athlete => {
+				athlete.time = 0
+				athlete.finished = false
+				athlete.startOffset = undefined
+			})
 		})
 	}
 
-	// 右上角更多按钮点击
-	const rightClick = () => {
-		showMoreModal.value = true
-	}
-
-	// 关闭更多弹出框
-	const closeMoreModal = () => {
-		showMoreModal.value = false
-	}
-
-	// 关闭秒表模式弹出框
-	const closeStopwatchModal = () => {
-		showStopwatchModal.value = false
-	}
-
-	// 确认秒表模式
-	const confirmStopwatchMode = () => {
-		if (stopwatchMode.value === 'interval') {
-			if (!intervalTime.value.trim()) {
-				Service.Msg('请输入间隔时间')
-				return
-			}
-			const intervalNum = parseFloat(intervalTime.value)
-			if (isNaN(intervalNum) || intervalNum <= 0) {
-				Service.Msg('请输入有效的间隔时间')
-				return
-			}
-			Service.Msg(`已切换为间隔出发模式，间隔${intervalTime.value}秒`, 'success')
-		} else {
-			Service.Msg('已切换为一起出发模式', 'success')
-		}
-		showStopwatchModal.value = false
-	}
-
-	// 性别选择变化
-	const onGenderChange = (e : any) => {
-		newStudentGender.value = e.detail.value
-	}
-
-	// 打开日期选择器
-	const openDatePicker = () => {
-		showDatePicker.value = true
-	}
-
-	// 根据出生日期计算年龄
-	const calculateAge = (birthday : string) : string => {
-		const birthDate = new Date(birthday)
-		const today = new Date()
-		let age = today.getFullYear() - birthDate.getFullYear()
-		const monthDiff = today.getMonth() - birthDate.getMonth()
-
-		// 如果当前月份小于出生月份，或者月份相同但日期还没到，年龄减1
-		if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birthDate.getDate())) {
-			age--
-		}
-
-		return age.toString()
-	}
-
-	// 日期选择确认
-	const onDateConfirm = (e : any) => {
-		let selectedDate = e
-		if (Array.isArray(e) && e.length > 0) {
-			selectedDate = e[0]
-		} else if (e && e.value) {
-			selectedDate = e.value
-		}
-		newStudentBirthday.value = selectedDate
-		newStudentAge.value = calculateAge(selectedDate)
-		showDatePicker.value = false
-	}
-
-	// 关闭添加学生弹出框
-	const closeAddStudentModal = () => {
-		showAddStudentModal.value = false
-		newStudentName.value = ''
-		newStudentGender.value = '男'
-		newStudentBirthday.value = ''
-		newStudentAge.value = ''
-	}
-
-	// 关闭组别弹出框
-	const closeGroupModal = () => {
-		showGroupModal.value = false
-		groupCount.value = ''
-		groupSize.value = ''
-	}
-
-	// 确认组别设置
-	const confirmGroupSettings = () => {
-		if (!groupCount.value.trim()) {
-			Service.Msg('请输入组别个数')
-			return
-		}
-		if (!groupSize.value.trim()) {
-			Service.Msg('请输入一组多少人')
-			return
-		}
-		const count = parseInt(groupCount.value)
-		const size = parseInt(groupSize.value)
-		if (isNaN(count) || count <= 0) {
-			Service.Msg('请输入有效的组别个数')
-			return
-		}
-		if (isNaN(size) || size <= 0) {
-			Service.Msg('请输入有效的一组人数')
-			return
-		}
-		Service.Msg(`已设置${count}组，每组${size}人`, 'success')
-		closeGroupModal()
-	}
-
-	// 添加新学生
-	const addNewStudent = () => {
-		if (!newStudentName.value.trim()) {
-			Service.Msg('请输入姓名')
-			return
-		}
-		if (!newStudentBirthday.value.trim()) {
-			Service.Msg('请选择出生日期')
-			return
-		}
-
-		const newNumber = (athletes.value.length + 1).toString().padStart(2, '0')
-		const newAthlete : Athlete = {
-			id: Date.now().toString(),
-			number: newNumber,
-			name: newStudentName.value.trim(),
-			gender: newStudentGender.value,
-			age: newStudentAge.value.trim(),
-			birthday: newStudentBirthday.value.trim(),
-			time: 0,
-			bestTime: null,
-			finished: false
-		}
-
-		athletes.value.push(newAthlete)
-		Service.Msg('添加成功', 'success')
-		closeAddStudentModal()
-	}
-
-	// 保存数据
-	const saveData = () => {
-		const data = {
-			athletes: athletes.value,
-			currentTime: currentTime.value,
-			stopwatchMode: stopwatchMode.value,
-			intervalTime: intervalTime.value
-		}
-		console.log(data);
-		Service.Msg('保存成功', 'success')
-	}
 
 	// 页面卸载时清理计时器
 	onUnmounted(() => {
@@ -591,30 +364,46 @@
 		min-height: 100vh;
 		background-color: #f6f6f6;
 		padding: 20rpx 20rpx;
+		padding-top: 180rpx;
 	}
 
-	/* 总用时区域 */
+	/* 总用时区域 - 固定在顶部 */
 	.total-time-section {
-		margin-top: 20rpx;
+		position: fixed;
+		top: 0rpx;
+		left: 0;
+		right: 0;
 		text-align: center;
-		margin-bottom: 60rpx;
+		padding: 40rpx 20rpx;
+		background-color: #f6f6f6;
 
-		.time-label {
-			font-size: 28rpx;
-			color: #666666;
-			margin-bottom: 20rpx;
-			display: block;
-		}
+		z-index: 100;
+		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.08);
 
 		.total-time {
 			font-size: 80rpx;
 			font-weight: bold;
 			color: #ff0000;
 		}
+
+		.plan-info {
+			margin-top: 20rpx;
+			padding: 0 20rpx;
+
+			.plan-title {
+				font-size: 24rpx;
+				color: #666;
+				background-color: rgba(255, 255, 255, 0.8);
+				padding: 8rpx 16rpx;
+				border-radius: 16rpx;
+				display: inline-block;
+			}
+		}
 	}
 
 	/* 选手列表区域 */
 	.athletes-section {
+		margin-top: 20rpx;
 		margin-bottom: 120rpx;
 
 		.section-header {
@@ -639,15 +428,57 @@
 		}
 
 		.athletes-list {
+			.group-wrapper {
+				margin-bottom: 24rpx;
+				background-color: #ffffff;
+				border-radius: 20rpx;
+				box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
+				overflow: hidden;
+
+				.group-header {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					padding: 24rpx 28rpx;
+					background: linear-gradient(135deg, #e6f7ff 0%, #f0f9ff 100%);
+					border-left: 6rpx solid #1890ff;
+
+					.group-title {
+						display: flex;
+						align-items: center;
+						gap: 12rpx;
+
+						.group-label {
+							font-size: 30rpx;
+							font-weight: 600;
+							color: #1890ff;
+						}
+					}
+
+					.group-count {
+						font-size: 24rpx;
+						color: #666;
+						background-color: rgba(255, 255, 255, 0.8);
+						padding: 6rpx 16rpx;
+						border-radius: 16rpx;
+					}
+				}
+
+				.group-athletes {
+					padding: 8rpx 16rpx 16rpx 16rpx;
+				}
+			}
+
 			.athlete-item {
 				display: flex;
 				align-items: center;
 				padding: 24rpx;
-				margin-bottom: 16rpx;
+				margin-bottom: 12rpx;
 				background-color: #ffffff;
 				border-radius: 16rpx;
-				box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+				box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.03);
 				transition: all 0.3s;
+				border: 2rpx solid transparent;
 
 				&.finished {
 					background-color: #f6ffed;
@@ -682,15 +513,33 @@
 						font-size: 30rpx;
 						font-weight: 500;
 						color: #333333;
-						margin-bottom: 4rpx;
+						margin-bottom: 6rpx;
 						display: block;
 					}
 
+					.athlete-meta {
+						display: flex;
+						flex-direction: column;
+						gap: 4rpx;
+					}
+
 					.athlete-lane {
 						font-size: 24rpx;
 						color: #999999;
 					}
 
+					.start-offset {
+						font-size: 20rpx;
+						color: #fa8c16;
+						background-color: #fff7e6;
+						padding: 2rpx 10rpx;
+						border-radius: 8rpx;
+						display: inline-flex;
+						align-items: center;
+						gap: 4rpx;
+						width: fit-content;
+					}
+
 					.fastest-tag {
 						position: absolute;
 						top: 0;
@@ -758,6 +607,7 @@
 			justify-content: center;
 		}
 
+		.back-btn,
 		.start-btn,
 		.pause-btn,
 		.reset-all-btn,
@@ -837,6 +687,17 @@
 			}
 		}
 
+		.back-btn {
+			background: linear-gradient(135deg, #722ed1 0%, #9254de 100%);
+			color: #ffffff;
+			box-shadow: 0 6rpx 20rpx rgba(114, 46, 209, 0.4);
+
+			&:active {
+				transform: scale(0.96);
+				box-shadow: 0 2rpx 8rpx rgba(114, 46, 209, 0.3);
+			}
+		}
+
 		.record-btn {
 			background: linear-gradient(135deg, #52c41a 0%, #73d13d 100%);
 			color: #ffffff;
@@ -858,292 +719,4 @@
 			text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
 		}
 	}
-
-	/* 弹出框遮罩 */
-	.modal-overlay {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.5);
-		z-index: 998;
-	}
-
-	/* 更多选项弹出框 */
-	.more-modal {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		background-color: #fff;
-		border-radius: 24rpx 24rpx 0 0;
-		z-index: 999;
-		padding: 20rpx;
-		padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
-
-		.modal-item {
-			display: flex;
-			align-items: center;
-			padding: 30rpx 20rpx;
-			border-bottom: 1rpx solid #f5f5f5;
-
-			.modal-item-text {
-				flex: 1;
-				font-size: 30rpx;
-				color: #333;
-				margin-left: 20rpx;
-			}
-		}
-
-		.modal-cancel {
-			text-align: center;
-			padding: 30rpx;
-			font-size: 30rpx;
-			color: #666;
-			background-color: #f5f5f5;
-			border-radius: 12rpx;
-			margin-top: 20rpx;
-		}
-	}
-
-	/* 秒表模式、添加学生和组别弹出框 */
-	.stopwatch-modal,
-	.add-student-modal,
-	.group-modal {
-		position: fixed;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		width: 90%;
-		max-width: 600rpx;
-		background-color: #fff;
-		border-radius: 24rpx;
-		z-index: 999;
-
-		.modal-header {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 30rpx;
-			border-bottom: 1rpx solid #f0f0f0;
-
-			.modal-title {
-				font-size: 32rpx;
-				font-weight: 600;
-				color: #333;
-			}
-
-			.modal-close {
-				width: 48rpx;
-				height: 48rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-		}
-
-		.modal-content {
-			padding: 30rpx;
-		}
-
-		.modal-footer {
-			display: flex;
-			gap: 20rpx;
-			padding: 30rpx;
-			border-top: 1rpx solid #f0f0f0;
-
-			.modal-cancel-btn,
-			.modal-confirm-btn {
-				flex: 1;
-				height: 80rpx;
-				border-radius: 12rpx;
-				border: none;
-				font-size: 30rpx;
-				font-weight: 600;
-			}
-
-			.modal-cancel-btn {
-				background-color: #f5f5f5;
-				color: #666;
-			}
-
-			.modal-confirm-btn {
-				background-color: #1890ff;
-				color: #fff;
-			}
-		}
-	}
-
-	/* 秒表模式选项 */
-	.stopwatch-option {
-		display: flex;
-		align-items: center;
-		padding: 24rpx 0;
-		border-bottom: 1rpx solid #f5f5f5;
-
-		&:last-child {
-			border-bottom: none;
-		}
-
-		&.active {
-			.option-radio {
-				border-color: #1890ff;
-			}
-		}
-
-		.option-radio {
-			width: 36rpx;
-			height: 36rpx;
-			border: 2rpx solid #ddd;
-			border-radius: 50%;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			margin-right: 20rpx;
-			transition: all 0.3s;
-
-			.option-dot {
-				width: 18rpx;
-				height: 18rpx;
-				background-color: #1890ff;
-				border-radius: 50%;
-			}
-		}
-
-		.option-text {
-			font-size: 30rpx;
-			color: #333;
-		}
-	}
-
-	/* 间隔时间输入框 */
-	.interval-input-wrapper {
-		padding: 20rpx 0 20rpx 56rpx;
-		border-bottom: 1rpx solid #f5f5f5;
-
-		.form-group {
-			margin-bottom: 0;
-
-			.form-label {
-				display: block;
-				font-size: 26rpx;
-				color: #666;
-				margin-bottom: 12rpx;
-			}
-
-			.form-input {
-				width: 100%;
-				height: 72rpx;
-				background-color: #f5f5f5;
-				border-radius: 12rpx;
-				padding: 0 24rpx;
-				font-size: 28rpx;
-				color: #333;
-			}
-		}
-	}
-
-	/* 表单组 */
-	.form-group {
-		margin-bottom: 30rpx;
-
-		&:last-child {
-			margin-bottom: 0;
-		}
-
-		.form-label {
-			display: block;
-			font-size: 28rpx;
-			color: #666;
-			margin-bottom: 12rpx;
-		}
-
-		.form-input {
-			width: 100%;
-			height: 80rpx;
-			background-color: #f5f5f5;
-			border-radius: 12rpx;
-			padding: 0 24rpx;
-			font-size: 28rpx;
-			color: #333;
-		}
-	}
-
-	/* 性别单选按钮组 */
-	.radio-group {
-		display: flex;
-		gap: 40rpx;
-
-		.radio-item {
-			display: flex;
-			align-items: center;
-			gap: 12rpx;
-
-			.radio-text {
-				font-size: 28rpx;
-				color: #333;
-			}
-		}
-	}
-
-	/* 日期选择器包装 */
-	.date-picker-wrapper {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		width: 100%;
-		height: 80rpx;
-		background-color: #f5f5f5;
-		border-radius: 12rpx;
-		padding: 0 24rpx;
-		cursor: pointer;
-
-		.date-value {
-			font-size: 28rpx;
-			color: #333;
-			flex: 1;
-
-			&.placeholder {
-				color: #999;
-			}
-		}
-	}
-
-	/* 悬浮保存按钮 */
-	.float-save-btn {
-		position: fixed;
-		right: 40rpx;
-		bottom: 180rpx;
-		width: 110rpx;
-		height: 110rpx;
-		background: linear-gradient(135deg, #1890ff 0%, #40a9ff 100%);
-		border-radius: 50%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		box-shadow: 0 6rpx 20rpx rgba(24, 144, 255, 0.4);
-		z-index: 100;
-		font-size: 28rpx;
-		font-weight: 600;
-		color: #ffffff;
-		letter-spacing: 2rpx;
-		transition: all 0.3s ease;
-
-		&::before {
-			content: '';
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			height: 50%;
-			background: linear-gradient(180deg, rgba(255, 255, 255, 0.3) 0%, transparent 100%);
-			border-radius: 50% 50% 0 0;
-		}
-
-		&:active {
-			transform: scale(0.96);
-			box-shadow: 0 4rpx 12rpx rgba(24, 144, 255, 0.3);
-		}
-	}
 </style>
\ No newline at end of file