From 8ef987b3d317d3637d34b00829225c3ecb949356 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sun, 2 Aug 2026 20:02:17 +0800
Subject: [PATCH 1/2] 11

---
 src/sheep/api/user.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sheep/api/user.ts b/src/sheep/api/user.ts
index 64c147c..e3b7d3d 100644
--- a/src/sheep/api/user.ts
+++ b/src/sheep/api/user.ts
@@ -72,8 +72,8 @@ export default {
 			url: `/auth/oauth2/token`,
 			method: "POST",
 			params: query,
-			// data: `password=${encodeURIComponent(pwdForWire)}`,
-			data: `password=`+password,
+			data: `password=${encodeURIComponent(pwdForWire)}`,
+			// data: `password=`+password,
 			header: {
 				skipToken: true,
 				Authorization: BASIC_AUTH,

From d10934fdf434fb9a56f4848e5526e09efbd79233 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sun, 2 Aug 2026 20:19:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=95=86=E6=88=B7=E5=90=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/individualOrder.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/tabbar/individualOrder.vue b/src/pages/tabbar/individualOrder.vue
index cd56b60..45f5844 100644
--- a/src/pages/tabbar/individualOrder.vue
+++ b/src/pages/tabbar/individualOrder.vue
@@ -35,7 +35,7 @@
 			<view class="h-20rpx" />
 			<view class="card rounded-24rpx bg-white p-20rpx pb-0rpx mb-20rpx" v-for="(v, index) in pageHook.list"
 				:key="v.id">
-				<order-car visibleUser :visibleMchOrderStatus="false" :cardetail="v"
+				<order-car visibleUser :visibleMchOrderStatus="true" :cardetail="v"
 					:footerOperate="['refund', 'qrCodeDetail']" />
 			</view>
 		</z-paging>