From 9869ca7fc2136fabf04a9e08c7620564c36607ed Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Thu, 20 Jun 2024 20:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afix=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91=EF=BC=9A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=20=E8=AE=A2=E5=8D=95=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E3=80=90=E6=8F=8F=09=E8=BF=B0=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=09[=E5=8E=9F=E5=9B=A0]=EF=BC=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=20=E8=AE=A2=E5=8D=95=E8=A1=A8=E4=BF=AE=E6=94=B9=20=20?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=20=09[?=
 =?UTF-8?q?=E8=BF=87=E7=A8=8B]=EF=BC=9A=E8=B0=83=E6=95=B4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=A1=A8=20=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=20=09[=E5=BD=B1?=
 =?UTF-8?q?=E5=93=8D]=EF=BC=9A=20=E3=80=90=E7=BB=93=09=E6=9D=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 pages/index/index.vue | 11 ++++-------
 pages/main/order.vue  |  6 +++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7178e13..9004445 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -24,16 +24,14 @@
 		<!-- 新订单提示框 -->
 		<view v-for="(item, index) in orderList" :key="index">
 			订单：{{ item.order_sn }}
-			<text v-if="item.status === 'pending'">状态：已付款</text>
-			<text v-else-if="item.status === 'processing'">状态：备货中</text>
-			<text v-else-if="item.status === 'shipped'">状态：已发货</text>
+			<text>状态：{{ item.shipment_status }}</text>
 		</view>
 		<!-- 主按钮 -->
 		<view class="flex mse" style="height: 222rpx;margin-top: 30rpx;">
 			<navigator url="/pages/shop/list">
 				<mainBut bg="#D43030" imgSrc="/static/icons/ordernow.svg" butBt="开始点餐" butSt="Order Now" />
 			</navigator>
-			<navigator url="/pages/index/demo">
+			<navigator url="/pages/main/order">
 				<mainBut bg="#FF8D1A" imgSrc="/static/icons/buggoods.svg" butBt="购买商品" butSt="Buy Goods" />
 			</navigator>
 			<!-- <mainBut bg="#FFC300" imgSrc="/static/icons/franchise.svg" butBt="项目介绍" butSt="Introduction" /> -->
@@ -66,10 +64,9 @@
 			userInfo() {
 				return this.$store.state.userInfo
 			},
-			//订单列表 过滤出 已付款的状态订单 （包括 已付款 备货中 已发货）
+			//订单列表 过滤出 已付款的状态订单
 			orderList() {
-				const validStatuses = ['pending', 'processing', 'shipped'];
-				return this.$store.state.orderList.filter(item => validStatuses.includes(item.status));
+				return this.$store.state.orderList.filter(item => item.main_status === '已付款')
 			}
 		},
 		onReady() {
diff --git a/pages/main/order.vue b/pages/main/order.vue
index 74d6f1d..1e2c021 100644
--- a/pages/main/order.vue
+++ b/pages/main/order.vue
@@ -11,17 +11,17 @@
 		<!-- tabBoxs -->
 		<!-- 未付款 -->
 		<view v-if="curNow===0">
-			<view v-for="item in orderList" :key="item.id" v-if="item.status === 'unpaid' && item.back === 'normal'">
+			<view v-for="item in orderList" :key="item.id" v-if="item.main_status === '未付款' && item.refund_status !== '申请中'">
 				订单号: {{item.order_sn}}
 			</view>
 		</view>
 		<view v-if="curNow===1">
-			<view v-for="item in orderList" :key="item.id" v-if="item.status !== 'unpaid' && item.back === 'normal'">
+			<view v-for="item in orderList" :key="item.id" v-if="item.main_status === '已付款' && item.refund_status !== '申请中'">
 				订单号: {{item.order_sn}}
 			</view>
 		</view>
 		<view v-if="curNow===2">
-			<view v-for="item in orderList" :key="item.id" v-if="item.back !== 'normal'">
+			<view v-for="item in orderList" :key="item.id" v-if="item.refund_status === '申请中'">
 				订单号: {{item.order_sn}}
 			</view>
 		</view>