From 190bdc13705d50c66988d85ccf27fcef4fe90c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Mon, 9 Oct 2023 13:47:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    | 32 ++++++++++++-------
 .../imagetextConsultation.vue                 |  8 +++++
 pagesC/seekadvicefrom/seekadvicefrom.vue      | 25 +++++++++------
 3 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/pages.json b/pages.json
index 65698b9..0c45fe6 100644
--- a/pages.json
+++ b/pages.json
@@ -91,6 +91,18 @@
 					"navigationBarTitleText": "院内陪护",
 					"enablePullDownRefresh": false
 				}
+			}, {
+				"path": "imagetextConsultation/imagetextConsultation",
+				"style": {
+					"navigationBarTitleText": "图文问诊",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "createnewconsultation/createnewconsultation",
+				"style": {
+					"navigationBarTitleText": "新建图文问诊",
+					"enablePullDownRefresh": false
+				}
 			}, {
 				"path": "appointmenttime/appointmenttime",
 				"style": {
@@ -466,17 +478,15 @@
 					"navigationBarTitleText": "体征检测",
 					"enablePullDownRefresh": false
 				}
-			}
-		    ,{
-                    "path" : "seekadvicefrom/seekadvicefrom",
-                    "style" :
-                {
-                    "navigationBarTitleText": "咨询医生",
-                    "enablePullDownRefresh": false
-                }
+			}, {
+				"path": "seekadvicefrom/seekadvicefrom",
+				"style": {
+					"navigationBarTitleText": "咨询医生",
+					"enablePullDownRefresh": false
+				}
 
-                }
-            ]
+			}
+		]
 	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
@@ -525,4 +535,4 @@
 			// }
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/pagesB/imagetextConsultation/imagetextConsultation.vue b/pagesB/imagetextConsultation/imagetextConsultation.vue
index b606e50..c6c2b99 100644
--- a/pagesB/imagetextConsultation/imagetextConsultation.vue
+++ b/pagesB/imagetextConsultation/imagetextConsultation.vue
@@ -25,6 +25,9 @@
 </template>
 
 <script>
+	import {
+		consultationInfolist
+	} from '@/api/pagesB/imagetextConsultation.js'
 	export default {
 		data() {
 			return {
@@ -41,6 +44,11 @@
 				],
 			};
 		},
+		onShow(){
+			consultationInfolist().then(res=>{
+				console.log(res)
+			})
+		},
 		methods: {
 			//选择
 			selecttitltext(item) {
diff --git a/pagesC/seekadvicefrom/seekadvicefrom.vue b/pagesC/seekadvicefrom/seekadvicefrom.vue
index dc4eb30..640741b 100644
--- a/pagesC/seekadvicefrom/seekadvicefrom.vue
+++ b/pagesC/seekadvicefrom/seekadvicefrom.vue
@@ -72,16 +72,16 @@
 </template>
 
 <script>
-	// import {
-	// 	sendMessage,
-	// 	getChatHistory,
-	// 	markRead
-	// } from '@/service/api/api.js';
+	import {
+		sendMessage,
+		getChatHistory,
+		markRead
+	} from '@/api/pagesC/seekadvicefrom.js';
 	export default {
 		data() {
 			return {
 				title: '',
-				SOCKETURL: 'wss://fdmp.xinelu.cn/fm/webSocket/' + uni.getStorageSync('userInfo').bindingNo,
+				SOCKETURL: 'wss://http://192.168.16.212/fm/webSocket/' + uni.getStorageSync('userInfo').bindingNo,
 				// SOCKETURL: 'wss://fdmp.xinelu.cn/fm/webSocket/' + uni.getStorageSync('userInfo').bindingNo,
 				socketOpen: false,
 				sendInfo: {},
@@ -149,7 +149,14 @@
 			if (options.title) {
 				this.title = options.title //导航栏标题
 			}
-			this.currentItem = JSON.parse(options.currentItem)
+			this.currentItem = {
+				senderName: e.userName,
+				senderNo: e.userNo,
+				recipientName: uni.getStorageSync('userInfo').residentName,
+				recipientNo: uni.getStorageSync('userInfo').bindingNo,
+				// messageCategory: '3'
+			}
+			// this.currentItem = JSON.parse(options.currentItem)
 			this.getPageHistory()
 			this.scoket()
 		},
@@ -162,7 +169,7 @@
 			getPageHistory() {
 				let obj = {
 					bindingNo: this.currentItem.recipientNo,
-					messageCategory: this.currentItem.messageCategory,
+					// messageCategory: this.currentItem.messageCategory,
 					recipientNo: this.currentItem.senderNo,
 					senderNo: this.currentItem.recipientNo
 				}
@@ -179,7 +186,7 @@
 			Read() {
 				let markReadData = {
 					bindingNo: this.currentItem.recipientNo,
-					messageCategory: this.currentItem.messageCategory,
+					// messageCategory: this.currentItem.messageCategory,
 					senderNo: this.currentItem.senderNo
 				}
 				markRead(markReadData)