From 625bf5dff7267038342333c8cdc62a33b02c30da Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 04 Jul 2021 15:05:27 +0800
Subject: [PATCH] 聊天室调整

---
 static/JQimg/xiangji.png                            |    0 
 pages/groupChat/chatingQZ.vue                       |   14 ++++++++------
 manifest.json                                       |    2 +-
 static/JQimg/shipin.png                             |    0 
 pages/business/business.vue                         |    2 +-
 pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue |    4 ++--
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/manifest.json b/manifest.json
index f12f798..e1ec915 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "群防群控",
-    "appid" : "__UNI__88EDF2B",
+    "appid" : "__UNI__1A57486",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
diff --git a/pages/business/business.vue b/pages/business/business.vue
index f1885f3..e84f243 100644
--- a/pages/business/business.vue
+++ b/pages/business/business.vue
@@ -24,7 +24,7 @@
 				</navigator>
 			</view>
 			<view class="view-business-nav">
-				<navigator class="patrolBtn" url="/pages/riskReporting/riskReporting">
+				<navigator class="patrolBtn" url="/pages/groupChat/groupChat">
 					<image src="../../static/workbench/task4.png"></image>
 					<span>通讯录</span>
 				</navigator>
diff --git a/pages/groupChat/chatingQZ.vue b/pages/groupChat/chatingQZ.vue
index fde4bf8..0d47c8f 100644
--- a/pages/groupChat/chatingQZ.vue
+++ b/pages/groupChat/chatingQZ.vue
@@ -221,8 +221,8 @@
 						'content-type': 'application/x-www-form-urlencoded', 
 					},
 					data:{
-						//gid: that.recipientId
-						gid: "1"
+						gid: that.recipientId
+						//gid: "1"
 					},
 					success:(res)=> {
 						// recAvatar: null,//接收者头像
@@ -234,7 +234,9 @@
 							}else{
 								resdata[i].avatar = resdata[i].avatar;
 							}
-							
+							if(resdata[i].sender_id == that.senId){
+								that.senAvatar = resdata[i].avatar;
+							}
 							
 						}
 						let msg = res.data.data;
@@ -325,12 +327,12 @@
 				}
 				nowTime = t
 				let sendMsg = {
-					senderId: that.senId,
-					recipientId: that.recipientId,
+					sender_id: that.senId,
 					post_message: e.message,
 					message_type: 0,
 					status: 0,
 					post_time: nowTime,
+					avatar:that.senAvatar
 				}
 				
 				uni.request({
@@ -342,9 +344,9 @@
 						messageType: 0,
 						status: 0,
 						postTime: sentTime,
+						gid:that.recipientId
 					},
 					success:(res)=> {
-						
 					}
 				});
 				
diff --git a/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue b/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue
index 85a9d26..2c6c4d6 100644
--- a/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue
+++ b/pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao.vue
@@ -18,14 +18,14 @@
 			<view class="title">照片上传:</view>
 			<view class="t">
 				<view class="main">
-					<image @tap="takePhoto" src="../../../../static/JQimg/相机.png" mode=""></image>
+					<image @tap="takePhoto" src="../../../../static/JQimg/xiangji.png" mode=""></image>
 				</view>
 			</view>
 			<seeImgs  class="seeImgs" :imgs="imgs" :videos="[]" @del="delImg" :type="'imgs'"></seeImgs>
 			<view class="title">视频上传:</view>
 			<view class="s">
 				<view class="main">
-					<image @tap="takeVideo" src="../../../../static/JQimg/视频.png" mode=""></image>
+					<image @tap="takeVideo" src="../../../../static/JQimg/shipin.png" mode=""></image>
 				</view>
 			</view>
 			<seeImgs class="seeImgsVideo" :imgs="[]" :videos="videos" @del="delVideo" :type="'videos'"></seeImgs>
diff --git "a/static/JQimg/\350\247\206\351\242\221.png" b/static/JQimg/shipin.png
similarity index 100%
rename from "static/JQimg/\350\247\206\351\242\221.png"
rename to static/JQimg/shipin.png
Binary files differ
diff --git "a/static/JQimg/\347\233\270\346\234\272.png" b/static/JQimg/xiangji.png
similarity index 100%
rename from "static/JQimg/\347\233\270\346\234\272.png"
rename to static/JQimg/xiangji.png
Binary files differ

--
Gitblit v1.9.3