From 2a48964efbd692d057a6105df4cdccd9d05364c5 Mon Sep 17 00:00:00 2001
From: Leo_Ding <2405260743@qq.com>
Date: Tue, 12 Aug 2025 09:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/custom-back-header.vue | 150 +++++++++++++
 pages.json                        |  10 +-
 pages/chat/chatPage.vue           | 160 ++++++++++----
 pages/chat/index.vue              |   1 +
 pages/docList/index.vue           |  30 ++-
 pages/meetingDetail/index.vue     |   2 +-
 pages/meetingList/index.vue       |  10 +-
 pages/neighbor/index.vue          |   1 +
 pages/sign/sign.vue               | 344 +++++++++++++++++-------------
 static/imgs/wechat.png            | Bin 0 -> 4724 bytes
 utils/config.js                   |   1 +
 11 files changed, 512 insertions(+), 197 deletions(-)
 create mode 100644 components/custom-back-header.vue
 create mode 100644 static/imgs/wechat.png

diff --git a/components/custom-back-header.vue b/components/custom-back-header.vue
new file mode 100644
index 0000000..65ffeaf
--- /dev/null
+++ b/components/custom-back-header.vue
@@ -0,0 +1,150 @@
+<template>
+  <!-- 自定义顶部返回栏 -->
+  <view class="custom-back-header" :style="headerStyle">
+    <!-- 返回按钮 -->
+    <view class="back-btn" @click="handleBack">
+      <slot name="icon">
+        <!-- 默认返回图标 -->
+        <view class="icon">←</view>
+      </slot>
+      <text v-if="showText" class="text">{{ backText }}</text>
+    </view>
+    
+    <!-- 标题插槽 -->
+    <view class="title">
+      <slot>{{ title }}</slot>
+    </view>
+    
+    <!-- 右侧插槽 -->
+    <view class="right-slot">
+      <slot name="right"></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    // 标题文字
+    title: {
+      type: String,
+      default: ''
+    },
+    // 是否显示返回文字
+    showText: {
+      type: Boolean,
+      default: true
+    },
+    // 返回按钮文字
+    backText: {
+      type: String,
+      default: '返回'
+    },
+    // 背景颜色
+    bgColor: {
+      type: String,
+      default: '#ffffff'
+    },
+    // 文字颜色
+    color: {
+      type: String,
+      default: '#333333'
+    },
+    // 是否沉浸式（占位）
+    immersive: {
+      type: Boolean,
+      default: true
+    },
+    // 指定返回目标路径
+    targetPath: {
+      type: String,
+      default: ''
+    }
+  },
+  computed: {
+    headerStyle() {
+      return {
+        backgroundColor: this.bgColor,
+        color: this.color,
+        paddingTop: this.immersive ? 'var(--status-bar-height)' : '0'
+      };
+    }
+  },
+  methods: {
+    handleBack() {
+      if (this.$listeners.back) {
+        // 如果有自定义back事件则触发
+        this.$emit('back');
+        return;
+      }
+      
+      const pages = getCurrentPages();
+      
+      // 指定目标页面返回
+      if (this.targetPath) {
+        const target = pages.find(page => 
+          page.route === this.targetPath.replace(/^\//, '')
+        );
+        
+        if (target) {
+          const delta = pages.length - pages.indexOf(target) - 1;
+          uni.navigateBack({ delta });
+        } else {
+          uni.redirectTo({ url: this.targetPath });
+        }
+        return;
+      }
+      
+      // 默认返回逻辑
+      if (pages.length >= 2) {
+        uni.navigateBack();
+      } else {
+        uni.switchTab({ url: '/pages/index/index' });
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+.custom-back-header {
+  display: flex;
+  align-items: center;
+  height: 44px;
+  padding: 0 15px;
+  position: relative;
+  z-index: 999;
+}
+
+.back-btn {
+  display: flex;
+  align-items: center;
+  padding: 5px 10px 5px 0;
+  margin-right: 10px;
+}
+
+.icon {
+  font-size: 20px;
+  margin-right: 5px;
+}
+
+.text {
+  font-size: 16px;
+}
+
+.title {
+  flex: 1;
+  text-align: center;
+  font-size: 17px;
+  font-weight: bold;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.right-slot {
+  min-width: 60px;
+  display: flex;
+  justify-content: flex-end;
+}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index b8a8526..822b93d 100644
--- a/pages.json
+++ b/pages.json
@@ -172,9 +172,10 @@
 		// 会议室预定
 		{
 		  "path": "pages/meetingList/index",
-		  "style": {
-		    "navigationBarTitleText": "近山社区",
-		    "navigationStyle": "custom"  // 隐藏原生导航栏
+		  "style": {
+			  "navigationStyle": "default",
+		    "navigationBarTitleText": "近山社区"
+		    // "navigationStyle": "custom"  // 隐藏原生导航栏
 		  }
 		},
 		// 会议室详情
@@ -206,18 +207,21 @@
 		{
 			"path": "pages/sign/sign",
 			"style": {
+				"navigationStyle": "default",
 				"navigationBarTitleText": "电子签名"
 			}
 		},
 		{
 			"path": "pages/docList/index",
 			"style": {
+				"navigationStyle": "default",
 				"navigationBarTitleText": "文件下载"
 			}
 		}
 		
 	],
 	"globalStyle": {
+		
 		"navigationBarTextStyle": "black",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
diff --git a/pages/chat/chatPage.vue b/pages/chat/chatPage.vue
index 4341c27..9975a4b 100644
--- a/pages/chat/chatPage.vue
+++ b/pages/chat/chatPage.vue
@@ -84,25 +84,40 @@
 		</scroll-view>
 
 		<!-- 输入区域 -->
-		<view class="chat-input">
-			<view class="" style="flex: 1;">
-				<input class="input-field" placeholder="输入消息..." v-model="inputMsg" @confirm="sendMessage"
-					confirm-type="send" />
-			</view>
-			<view class="" style="width: 100px;">
-				<u-button type="primary" :disabled="!inputMsg.trim()||isAnswering" @click="sendMessage" shape="circle">
-					发送
-				</u-button>
+		<view class="chat-bottom">
+			<view class="" style="padding: 10px;">
+				<view class="aiTag" v-if="aiName==='生活咨询'" @click="sendMessageCeshi(0)">
+					最近雨季来了，家里总是很潮湿，有什么简单有效的除湿防霉小妙招吗？
+				</view>
+				<view class="aiTag" v-if="aiName==='穿搭顾问'" @click="sendMessageCeshi(1)">
+					我下周要参加一个商务休闲风格的客户午餐会（夏天，户外庭院），男，身高175cm，体型偏瘦，肤色偏白，有什么搭配建议吗？
+				</view>
+				<view class="aiTag" v-if="aiName==='膳食管家'" @click="sendMessageCeshi(2)">
+					我想开始减脂，能为我设计一份适合上班族、操作简单、营养均衡的晚餐食谱吗？
+				</view>
 			</view>
+			<view class="chat-input">
+				<view class="" style="flex: 1;">
+					<input class="input-field" placeholder="输入消息..." v-model="inputMsg" @confirm="sendMessage"
+						confirm-type="send" />
+				</view>
+				<view class="" style="width: 100px;">
+					<u-button type="primary" :disabled="!inputMsg.trim()||isAnswering" @click="sendMessage"
+						shape="circle">
+						发送
+					</u-button>
+				</view>
 
+			</view>
 		</view>
+
 	</view>
 </template>
 
 <script>
 	import {
 		WS_BASE_URL,
-		IMAGE_BASE_URL 
+		IMAGE_BASE_URL
 	} from '@/utils/config';
 
 	export default {
@@ -124,7 +139,14 @@
 				serviceUrl: '',
 				currentAnswer: '',
 				isAnswering: false,
-				isHandleClose:false
+				isHandleClose: false,
+				connectNum: 0,
+				aiName: '',
+				aiDefaultList: [
+					'最近雨季来了，家里总是很潮湿，有什么简单有效的除湿防霉小妙招吗？',
+					'我下周要参加一个商务休闲风格的客户午餐会（夏天，户外庭院），男，身高175cm，体型偏瘦，肤色偏白，有什么搭配建议吗？',
+					'我想开始减脂，能为我设计一份适合上班族、操作简单、营养均衡的晚餐食谱吗？'
+				]
 			}
 		},
 
@@ -132,11 +154,11 @@
 			this.serviceUrl = options.serviceUrl || '';
 			this.apiKey = options.apiKey || '';
 			this.botAvatar = options.icon || this.botAvatar;
-
+			this.aiName = options.name
 			const userInfo = wx.getStorageSync('userInfo') || {};
 			this.userId = userInfo.id || Date.now().toString();
 			this.userName = userInfo.name || '默认用户';
-			this.userAvatar = userInfo.avatar?`${IMAGE_BASE_URL+userInfo.avatar}`:this.userAvatar;
+			this.userAvatar = userInfo.avatar ? `${IMAGE_BASE_URL+userInfo.avatar}` : this.userAvatar;
 
 			uni.setNavigationBarTitle({
 				title: options.name || 'AI助手'
@@ -153,7 +175,7 @@
 			// 初始化WebSocket连接
 			initWebSocket() {
 				if (this.isConnected) return;
-
+				console.log(WS_BASE_URL,'aiName===');
 				// 微信小程序中使用 wx.connectSocket
 				this.socketTask = wx.connectSocket({
 					url: `${WS_BASE_URL}/api/v1/ws/ai?apiUrl=${encodeURIComponent(this.serviceUrl)}&apiToken=${this.apiKey}&userName=${this.userName}`,
@@ -170,17 +192,20 @@
 				this.socketTask.onOpen(() => {
 					console.log('WebSocket连接已打开');
 					this.isConnected = true;
-					this.reconnectAttempts = 0;
-					const params = {
-						sender: 'bot',
-						thinkContent: '',
-						answerContent: '',
-						type: 'normal',
-						isTyping: false,
-						showAnswer: '已连接，请输入您的问题',
-						answerType: 2
+					// this.reconnectAttempts = 0;
+					if (this.reconnectAttempts === 0) {
+						const params = {
+							sender: 'bot',
+							thinkContent: '',
+							answerContent: '',
+							type: 'normal',
+							isTyping: false,
+							showAnswer: '已连接，请输入您的问题',
+							answerType: 2
+						}
+						this.addMessage(params);
 					}
-					this.addMessage(params);
+
 				});
 
 				this.socketTask.onMessage((res) => {
@@ -207,7 +232,7 @@
 				this.socketTask.onClose(() => {
 					console.log('WebSocket连接已关闭');
 					this.isConnected = false;
-					if(!this.isHandleClose){
+					if (!this.isHandleClose) {
 						this.handleReconnect();
 					}
 				});
@@ -329,7 +354,9 @@
 					if (lastMsg.answerContent.includes('outfit')) {
 						const ls = lastMsg.answerContent.replace(/\n/g, '')
 						try {
+							console.log(lastMsg.answerContent)
 							const obj = JSON.parse(lastMsg.answerContent)
+							console.log(obj)
 							lastMsg.answerContent = obj
 						} catch (error) {
 							lastMsg.answerContent = '哎呀，AI开小差了，请重新提问'
@@ -437,7 +464,54 @@
 
 				this.inputMsg = '';
 			},
+			sendMessageCeshi(index) {
+				const content = this.aiDefaultList[index];
+				if (!content || !this.isConnected) return;
+				const params = {
+					sender: 'me',
+					thinkContent: '',
+					answerContent: '',
+					type: 'normal',
+					isTyping: false,
+					showAnswer: content,
+					answerType: 2
+				}
+				this.addMessage(params);
+				this.isAnswering = true
+				// 微信小程序中使用 socketTask.send
+				this.socketTask.send({
+					data: content,
+					success: () => {
+						console.log('消息发送成功');
+						const params = {
+							sender: 'bot',
+							thinkContent: '思考中...',
+							answerContent: '',
+							type: 'normal',
+							isTyping: true,
+							showAnswer: '',
+							answerType: 2
+						}
+						// 添加机器人正在输入的提示
+						this.addMessage(params);
+					},
+					fail: (err) => {
+						console.error('消息发送失败', err);
+						const params = {
+							sender: 'bot',
+							thinkContent: '',
+							answerContent: '',
+							type: 'normal',
+							isTyping: true,
+							showAnswer: '消息发送失败，请重试',
+							answerType: 2
+						}
+						this.addMessage(params);
+					}
+				});
 
+				this.inputMsg = '';
+			},
 			// 处理重连逻辑
 			handleReconnect() {
 				if (this.reconnectAttempts >= this.maxReconnectAttempts) {
@@ -466,14 +540,14 @@
 			// 关闭WebSocket连接
 			closeWebSocket() {
 				if (this.socketTask) {
-				    // 移除所有回调引用
-				    this.socketTask.onClose = null;
-				    this.socketTask.onError = null;
-				    this.socketTask.onMessage = null;
-				    this.socketTask.close();
-				    this.socketTask = null;
-					this.isHandleClose=true
-				  }
+					// 移除所有回调引用
+					this.socketTask.onClose = null;
+					this.socketTask.onError = null;
+					this.socketTask.onMessage = null;
+					this.socketTask.close();
+					this.socketTask = null;
+					this.isHandleClose = true
+				}
 				this.isConnected = false;
 			},
 
@@ -519,6 +593,14 @@
 		justify-content: flex-start;
 	}
 
+	.aiTag {
+		padding: 5px;
+		font-size: 14px;
+		background: #f0f0f0;
+		border-radius: 10px;
+		color: #666;
+	}
+
 	.avatar {
 		width: 36px;
 		height: 36px;
@@ -544,13 +626,19 @@
 		color: #333333;
 	}
 
-	.chat-input {
-		display: flex;
-		padding: 10px;
+	.chat-bottom {
 		background-color: white;
 		border-top: 1px solid #ddd;
 	}
 
+	.chat-input {
+		background-color: white;
+		border-top: 1px solid #ddd;
+		display: flex;
+		padding: 10px;
+
+	}
+
 	.input-field {
 		flex: 1;
 		padding: 8px 15px;
diff --git a/pages/chat/index.vue b/pages/chat/index.vue
index 7ea9d87..b099544 100644
--- a/pages/chat/index.vue
+++ b/pages/chat/index.vue
@@ -50,6 +50,7 @@
         },
         methods: {
             goAiType(item) {
+				console.log(item);
                 navigateTo({
                     url: `/pages/chat/chatPage?serviceUrl=${item.serviceUrl}&apiKey=${item.apiKey}&id=${item.id}&name=${item.name}&icon=${item.icon}`
                 });
diff --git a/pages/docList/index.vue b/pages/docList/index.vue
index a2b01de..945c656 100644
--- a/pages/docList/index.vue
+++ b/pages/docList/index.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="doc-page">
+
 		<view class="doc-content">
 			<view class="doc-file" v-for="item of docList" @click="downLoadFile(item)">
 				<image src="/static/imgs/word.png" alt="" srcset="" class="doc-img"/>
@@ -37,6 +38,12 @@
 			]
 		},
 		methods:{
+			handleBack() {
+				// 固定跳转首页
+				uni.redirectTo({
+					 	url: `/pages/meetingList/index`
+				})
+			},
 			async downLoadFile(fileUrl){
 				  const result = await downloadPdfFiles(fileUrl);
 				  	  if(result.success==true){
@@ -46,7 +53,7 @@
 				  	  }
 			},
 			reback(){
-				uni.redirectTo({
+				uni.reLaunch({
 					 	url: `/pages/meetingList/index`
 				})
 			}
@@ -84,4 +91,25 @@
 		  text-overflow: ellipsis;
 		  white-space: nowrap;
 	}
+	.nav-bar {
+		display: flex;
+		align-items: center;
+		padding: 15px;
+		// background-color: #fff;
+		border-bottom: 1px solid #f5f5f5;
+		margin-top: 84rpx;
+	}
+	
+	.nav-left {
+		display: flex;
+		align-items: center;
+		margin-right: 10px;
+	}
+	
+	.nav-title {
+		flex: 1;
+		text-align: center;
+		// font-weight: bold;
+		width: 100%;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/meetingDetail/index.vue b/pages/meetingDetail/index.vue
index 8f63051..81ef91e 100644
--- a/pages/meetingDetail/index.vue
+++ b/pages/meetingDetail/index.vue
@@ -620,7 +620,7 @@
 					icon: 'success'
 				});
 				if (res.success == true) {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: `/pages/docList/index?files=${JSON.stringify(res.data)}&&isSelfStudy=${this.isSelfStudy}`
 					})
 				}
diff --git a/pages/meetingList/index.vue b/pages/meetingList/index.vue
index 869e4a3..1cff183 100644
--- a/pages/meetingList/index.vue
+++ b/pages/meetingList/index.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="container">
 		<!-- 自定义导航栏 -->
-		<view class="nav-bar">
+		<!-- <view class="nav-bar">
 			<view class="nav-left" @click="handleBack">
 				<u-icon name="arrow-left" size="44"></u-icon>
-				<!--  <text>返回</text> -->
+				 <text>返回</text>
 			</view>
 			<text class="nav-title">近山社区</text>
-		</view>
+		</view> -->
 
 		<view v-if="tabsReady">
 			<u-tabs :list="tabList" :current="currentTab" @change="handleTabChange" border="false"
@@ -397,13 +397,13 @@
 			padding: 15px;
 			// background-color: #fff;
 			border-bottom: 1px solid #f5f5f5;
-			margin-top: 84rpx;
+			padding-top: 60rpx;
 		}
 
 		.nav-left {
 			display: flex;
 			align-items: center;
-			margin-right: 10px;
+			// margin-right: 10px;
 		}
 
 		.nav-title {
diff --git a/pages/neighbor/index.vue b/pages/neighbor/index.vue
index 47205dd..676ae4d 100644
--- a/pages/neighbor/index.vue
+++ b/pages/neighbor/index.vue
@@ -93,6 +93,7 @@
 			        uni.getLocation({
 			            type: 'wgs84',
 			            success: (res) => {
+							console.log('=====>',res)
 			                resolve({
 			                    longitude: res.longitude,
 			                    latitude: res.latitude
diff --git a/pages/sign/sign.vue b/pages/sign/sign.vue
index 62d56be..50bc51b 100644
--- a/pages/sign/sign.vue
+++ b/pages/sign/sign.vue
@@ -4,6 +4,13 @@
 			<!-- <view class="handRight">
 				<view class="handTitle">请签名</view>
 			</view> -->
+<!-- 			<view class="nav-bar">
+				<view class="nav-left" @click="handleBack">
+					<u-icon name="arrow-left" size="44"></u-icon>
+					 <text>返回</text>
+				</view>
+				<text class="nav-title">签名</text>
+			</view> -->
 			<view class="handCenter">
 				<canvas class="handWriting" :disable-scroll="true" @touchstart="uploadScaleStart"
 					@touchmove="uploadScaleMove" @touchend="uploadScaleEnd" canvas-id="handWriting"></canvas>
@@ -26,8 +33,8 @@
 				<button @click="undo" class="undoBtn">撤销</button>
 				<button @click="readShow=true" class="subBtn">完成</button>
 			</view>
-			
-			
+
+
 		</view>
 
 		<pickerColor :isShow="showPickerColor" :bottom="0" @callback='getPickerColor' />
@@ -39,11 +46,18 @@
 </template>
 
 <script>
-	import { post } from "../../utils/request";
-import pickerColor from "./pickerColor.vue"
-	 import {IMAGE_BASE_URL,BASE_URL} from '@/utils/config';
-	 import {downloadPdfFiles} from '@/utils/download.js'
-	 import instructionVue from '../../components/instruction.vue';
+	import {
+		post
+	} from "../../utils/request";
+	import pickerColor from "./pickerColor.vue"
+	import {
+		IMAGE_BASE_URL,
+		BASE_URL
+	} from '@/utils/config';
+	import {
+		downloadPdfFiles
+	} from '@/utils/download.js'
+	import instructionVue from '../../components/instruction.vue';
 	export default {
 		components: {
 			pickerColor,
@@ -51,8 +65,8 @@ import pickerColor from "./pickerColor.vue"
 		},
 		data() {
 			return {
-				readShow:false,
-				hasReaded:true,
+				readShow: false,
+				hasReaded: true,
 				showPickerColor: false,
 				ctx: '',
 				canvasWidth: 0,
@@ -74,8 +88,8 @@ import pickerColor from "./pickerColor.vue"
 				},
 				toDataURL: void 0,
 				requestAnimationFrame: void 0,
-				applyInfo:null,
-				isSelfStudy:true,
+				applyInfo: null,
+				isSelfStudy: true,
 			};
 		},
 		props: { //可用于修改的参数放在props里   也可单独放在外面做成组件调用  传值
@@ -109,14 +123,14 @@ import pickerColor from "./pickerColor.vue"
 			},
 		},
 		onLoad(option) {
-			this.isSelfStudy=option.isSelfStudy
+			this.isSelfStudy = option.isSelfStudy
 			// 页面A设置参数
 			const app = getApp()
-			if(app.globalData.applyInfo){
-				this.applyInfo=app.globalData.applyInfo
-			}else{
+			if (app.globalData.applyInfo) {
+				this.applyInfo = app.globalData.applyInfo
+			} else {
 				uni.navigateTo({
-					url:'/pages/meetingList/index'
+					url: '/pages/meetingList/index'
 				})
 			}
 			this.ctx = uni.createCanvasContext("handWriting");
@@ -130,12 +144,16 @@ import pickerColor from "./pickerColor.vue"
 			});
 		},
 		methods: {
-	readChange(flag){
-		this.hasReaded=flag
-		
-	},
-			postApply(){
-				this.readShow=false
+			handleBack() {
+				// 固定跳转首页
+				uni.navigateBack()
+			},
+			readChange(flag) {
+				this.hasReaded = flag
+
+			},
+			postApply() {
+				this.readShow = false
 				// 这里可以添加实际的API调用
 				this.subCanvas()
 			},
@@ -430,141 +448,145 @@ import pickerColor from "./pickerColor.vue"
 			//完成
 			// 完成
 			subCanvas() {
-			  if (this.isEmpty()) {
-			    uni.showToast({
-			      title: '没有任何绘制内容哦',
-			      icon: 'none',
-			    });
-			    return;
-			  }
-			  
-			  uni.showLoading({
-			    title: '正在生成图片...'
-			  });
-			  
-			  uni.canvasToTempFilePath({
-			    canvasId: 'handWriting',
-			    fileType: 'png',
-			    quality: 1,
-			    success: async (res) => {
-			      uni.hideLoading();
-			      
-			      // 1. 保存到本地相册
-			      try {
-			        // await this.saveToAlbum(res.tempFilePath);
-			        
-			        // 2. 上传到服务器
-			        uni.showLoading({
-			          title: '正在上传签名...'
-			        });
-			        
-			        const uploadRes = await this.uploadSignature(res.tempFilePath);
-			        
-			        uni.hideLoading();
-					this.applyInfo.applySign=uploadRes
-			        const response=await post('/api/v1/app_auth/metting-room/order/register', this.applyInfo)
-					console.log("===response", response)
-					if (!response || !response.success) {
-						throw new Error('会议室预定失败');
-					}
-					if(response.success==true){
-						uni.navigateTo({
-							url:`/pages/docList/index?files=${JSON.stringify(response.data)}&&isSelfStudy=${this.isSelfStudy}`
-						})
-					}
+				if (this.isEmpty()) {
 					uni.showToast({
-						title: '会议室预定成功!',
-						icon: 'success'
+						title: '没有任何绘制内容哦',
+						icon: 'none',
 					});
-					
-					//   const result = await downloadPdfFiles(response);
-					//       console.log('下载结果:', result);
-					// 	  if(result.success==true){
-					// 		  uni.navigateTo({
-					// 		  	url: `/pages/meetingList/index`
-					// 		  });
-					// 	  }
-					
-			        
-			        // 3. 可以通过回调或者事件将上传结果返回给父组件
-			        // this.$emit('upload-success', {
-			        //   tempFilePath: res.tempFilePath,
-			        //   serverPath: uploadRes // 假设服务器返回了图片地址
-			        // });
-			        
-			      } catch (error) {
-			        uni.hideLoading();
-			        uni.showToast({
-			          title: error.message || '上传失败',
-			          icon: 'none'
-			        });
-			      }
-			    },
-			    fail: (err) => {
-			      uni.hideLoading();
-			      uni.showToast({
-			        title: '生成图片失败',
-			        icon: 'none'
-			      });
-			      console.error(err);
-			    }
-			  });
+					return;
+				}
+
+				uni.showLoading({
+					title: '正在生成图片...'
+				});
+
+				uni.canvasToTempFilePath({
+					canvasId: 'handWriting',
+					fileType: 'png',
+					quality: 1,
+					success: async (res) => {
+						uni.hideLoading();
+
+						// 1. 保存到本地相册
+						try {
+							// await this.saveToAlbum(res.tempFilePath);
+
+							// 2. 上传到服务器
+							uni.showLoading({
+								title: '正在上传签名...'
+							});
+
+							const uploadRes = await this.uploadSignature(res.tempFilePath);
+
+							uni.hideLoading();
+							this.applyInfo.applySign = uploadRes
+							const response = await post('/api/v1/app_auth/metting-room/order/register', this
+								.applyInfo)
+							console.log("===response", response)
+							if (!response || !response.success) {
+								throw new Error('会议室预定失败');
+							}
+							if (response.success == true) {
+								uni.redirectTo({
+									url: `/pages/docList/index?files=${JSON.stringify(response.data)}&&isSelfStudy=${this.isSelfStudy}`
+								})
+							}
+							uni.showToast({
+								title: '会议室预定成功!',
+								icon: 'success'
+							});
+
+							//   const result = await downloadPdfFiles(response);
+							//       console.log('下载结果:', result);
+							// 	  if(result.success==true){
+							// 		  uni.navigateTo({
+							// 		  	url: `/pages/meetingList/index`
+							// 		  });
+							// 	  }
+
+
+							// 3. 可以通过回调或者事件将上传结果返回给父组件
+							// this.$emit('upload-success', {
+							//   tempFilePath: res.tempFilePath,
+							//   serverPath: uploadRes // 假设服务器返回了图片地址
+							// });
+
+						} catch (error) {
+							uni.hideLoading();
+							uni.showToast({
+								title: error.message || '上传失败',
+								icon: 'none'
+							});
+						}
+					},
+					fail: (err) => {
+						uni.hideLoading();
+						uni.showToast({
+							title: '生成图片失败',
+							icon: 'none'
+						});
+						console.error(err);
+					}
+				});
 			},
-			
+
 			// 保存到相册的方法
 			saveToAlbum(tempFilePath) {
-			  return new Promise((resolve, reject) => {
-			    uni.saveImageToPhotosAlbum({
-			      filePath: tempFilePath,
-			      success: () => {
-			        uni.showToast({
-			          title: '已保存到相册',
-			          duration: 2000
-			        });
-			        resolve();
-			      },
-			      fail: (err) => {
-			        reject(new Error('保存到相册失败'));
-			        console.error(err);
-			      }
-			    });
-			  });
+				return new Promise((resolve, reject) => {
+					uni.saveImageToPhotosAlbum({
+						filePath: tempFilePath,
+						success: () => {
+							uni.showToast({
+								title: '已保存到相册',
+								duration: 2000
+							});
+							resolve();
+						},
+						fail: (err) => {
+							reject(new Error('保存到相册失败'));
+							console.error(err);
+						}
+					});
+				});
 			},
-			
+
 			// 上传签名到服务器的方法
 			uploadSignature(tempFilePath) {
-			  return new Promise((resolve, reject) => {
-			    // 这里替换为你自己的上传接口
-			    const uploadUrl = IMAGE_BASE_URL+'/api/v1/upload';
-			    uni.uploadFile({
-			      url: uploadUrl,
-			      filePath: tempFilePath,
-			      name: 'file',
-			      // formData: {
-			      //   // 可以添加其他表单数据
-			      //   userId: '123', // 示例用户ID
-			      //   type: 'signature'
-			      // },
-			      success: (uploadRes) => {
-					  console.log(uploadRes);
-					  console.log(JSON.parse(uploadRes.data))
-			        try {
-			          const {success,data} = JSON.parse(uploadRes.data);
-			          if (success) {
-			            resolve(data); // 假设服务器返回了图片URL
-			          } else {
-			            reject(new Error(success || '上传失败'));
-			          }
-			        } catch (e) {
-			          reject(new Error('解析服务器响应失败'));
-			        }
-			      },
-			      fail: (err) => {
-			        reject(new Error('上传请求失败'));
-			        console.error(err);
-			      }
-			    });
-			  });
+				return new Promise((resolve, reject) => {
+					// 这里替换为你自己的上传接口
+					const uploadUrl = IMAGE_BASE_URL + '/api/v1/upload';
+					uni.uploadFile({
+						url: uploadUrl,
+						filePath: tempFilePath,
+						name: 'file',
+						// formData: {
+						//   // 可以添加其他表单数据
+						//   userId: '123', // 示例用户ID
+						//   type: 'signature'
+						// },
+						success: (uploadRes) => {
+							console.log(uploadRes);
+							console.log(JSON.parse(uploadRes.data))
+							try {
+								const {
+									success,
+									data
+								} = JSON.parse(uploadRes.data);
+								if (success) {
+									resolve(data); // 假设服务器返回了图片URL
+								} else {
+									reject(new Error(success || '上传失败'));
+								}
+							} catch (e) {
+								reject(new Error('解析服务器响应失败'));
+							}
+						},
+						fail: (err) => {
+							reject(new Error('上传请求失败'));
+							console.error(err);
+						}
+					});
+				});
 			},
 			//保存到相册
 			saveCanvasAsImg() {
@@ -616,11 +638,31 @@ import pickerColor from "./pickerColor.vue"
 		overflow: hidden;
 		display: flex;
 		align-content: center;
-		flex-direction:column;
+		flex-direction: column;
 		/* justify-content: center; */
 		font-size: 28rpx;
 	}
+		.nav-bar {
+			display: flex;
+			align-items: center;
+			padding: 15px;
+			// background-color: #fff;
+			border-bottom: 1px solid #f5f5f5;
+			padding-top: 60rpx;
+		}
 
+		.nav-left {
+			display: flex;
+			align-items: center;
+			/* margin-right: 10px; */
+		}
+
+		.nav-title {
+			flex: 1;
+			text-align: center;
+			// font-weight: bold;
+			width: 100%;
+		}
 	.handWriting {
 		background: #fff;
 		width: 95vw;
@@ -657,7 +699,7 @@ import pickerColor from "./pickerColor.vue"
 		display: flex;
 		/* flex-direction: column; */
 		justify-content: space-between;
-		align-content:center;
+		align-content: center;
 		align-items: center;
 		/* flex: 1; */
 	}
diff --git a/static/imgs/wechat.png b/static/imgs/wechat.png
new file mode 100644
index 0000000000000000000000000000000000000000..c808cc6070948b38dcc007654e44764b7b10675f
GIT binary patch
literal 4724
zcmds5`9IX(_qPm&EH6ugQU+s}oiT;H>@&8IZR|_3@3N&d$XLo??DAFykx`b(-XcWy
zZ7daUdk9gsC?D_t;`{jiaPISmd(QKmd+vRl$GIo@hN%G?%LNu18X7jVp{~Ul_WUPM
z#<P`dTT^@nw4oLT+B7wT0&6rhT(W3g@MfgbrsK7qTWHQLMuq_%R%;+kgiVFV@eY!Q
zUd2*3Y}i2$<Te*ku~4G#$~WW&m6RfaKqaIy5C#U(gY@qi68EVT`=O%dgF9AFs_uRH
z%g%cG_V{3J?2lEfWBR?WI3_5~gBMU;7kWtCyKsmW;Kc+qJ)nWo?a|P|p<y)8Z$KQw
z$o#`b7)S%L(;fa+&Q1&HCS9DxLTCXGPO!A_>Y34{fJk3Xh!#N)@+e>(paH|0=E-_z
z2;)?4snnr?{NEvPg<dWDRRhrdDXln>3H<AA*>!Zlx43_*@Fq^URG0?m(Muv~X5Ej~
zJiR+l$Bzg>WD@Vcd<Zx_J7tVQ0Q+*SGN7Ump4A{3p6w<y;7-tIaXjAb14tr5Y8Ij!
zyC$}L>^J@UzNmnV;$14}co~0G&`;k8G{HFSrC^#+bZW9gtwDvRy6%@zGoA<?LXo$y
z1<|Eduxj5~(>|L|<WJ`q@L-KOGkIrGzz>;F(^r9qbGVq#xL#KQEik%iFj#57uS3CH
zlj`*a$*!d7XD)BLxNjAVh1ATI{U(kgwV_L<cGpRfzizPP6z3vJ_X4ytX63lkh^Diq
zs#r>)qBGvSdbsVz&`k(ha-@iXGyWb{T^IlJZbAZdhGTW#^7D27JT17ib^z}JH`yhi
z4ao+wk{L4=MxZR&%sL*mdDRJ@DZ*e{b+<gJNld5oUPl36mWS85%<L5#rr#$e*~eie
zkIdS9Jgg){je{=~$3t0-2=x3?7xd5|=3OlCO!H;nN_fK-uY)Z82pgI}<g#Nkft$Wx
zAMb2JjL}Qe%Lj%K5IUTQ^a9<-e~MGF$lM@FqII^+dg_(BFcqPJ!vj}nX77%H5Werq
z`yK@r69R@Q<2K0k^v)wi^XG_<T-J;FRHOP78U$wusg=Q;KwsG}<58wUi-sW9FaQI}
ztNU0FJk61)!kcJum3#gY!z1h|4MtX36+vaRbO#qoj<&x-g^iajV2r+xq_i2(d006K
zY9d@4#0k(nV5#l$`IqJO0CT2zy9E7*C@pq&Osk?rri<ODa6%!ME*~*ofF*=zqlj+m
zTjy+We&3=3Hi0O*UHYY|jD-4HRxl<I2kqC~B$Qe;MY00GzmLH+x>*w${5wjAdJ?VV
zz7>h+#msTro5g{ADUuBBu!DiCRLzYN!9E*FTSy9Rl?n)<eo&T}ds1a<dRh`cRq*|K
z?yFsG`^xt6m}Q0<s$&2@p~u~x`V}WH4jEWr??%~us9tvSt5^9t^xh#87Z>{hu))bU
z_7^l;)A{NFVQiTEDIW9uF2?>ylC<i~$n2s<AT9`}qvR@2o`4xBb!D+6RX#7n)|)$O
z^#@ED*8Y;&)(2L+0=zYplX~+rEQJxE`YSTEnrs{*4BPo4-}NhEfG%|9pm=mK5_?<7
zJRr4>#mL|vl|Ffe+~d61A-Z~}@FocZ-wp8JvawgyklJQx1#SC$YZ6Ko!{5@rq6a)~
zb@%DWr+W(_<)2@~pp5_{-;WK#p3{1=s-@XKg$@0ck*OLiC78y<08;q-e{)K*J@((F
zW$D_@q~u96jkPPDQ$s@L`>ES|REIS+k&?{*6$M%)I~Sid)M47q?s&M>!6)}|m`p`b
zFDp7h%8(N9B0QLZpX%q0?2Cs}L^oGN=DSmF_BM~GHQov8=@4i)vRZ-JxJ0$u+Oa>p
z@+pstlp8}~NXg&Y#IQdIDJYMSljKpdbyj7s6@xk^-3h%$PKu%M-d%2c{`Btpr{-4K
zfC+{+A9VIpd0$u5CuB9VMQCtA!Nx$gR|BtGlU3WbKARdZ-&yNUp-IWxCIsxs{EAVd
zfYsKfJ!@kaG`E3iiwddC_W?*rMCmzQfzfw3dHP>sntO3q)xxs!yjMl(!<Ei;2pOi*
z#Cn+sGzF)rdGu<1&4g1}t;c9$T^zs9HuxzNGYhpLkt-TP2^<N)?48nJcn@c<!pYPv
z`gW0~%dyC^Umt*uRvoA=KH_XYtYk1mb2sYkUFZYG_PV)KEz05>A8*h{(g`3vxa^^=
z{!jW*luo=EY;+j)Ho_n;2Vxg(l3wx5)8ek0J@b%R@VZzBYg9CA#m=!J9M4FhokdH=
zq7r_Tfri0s8Ee~w285x1GfD<eTU$ptTzYTYQ6l<Gs+=MP#~Tj*VW}X#xukt~;?X%p
zuTQJdC8Z;GJgqu&b|PgtTo}V!3yiaxe{%)*%-plc*m0Zk;C3wnXeD9R_P0DZZ6_M~
z)Z-2I);q6zx2A5^ih@p1p<%bK7aX3WQGWef<2I3H(`A1-wGVZm^AkXavkvqvhtSDc
zY@dBuTFwfRpyZ23MlAWESoOx>52o6xqCJv-8keFk*W}!2CXPCvRYcB(+ZDg>xoBWk
zrz0=$kfH9;?6r`eh4C#`dPNjlcu#nPB}VZ2K;-FCi8>xo?la;4kjp_8jgHmf+oA+c
zt_%8rFY+0BOP&3jk8eET^^S9&7r@^?cqfkMb52$G`%CMR=S%B5=#V!`{jZ_ExbZ=|
z3)IOa!+}y`%-X6@Lb}ApJ<)_83cd&E>6{9uYlcLjn&$x~fH5p!T%zpP2GGHDo&~)%
zR-rH2{pNaF%#9jw_zB|d2@RBU1JLo)i)p?+J6P!apL$@C&fE)pp{&1#;qt}Zv}~_{
zha9Qtq8}TGyA6AMA5Y(ndmF$nYl&OZYKJAUa>wlrE9>=xSrI&~Y@BiSuH9-9Zl{&9
z(TgCVppf!ClUwigdQF6@^`Km9XV(g12X5$ZLd^^|#3bW_Q?4})@w%tYEy9W^MIFmN
z1<ZSJ=oJu-+@Ox#MSQE&>PL_JbLYZ8zW$J=Bl5bdP&B%qxg$-dU$*Rf<>8mWbBU)<
z_!e!N!{>}pPer}UuRB31yMz#vqSbi$E!#|i#3k)a<q<(ST+nFyfc^ug(&}MKORDmg
zd37QpID+B;&HP%uOzx31(m9I3ZenBZ@w=bgAP-C3=OuJ%h^(W5$LE_rr{%zX_s)6(
zdmHn60oNILS(`m6U!WbV)NNH5TJldoXvqAP_MiyvCJYLTT5)__Q`3S3a~g!{Hg?py
z4f*Dq<Ko^;gq)jlWUi|^?}|;IbWaPUDvC&Rn0(5)6sw%cHSYzw<ciA$R_p_7eVU;d
zP4#hA{F+a*T?Py?kL7GM*OC?(h&iKU-uzvaGTJ2Br=qTCCn*^^aN#o6ucyc$Bw6nZ
zv+yh72+mhZN;c~%*6jx4MhMq#mi095pMSY>+x5v%ZIN@2<SAM51?l%LNC$5`A&$OP
zHCT0!snYnGSShhw=#xlv=|K2ZT5O8S+ng4Ns}}$W`;3{jZ3f+48|EI@Axz7>PY?`I
zHP&J*dgT1GL6?V%bVqLa^;H#b{z>2Ah;c|8b=4EX*@9iUlnr&X&slS-yxm_0@vcQ(
zd18zQ<n|<n@OtAAfkgO{+X&t=l=8e?7R<eo_iRD3>^^mHP(!gwDfW+l;a3GB*OJRA
z>V?u7CE|NIO!u3Q$@z5odYkos)!jdu6Uap-*~^$Xr_W$Z?55W#ir;(;e2M}S5DJ^s
zJp#~ktG>*d_EDS13i?;muzT`<epnm`-C9z8WkqnB`4CiZTyN(H6~-HsC+qR;e0+O$
z8%t8Nln^@Pi{5!Y+;jkUhvI_#m>NkORNLt>h8)>1r{E^t(gKliC{ts3PHvP|5wk1G
z`j=r*eXbc2=OJy;7nc_oeNz&(t%RGfaZB4?9Ji9LxAW9Kc&I+VxVog@Y+G-gJw1o4
zUt8umv}p96DMs;nz+%EhptqGWmJMCXnR%t$7{9&6E8H7zxpd}k?AgZ^Qqw$R@uXW+
z|E=I(-HP-xS#Zjjnekm~-^8|?f?05*zzPbHUgQQcR3V0oq*|}Z4XWAjKIaw3N=<5v
zcfs*?-~TfaWkFtRw!@kr#WG^%-9}L?UFv!7`{h;|){6V&6{8|R!VF}r%XHT8XLu`^
z9eQg<W@ntW(~T58u%aD}1<V<Z)P(j*maRUdp|!J61b$+p-o@==c#*L#e=sU)`=YjY
zNSLOK;W_Nd=|xst|E8M)@lBHvadlP3uNsXH*-39(;PGVLb=ZiZ_buuFebAZ?CTwL=
z1cq{_>@yRiXvLv!2(&)TcS~8$9U_mb!?I;0%A6z5nFkKL4aUO<?9Vg3q;a3XO|zuQ
zf>%r9)k)utvZuXTFwG}}7(u1qze@QQSHBmwSwAW|oY*aRy8>~&6Qo=@S0}q1Ncl;2
zdaR&{#D4Vj<uJG}W4T_>oiN%=D&gs$<Y{P>&8uG7{F*#Fx7zu#o}2W#GeIQ2Vl=Yw
z#lwRaXw;sHq`PF37~AC^B58*cVaXO8=Ry+T6a1sbJS{$XGAVi~Qx+zK-m7t9AKU9R
zr%6m8>9~s7Vxk!5_qcDQNQBVkN4F7IY;r6WDu=gYOpRMVOSR$wnZ~NKi9{O}Qs>|{
zmnvg<Nmt=Q7T-=%Wz0k>yy!~lYOnfB6RjtU=f^k$ltuUbI7G4o0-hGy19U&S_3zub
zIdD6Pv3AL9_XnrmE^&TTs-EpfZQ-ZJx7-ngNNUeWh&5mKxNPuQ6<dIHsN2oLH^h3G
zVe&bStfBMyDZ*}nctR!X2B&&mf};!`D6C95xUg1Ehn}((D=+`}hbV@FYr6)gD8a_e
zRbC0R%I8-)BGp0QA%UdFcYOXiCYRG}hC0%xL{5s@XMuH^D?uvQ3YfAVfAw*qyo+wS
z#pntabq-!S+C9&(Ubb&KAovX1UB~59QMgy~2?WHg;?AQOWkTbgrsw%TZW(t2mhuDw
z-&_F{9ms5%{i32<RC-uvhCrE*r+!~7!f)6r%M7}}{=3-z`vdq_-J(6ru2)a<yRfKC
z=ogEQs^p2pRIACI52BD7Sgh~#5htzbfW;EL$8~Sj3LZqs5oNxON{*oV$e92M6>~{O
z%wLn1bGpvCaU3+cOZx#!uhxG`yUcbrkYDxo5>753W_xgv&|heAhrP|%`gcRJ;Ug@!
zKkd!^@euyN7XIXC6GGjVP=)!-dxPMS%*yM&A^@qi`KaJ~Gt(nFSGqO-*69$pbw+JZ
z{gJ1VE#dKrc_!(zh6MJx>MHH`A=#LPe%kJ*D+8mgc@pE8&xh^CnIU-z4g2K>C59Ix
z;`xrN26GewBgzXu256Y9CcA(niwFt1BLBDJboFD-GA-ip?!TeBk=Sq=oGo;rcpVtb
za@c4&nqYTGLq_P2)|wWZjcHwiby^ZrTKFGGHChWBp~{NGwKW<SECO^=aw=?ba0~FO
zeH4A}1{WexewEciHt4Tip?fctOo%fL^G4%ioeMncTtG%oo7ZAwVl8m{e&>i6RAs>9
z0lYN%{$%lhB%#!Kdzh=&GhYTEmDzIK?d#pVIxIZ#V);{R$nQ5*nK|}!S^yb;wSDr)
z!PWoeP$O%g*`T@?e<8y<9B;k!WbWe0Wg^Zr{GL9V=xH<y5(ZNOc8=cnXp<rZ+)4j@
zH~6NFgZp`y|6qowGT|Cq)bMrAt5Y2dKY|&}30=6s&q6MDDLS<*tIRz!C%qX?4$}_Q
zF!m*NgD?_zWP}rBcWG|FoV>aHELqo#NAZ27e@#Lgl?mvyY<V6NeKw6))5Ehzp8e?~
upQW}`7|=lSof5vqiPORH;{Oj7eh5llI8@AzsQhoPM1$5d)veKX!Tk>bm480~

literal 0
HcmV?d00001

diff --git a/utils/config.js b/utils/config.js
index e38372b..1004759 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -3,6 +3,7 @@
 export const BASE_URL = 'https://jinshan.nantong.info';
 export const IMAGE_BASE_URL = `https://jinshan.nantong.info`;
 export const WS_BASE_URL = `wss://jinshan.nantong.info`;
+// export const WS_BASE_URL = 'ws://10.10.1.6:8071';
 
 
 // http://36.212.197.253:8071