From 9dde19289db225d8b655fa34be436974be9dab50 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 14 Apr 2025 12:58:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B8=E9=94=80=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/order.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index 0123129..fa9fe90 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -48,7 +48,7 @@ const pageHook = hooks.usePage(
 		? orderApi.caneenPage
 		: new URL(window.location.href).searchParams.get("launchParam") == "selfMerchant"
 		? orderApi.supPage
-		: null,
+		: async () => [],
 	null,
 	"data.records",
 )
@@ -60,8 +60,9 @@ const query = (page: number, pagesize: number) => {
 	pageHook.startPage(page, pagesize, false, state.pa)
 }
 
+// 查看订单和核销码
 const doToDetail = (v: any) => {
-	// router.jump("/pages/order/detail", { id: v.id })
+	router.jump("/pages/order/detail", { id: v.id })
 }
 
 const doAppraise = () => {}
@@ -151,7 +152,7 @@ const doRefund = (v: any) => {
 				</view>
 				<view v-if="['5', '10'].includes(v.orderStatus)" class="flex-row items-center justify-end p-t-20rpx">
 					<!-- <view v-if="v.orderStatus == 5 && v.orderType == 2" class="botder_btn" @tap.stop="doRefund(v)">退款</view> -->
-					<!-- <view v-if="v.orderStatus == 5 && v.orderType == 2" class="m-l-20rpx botder_btn" @tap.stop="doToDetail(v)">核销码</view> -->
+					<view v-if="v.orderStatus == 5 && v.orderType == 2" class="m-l-20rpx botder_btn" @tap.stop="doToDetail(v)">核销码</view>
 				</view>
 			</view>
 		</z-paging>

From 0be23710adbe7acf82d0686b40ec0d525224b1b5 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 14 Apr 2025 14:32:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=AE=E7=9B=98=E6=8A=98=E5=8F=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pay/scanPay.vue               |  2 +-
 src/pages/tabbar/my.vue                 | 11 +----------
 src/sheep/components/numberKeyboard.vue | 21 +++++++++++++--------
 src/static/page/展开.svg                |  1 +
 src/static/page/折叠.svg                |  1 +
 5 files changed, 17 insertions(+), 19 deletions(-)
 create mode 100644 src/static/page/展开.svg
 create mode 100644 src/static/page/折叠.svg

diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue
index 5ab4651..1154c0d 100644
--- a/src/pages/pay/scanPay.vue
+++ b/src/pages/pay/scanPay.vue
@@ -1,6 +1,6 @@
 <template>
 	<crud-layout bg="/static/page/blue-bg.png">
-		<view class="h-screen flex flex-col position-relative">
+		<view class="h-screen flex flex-col">
 			<view class="mx-auto text-34 py-2 h-80rpx">{{ scanData.name }}</view>
 
 			<tm-sheet class="flex flex-row">
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 51a9a85..2a6774f 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -70,6 +70,7 @@ const state = reactive<{
 	wallet: [],
 	userInfo: {},
 	menuList: [
+		{ text: "扫一扫", icon: "/static/icon/scan.png", router: "" },
 		{ text: "钱包管理", icon: "/static/icon/service_3.png", router: "/pages/wallet/list" },
 		// { text: "包厢预定", icon: "/static/icon/service_4.png", router: "/pages/boxes/apply-list" },
 		// { text: "外来人员就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/foreign-list" },
@@ -360,16 +361,6 @@ const initMenuConfig = () => {
 			router: "/pages/user/userRole",
 		})
 	}
-
-	// 根据启动参数添加扫一扫菜单项
-	const launchParam = new URL(window.location.href).searchParams.get("launchParam")
-	if (launchParam === "selfMerchant") {
-		state.menuList.unshift({
-			text: "扫一扫",
-			icon: "/static/icon/scan.png",
-			router: "",
-		})
-	}
 }
 
 onLoad(async () => {
diff --git a/src/sheep/components/numberKeyboard.vue b/src/sheep/components/numberKeyboard.vue
index 5a15966..7350f73 100644
--- a/src/sheep/components/numberKeyboard.vue
+++ b/src/sheep/components/numberKeyboard.vue
@@ -1,8 +1,12 @@
 <template>
-	<view class="bg-[#f5f5f5] px-1 py-2 rounded-4 absolute bottom-0 w-full">
-		<view class="flex mb-2.5" v-for="(row, rowIndex) in keyboardLayout" :key="rowIndex">
+	<view class="bg-[#f5f5f5] px-1 py-2 rounded-4 fixed bottom-0 left-0 right-0 w-full">
+		<view class="flex justify-end">
+			<image v-show="show" class="w-[50rpx] h-[50rpx] mx-2 mb-1" src="@/static/page/折叠.svg" @click="show = !show" />
+			<image v-show="!show" class="w-[50rpx] h-[50rpx] mx-2 mb-1" src="@/static/page/展开.svg" @click="show = !show" />
+		</view>
+		<view v-show="show" class="flex mb-2.5" v-for="(row, rowIndex) in keyboardLayout" :key="rowIndex">
 			<view
-				class="flex-1 h-[60px] flex items-center justify-center bg-white text-2xl text-[#333] mx-[5px] rounded-lg cursor-pointer select-none active:bg-[#f0f0f0]"
+				class="flex-1 h-[80rpx] flex items-center justify-center bg-white text-2xl text-[#333] mx-[5px] rounded-lg cursor-pointer select-none active:bg-[#f0f0f0]"
 				v-for="(key, keyIndex) in row"
 				:key="keyIndex"
 				@click="handleKeyPress(key.toString())"
@@ -10,24 +14,24 @@
 				{{ key }}
 			</view>
 		</view>
-		<view class="flex mb-0">
+		<view v-show="show" class="flex mb-0">
 			<view
-				class="flex-1 h-[60px] flex items-center justify-center bg-white text-2xl text-[#333] mx-[5px] rounded-lg cursor-pointer select-none active:bg-[#f0f0f0]"
+				class="flex-1 h-[80rpx] flex items-center justify-center bg-white text-2xl text-[#333] mx-[5px] rounded-lg cursor-pointer select-none active:bg-[#f0f0f0]"
 				@click="handleKeyPress('.')"
 			>
 				.
 			</view>
 			<view
-				class="flex-auto h-[60px] flex items-center justify-center bg-white text-2xl text-[#333] mx-[5px] rounded-lg cursor-pointer select-none active:bg-[#f0f0f0]"
+				class="flex-auto h-[80rpx] flex items-center justify-center bg-white text-2xl text-[#333] mx-[5px] rounded-lg cursor-pointer select-none active:bg-[#f0f0f0]"
 				@click="handleKeyPress('0')"
 			>
 				0
 			</view>
 			<view
-				class="flex-1 h-[60px] flex items-center justify-center bg-white mx-[5px] rounded-lg cursor-pointer select-none active:bg-[#f0f0f0]"
+				class="flex-1 h-[80rpx] flex items-center justify-center bg-white mx-[5px] rounded-lg cursor-pointer select-none active:bg-[#f0f0f0]"
 				@click="handleDelete"
 			>
-				<image class="w-[30px] h-[30px]" src="@/static/page/keyboardDelete.svg" />
+				<image class="w-[30rpx] h-[30rpx]" src="@/static/page/keyboardDelete.svg" />
 			</view>
 		</view>
 	</view>
@@ -43,6 +47,7 @@ const keyboardLayout = ref([
 	["4", "5", "6"],
 	["7", "8", "9"],
 ])
+const show = ref(true)
 
 // 按下键盘
 const handleKeyPress = (key) => {
diff --git a/src/static/page/展开.svg b/src/static/page/展开.svg
new file mode 100644
index 0000000..38d1a27
--- /dev/null
+++ b/src/static/page/展开.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1744612190511" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12706" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M736 544c-12.5 12.5-32.8 12.5-45.3 0L523.3 376.6c-6.2-6.2-16.4-6.2-22.6 0L333.3 544c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3L466.7 320c25-25 65.5-25 90.5 0L736 498.7c12.5 12.5 12.5 32.8 0 45.3z" p-id="12707"></path></svg>
\ No newline at end of file
diff --git a/src/static/page/折叠.svg b/src/static/page/折叠.svg
new file mode 100644
index 0000000..e10fcda
--- /dev/null
+++ b/src/static/page/折叠.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1744612158830" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12544" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M736 480c-12.5-12.5-32.8-12.5-45.3 0L523.3 647.4c-6.2 6.2-16.4 6.2-22.6 0L333.3 480c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3L466.7 704c25 25 65.5 25 90.5 0L736 525.3c12.5-12.5 12.5-32.8 0-45.3z" p-id="12545"></path></svg>
\ No newline at end of file