From c8018ceb97e7f998719327149f97b57567890874 Mon Sep 17 00:00:00 2001
From: sszdot <szdot@qq.com>
Date: Mon, 23 Dec 2024 18:03:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afix=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91?=
 =?UTF-8?q?=EF=BC=9AcheckUserInfo=E7=9A=84=E5=87=BD=E6=95=B0=E4=B9=8B?=
 =?UTF-8?q?=E5=89=8D=E4=BF=AE=E6=94=B9=E8=BF=87=20=E4=B8=8D=E7=94=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=97=E5=8F=82=E6=95=B0=20=E5=86=8D=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E5=86=85=E9=83=A8=E7=9B=B4=E6=8E=A5=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F=20=EF=BC=8C?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=B0=83=E7=94=A8=E6=97=B6=E5=B9=B6=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=88=A0=E6=8E=89=E4=BC=A0=E5=8F=82=20=E3=80=90?=
 =?UTF-8?q?=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84wxLogin=E5=87=BD=E6=95=B0=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=20checkUserInfo=E8=BF=99=E4=B8=AA=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8D=E7=94=A8=E4=BC=A0=E5=8F=82=20=E3=80=90=E5=BD=B1=20=20?=
 =?UTF-8?q?=E5=93=8D=E3=80=91=EF=BC=9A?=
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：构建过程或辅助工具的变动
---
 App.vue                            |  4 ++++
 components/orderItem/orderItem.vue | 10 ++++++++--
 pages/index/index.vue              |  9 +++------
 pages/main/order.vue               |  9 +++++----
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/App.vue b/App.vue
index 54a4650..c2d0f1c 100644
--- a/App.vue
+++ b/App.vue
@@ -58,6 +58,10 @@
 	.pr{
 		position: relative;
 	}
+	
+	.pa{
+		position: absolute;
+	}
 
 	.fc {
 		text-align: center;
diff --git a/components/orderItem/orderItem.vue b/components/orderItem/orderItem.vue
index 2dd4162..6e8b942 100644
--- a/components/orderItem/orderItem.vue
+++ b/components/orderItem/orderItem.vue
@@ -20,12 +20,18 @@
 			</view>
 		</view>
 		<view class="m-t-24 flex mr">
-			<view class="numberBut bg-m fci rad8 fz28 fb flex mac mc" :key="foodSn">
+			<view class="nullBut bg-m fci rad8 fz28 flex mac mc m-l-24" :key="foodSn">
+				立即支付
+			</view>
+			<view class="numberBut bg-m fci rad8 fz28 fb flex mac mc m-l-24" :key="foodSn">
 				{{ foodSn }}
 			</view>
-			<view class="nullBut border fcb rad8 fz28 flex mac mc m-l-24" style="">
+			<view class="nullBut border fcb rad8 fz28 flex mac mc m-l-24">
 				申请售后
 			</view>
+			<view class="nullBut border fcb rad8 fz28 flex mac mc m-l-24">
+				退款详情
+			</view>
 		</view>
 	</view>
 </template>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2c508b5..dc166f4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -47,8 +47,7 @@
 
 <script>
 	import {
-		checkUserInfo,
-		wxLogin
+		checkUserInfo
 	} from '@/utils/index.js'
 
 	export default {
@@ -69,7 +68,7 @@
 				return this.$store.state.orderList.filter(item => item.main_status === '已付款')
 			}
 		},
-		onShow() {
+		created() {
 			//检查token 没有则进行无感登录
 			this.checkUserInfo()
 			// 当页面显示时，设置tabber的激活项
@@ -77,9 +76,7 @@
 		},
 		methods: {
 			// 检查用户信息
-			checkUserInfo() {
-				return checkUserInfo(this.$store)
-			}
+			checkUserInfo,
 		}
 	}
 </script>
diff --git a/pages/main/order.vue b/pages/main/order.vue
index d0889ff..68e87f2 100644
--- a/pages/main/order.vue
+++ b/pages/main/order.vue
@@ -71,12 +71,13 @@
 			orderList_unpaid() {
 				return this.$store.state.orderList.filter(item => item.main_status === '未付款')
 			},
-			//已付款 并且没有申请退款的订单
+			//已付款 已完成 并且没有申请退款的订单
 			orderList_paid() {
-				return this.$store.state.orderList.filter(item => item.main_status === '已付款' && item.refund_status ===
-					'未申请')
+				return this.$store.state.orderList.filter(item => {
+					(item.main_status === '已付款' || item.main_status === '已完成') && item.refund_status === '未申请'
+				})
 			},
-			//申请中 已同意 主动退 等退款的订单
+			//申请中 已同意 主动退 拒绝退 等退款相关的订单
 			orderList_refund() {
 				return this.$store.state.orderList.filter(item => item.refund_status !== '未申请')
 			},