修复类型页面图片全都显示一样的问题。

pages/common/allType/index.vue

@@ -2,7 +2,7 @@
 	<view class="alltype">
 		<!-- 车辆列表 -->
 		<view class="vehicle-list" v-if="vehicles.length>0">
-			<view v-for="(item, index) in vehicles" :key="index">
+			<view class="typeContent" v-for="(item, index) in vehicles" :key="index">
 				<view class="vehicle-item" @click="alltypeInfo(item)">
 					<image :src="item.img" mode="aspectFit" class="IMG"></image>
 				</view>
@@ -20,6 +20,7 @@
 <script>
 	import {
 		deviceTypeList,
+		typeAll
 	} from '@/api/common/index.js'
 	export default {
 		data() {
@@ -90,32 +91,57 @@
 		},
 		methods: {
 			getTab() {
-				deviceTypeList({}).then((res) => {
+				let p1 = deviceTypeList({});
+				let p2 = typeAll();
+
+				Promise.allSettled([p1, p2]).then(result => {
+					let res = result[0].status === 'fulfilled' ? result[0].value : {};
+					let res1 = result[1].status === 'fulfilled' ? result[1].value : {};
 					if (res.code == 200) {
-						for (var i = 0; i < res.data.length; i++) {
-							var item = res.data[i];
-							
-							item.img="/static/images/common/bip.6.png";
-							let f=this.typeImgs.find(v=>{
-								if(item.typeName.toLowerCase()===v.Name.toLowerCase()){
-									return true;
+						if (res1.code != 200) {
+							for (let i = 0; i < res.data.length; i++) {
+								let f = this.typeImgs.find(v => {
+									if (res.data[i].typeName.toLowerCase() === v.Name.toLowerCase()) {
+										return true;
+									}
+									return false;
+								});
+								if (f) {
+									res.data[i].img = f.url;
+								}else{
+									res.data[i].img = "/static/images/common/bip.6.png";
 								}
-								return false;
-							});
-							if(f){
-								item.img=f.url;
 							}
+						
+						} else {
+							let all = res1.data;
+							for (let i = 0; i < res.data.length; i++) {	
+								let f = all.find(v => {
+									if (res.data[i].id === v.deviceTypeId) {
+										return true;
+									}
+									return false;
+								});
+								if (f && f.devicePic) {
+									res.data[i].img = f.devicePic;
+								}else{
+									res.data[i].img = "/static/images/common/bip.6.png";
+								}
+							}							
 						}
 						this.vehicles = res.data;
+
 					}
-				})
+
+				});
+
 			},
 			alltypeInfo(item) {
 				uni.switchTab({
 					url: '/pages/common/index/index',
 					success: (res) => {
-					 let eventChannel = this.getOpenerEventChannel();
-					  eventChannel.emit('index', item);						  				
+						let eventChannel = this.getOpenerEventChannel();
+						eventChannel.emit('index', item);
 					}
 				});
 			}
@@ -139,8 +165,10 @@
 	.vehicle-list {
 		display: flex;
 		flex-wrap: wrap;
+		flex-direction: row;
+		align-content: center;
+		justify-content: space-around;
 		align-items: center;
-		text-align: center;
 
 	}
 
@@ -151,14 +179,17 @@
 	}
 
 	.vehicle-item {
-		padding: 24rpx 0;
+
 		background: rgba(26, 26, 26, 1);
-		border-radius: 16rpx;
-		width: 156rpx;
-		height: 156rpx;
-		margin-right: 16rpx;
-		margin-bottom: 16rpx;
-		line-height: 156rpx;
+		border-radius: 9px;
+		width: 140rpx;
+		height: 140rpx;
+
+		margin-bottom: 15rpx;
+
+		display: grid;
+		align-content: center;
+		justify-content: center;
 
 	}
 
@@ -170,6 +201,9 @@
 
 	.plate-number {
 		color: rgba(255, 255, 255, 0.87);
+		font-size: 27rpx;
+		font-family: 'PingFang SC';
+		text-align: center;
 	}
 
 	.noDATA {
@@ -177,4 +211,8 @@
 		color: rgba(255, 255, 255, 0.87);
 		transform: translate(-0%, 100%);
 	}
+
+	.typeContent {
+		padding-bottom: 15rpx;
+	}
 </style>