From 77b460b2a2732116e73dece01586558befc3bc49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Wed, 20 Nov 2024 23:06:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=9C=8D=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/components/attachmentUpload.vue   | 28 -------------------
 src/views/service/infoQuery.vue               | 10 +++++--
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/src/views/service/components/attachmentUpload.vue b/src/views/service/components/attachmentUpload.vue
index 0a3590c..3861753 100644
--- a/src/views/service/components/attachmentUpload.vue
+++ b/src/views/service/components/attachmentUpload.vue
@@ -67,34 +67,6 @@ export default {
 
 	},
 	methods:{
-		getWsResult(res){
-			if(res.data && (res.data.type == 12)){
-				this.progressShow = true;
-				if(this.listProgress.length==0){
-					this.listProgress.push(res.data);
-				}
-				let ids = this.listProgress.map(em=>em.file_unique_id);
-				if(!ids.includes(res.data.file_unique_id)){
-					this.listProgress.push(res.data);
-				}
-				this.listProgress.forEach(em=>{
-					if(em.file_unique_id == res.data.file_unique_id){
-						em.rate = res.data.rate
-					}
-				})
-
-				let list = this.listProgress.filter(em=> em.rate != 100);
-				if(list.length==0 && res.data.status == 1){
-					this.progressShow = false;
-				}
-				if(res.data.status == 1){
-					this.fileList.splice(this.fileList[0],1);
-					this.params = {};
-					this.$emit('uploadFileSuccess');
-				}
-			}
-		},
-
 		// 导入文件
 		importFile(params){
 			this.parentParams = params;
diff --git a/src/views/service/infoQuery.vue b/src/views/service/infoQuery.vue
index c86ba07..f02d710 100644
--- a/src/views/service/infoQuery.vue
+++ b/src/views/service/infoQuery.vue
@@ -2,7 +2,7 @@
 	<el-container class="mainNoBack userBox">
 		<el-aside class="userAside" width="220px">
 			<el-container>
-				<el-main class="nopadding">
+				<el-main class="nopadding" v-loading="contactsLoading" element-loading-text="加载中...">
 					<el-scrollbar>
 						<div class="contacts">
 							<div class="contactsTitle">联系人</div>
@@ -30,7 +30,7 @@
 		<el-main class="userMain userMainPadding_0" style="border-top-right-radius: 0;border-bottom-right-radius: 0;padding: 0;">
 			<div class="mainBody">
 				<div class="mainTitle">{{contactsInfo.from_user && contactsInfo.from_user.name?contactsInfo.from_user.name:"匿名"}}</div>
-				<div class="mainView">
+				<div class="mainView" v-loading="msgDataLoading" element-loading-text="加载中...">
 					<el-scrollbar ref="scrollbar" @scroll="handleScroll">
 						<div class="msgList">
 							<div class="msgItem" :class="user_id != item.to_user_id?'msgRightItem':''" v-for="(item,index) in msgList" :key="index">
@@ -140,6 +140,8 @@ export default {
 		return{
 			contactsList:[],
 			contactsInfo:{},
+			msgDataLoading:false,
+			contactsLoading:false,
 			msgList:[],
 			user_id:0,
 			to_user_id:0,
@@ -249,7 +251,9 @@ export default {
 			}
 		},
 		async getContactList() {
+			this.contactsLoading = true;
 			await this.$API.customer.contactList.post();
+			this.contactsLoading = false;
 		},
 		contactsActive(item){
 			this.contactsInfo = item;
@@ -261,6 +265,7 @@ export default {
 		async getCustomerMsgList(isPage=false) {
 			let params = {}
 			if(!isPage){
+				this.msgDataLoading = true;
 				params = {
 					to_user_id:this.to_user_id,
 					pageSize:30
@@ -273,6 +278,7 @@ export default {
 				}
 			}
 			await this.$API.customer.list.post(params);
+			this.msgDataLoading = false;
 		},
 		handleKeydown(event){
 			if(event.key === 'Enter' && !event.shiftKey){