From 744ac0cc111ff22a2295007b1605d577f489f42e Mon Sep 17 00:00:00 2001
From: Leo_Ding <2405260743@qq.com>
Date: Wed, 27 Aug 2025 14:14:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E5=B7=B2=E7=9F=A5?=
 =?UTF-8?q?=E6=99=93=E7=9A=84=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/meetingDetail/index.vue | 35 ++++++++++++++++++++---------------
 pages/sign/sign.vue           |  6 +++---
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/pages/meetingDetail/index.vue b/pages/meetingDetail/index.vue
index 915f42a..322fea6 100644
--- a/pages/meetingDetail/index.vue
+++ b/pages/meetingDetail/index.vue
@@ -626,9 +626,7 @@
 						// 页面A设置参数
 						const app = getApp()
 						app.globalData.applyInfo = applyInfo
-						uni.navigateTo({
-							url: `/pages/sign/sign?isSelfStudy=${this.isSelfStudy}`
-						})
+						this.readShow=true
 					}
 					if (this.applyType === 2) {
 						if (!this.stampUrl) return uni.showToast({
@@ -659,20 +657,27 @@
 			},
 			async postApply(){
 				this.readShow=false
-				// 这里可以添加实际的API调用
-				const res = await post('/api/v1/app_auth/metting-room/order/register', this.applyInfo)
-				if (!res || !res.success) {
-					throw new Error('会议室预定失败');
-				}
-				uni.showToast({
-					title: '预约完成，请致电社区，并关注预约记录留意审核状态，谢谢！',
-					icon: 'success'
-				});
-				if (res.success == true) {
-					uni.redirectTo({
-						url: `/pages/docList/index?files=${JSON.stringify(res.data)}&&isSelfStudy=${this.isSelfStudy}`
+				if(this.applyType===1){
+					uni.navigateTo({
+						url: `/pages/sign/sign?isSelfStudy=${this.isSelfStudy}`
 					})
+				}else{
+					// 这里可以添加实际的API调用
+					const res = await post('/api/v1/app_auth/metting-room/order/register', this.applyInfo)
+					if (!res || !res.success) {
+						throw new Error('会议室预定失败');
+					}
+					uni.showToast({
+						title: '预约完成，请致电社区，并关注预约记录留意审核状态，谢谢！',
+						icon: 'success'
+					});
+					if (res.success == true) {
+						uni.redirectTo({
+							url: `/pages/docList/index?files=${JSON.stringify(res.data)}&&isSelfStudy=${this.isSelfStudy}`
+						})
+					}
 				}
+
 			}
 
 		}
diff --git a/pages/sign/sign.vue b/pages/sign/sign.vue
index 50bc51b..2e29393 100644
--- a/pages/sign/sign.vue
+++ b/pages/sign/sign.vue
@@ -31,17 +31,17 @@
 				<!-- <button @click="saveCanvasAsImg" class="saveBtn">保存</button> -->
 				<!-- <button @click="previewCanvasImg" class="previewBtn">预览</button> -->
 				<button @click="undo" class="undoBtn">撤销</button>
-				<button @click="readShow=true" class="subBtn">完成</button>
+				<button  class="subBtn" @click="postApply">完成</button>
 			</view>
 
 
 		</view>
 
 		<pickerColor :isShow="showPickerColor" :bottom="0" @callback='getPickerColor' />
-		<u-popup :show="readShow" mode="bottom" :round="10">
+		<!-- <u-popup :show="readShow" mode="bottom" :round="10">
 			<instructionVue @change='readChange' />
 			<u-button type="primary" text="我已知晓" :disabled="hasReaded" @click="postApply"></u-button>
-		</u-popup>
+		</u-popup> -->
 	</view>
 </template>