Merge remote-tracking branch 'origin/master'

components/orderCard/OrderCard.vue

@@ -200,10 +200,11 @@
 		.orderCardType {
 			background-color: #EAF1FE;
 			color: #317DFA;
-			padding: 4rpx 16rpx;
+			padding: 8rpx 16rpx;
 			border-radius: 16rpx 0 16rpx 0;
 			font-size: 24rpx;
 			margin-right: 12rpx;
+			line-height: 1;
 		}
 
 		.orderCardTitle {
@@ -222,6 +223,7 @@
 		align-items: center;
 		column-gap: 4rpx;
 		font-size: 24rpx;
+		line-height: 1;
 	}
 
 	.orderCardDistanceIcon,
@@ -241,8 +243,9 @@
 
 	.orderCardFlag {
 		font-size: 24rpx;
-		padding: 4rpx 16rpx;
-		border-radius: 4rpx;
+		padding: 8rpx 16rpx;
+		line-height: 1;
+		border-radius: 8rpx;
 
 		&.inRescue {
 			background-color: #ECF8EA;

components/tabBar/tabBar.vue

@@ -107,6 +107,9 @@
 			}, 2000);
 
 			this.aindex = this.msg
+			if (this.role == 'police' && this.msg == '1') {
+				this.aindex = '8'
+			}
 			this.getbottom()
 		},
 		watch: {

pages/details/details.vue

@@ -51,7 +51,7 @@
 					<view class="box-title" v-if="detailsinfo.rescueInfo.rescueStatus == 6">待取车</view> -->
 
 					<view class="touxiang">
-						<image :src=" baseUrl + detailsinfo.driverInfo.avatar " mode=""></image>
+						<image :src="baseUrl + detailsinfo.driverInfo.avatar" mode="aspectFit"></image>
 					</view>
 					<view class="box-bs" v-if="detailsinfo.driverInfo != '' ">
 						<view class="orderCardStatusData" v-if="detailsinfo.rescueInfo.rescueStatus == 3">
@@ -557,6 +557,7 @@
 		margin: 32rpx 0;
 		display: flex;
 		align-items: center;
+		line-height: 1;
 		column-gap: 4rpx;
 		font-size: 24rpx;
 	}
@@ -581,6 +582,7 @@
 		font-weight: 400;
 		font-size: 28rpx;
 		color: #000000;
+		line-height: 1;
 	}
 
 	.box-bs-footer {

pages/my/my.vue

@@ -4,7 +4,7 @@
       <view class="c-top" style="padding-top: 50px">
         <view style="width: 10%; height: 1px;"></view>
         <view class="X-title">个人中心</view>
-        <view style="width: 10%;font-size: 18px;font-weight: bold;color: white">···</view>
+        <!-- <view style="width: 10%;font-size: 18px;font-weight: bold;color: white">···</view> -->
       </view>
 
       <view style="justify-content: space-between;display: flex; align-items: center; margin-bottom: 20px;padding-bottom: 80px;">
@@ -549,6 +549,7 @@
 		justify-content: space-between;
 		align-items: center;
     background-color: #317dfa;
+		position: relative;
 	}
 
 	.c-title {
@@ -559,7 +560,9 @@
 	}
 
 	.X-title {
-
+		position: absolute;
+		left: 50%;
+		transform: translateX(-50%);
 		font-size: 18px;
 		color: white;
 

pages/rescue/historylist.vue

@@ -121,7 +121,8 @@
 					}
 					
 				],
-				arrbox: []
+				arrbox: [],
+				role: ''
 			}
 		},
 		components: {
@@ -130,6 +131,7 @@
 			OrderCardVue
 		},
 		onLoad(option) {
+			this.role = uni.getStorageSync('role')
 			this.gindex = option.id
 			this.getlist()
 		},

pages/rescue/initiate.vue

@@ -115,7 +115,7 @@
 				</view>
 			</view>
 			<view class="tinput">
-				<view class="text1"> 备注</view>
+				<view class="text1" style="flex-shrink: 0;"> 备注</view>
 				<view class="you">
 					<input type="text" placeholder-style="color: #929292;font-size: 24rpx" placeholder="添加备注"
 						v-model="rescueDetail">

pages/rescue/trafficPolice.vue

@@ -509,10 +509,11 @@
 		.orderCardType {
 			background-color: #EAF1FE;
 			color: #317DFA;
-			padding: 4rpx 16rpx;
+			padding: 8rpx 16rpx;
 			border-radius: 16rpx 0 16rpx 0;
 			font-size: 24rpx;
 			margin-right: 12rpx;
+			line-height: 1;
 		}
 
 		.orderCardTitle {
@@ -531,6 +532,7 @@
 		align-items: center;
 		column-gap: 4rpx;
 		font-size: 24rpx;
+		line-height: 1;
 	}
 
 	.orderCardDistanceIcon,
@@ -546,8 +548,9 @@
 
 	.orderCardFlag {
 		font-size: 24rpx;
-		padding: 4rpx 16rpx;
-		border-radius: 4rpx;
+		padding: 8rpx 16rpx;
+		border-radius: 8rpx;
+		line-height: 1;
 
 		&.inRescue {
 			background-color: #ECF8EA;