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

pages/mall/merchant/shop-edit.uvue

@@ -61,6 +61,7 @@
 
 <script lang="uts">
 	import supa from '@/components/supadb/aksupainstance.uts'
+	import { requireMerchantAuth } from '@/utils/merchantAuth.uts'
 	
 	export default {
 		data() {
@@ -83,19 +84,20 @@
 		},
 		
 		methods: {
-			async initMerchantId() {
-				try {
-					const session = supa.getSession()
-					if (session != null && session.user != null) {
-						this.merchantId = session.user.getString('id') || ''
-					}
-					if (!this.merchantId) {
-						this.merchantId = uni.getStorageSync('user_id') || ''
-					}
-					this.loadShop()
-				} catch (e) {
-					console.error('获取商户ID失败:', e)
+			async ensureMerchantAuth(): Promise<boolean> {
+				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 initMerchantId() {
+				const passed = await this.ensureMerchantAuth()
+				if (!passed) return
+				this.loadShop()
 			},
 			
 			async loadShop() {