From 58ff637238b06f0744661b11db4214ef903ac867 Mon Sep 17 00:00:00 2001
From: Suk1No <674874220@qq.com>
Date: Thu, 21 Aug 2025 16:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 order-app/src/pages/mine/mine.vue   | 18 ++++++++++++++----
 order-app/src/pages/order/order.vue | 25 ++++++++++++-------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/order-app/src/pages/mine/mine.vue b/order-app/src/pages/mine/mine.vue
index 059c713..1639e95 100644
--- a/order-app/src/pages/mine/mine.vue
+++ b/order-app/src/pages/mine/mine.vue
@@ -12,13 +12,11 @@
 
 		<view class="u-m-t-20">
 			<u-cell-group>
-				<u-cell-item icon="star" title="我的收藏"></u-cell-item>
-				<u-cell-item icon="photo" title="我的订单"></u-cell-item>
+				<u-cell-item @click="toOrder" icon="star" title="我的订单"></u-cell-item>
+				<u-cell-item icon="photo" title="我的收藏"></u-cell-item>
 				<u-cell-item icon="coupon" title="我的地址"></u-cell-item>
 			</u-cell-group>
 		</view>
-
-
 	</view>
 </template>
 
@@ -29,6 +27,9 @@
 	import {
 		ref
 	} from 'vue'
+	import {
+		userLogin
+	} from '../../api/user.js'
 	//昵称
 	const nickName = ref('大幕孤烟直')
 	//头像
@@ -52,7 +53,16 @@
 			})
 		}
 	}
+	//跳转详情
+	const toOrder = () => {
+		getUserInfo()
+		//在起始页面跳转到details.vue页面并传递参数
+		uni.navigateTo({
+			url: '../order/order'
+		});
+	}
 	onShow(() => {
+		userLogin()
 		getUserInfo()
 	})
 </script>
diff --git a/order-app/src/pages/order/order.vue b/order-app/src/pages/order/order.vue
index 042b826..e3af72c 100644
--- a/order-app/src/pages/order/order.vue
+++ b/order-app/src/pages/order/order.vue
@@ -17,7 +17,10 @@
 										<view class="store">{{ res.userName }}</view>
 										<u-icon name="arrow-right" color="rgb(203,203,203)" :size="26"></u-icon>
 									</view>
-									<view class="right">{{ res.phone }}</view>
+									<view style="margin-left: 6px;;" class="right">{{ res.phone }}</view>
+								</view>
+								<view class="">
+									{{res.address}}
 								</view>
 								<view class="item" v-for="(item, index) in res.goodsList" :key="index">
 									<view class="left">
@@ -44,12 +47,8 @@
 									</text>
 								</view>
 								<view class="bottom">
-									<view class="more">
-										<u-icon name="more-dot-fill" color="rgb(203,203,203)"></u-icon>
-									</view>
-									<view class="logistics btn">查看物流</view>
-									<view class="exchange btn">卖了换钱</view>
-									<view class="evaluate btn">评价</view>
+									<view v-if="res.status == '0'" class="exchange btn">取消订单</view>
+									<view v-if="res.status == '2'" class="evaluate btn">评价</view>
 								</view>
 							</view>
 							<u-loadmore :status="loadStatus[index]" bgColor="#f2f2f2"></u-loadmore>
@@ -150,7 +149,7 @@
 	const getOrderList = async (idx) => {
 		let res = await getOrderListApi({
 			openid: uni.getStorageSync("openid"),
-			type: idx == 0 ? '' : idx,
+			type: idx == 0 ? '' : idx - 1,
 			currentPage: currentPage.value,
 			pageSize: pageSize.value
 		})
@@ -189,7 +188,7 @@
 	.order {
 		width: 710rpx;
 		background-color: #ffffff;
-		margin: 20rpx auto;
+		margin: 10rpx auto;
 		border-radius: 20rpx;
 		box-sizing: border-box;
 		padding: 20rpx;
@@ -197,8 +196,8 @@
 
 		.top {
 			display: flex;
-			justify-content: space-between;
 
+			// justify-content: space-between;
 			.left {
 				display: flex;
 				align-items: center;
@@ -223,8 +222,8 @@
 				margin-right: 20rpx;
 
 				image {
-					width: 200rpx;
-					height: 200rpx;
+					width: 140rpx;
+					height: 140rpx;
 					border-radius: 10rpx;
 				}
 			}
@@ -278,7 +277,7 @@
 			display: flex;
 			margin-top: 40rpx;
 			padding: 0 10rpx;
-			justify-content: space-between;
+			justify-content: flex-end;
 			align-items: center;
 
 			.btn {