From f7b1bd8cd86ababd2f2b1671699d422fe993b6c2 Mon Sep 17 00:00:00 2001
From: yxt_njy <119782786@qq.com>
Date: Mon, 6 May 2024 15:02:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E9=A1=B9=E7=9B=AE=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                       | 25 ++++++++++---------
 pages/find/ActivityDetail.vue    |  2 +-
 pages/publish/CreateActivity.vue | 43 ++++++++++++++++++++++++++------
 3 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/pages.json b/pages.json
index f4e0ec1..cd3211c 100644
--- a/pages.json
+++ b/pages.json
@@ -1,17 +1,5 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/publish/Publish",
-			"style": {}
-		},
-		{
-			"path": "pages/publish/EnrollCondition",
-			"style": {}
-		},
-		{
-			"path": "pages/publish/EnrollRequired",
-			"style": {}
-		},
 		{
 			"path": "pages/find/ActivityList",
 			"style": {}
@@ -28,6 +16,19 @@
 			"path": "pages/find/TeamEnroll",
 			"style": {}
 		}, 
+		{
+			"path": "pages/publish/Publish",
+			"style": {}
+		},
+		{
+			"path": "pages/publish/EnrollCondition",
+			"style": {}
+		},
+		{
+			"path": "pages/publish/EnrollRequired",
+			"style": {}
+		},
+
 		{
 			"path": "pages/team/MyTeam",
 			"style": {}
diff --git a/pages/find/ActivityDetail.vue b/pages/find/ActivityDetail.vue
index 5f3ad0e..ba66e8b 100644
--- a/pages/find/ActivityDetail.vue
+++ b/pages/find/ActivityDetail.vue
@@ -125,7 +125,7 @@
 					<checkbox style="transform:scale(0.7)" :checked="checked1"></checkbox>
 				</checkbox-group>
 				<text class="text2">我已阅读并同意</text>
-				<text style="color: #007AFF;">《参赛须知》</text>
+				<text style="color: #007AFF;">《活动免责条款》</text>
 				<text style="display: flex;text-align: center; margin-left: 20rpx; padding: 5rpx 10rpx;background: #0081D5;
 									 color: #FFFFFF; font-size: 28rpx;" @click="enroll()"> 我要报名 </text>
 			</view>
diff --git a/pages/publish/CreateActivity.vue b/pages/publish/CreateActivity.vue
index 0ed9a36..1297481 100644
--- a/pages/publish/CreateActivity.vue
+++ b/pages/publish/CreateActivity.vue
@@ -401,27 +401,54 @@
 					// console.log('=======', res)
 				});
 			}else{
-				// 如果用户已经登陆
+				
 				console.log('options.sportCategoryName', options.sportCategoryName)
 				console.log('options.sportCategorySid', options.sportCategorySid)
+				// 活动类型赋值
 				this.data.sportCategoryName = options.sportCategoryName    // 活动类型名称
 				this.data.sportCategorySid = options.sportCategorySid      // 活动类型sid
 				
-				// 控件赋值
-				this.page.cancelEnrollRefundDesc = this.control.listCancelEnrollRefund[1]
-				this.page.inviteTypeDesc = this.control.listInviteType[0]
-				this.setEnrollRequiredName()
-				// this.data.disclaimer = options.disclaimer                  // 默认免责声明
+				// 设定默认值
+				// 联系人
+				
+				// 判断是否登陆
+				let _this = this
+				if (!_this.isLogin){
+					this.WxAuthLogin()
+				}
+				
+				_this.data.sysUserSid = getApp().globalData.sysUserSid
+				
+				_this.HTTP({
+					url: 'aos/v1/aosUser/getRealInfoBySysUserSid/' + _this.data.sysUserSid,
+					method: 'GET',
+					paramsType: "FORM",
+					loading: true
+				}).then((res) => {
+					_this.data.linkerName=res.data.realName                             // 联系人姓名
+					console.log('联系人姓名', _this.data.linkerName)
+				})
+				
+				this.data.linkerPhone=res.data.linkerPhone                           // 联系人电话
+				
+				
+				console.log('联系人电话', this.data.linkerPhone)
+				// 免责条款
 				_this.HTTP({
 					url: 'aos/v1/sportCategory/getSportCategory/' + this.data.sportCategorySid,
 					method: 'GET',
 					paramsType: "FORM",
 					loading: true
 				}).then((res) => {
-					this.data.disclaimer  = res.data.disclaimerTemplate
-					// console.log('=============================================================',_this.disclaimerTemplate)
+					this.data.disclaimer  = res.data.disclaimerTemplate                   
 				})
+								
+				// 控件赋值
+				this.page.cancelEnrollRefundDesc = this.control.listCancelEnrollRefund[1]
+				this.page.inviteTypeDesc = this.control.listInviteType[0]
 				
+				this.setEnrollRequiredName()
+
 			}
 
 		},