From 5866ee47dce13d706d4f65d0ea6331add12a43c6 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 26 Feb 2023 01:16:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E4=B8=BB=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order-manage/order-manage.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 984cca6..6808f3d 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -85,7 +85,8 @@
 					<text v-else-if="item.code === 2">({{orderStatistics.waitServOrderNum}})</text>
 					<text v-else-if="item.code === 3">({{orderStatistics.servingOrderNum}})</text>
 					<text v-else-if="item.code === 4">({{orderStatistics.waitSureOrderNum}})</text>
-					<text v-else-if="item.code === 5">({{orderStatistics.finishedOrderNum}})</text>
+					<text v-else-if="item.code === 5 && item.isChild">({{orderStatistics.finishedOrderNum}})</text>
+					<text v-else-if="item.code === 5 && !item.isChild">({{orderStatistics.finishedMasterOrderNum}})</text>
 					<text v-else-if="item.other === 0">({{orderStatistics.afterListNum}})</text>
 					<text v-else>(0)</text>
 				</view>
@@ -372,7 +373,7 @@
 				<text>备注：{{order.customerRemark}}</text>
 			</view>
 		</view>
-		<load-status-bar v-show="tabCur === 5 || (stateCur != null && stateList[stateCur].code === 105)" ref="loadStatusBar" @loadMore="loadMasterOrderPage"></load-status-bar>
+		<load-status-bar v-show="[5,6].indexOf(tabCur) >= 0 || (stateCur != null && stateList[stateCur].code === 105)" ref="loadStatusBar" @loadMore="loadMasterOrderPage"></load-status-bar>
 		<view v-show="tabCur !== 5 && stateCur !== 0" class="cu-tabbar-height"></view>
 		<!-- 模态框 -->
 		<agree-after-sale v-if="agreeAfterSale" :show="agreeAfterSale" :data="curOrder" @confirmFeedback="reloadMasterOrderPage"></agree-after-sale>
@@ -497,7 +498,12 @@
 					name: '售后中',
 				}, {
 					code: 5,
-					name: '已完成'
+					name: '已完成/子',
+					isChild: true
+				}, {
+					code: 5,
+					name: '已完成/主',
+					isChild: false
 				}],
 				myOrders: {},
 				orderList: [],
@@ -593,7 +599,7 @@
 					params.orderStatus = this.stateList[this.stateCur].code;
 				}
 				// 分页
-				if ((this.stateCur != null && [104, 103, 100, 0].indexOf(this.stateList[this.stateCur].code) >= 0) || [0, 4].indexOf(this.tabCur) >= 0) {
+				if ((this.stateCur != null && [105].indexOf(this.stateList[this.stateCur].code) >= 0) || [0, 4, 5, 6].indexOf(this.tabCur) >= 0) {
 					params.pageSize = this.$globalData.initPageSize;
 					params.pageNum = this.pageNum;
 				} else {
@@ -644,7 +650,7 @@
 					let tmpStateCur = this.stateCur;
 					let tmpTabCur = this.tabCur;
 					// 不同状态的单需要请求不同接口
-					if (this.stateCur != null && [105].indexOf(this.stateList[this.stateCur].code) >= 0) {
+					if ((this.stateCur != null && [105].indexOf(this.stateList[this.stateCur].code) >= 0) || (this.tabCur === 6)) {
 						// 只查询主单，需要进行分页处理
 						this.$refs.loadStatusBar.showLoading();
 						res = await this.$request.qryMasterOrderPage(params);