Harley 6 vuotta sitten
vanhempi
commit
3e95425663

+ 0 - 2
service/src/components/messageCenter.vue

@@ -40,8 +40,6 @@
 						<p>{{item.atext}}</p>
 					</li>
 				</ul>
-
-
 			</el-col>
 
 			<el-col :span="18">

+ 12 - 0
service/src/css/index.css

@@ -245,4 +245,16 @@ body {
   width: 100px !important;
   height: 100px !important;
   line-height: 100px !important;
+}
+
+#pop {
+  position: relative;
+  top: 0;
+  line-height: 0;
+}
+.el-textarea__inner {
+  border: none;
+  resize: none;
+  /* height: 300px !important; */
+  line-height: 3.5 !important;
 }

+ 30 - 30
service/src/pages/LeaveMessage.vue

@@ -45,8 +45,8 @@
 							<el-table-column prop="add_time" width="160" label="留言时间" ></el-table-column>
 							<el-table-column prop="content"  label="留言内容">
 								<template slot-scope="scope">
-									<el-popover trigger="hover" placement="top">
-										<p>{{ scope.row.content }}</p>
+									<el-popover width="800" trigger="hover" placement="top">
+										<p  >{{ scope.row.content }}</p>
 										<div slot="reference" class="name-wrapper">
 											<el-tag size="medium">{{ scope.row.content }}</el-tag>
 										</div>
@@ -112,7 +112,8 @@
 										<el-col class="serive">
 											<el-input class="serive_text" resize="none" type="textarea"
 												@blur="widthCheck($event.target, 100)" placeholder="请回复用户留言"
-												v-model="leaveInfor"></el-input>
+												maxlength="120" show-word-limit
+												v-model.trim="leaveInfor"></el-input>
 										</el-col>
 										<el-col>
 											<el-upload style="margin:10px;"
@@ -344,27 +345,30 @@
 			},
 			//提交留言
 			sendMessage() {
-				// if(!this.isSendMessage) return false;
-				this.isUpImg = true;
-				this.$refs.upload.submit();
-
-				this.isSendMessage  = false;
-				setTimeout(()=>{
-					let parmas = {
-						"user_id":this.users.id,
-						"message_id":this.uid,
-						"reply_content":this.leaveInfor,
-						"images":this.imgUrl,
-					}
-					this.post('/api/service/Message/dealmessage', parmas).then(res => {
-						this.$message.success(res.data.msg);
-						this.leaveInfor = '';
-						this.drawer = false;
-						this.getSessionList(1)
-						this.$refs.upload.clearFiles();
-						this.fileList =[];
-					})
-				},1500)
+				if(this.leaveInfor){
+					this.isUpImg = true;
+					this.$refs.upload.submit();
+	
+					this.isSendMessage  = false;
+					setTimeout(()=>{
+						let parmas = {
+							"user_id":this.users.id,
+							"message_id":this.uid,
+							"reply_content":this.leaveInfor,
+							"images":this.imgUrl,
+						}
+						this.post('/api/service/Message/dealmessage', parmas).then(res => {
+							this.$message.success(res.data.msg);
+							this.leaveInfor = '';
+							this.drawer = false;
+							this.getSessionList(1)
+							this.$refs.upload.clearFiles();
+							this.fileList =[];
+						})
+					},1500)
+				}else{
+					this.$message.error(`请输入留言信息`);
+				}
 			},
 
 			/*****************获取当前聊天用户信息****************/
@@ -519,14 +523,10 @@
 			margin-top: 20px;
 			background: #F5F5F5;
 			border: 1px solid #EEEEEE;
-			padding: 20px;
+			// padding: 20px;
 			font-size: 14px;
 			color: #666;
-			.el-textarea__inner {
-				border: none;
-				resize: none;
-				height: 300px;
-			}
+		
 		}
 	}
 

+ 1 - 2
service/src/pages/TheCurrentSession.vue

@@ -148,7 +148,7 @@
 									 :src="isFrce?require('@/assets/img/frcea.png'):require('@/assets/img/frce.png')"
 									 @click="frceClick" style="margin-right:16px;"/> -->
 
-								<el-popover placement="top-start" width="400" trigger="hover">
+								<el-popover id="pop" placement="top-start" width="400" trigger="hover">
 									<ul>
 										<li class="emoticon" v-for="(item,index) in frceArr" :key="item.id">
 											<img class="pointer" :src="require(`@/assets/img/${index}.gif`)"
@@ -376,7 +376,6 @@
 		 *
 		 */
 		methods: {
-
 			/****************************/
 			validation_user_info(type){
 				if(type == 1 && this.session_user_info.account_phone){

+ 11 - 1
service/src/pages/login.vue

@@ -112,7 +112,17 @@
 			},
 		},
 		mounted(){
-			this.logo = sessionStorage.getItem('logo');
+			
+			if(!sessionStorage.getItem('logo')){
+				this.get('http://kfadmin.bocai186.com'+this.$ports.TIME).then(res => {
+					if (res.data.code == 1) {
+						console.log(res);
+						this.logo = res.data.data.logo;
+					}
+				});
+			}else{
+				this.logo = sessionStorage.getItem('logo');
+			}
 			//console.log(this.logo, '========logo')
 		}
 	};