diff --git a/components/orderCard/OrderCard.vue b/components/orderCard/OrderCard.vue
index d958882..253afab 100644
--- a/components/orderCard/OrderCard.vue
+++ b/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;
diff --git a/components/tabBar/tabBar.vue b/components/tabBar/tabBar.vue
index dbc3ec5..9eae4fb 100644
--- a/components/tabBar/tabBar.vue
+++ b/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: {
diff --git a/pages/details/details.vue b/pages/details/details.vue
index 5789a21..c75e1e3 100644
--- a/pages/details/details.vue
+++ b/pages/details/details.vue
@@ -51,7 +51,7 @@
待取车 -->
-
+
@@ -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 {
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 8ff0423..b2b7ba1 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -4,7 +4,7 @@
个人中心
- ···
+
@@ -543,6 +543,7 @@
justify-content: space-between;
align-items: center;
background-color: #317dfa;
+ position: relative;
}
.c-title {
@@ -553,7 +554,9 @@
}
.X-title {
-
+ position: absolute;
+ left: 50%;
+ transform: translateX(-50%);
font-size: 18px;
color: white;
diff --git a/pages/rescue/historylist.vue b/pages/rescue/historylist.vue
index 73402f5..82beb1e 100644
--- a/pages/rescue/historylist.vue
+++ b/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()
},
diff --git a/pages/rescue/initiate.vue b/pages/rescue/initiate.vue
index 88d7f14..34e8c56 100644
--- a/pages/rescue/initiate.vue
+++ b/pages/rescue/initiate.vue
@@ -115,7 +115,7 @@
- 备注
+ 备注
diff --git a/pages/rescue/trafficPolice.vue b/pages/rescue/trafficPolice.vue
index 9f13344..d55e1c1 100644
--- a/pages/rescue/trafficPolice.vue
+++ b/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;