zs %!s(int64=2) %!d(string=hai) anos
pai
achega
994f6cc479
Modificáronse 2 ficheiros con 14 adicións e 7 borrados
  1. 4 0
      pages/login/index.vue
  2. 10 7
      pagesMessage/message/components/submit_1.vue

+ 4 - 0
pages/login/index.vue

@@ -455,6 +455,10 @@
 												delta: 1
 												delta: 1
 											})
 											})
 											let user = that.$jwt(res.data);
 											let user = that.$jwt(res.data);
+											//当websocket收到后端发送的消息时,触发
+											let config = that.$config.wsUrl;
+											// 开启websocket
+											that.$store.dispatch('websocketInit', config + `/${user._id}`);
 											// 如果是团长,请求刷新
 											// 如果是团长,请求刷新
 											if (user.is_leader == '0') {
 											if (user.is_leader == '0') {
 												let pages = getCurrentPages();
 												let pages = getCurrentPages();

+ 10 - 7
pagesMessage/message/components/submit_1.vue

@@ -3,8 +3,9 @@
 		<view class="submit">
 		<view class="submit">
 			<view class="submit-chat">
 			<view class="submit-chat">
 				<!-- 文本框 -->
 				<!-- 文本框 -->
-				<textarea disable-default-padding="true" auto-height="true" fixed="true" class="btn" @input="inputs"
-					@focus="focus" v-model="msg"></textarea>
+				<textarea cursor-spacing='20' class="chat-send btn" :show-confirm-bar="false"
+					disable-default-padding="true" auto-height="true" @input="inputs" @focus="focus"
+					v-model="msg"></textarea>
 				<view class="bt-img" @tap="more">
 				<view class="bt-img" @tap="more">
 					<text class="iconfont icon-gengduoneirong"></text>
 					<text class="iconfont icon-gengduoneirong"></text>
 				</view>
 				</view>
@@ -44,10 +45,6 @@
 					// 0为表情和文字
 					// 0为表情和文字
 					this.send(this.msg, '0')
 					this.send(this.msg, '0')
 				}
 				}
-				// if (chat.length > 1) {
-				// 	// 0为表情和文字
-				// 	this.send(this.msg, '0')
-				// }
 			},
 			},
 			// 输入框聚焦
 			// 输入框聚焦
 			focus() {
 			focus() {
@@ -121,17 +118,23 @@
 		}
 		}
 
 
 		.btn {
 		.btn {
+			flex: auto;
 			background-color: #fff;
 			background-color: #fff;
 			border-radius: 10rpx;
 			border-radius: 10rpx;
 			padding: 20rpx;
 			padding: 20rpx;
+			max-height: 160rpx;
 			margin: 0 10rpx;
 			margin: 0 10rpx;
 		}
 		}
 
 
+		.chat-send {
+			line-height: 44rpx;
+		}
+
 	}
 	}
 
 
 	.more {
 	.more {
 		width: 100%;
 		width: 100%;
-		height: 436rpx;
+		height: 450rpx;
 		background: rgba(236, 237, 238, 1);
 		background: rgba(236, 237, 238, 1);
 		box-shadow: 0px 11rpx 0px 0px rgba(0, 0, 0, 0.1);
 		box-shadow: 0px 11rpx 0px 0px rgba(0, 0, 0, 0.1);
 		bottom: env(safe-area-inset-bottom);
 		bottom: env(safe-area-inset-bottom);