From a768597ca274c94f9ed8eace439f53b0c2166865 Mon Sep 17 00:00:00 2001
From: huangzhenbao <17818024429@163.com>
Date: Thu, 12 Mar 2026 16:13:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90merchant?=
 =?UTF-8?q?=E5=92=8Cadmin=E4=B8=8D=E5=90=8Crole=E7=9A=84=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E9=80=BB=E8=BE=913?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/supadb/aksupa.uts                         |  3 +--
 .../consumer/subscription/subscribe-checkout.uvue    |  4 ++--
 pages/user/login.uvue                                | 12 +++---------
 utils/supabaseService.uts                            |  5 ++---
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/components/supadb/aksupa.uts b/components/supadb/aksupa.uts
index d763b1ea..2a318b89 100644
--- a/components/supadb/aksupa.uts
+++ b/components/supadb/aksupa.uts
@@ -1110,8 +1110,7 @@ async delete(table : string, filter : string | null) : Promise<AkReqResponse<any
 					return res;
 				}
 
-				uni.removeStorageSync('user_id');
-				uni.removeStorageSync('token');
+				// completely removed global storage clearing
 
 				uni.reLaunch({ url: '/pages/user/login' });
 				throw toUniError('登录已过期，请重新登录', '用户认证失败');
diff --git a/pages/mall/consumer/subscription/subscribe-checkout.uvue b/pages/mall/consumer/subscription/subscribe-checkout.uvue
index c6e1c92f..8736707c 100644
--- a/pages/mall/consumer/subscription/subscribe-checkout.uvue
+++ b/pages/mall/consumer/subscription/subscribe-checkout.uvue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <view class="subscribe-checkout">
     <view class="header">
       <text class="title">确认订阅</text>
@@ -91,7 +91,7 @@ const selPay = (v: number) => { payMethod.value = v }
 
 // 获取当前用户ID（按现有store实现替换）
 const getCurrentUserId = (): string => {
-  try { return (uni.getStorageSync('current_user_id') as string) || '' } catch { return '' }
+  try { return (supa.getSession().user?.id as string) || '' } catch { return '' }
 }
 
 const confirmSubscribe = async () => {
diff --git a/pages/user/login.uvue b/pages/user/login.uvue
index 1c53e27e..84442a31 100644
--- a/pages/user/login.uvue
+++ b/pages/user/login.uvue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <view class="page" :style="cssVars">
     <!-- Header：仅保留左侧Logo -->
     <view class="header">
@@ -339,7 +339,7 @@ const handleLogin = async () => {
       class_id: ''
     } as UserProfile
     setUserProfile(adminProfile)
-    uni.setStorageSync('merchant_id', 'admin') // mock
+    // uni.setStorageSync('merchant_id', 'admin') // mock removed
     
     uni.showToast({ title: '管理员登录成功', icon: 'success' })
     setTimeout(() => {
@@ -422,14 +422,8 @@ const handleLogin = async () => {
       console.error('获取用户信息失败（忽略）:', e)
     }
 
-    // 显式保存用户ID到本地存储
+    // 已移除对 shared storage user_id 的依赖
     const currentSession = supa.getSession()
-    if (currentSession.user != null) {
-      const uid = currentSession.user?.getString('id')
-      if (uid != null) {
-        uni.setStorageSync('user_id', uid)
-      }
-    }
 
     uni.showToast({ title: '登录成功', icon: 'success' })
     
diff --git a/utils/supabaseService.uts b/utils/supabaseService.uts
index beecb3bb..515368b3 100644
--- a/utils/supabaseService.uts
+++ b/utils/supabaseService.uts
@@ -126,9 +126,8 @@ class SupabaseService {
         return session.user.getString('id')
       }
       
-      // 后备：尝试从本地存储获取 (兼容旧逻辑)
-      const userId = uni.getStorageSync('user_id')
-      return userId ? userId as string : null
+      // 移除基于 storage 的后备获取，严格只认当前 Tab 独立 session
+      return null
     } catch (e) {
       console.error('获取用户ID失败:', e)
       return null