Merge branch 'dev-phase1-0111' of...

Merge branch 'dev-phase1-0111' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-IM into dev-phase1-0111

* 'dev-phase1-0111' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-IM:
  消息查询样式修改

src/views/IM/chain-history/detail.vue

@@ -51,7 +51,7 @@ export default {
     };
   },
   created() {
-    this.historyId = this.$router.query.id;
+    this.historyId = this.$route.query.id;
   },
   // 挂载到Dom完成时
   mounted() {

src/views/IM/search-message/detail.vue

@@ -2,8 +2,8 @@
 <template>
   <div class="search-msg-detail">
     <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
-    <div class="detail-content screenSet" id="screenSet">		
-		<div id="msg-container" class="msg-container" v-for="(item, index) in detailData" :key="index">
+    <div ref="msg-container" class="detail-content screenSet" id="screenSet">		
+		<div class="msg-container" v-for="(item, index) in detailData" :key="index">
 			<div class="msg-item-img">
               	<img v-if="item.fromAccId == picakfAccId" src="../../../assets/image/IM/kf-avatar.png" alt />
 				<img v-else :src="userAvatar" />
@@ -18,22 +18,22 @@
 					<div>{{item.content}}</div>
 				</div>
 				<div v-if="item.type == 'PICTURE'" class="img-content" v-viewer>
-					<img :src="item.url" />
+					<img :src="typeChange(item.content).url" />
 				</div>
 				<div v-if="item.type == 'CUSTOM'">
 					<div v-if="typeChange(item.content).bizType == 18" class="file-content">
 						<div class="file-con" @click="downPDF(typeChange(item.content).url)">
-						<div class="file-left">
-							<span class="name">{{typeChange(item.content).name}}</span>
-							<span class="size">{{fileSizeChange(typeChange(item.content).size)}}</span>
-						</div>
-						<div class="file-right">
-							<img src="../../../assets/image/IM/icon-pdf.png" alt />
-						</div>
+							<div class="file-left">
+								<span class="name">{{typeChange(item.content).name}}</span>
+								<span class="size">{{fileSizeChange(typeChange(item.content).size)}}</span>
+							</div>
+							<div class="file-right">
+								<img src="../../../assets/image/IM/icon-pdf.png" alt />
+							</div>
 						</div>
 					</div>
 					<div v-if="typeChange(item.content).bizType == 19" class="link-content">
-						<div class="link-text">{{typeChange(item.content).name}}</div>
+						<div class="link-text">{{typeChange(item.content).content}}</div>
 					</div>
 				</div>
 			</div>
@@ -46,8 +46,6 @@ import BreadCrumb from "@/components/breadcrumb.vue";
 import { doUpload, getFilePath } from "@/utils/qiniu-util";
 import { openLoading, closeLoading, betaHandle, timeHandle } from "@/utils/utils";
 import { getPicaKFAccid } from "@/utils";
-import * as commonUtil from "@/utils/utils";
-let vm = null;
 export default {
   components: {
     BreadCrumb
@@ -63,6 +61,7 @@ export default {
 			userAvatar: '',
 			userName: '',
 			scroll: true,
+			ele: ''
 		};
 	},
 	created() {
@@ -72,14 +71,12 @@ export default {
 		this.userName = this.$route.query.userName;
 	},
 	mounted() {
-		window.addEventListener('scroll', this.handleScroll)
 		this.picakfAccId = getPicaKFAccid();
 		this.getDeatailData(1);
+		//this.getHistoryData(0);
+		
 	},
   	methods: {
-		handleScroll() {
-			
-		},
 		  // 获取详情数据以及下拉加载历史数据
 		getDeatailData(param) {
 			let url = '/im/msg/forward';
@@ -93,17 +90,37 @@ export default {
 			}
 			this.POST(url, req).then((res) => {
 				if(res.code == '000000') {
-					this.detailData = res.data;
+					this.detailData = res.data.reverse();
+				}
+			})
+		},
+		// 上翻查看最新消息
+		getHistoryData(param) {
+			let url = '/im/msg/history';
+			let req = {
+				doctorAccId: this.doctorAccId,
+				includeFlag: param,
+				lastMsgTimestamp: this.lastMsgTime,
+				limit: 20,
+				patientAccId: this.picakfAccId,
+				unionId: ""
+			}
+			this.POST(url, req).then((res) => {
+				if(res.code == '000000') {
+					this.detailData = res.data.reverse();
 				}
 			})
 		},
+		// 时间格式转换
 		timeChange(data) {
 			return timeHandle(data)
 		},
+		// PDF和链接类型处理
 		typeChange(data) {
 			let obj = JSON.parse(data);
 			return obj;
 		},
+		// 文件大小单位转换
 		fileSizeChange(val) {
 			return betaHandle(val)
 		},
@@ -192,6 +209,10 @@ export default {
 						}
 					}
 				}
+				.link-content {
+					padding: 16px 0;
+					color: #2f86f6;
+				}
 			}
 		}
 	}

src/views/IM/search-message/list.vue

@@ -4,16 +4,22 @@
       <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;margin-right:0px;">
         <el-form ref="serchForm" inline :model="searchParam" label-width="15px" style="width:100%;text-align:right;">
             <el-form-item label="">
-              <el-input clearable v-model="searchParam.userMobile" size="mini" placeholder="请输入用户电话" ><el-button slot="append" icon="el-icon-search" @click="search()"></el-button></el-input>
+              <el-input clearable v-model="searchParam.userMobile" size="mini" placeholder="请输入用户电话" @change="searchMessage(1)"><el-button slot="append" icon="el-icon-search" @click="searchMessage(1)"></el-button></el-input>
             </el-form-item>
             <el-form-item label="">
-              <el-input clearable v-model="searchParam.userName" size="mini" placeholder="请输入用户名称" ><el-button slot="append" icon="el-icon-search" @click="search()"></el-button></el-input>
+              <el-input clearable v-model="searchParam.userName" size="mini" placeholder="请输入用户名称" @change="searchMessage(1)"><el-button slot="append" icon="el-icon-search" @click="searchMessage(1)"></el-button></el-input>
             </el-form-item>
             <el-form-item label="">
-              <el-input clearable v-model="searchParam.adminName" size="mini" placeholder="请输入客服名" ><el-button slot="append" icon="el-icon-search" @click="search()"></el-button></el-input>
+              <el-input clearable v-model="searchParam.adminName" size="mini" placeholder="请输入客服名" @change="searchMessage(1)"><el-button slot="append" icon="el-icon-search" @click="searchMessage(1)"></el-button></el-input>
             </el-form-item>
             <el-form-item label="" style="position:relative;top:-8px;left:0;margin-bottom: 0px;">
-                <el-date-picker v-model="searchParam.chooseDate" size="mini" type="date" placeholder="请选择日期"></el-date-picker>
+                <el-date-picker 
+                v-model="date" 
+                size="mini" 
+                type="date" 
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+                @change="searchMessage(1)"></el-date-picker>
             </el-form-item>              
         </el-form>
       </el-row>
@@ -64,6 +70,7 @@ let vm = null;
 export default {
   data() {
     return {
+      date: '',
       searchParam: {
         adminName: "",
         chooseDate: "",
@@ -99,9 +106,11 @@ export default {
   },
   methods: {
     // 列表查询
-    searchMessage() {
+    searchMessage(a) {
+      if(a) this.searchParam.pageNo = 1;
       this.loading = true;
       let url = `/im/system/message/list`;
+      this.searchParam.chooseDate = this.date ? new Date(this.date).getTime() : '';
       let params = this.searchParam;
       this.GET(url, params).then(res => {
         this.loading = false;