更新优化

pages/order/order.vue

@@ -47,8 +47,6 @@
 					<text class="status" v-if="item.status == 'unsend'">
 						<text>待发货</text>
 					</text>
-
-
 					<text class="status" v-if="item.status == 'closed'">
 						<text>订单完成</text>
 					</text>
@@ -62,7 +60,7 @@
 						<text>退单</text>
 					</text>
 					<text class="status" v-if="item.status == 'cancelled'">
-						<text>取消订单</text>
+						<text>已取消</text>
 					</text>
 					<text class="status" v-if="item.status == 'merge'">
 						<text>合台</text>
@@ -81,8 +79,8 @@
 								</view> -->
 						</view>
 					</view>
-					<view class="total">
-						<text class="t">{{item.status == 'unpaid' || item.status == 'paying'?'需':'已'}}付款</text>
+					<view class="total" v-if="item.status != 'cancelled'">
+						<text class="t">{{item.description}}</text>
 						<text class="i">￥</text>
 						<text class="num">{{item.orderAmount}}</text>
 					</view>
@@ -209,6 +207,7 @@
 			} else {
 				this.active = (this.tabs.findIndex((item) => item.type == this.useStorage.get('orderType')));
 			}
+			this.swiperCurrent = ''
 			this.init_fn()
 		},
 		onReachBottom() {
@@ -354,7 +353,8 @@
 			position: relative;
 			background: #FFFFFF;
 			border-radius: 12rpx;
-			padding:0 10rpx;
+			padding: 0 10rpx;
+
 			.navtabone {
 				// margin-left: -10rpx;
 				width: 166rpx;