fix

virgo.wzfrontend/workark/src/components/website/payOrder.vue

@@ -3,8 +3,9 @@
 		<div class="pay-order-item"><span class="label">订单编号：</span><span>{{orderNo}}</span></div>
 		<div class="pay-order-item"><span class="label">支付方式：</span><span>微信支付</span></div>
 		<div v-if="state === 'NOTPAY'">
-			<el-statistic :value="codeUrlFailureTime" format="HH:mm:ss" time-indices title="订单将过期"
-				@finish="finish"></el-statistic>
+			<el-statistic v-if="codeUrlFailureTime && !orderClose" :value="codeUrlFailureTime" format="HH:mm:ss"
+				time-indices title="订单即将过期" @finish="finish">
+			</el-statistic>
 			<el-skeleton :loading="loading" animated>
 				<template slot="template">
 					<div class="pay-img">
@@ -12,7 +13,10 @@
 					</div>
 				</template>
 				<template>
-					<div class="pay-img" v-if="payUrl">
+					<div v-if="orderClose">
+						<el-result icon="error" title="WORKARK提示" subTitle="订单已过期,请重新下单"></el-result>
+					</div>
+					<div class="pay-img" v-else-if="payUrl">
 						<img :src="payUrl" alt="pay.png" />
 					</div>
 				</template>
@@ -41,7 +45,8 @@
 				timer: null,
 				state: 'NOTPAY',
 				loading: false,
-				codeUrlFailureTime: ''
+				codeUrlFailureTime: '',
+				orderClose: false
 			}
 		},
 		mounted() {
@@ -80,6 +85,7 @@
 			},
 			finish() {
 				this.stopTimer();
+				this.orderClose = true;
 				this.$emit('callback', 'payState');
 			}
 		},

virgo.wzfrontend/workark/src/components/work/serve/list/detail.vue

@@ -24,8 +24,12 @@
 						<div class="hui-detail-item">
 							<div class="hui-detail-label">支付状态</div>
 							<div class="hui-detail-value">
-								<span :class="part.orderStatus === '未支付'?'color-warning':'color-success'">
-									{{part.orderStatus}}
+								<span :class="{
+									'color-warning':part.orderStatus === '未支付',
+									'color-success':part.orderStatus === '支付成功',
+									'color-danger':part.orderStatus === '超时已关闭'
+								}">
+									{{part.orderStatus}}
 								</span>
 							</div>
 						</div>
@@ -208,6 +212,7 @@
 			initFacilitatorRole() {
 				//status   0-待服务商确认  1-服务商已确认，过程开始   2.过程结束，已交付
 				//服务商
+				if (this.part.orderStatus === '超时已关闭') return;
 				if (this.part.orderStatus === '未支付') this.activeList.push({
 					id: 1,
 					type: 'primary',
@@ -236,6 +241,7 @@
 			},
 			initCustomerRole() {
 				//客户
+				if (this.part.orderStatus === '超时已关闭') return;
 				if (this.part.orderStatus === '未支付') this.activeList.push({
 					id: 4,
 					type: 'primary',

virgo.wzfrontend/workark/src/views/work/serve/list.vue

@@ -20,7 +20,11 @@
 					<el-table-column label="创建时间" prop="createTime"></el-table-column>
 					<el-table-column label="支付状态" align="center" width="150">
 						<template slot-scope="scope">
-							<span :class="scope.row.orderStatus === '未支付'?'color-warning':'color-success'">
+							<span :class="{
+								'color-warning':scope.row.orderStatus === '未支付',
+								'color-success':scope.row.orderStatus === '支付成功',
+								'color-danger':scope.row.orderStatus === '超时已关闭'
+							}">
 								{{scope.row.orderStatus}}
 							</span>
 						</template>