Merge pull request bailicangdu#8 from bailichen/master

啊发放

src/config/env.js

@@ -1,5 +1,5 @@
 //获取图片地址
-const imgurl = 'http://images.cangdu.org/';
+const imgurl = 'http://cangdu.org/files/images/';
 let baseUrl;
 
 if (process.env.NODE_ENV == 'development') {

src/frames/conversation/groupchat.vue

@@ -145,6 +145,7 @@
 				imgurl,
 				userId:'',
 				allgroups:[],	//所有群聊信息
+
 			}
 		},
 		created(){
@@ -156,10 +157,11 @@
 			this.loadStatus=true;
 			groupChat().then((res) => {
 				this.gropname=res.petname;
-				//this.groupconversine=[...res.grouphead];
 			});	
 			socket.on('chat', (data) => {
-				//console.log(data);//聊天返回内容
+				if (!data) {
+					return
+				};
 				this.groupconversine.push(data);
 				this.$nextTick(()=>{
 					window.scrollTo(0,this.$refs.groupHeight.offsetHeight-window.innerHeight)
@@ -211,7 +213,7 @@
 
 	            	}
             		this.groupconversine = [...groupData.history, ...this.groupconversine]
-
+            		console.log(this.groupconversine)
             		this.allgroups=[...this.groupconversine]
 					Array.prototype.unique = function(){//数组去重
 						var res = [this[0]];
@@ -281,11 +283,10 @@
 				this.clickmore=false;
 			},
 			async clickSend(){
-	
-				
-				this.light=false;
+				console.log(this.inputmessage)
 				socket.emit('chat', {user_id: this.userInfo.id, content: this.inputmessage});
 				this.inputmessage='';
+				this.light=false;
 				this.$nextTick(()=>{
 					window.scrollTo(0,this.$refs.groupHeight.offsetHeight-window.innerHeight)
 				})

src/service/data/contacts.js

@@ -339,7 +339,7 @@ X:[
 		"sex":1,
 		"sdasd":"披荆斩棘",
 		"phone":"15800319949",
-		"sendobject":0,
+		"sendobject":1,
 		"gallery":[
 			imgurl+'chen.jpg',imgurl+'cangdu.jpg',imgurl+'b1.jpg'
 		],

src/vuex/action.js

@@ -10,7 +10,7 @@ export default {
 		state
 	}){
 		const user_id = localStorage.getItem('user_id')
-		let res = await userInfo()
+		let res = await userInfo(user_id)
 		commit(GET_USERINFO,res.user_info)
 	},
 	 async getDialog({