From e908eab8fdeab6af71eba48434d1c844fec3f5b7 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 31 Mar 2025 19:19:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/my.vue    | 11 ++++++-
 src/pages/tabbar/order.vue | 19 ++++++++---
 src/sheep/api/order.ts     | 67 +++++++++++++++++++++-----------------
 3 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index ce6685a..a37bb6d 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -61,7 +61,6 @@ const state = reactive<{ wallet: any; userInfo: any; menuList: MenuItem[] }>({
 	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" },
@@ -272,6 +271,16 @@ onLoad(() => {
 		  })
 		: ""
 	// checkAppInfo()
+
+	new URL(window.location.href).searchParams.get("launchParam") == "canteen"
+		? ""
+		: new URL(window.location.href).searchParams.get("launchParam") == "selfMerchant"
+		? state.menuList.unshift({
+				text: "扫一扫",
+				icon: "/static/icon/scan.png",
+				router: "",
+		  })
+		: ""
 })
 onShow(() => {
 	getStorageUserInfo()
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index f26f7c8..444ba26 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive, computed } from "vue"
+import { ref, reactive } from "vue"
 import { onLoad, onShow } from "@dcloudio/uni-app"
 
 import { hooks, router } from "@@/index"
@@ -31,9 +31,9 @@ onLoad(() => {
 onShow(async () => {
 	const isLogin = await hooks.useCheckLogin()
 	if (!isLogin) return
-	// if (pageRef.value) {
-	// 	pageRef.value.reload(false)
-	// }
+	if (pageRef.value) {
+		pageRef.value.reload(false)
+	}
 })
 const doTab = (e: any) => {
 	const target = data.tabs[e]
@@ -42,7 +42,16 @@ const doTab = (e: any) => {
 }
 
 const pageRef = ref<any>(null)
-const pageHook = hooks.usePage(pageRef, orderApi.page, null, "data.records")
+const pageHook = hooks.usePage(
+	pageRef,
+	new URL(window.location.href).searchParams.get("launchParam") == "canteen"
+		? orderApi.caneenPage
+		: new URL(window.location.href).searchParams.get("launchParam") == "selfMerchant"
+		? orderApi.supPage
+		: null,
+	null,
+	"data.records",
+)
 const query = (page: number, pagesize: number) => {
 	const isLogin = hooks.useStaticCheckLogin()
 	console.log(isLogin, "isLogin")
diff --git a/src/sheep/api/order.ts b/src/sheep/api/order.ts
index 88e64ef..1043cc8 100644
--- a/src/sheep/api/order.ts
+++ b/src/sheep/api/order.ts
@@ -1,31 +1,40 @@
-import request from "@/sheep/utils/request";
+import request from "@/sheep/utils/request"
 
 export default {
-  page: (params: any) =>
-    request({
-      url: `/hard/hard-order/app/page-join`,
-      method: "GET",
-      params,
-      custom: {
-        showLoading: false,
-      },
-    }),
-  detail: (params: any) =>
-    request({
-      url: `/hard/hard-order/app/detail`,
-      method: "GET",
-      params,
-      custom: {
-        showLoading: false,
-      },
-    }),
-  shopCarList: (params: any) =>
-    request({
-      url: `/hard/hard-car/app/order-id`,
-      method: "GET",
-      params,
-      custom: {
-        showLoading: false,
-      },
-    }),
-};
+	caneenPage: (params: any) =>
+		request({
+			url: `/hard/hard-order/app/caneen-page-join`,
+			method: "GET",
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
+	supPage: (params: any) =>
+		request({
+			url: `/hard/hard-order/app/sup-page-join`,
+			method: "GET",
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
+	detail: (params: any) =>
+		request({
+			url: `/hard/hard-order/app/detail`,
+			method: "GET",
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
+	shopCarList: (params: any) =>
+		request({
+			url: `/hard/hard-car/app/order-id`,
+			method: "GET",
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
+}