解决登录显示、首页显示bug

pages/mall/merchant/promotions.uvue

@@ -47,6 +47,7 @@
 
 <script lang="uts">
 	import supa from '@/components/supadb/aksupainstance.uts'
+	import { requireMerchantAuth } from '@/utils/merchantAuth.uts'
 	import { USE_MOCK, MOCK_MERCHANT_ID, getMockPromotions } from '@/pages/mall/merchant/mock/merchant-mock-data.uts'
 	
 	type PromotionType = {
@@ -76,12 +77,27 @@
 		},
 		
 		onShow() {
-			if (this.merchantId !== '') {
-				this.loadPromotions()
-			}
+			this.handlePageShow()
 		},
 		
 		methods: {
+			async ensureMerchantAuth(): Promise<boolean> {
+				if (USE_MOCK) return true
+				const result = await requireMerchantAuth({ redirectOnFail: true, toastOnFail: true })
+				if (!result.ok) {
+					this.merchantId = ''
+					return false
+				}
+				this.merchantId = result.userInfo != null && result.userInfo.id != null ? result.userInfo.id : ''
+				return this.merchantId !== ''
+			},
+
+			async handlePageShow() {
+				const passed = await this.ensureMerchantAuth()
+				if (!passed) return
+				this.loadPromotions()
+			},
+
 			async initMerchantId() {
 				if (USE_MOCK) {
 					this.merchantId = MOCK_MERCHANT_ID