From a249a036594aaa326c32f49c43121d45b46ee044 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Thu, 29 May 2025 15:30:41 +0800
Subject: [PATCH 1/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/notice/detail.vue | 59 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 9 deletions(-)

diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index 6488871..0be644b 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -108,19 +108,19 @@
 							{{!noticeDetail.isUrgent?'否':noticeDetail.isUrgent==1?'是':'否'}}
 						</view>
 					</view>
-					<view class="dl-item" v-if="noticeDetail.thirdUrl&&passSign">
+					<view class="dl-item" v-if="noticeDetail.thirdUrl&&isSign">
 
-						<view class="dl-label">
-							三方链接：
+						<view class="dl-label" @click="copyUrl(noticeDetail.thirdUrl)">
+							报名链接(点击复制)：
 						</view>
-						<view class="dl-value">
+						<view class="dl-value" @click="copyUrl(noticeDetail.thirdUrl)">
 							{{noticeDetail.thirdUrl}}
 						</view>
 					</view>
-					<view class="dl-item" v-else-if="noticeDetail.thirdUrl&&!passSign">
+					<view class="dl-item" v-else-if="noticeDetail.thirdUrl&&!isSign">
 
 						<view class="dl-label">
-							三方链接：
+							报名链接：
 						</view>
 						<view class="dl-value">
 							报名通过后可查看
@@ -259,7 +259,8 @@
 	} from '@/api/business/base.js'
 	import config from '@/config'
 	import {
-		getSignCard
+		getSignCard,
+		userSign
 	} from '@/api/business/signCard.js'
 	import {
 		getUrlLink
@@ -271,6 +272,9 @@
 		},
 		data() {
 			return {
+				signFormData: {
+					customForm: []
+				},
 				navigatePath: '000',
 				//是否是看自己的通告-通告主
 				viewMy: false,
@@ -371,6 +375,25 @@
 			this.viewNotice()
 		},
 		methods: {
+			copyUrl(url) {
+				uni.setClipboardData({
+					data: url,
+					success: function() {
+						uni.showToast({
+							title: '复制成功',
+							icon: 'none',
+							duration: 2000
+						});
+					},
+					fail: function() {
+						uni.showToast({
+							title: '复制失败',
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			},
 			goLogin() {
 				uni.navigateTo({
 					url: '/pages/login?canBack=true'
@@ -559,7 +582,7 @@
 						data: res.data,
 						success: function() {
 							uni.showToast({
-								title: '名单复制成功，请到浏览器下载',
+								title: '复制成功',
 								icon: 'none',
 								duration: 2000
 							});
@@ -584,12 +607,30 @@
 			 * 报名
 			 */
 			goReport() {
+				let that = this
 				getSignCard({
 					noticeId: this.noticeId
 				}).then(res => {
 					if (res.code == 200) {
 						if (res.data.canUserNum > 0) {
-							this.$tab.navigateTo('/pages/notice/report?noticeId=' + this.noticeId)
+							if (this.noticeDetail.thirdUrl) {
+								//有第三方链接的不需要在本平台填写信息
+								//处理卡片
+								this.signFormData.noticeId = this.noticeDetail.id
+								this.signFormData.cardList = [res.data.list[0]]
+								this.signFormData.isSuper = 0
+								userSign(this.signFormData).then(res => {
+									uni.showToast({
+										title: '报名成功',
+										duration: 1000
+									})
+									that.getDetail()
+
+								})
+							} else {
+								this.$tab.navigateTo('/pages/notice/report?noticeId=' + this.noticeId)
+							}
+
 						} else {
 							this.$refs.alertDialog.open()
 						}

From b566cddfedb6107f7b2b62963ddbf3a8c370e560 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Thu, 29 May 2025 15:31:19 +0800
Subject: [PATCH 2/4] 1

---
 pages/notice/detail.vue | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index 6488871..9208eaa 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -229,7 +229,18 @@
 			<shareImages ref="canvas" :canvasWidth="canvasWidth" :canvasHeight="canvasHeight" :shareTitle="shareTitle"
 				:goodsTitle="goodsTitle" :shareImage="shareImage" :qrSize="qrSize" :qrUrl="qrUrl"
 				@success="shareSuccess()" />
-
+			<!-- 报名弹窗 -->
+			<uni-popup ref="popupNew">
+				<view class="popup-content">
+					<view style="text-align: center;">
+						<view>此通告需要收集博主信息</view>
+						<view>请复制通告到微信对话框填写信息报名</view>
+					</view>
+					<view style="text-align: center;width: 100%;margin-top: 20rpx;">
+						<view class="dl-copy-button">点击复制</view>
+					</view>
+				</view>
+			</uni-popup>
 		</view>
 	</view>
 </template>
@@ -602,7 +613,6 @@
 						title: e
 					});
 				})
-
 			},
 			/**
 			 * 分享
@@ -1040,4 +1050,24 @@
 			}
 		}
 	}
+
+	.popup-content {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		padding: 30rpx;
+		border-radius: 10px;
+		background-color: white;
+
+		.dl-copy-button {
+			text-align: center;
+			margin: auto;
+			border-radius: 40rpx;
+			width: 75%;
+			background-color: #FC1F3E;
+			color: white;
+			padding: 15rpx 0;
+		}
+	}
 </style>
\ No newline at end of file

From e9d98de9229d5e505763aa8ffd869cbf4c8d87bd Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Thu, 29 May 2025 15:37:15 +0800
Subject: [PATCH 3/4] 1

---
 pages/notice/detail.vue | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index b88db13..63af7fb 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -109,18 +109,18 @@
 						</view>
 					</view>
 					<view class="dl-item" v-if="noticeDetail.thirdUrl&&isSign">
-
 						<view class="dl-label" @click="copyUrl(noticeDetail.thirdUrl)">
-							报名链接(点击复制)：
+							三方报名链接(点击复制)：
 						</view>
+					</view>
+					<view class="dl-item" v-if="noticeDetail.thirdUrl&&isSign">
 						<view class="dl-value" @click="copyUrl(noticeDetail.thirdUrl)">
 							{{noticeDetail.thirdUrl}}
 						</view>
 					</view>
 					<view class="dl-item" v-else-if="noticeDetail.thirdUrl&&!isSign">
-
 						<view class="dl-label">
-							报名链接：
+							三方报名链接：
 						</view>
 						<view class="dl-value">
 							报名通过后可查看
@@ -237,7 +237,7 @@
 						<view>请复制通告到微信对话框填写信息报名</view>
 					</view>
 					<view style="text-align: center;width: 100%;margin-top: 20rpx;">
-						<view class="dl-copy-button">点击复制</view>
+						<view class="dl-copy-button" @click="goLinkUrl">点击复制</view>
 					</view>
 				</view>
 			</uni-popup>
@@ -631,12 +631,8 @@
 								this.signFormData.cardList = [res.data.list[0]]
 								this.signFormData.isSuper = 0
 								userSign(this.signFormData).then(res => {
-									uni.showToast({
-										title: '报名成功',
-										duration: 1000
-									})
+									this.$refs.popupNew.open('center')
 									that.getDetail()
-
 								})
 							} else {
 								this.$tab.navigateTo('/pages/notice/report?noticeId=' + this.noticeId)

From 3526d2197a89cdbe3822ce4e159badd0463d4e7e Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Thu, 29 May 2025 15:41:20 +0800
Subject: [PATCH 4/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/set/my-info.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/mine/set/my-info.vue b/pages/mine/set/my-info.vue
index 6363afc..5c18cc5 100644
--- a/pages/mine/set/my-info.vue
+++ b/pages/mine/set/my-info.vue
@@ -13,7 +13,7 @@
 					<uni-easyinput v-model="valiFormData.nickName" placeholder="请输入" />
 				</uni-forms-item>
 				<uni-forms-item labelWidth="280rpx" label="联系方式" required name="phonenumber">
-					<uni-easyinput v-model="valiFormData.phonenumber" placeholder="请输入" />
+					<uni-easyinput v-model="valiFormData.phonenumber" type="number" placeholder="请输入" />
 				</uni-forms-item>
 				<uni-forms-item labelWidth="280rpx" label="绑定手机号" required name="userName">
 					<uni-easyinput disabled v-model="valiFormData.userName" />