From 1c3ed37983496e2cae692a74964cad63abe78ae1 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 14 Aug 2020 10:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=BA=86=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageB/sdetails/index.vue          | 2 +-
 pageC/merchant/index.vue          | 2 +-
 pageD/privateChat/privateChat.vue | 7 ++++---
 pageE/mine/EditUserInfo.vue       | 2 +-
 pages/information/information.vue | 2 +-
 static/imservice.js               | 6 +++---
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index e502c85..39213f8 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -284,7 +284,7 @@ export default {
 					id:this.storeid
 				}).then((res)=>{
 					console.log(res)
-					let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
+					let user = new Friend(res.data.member_id,res.data.store_name,res.data.member_avatar)
 					this.$u.route({
 						url:"/pageD/privateChat/privateChat",
 						params:{
diff --git a/pageC/merchant/index.vue b/pageC/merchant/index.vue
index 7292e78..c301778 100644
--- a/pageC/merchant/index.vue
+++ b/pageC/merchant/index.vue
@@ -141,7 +141,7 @@ export default {
 					id:this.sid
 				}).then((res)=>{
 					console.log(res)
-					let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
+					let user = new Friend(res.data.member_id,res.data.store_name,res.data.member_avatar)
 					this.$u.route({
 						url:"/pageD/privateChat/privateChat",
 						params:{
diff --git a/pageD/privateChat/privateChat.vue b/pageD/privateChat/privateChat.vue
index aa55234..c638b31 100644
--- a/pageD/privateChat/privateChat.vue
+++ b/pageD/privateChat/privateChat.vue
@@ -430,7 +430,7 @@
 	}
 	.chatInterface .action-top .file-icon{
 		background: url("../images/vedio.png") no-repeat center;
-		background-size: 70%;
+		background-size: 50%;
 		color: #9D9D9D;
 		position: relative;
 		width:80rpx;
@@ -445,7 +445,7 @@
 	}
 	.chatInterface .action-top .img-video{
 		background: url("../images/file.png") no-repeat center;
-		background-size: 74%;
+		background-size: 50%;
 	}
 	.chatInterface .record-input{
 		width: 480rpx;
@@ -468,9 +468,10 @@
 		font-size: 28rpx;
 	}
 	.chatInterface .send-message-btn{
-		font-size: 32rpx;
+		font-size: 28rpx;
 		width: 80rpx;
 		line-height: 80rpx;
+		margin-right: 20rpx;
 	}
 	.record-loading{
 		position: absolute;
diff --git a/pageE/mine/EditUserInfo.vue b/pageE/mine/EditUserInfo.vue
index 1fc040d..5232045 100644
--- a/pageE/mine/EditUserInfo.vue
+++ b/pageE/mine/EditUserInfo.vue
@@ -117,7 +117,7 @@ export default {
 				id: 1 // 平台店铺 id
 			}).then((res)=>{
 				// console.log(res)
-				let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
+				let user = new Friend(res.data.member_id,res.data.store_name,res.data.member_avatar)
 				this.$u.route({
 					url:"/pageD/privateChat/privateChat",
 					params:{
diff --git a/pages/information/information.vue b/pages/information/information.vue
index 4247942..a796ba7 100644
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@@ -136,7 +136,7 @@
 						success(res){
 							console.log(res)
 							res = res.data
-							let user = new Friend(res.data.member_id,res.data.member_nickname,res.data.member_avatar)
+							let user = new Friend(res.data.member_id,res.data.store_name,res.data.member_avatar)
 							that.$u.route({
 								url:"/pageD/privateChat/privateChat",
 								params:{
diff --git a/static/imservice.js b/static/imservice.js
index e89503b..688b6fd 100644
--- a/static/imservice.js
+++ b/static/imservice.js
@@ -116,7 +116,7 @@ IMService.prototype.initialContacts = function (friendList) {
             },
             success(res){
                 console.log(res)
-                that.friends[i[0]] = new Friend(res.data.data.member_id, res.data.data.member_nickname, res.data.data.member_avatar,i[1],i[2],i[3]);
+                that.friends[i[0]] = new Friend(res.data.data.member_id, res.data.data.store_name, res.data.data.member_avatar,i[1],i[2],i[3]);
                 console.log(that.friends)
                 let sorts = function (friends){
                     let paixu = function (a,b){
@@ -295,7 +295,7 @@ IMService.prototype.initialIMListeners = function () {
                     },
                     success(res){
                         console.log(res)
-                        that.friends[message.senderId] = new Friend(res.data.data.member_id, res.data.data.member_nickname, res.data.data.member_avatar);
+                        that.friends[message.senderId] = new Friend(res.data.data.member_id, res.data.data.store_name, res.data.data.member_avatar);
                         friend = that.friends[message.senderId];
                         console.log(friend)
                         friend.unReadMessage++;
@@ -538,7 +538,7 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
             },
             success(res){
                 console.log(res)
-                that.friends[friendId] = new Friend(res.data.data.member_id, res.data.data.member_nickname, res.data.data.member_avatar);
+                that.friends[friendId] = new Friend(res.data.data.member_id, res.data.data.store_name, res.data.data.member_avatar);
                 friend = that.friends[friendId];
                 console.log(friend)
                 friend.text = message