flx：合并冲突

pages/contractors/qualification.vue

@@ -21,7 +21,8 @@
 				<view class="itemBox">
 					<view class="file-info">
 						<image :src="item.logoUrl" class="icon-image" v-if="fileTypeCondition(item.logoUrl)"></image>
-						<image v-else src="/static/documentIcon/JPG.png" class="icon-image"></image>
+						<!-- <image v-else-if="getFileSuffix(item.logoUrl) == 'zip'" :src="'/static/documentIcon/ZIP.png'" class="icon-image"></image> -->
+						<image v-else :src="getFileSuffix(item.logoUrl)" class="icon-image"></image>
 						<view class="info">
 							<view class="info-inner">{{item.fileName}}</view>
 							<view class="info-inner">{{item.createTime}}</view>
@@ -55,6 +56,7 @@
 				barBoxHeight: '',
 				scrollHeight:'',
 				listData: [],
+				
 			};
 		},
 		onReady() {
@@ -76,6 +78,17 @@
 				// 检查文件后缀名是否在图片后缀名数组中
 				return imageExtensions.includes(extension);
 			},
+			getFileSuffix(fileName){
+				let suffixName = fileName.split('.').pop().toLowerCase()
+				if(suffixName == 'pdf') return '/static/documentIcon/pdf.png'
+				if(suffixName == 'ppt' || suffixName == 'pptx') return '/static/documentIcon/ppt.png'
+				if(suffixName == 'rar' || suffixName == 'zip') return '/static/documentIcon/rar.png'
+				if(suffixName == 'txt') return '/static/documentIcon/txt.png'
+				if(suffixName == 'mp4') return '/static/documentIcon/video.png'
+				if(suffixName == 'doc' || suffixName == 'docx') return '/static/documentIcon/word.png'
+				return '/static/documentIcon/null.png'
+				// return fileName.split('.').pop();
+			},
 			async getHeight() {
 				const query = uni.createSelectorQuery().in(this);