调整样式

components/orderCard/OrderCard.vue

@@ -22,10 +22,9 @@
 						到达
 					</template>
 				</view>
-				<text :class="{ toRescued: orderData.rescueStatus <= 2, inRescue: orderData.rescueStatus > 2 }"
+				<text v-if="statusStr" :class="{ toRescued: status == 2 || status == 3 || status == 4, inRescue: status == 5 || status == 1 }"
 					class="orderCardFlag">
-					<template v-if="orderData.rescueStatus <= 2">{{orderData.rescueStatusStr}}</template>
+					<template>{{statusStr}}</template>
-					<template v-if="orderData.rescueStatus > 2">{{orderData.rescueStatusStr}}</template>
 				</text>
 			</view>
 			<view class="orderCardProcess">
@@ -64,6 +63,28 @@
 				default: () => {
 					return {}
 				}
+			},
+			status: {
+				type: [String, Number],
+				default: ''
+			}
+		},
+		computed: {
+			statusStr() {
+				console.log('this.status: ',this.status);
+				if (this.status == '1') {
+					return '救援中'
+				} else if (this.status == '2') {
+					return '待支付'
+				} else if (this.status == '3') {
+					return '待取车'
+				} else if (this.status == '4') {
+					return '待评价'
+				} else if (this.status == '5') {
+					return '已完成'
+				} else {
+					return ''
+				}
 			}
 		},
 		mounted() {

pages/details/details.vue

@@ -127,7 +127,7 @@
 							<view v-if="index === detailsinfo.detail.length - 1" class="gain">
 								<image class="gainIcon" src="@/static/icons/currentDetails.png" mode="aspectFit"></image>
 							</view>
-							<view v-else class="gain">{{ index + 1 }}</view>
+							<view v-else class="gain"></view>
 							<view class="ga-content">
 								<view class="ga-content-top">
 									<view class="ga-content-title">{{item.title}}</view>

pages/rescue/historylist.vue

@@ -26,7 +26,7 @@
 				<image src="../../static/quesheng.png" mode=""></image>
 			</view>
 
-			<order-card-vue v-for="(item,index) in orderList" :key="index" :orderData="item"></order-card-vue>
+			<order-card-vue :status="gindex" v-for="(item,index) in orderList" :key="index" :orderData="item"></order-card-vue>
 			<!-- <view class="boxt" v-for="(item,index) in orderList" :key="index" @click="godetail(item.id)">
 				<view class="boxt-left">
 					<view class="left-lan">

pages/rescue/rescue.vue

@@ -152,7 +152,7 @@
 					<image src="../../static/quesheng.png" mode="aspectFit"></image>
 				</view>
 				<view style="display: flex;flex-direction: column;row-gap: 10px;" v-else>
-					<order-card @deleteOk="deleteOrderHandle" @refresh="getlist" v-for="(item, index) in orderList" :key="index" :orderData="item"></order-card>
+					<order-card :status="1" @deleteOk="deleteOrderHandle" @refresh="getlist" v-for="(item, index) in orderList" :key="index" :orderData="item"></order-card>
 				</view>
 				<!-- <view class="boxt" v-for="(item,index) in orderList" :key="index">
 					<view class="boxt-left" @click="godetail(item.id)">

pages/rescue/trafficPolice.vue

@@ -113,10 +113,9 @@
 									到达
 								</template>
 							</view>
-							<text :class="{ toRescued: item.rescueStatus <= 2, inRescue: item.rescueStatus > 2 }"
+							<text :class="{ inRescue: true }"
 								class="orderCardFlag">
-								<template v-if="item.rescueStatus <= 2">{{item.rescueStatusStr}}</template>
+								救援中
-								<template v-if="item.rescueStatus > 2">{{item.rescueStatusStr}}</template>
 							</text>
 						</view>
 						<view class="orderCardProcess">

utils/request.js

@@ -43,9 +43,11 @@ const request = config => {
         const code = res.data.code || 200
         const msg = errorCode[code] || res.data.msg || errorCode['default']
         if (code === 401) {
-              store.dispatch('LogOut').then(res => {
+					uni.clearStorageSync()
-                uni.reLaunch({ url: '/pages/login/login' })
+					uni.reLaunch({ url: '/pages/login/login' })
-              })
+              // store.dispatch('LogOut').then(res => {
+              //   uni.reLaunch({ url: '/pages/login/login' })
+              // })
         } else if (code === 500) {
           toast(msg)
           reject('500')