注册后跳回首页/增加用户信息缓存日志

mock清除登录状态机制/mock的user_info字段更新
支持用户授权注册登录mock
2026-07-10 15:13:53 +08:00 · 2026-07-10 14:02:26 +08:00 · 2026-07-09 18:49:56 +08:00 · 2026-07-02 19:32:07 +08:00 · 2026-07-02 19:20:08 +08:00 · 2026-07-02 19:04:08 +08:00
15 changed files with 581 additions and 296 deletions
@@ -0,0 +1 @@
+70011ed2d63c3cfa7094f5cb2a9aafea
@@ -0,0 +1 @@
+2K94E8Rn63mn6Nys
@@ -0,0 +1 @@
+sfIpUAfcT78BnMBv
@@ -1,31 +1,90 @@
 <script>
 	import { initEnv } from '@/utils/env.js';
-	import { handleAuthCallback, onAuthSuccess } from '@/utils/auth-guard.js';
+	import config from '@/config/env.js';

 	export default {
 		onLaunch: function(options) {
 			console.log('App Launch')

+			// 0. Mock 模式：仅首次进入时清除登录状态（刷新时保留）
+			if (config.mockWechatLogin) {
+				const mockInitialized = uni.getStorageSync('__mock_initialized');
+				if (!mockInitialized) {
+					uni.removeStorageSync('token');
+					uni.removeStorageSync('user_info');
+					uni.removeStorageSync('temp_token');
+					uni.removeStorageSync('auth_info');
+					uni.setStorageSync('__mock_initialized', 'true');
+					console.log('[Mock] 首次进入，清除登录状态');
+				} else {
+					console.log('[Mock] 刷新页面，保留登录状态');
+				}
+			}
+
 			// 1. 环境检测 + 缓存 app_no/platform
 			initEnv();

 			// #ifdef H5
-			// 2. 处理授权回调（URL 中带 code/auth_code 参数）
-			this.handleAuthRedirect();
+			// 2. 解析设备编号：优先从 query 参数获取，其次从路径解析
+			let deviceId = '';
+			const urlParams = new URLSearchParams(window.location.search);
+			deviceId = urlParams.get('device_id') || '';

-			// 3. 解析 URL 路径中的设备编号（如 /A1036）
-			const path = window.location.pathname;
-			const segments = path.split('/').filter(Boolean);
-			if (segments.length > 0) {
-				const last = segments[segments.length - 1];
-				// 匹配设备编号格式：大写字母开头 + 大写字母/数字
-				if (/^[A-Z][A-Z0-9]+$/.test(last)) {
-					uni.redirectTo({
-						url: '/pages/index/index?device_id=' + last
-					});
-					return;
+			// 兜底：从路径解析（如 /pages/index/index/N1154）
+			if (!deviceId) {
+				const path = window.location.pathname;
+				const segments = path.split('/').filter(Boolean);
+				if (segments.length > 0) {
+					const last = segments[segments.length - 1];
+					if (/^[A-Z][A-Z0-9]+$/.test(last)) {
+						deviceId = last;
+					}
 				}
 			}
+
+			// 3. 检查 URL 中是否有授权回调的 code
+			const code = urlParams.get('code');
+
+			if (code) {
+				// 有 code → 进入授权 Loading 页处理，保留 code 参数
+				let loadingUrl = '/pages/auth/loading?code=' + encodeURIComponent(code);
+				if (deviceId) {
+					loadingUrl += '&device_id=' + deviceId;
+				}
+				uni.redirectTo({ url: loadingUrl });
+				return;
+			}
+
+			// 4. 判断是否为根路径或设备编号路径（如 / 或 /N1154）
+			const currentPath = window.location.pathname;
+			const isRootOrDevice = currentPath === '/' || /^\/[A-Z][A-Z0-9]+$/.test(currentPath);
+
+			// 5. 检查 JWT
+			const token = uni.getStorageSync('token');
+
+			if (token) {
+				if (isRootOrDevice) {
+					// 根路径/设备编号路径 → 跳转首页
+					const homeUrl = deviceId
+						? `/pages/index/index?device_id=${deviceId}`
+						: '/pages/index/scan';
+					uni.redirectTo({ url: homeUrl });
+				} else {
+					// 其他业务页面 → 留在当前页面
+					console.log('[App] 已登录，保留在当前页面');
+				}
+			} else {
+				// 无 JWT → 进入授权 Loading 页
+				const loadingUrl = deviceId
+					? `/pages/auth/loading?device_id=${deviceId}`
+					: '/pages/auth/loading';
+				uni.redirectTo({ url: loadingUrl });
+			}
+			// #endif
+
+			// #ifndef H5
+			// 小程序环境：直接进入扫码页
+			uni.redirectTo({ url: '/pages/index/scan' });
 			// #endif
 		},
 		onShow: function() {
@@ -33,37 +92,6 @@
 		},
 		onHide: function() {
 			console.log('App Hide')
-		},
-		methods: {
-			// #ifdef H5
-			async handleAuthRedirect() {
-				const urlParams = new URLSearchParams(window.location.search);
-				const code = urlParams.get('code') || urlParams.get('auth_code') || '';
-
-				if (!code) return;
-
-				// 有授权码，调用后端回调接口
-				const result = await handleAuthCallback();
-				if (result) {
-					onAuthSuccess(result);
-
-					// 清除 URL 中的 code 参数，避免刷新重复处理
-					const url = new URL(window.location.href);
-					url.searchParams.delete('code');
-					url.searchParams.delete('auth_code');
-					url.searchParams.delete('state');
-					window.history.replaceState({}, '', url.toString());
-
-					// 如果需要绑定手机号
-					if (result.need_bindphone) {
-						uni.setStorageSync('temp_token', result.temp_token);
-						uni.showToast({ title: '请绑定手机号完成注册', icon: 'none' });
-					} else {
-						uni.showToast({ title: '登录成功', icon: 'success' });
-					}
-				}
-			}
-			// #endif
 		}
 	}
 </script>
@@ -6,16 +6,35 @@ const dev = {
  apiBaseUrl: 'http://192.168.0.23:4000',

  // 网关地址（vms-gateway，端口 4001）— 用户授权、短信等接口走网关
-  apiGatewayUrl: 'https://gateway.arklinksmart.cn',
+  apiGatewayUrl: 'http://192.168.0.23:4001',

-  // 授权回调地址（支付宝/微信 OAuth redirect_uri）
-  authRedirectUri: 'https://gateway.arklinksmart.cn/api/v1/user/auth/callback',
+  // 授权回调地址（微信 OAuth redirect_uri，必须 HTTPS，指向前端页面）
+  authRedirectUri: 'https://m.arklinksmart.cn/pages/auth/loading',

  // 开发阶段硬编码 Token（生产环境应从登录流程获取）
  bearerToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImRlZXB2ZW5kaW5nIiwic3ViIjoiMTY0MDI0MTEyNiIsImZyb20iOiJwb3MiLCJyb2xlIjoicG9zIiwibWFpbmJvYXJkX2lkIjoiVDEwMDIiLCJwb3Nfc24iOiIxNjQwMjQxMTI2IiwiaWF0IjoxNzc4NDkxOTA3LCJleHAiOjE3NzkwOTY3MDd9.DjscZtrTCr30XOngToUifxoel4q2EGES_uqGQernkvg',

  // 是否开启请求日志
  enableRequestLog: true,
+
+  // Mock 微信登录（跳过 OAuth 流程）
+  // 'skip'    → 直接登录进首页
+  // 'register' → 模拟新用户，走注册流程
+  // 'login'   → 模拟已注册用户，走登录流程
+  // false     → 走真实微信 OAuth
+  mockWechatLogin: 'register',
+  mockAppNo: '60000001102001',
+  mockUser: {
+    token: 'mock_token_dev_2024',
+    user_info: {
+      user_id: 'mock_user_001',
+      phone: '13264706088',
+      open_id: 'test_open_id',
+      union_id: 'test_union_id',
+      nickname: '测试用户',
+      avatar: 'https://img.wewemivending.com/vms/us/img/uploads/2025/12/18/6943d37c7d82b3439.jpeg',
+    },
+  },
 };

 export default dev;
@@ -8,8 +8,8 @@ const prod = {
  // 网关地址（vms-gateway）— 用户授权、短信等接口走网关
  apiGatewayUrl: 'https://gateway.arklinksmart.cn',

-  // 授权回调地址（支付宝/微信 OAuth redirect_uri）
-  authRedirectUri: 'https://gateway.arklinksmart.cn/api/v1/user/auth/callback',
+  // 授权回调地址（微信 OAuth redirect_uri，必须 HTTPS，指向前端页面）
+  authRedirectUri: 'https://m.arklinksmart.cn/pages/auth/loading',

  // 生产环境 Token 从登录流程获取，此处为空
  bearerToken: '',
@@ -1,13 +1,19 @@
 {
  "pages": [
    {
-      "path": "pages/register/register",
+      "path": "pages/index/scan",
      "style": {
        "navigationStyle": "custom"
      }
    },
    {
-      "path": "pages/index/scan",
+      "path": "pages/auth/loading",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/register/register",
      "style": {
        "navigationStyle": "custom"
      }
@@ -0,0 +1,274 @@
+<template>
+  <view class="loading-page">
+    <view class="loading-spinner"></view>
+    <text class="loading-text">{{ statusText }}</text>
+  </view>
+</template>
+
+<script>
+import config from '@/config/env.js';
+import { gatewayGet, gatewayPost } from '@/utils/request.js';
+import { detectPlatform, getAppNo } from '@/utils/env.js';
+
+export default {
+  data() {
+    return {
+      statusText: '正在登录...',
+      deviceId: '',
+    };
+  },
+  onLoad(options) {
+    this.deviceId = options.device_id || '';
+
+    // #ifdef H5
+    // Mock 模式：跳过微信 OAuth，直接登录
+    if (config.mockWechatLogin) {
+      this.mockLogin();
+      return;
+    }
+
+    // 优先从页面参数获取 code（App.vue 跳转时带过来）
+    // 兜底从 URL search 参数获取（微信直接回调时）
+    let code = options.code || '';
+    if (!code) {
+      const urlParams = new URLSearchParams(window.location.search);
+      code = urlParams.get('code') || '';
+    }
+
+    if (code) {
+      // 有 code → 调用后端登录
+      this.handleCallback(code);
+    } else {
+      // 无 code → 发起 OAuth 授权
+      this.startAuth();
+    }
+    // #endif
+
+    // #ifndef H5
+    // 小程序环境暂不支持，跳回扫码页
+    uni.redirectTo({ url: '/pages/index/scan' });
+    // #endif
+  },
+  methods: {
+    /**
+     * 发起 OAuth 授权
+     */
+    async startAuth() {
+      const platform = detectPlatform();
+      const appNo = getAppNo(platform);
+
+      if (!appNo) {
+        // 非微信环境，跳转注册页（手机号注册）
+        this.goToRegister();
+        return;
+      }
+
+      try {
+        this.statusText = '正在获取授权...';
+
+        // 回调地址必须是 HTTPS，使用配置文件中的地址
+        const redirectUri = config.authRedirectUri || (
+          window.location.origin.replace(/^http:/, 'https:') + window.location.pathname
+        );
+
+        const res = await gatewayGet('/api/v1/user/auth/url', {
+          app_no: appNo,
+          scopes: 'snsapi_userinfo',
+          redirect_uri: redirectUri,
+        });
+
+        const data = res.data || {};
+        if (data.code === 0 && data.data && data.data.auth_url) {
+          // 跳转微信授权页
+          window.location.href = data.data.auth_url;
+        } else {
+          uni.showToast({ title: data.message || '获取授权失败', icon: 'none' });
+          setTimeout(() => this.goToScan(), 1500);
+        }
+      } catch (e) {
+        console.error('[Auth] startAuth error:', e);
+        uni.showToast({ title: '网络请求失败', icon: 'none' });
+        setTimeout(() => this.goToScan(), 1500);
+      }
+    },
+
+    /**
+     * 处理授权回调（从 URL 中获取 code 后调用后端 /login）
+     */
+    async handleCallback(code) {
+      const appNo = uni.getStorageSync('app_no') || getAppNo(detectPlatform());
+
+      if (!appNo) {
+        uni.showToast({ title: '无法获取应用信息', icon: 'none' });
+        this.goToScan();
+        return;
+      }
+
+      try {
+        this.statusText = '正在验证身份...';
+
+        const res = await gatewayPost('/api/v1/user/login', {
+          app_no: appNo,
+          code: code,
+        });
+
+        const data = res.data || {};
+        console.log('[loading] login response:', JSON.stringify(data, null, 2));
+
+        if (data.code === 0 && data.data) {
+          const result = data.data;
+          console.log('[loading] login result:', JSON.stringify(result, null, 2));
+
+          // 清除 URL 中的 code 参数，避免刷新重复处理
+          const url = new URL(window.location.href);
+          url.searchParams.delete('code');
+          url.searchParams.delete('state');
+          window.history.replaceState({}, '', url.toString());
+
+          if (result.register) {
+            // 已注册 → 缓存 JWT → 跳转首页
+            uni.setStorageSync('token', result.token);
+            uni.setStorageSync('user_info', result.user_info);
+            console.log('[loading] stored user_info:', JSON.stringify(result.user_info, null, 2));
+            this.goToHome();
+          } else {
+            // 未注册 → 缓存临时数据 → 跳转注册页
+            uni.setStorageSync('temp_token', result.temp_token);
+            uni.setStorageSync('auth_info', result.auth_info);
+            console.log('[loading] stored auth_info:', JSON.stringify(result.auth_info, null, 2));
+            this.goToRegister();
+          }
+        } else {
+          uni.showToast({ title: data.message || '登录失败', icon: 'none' });
+          setTimeout(() => this.goToScan(), 1500);
+        }
+      } catch (e) {
+        console.error('[Auth] login error:', e);
+        uni.showToast({ title: '网络请求失败', icon: 'none' });
+        setTimeout(() => this.goToScan(), 1500);
+      }
+    },
+
+    goToHome() {
+      const url = this.deviceId
+        ? `/pages/index/index?device_id=${this.deviceId}`
+        : '/pages/index/index';
+      uni.redirectTo({ url });
+    },
+
+    goToRegister() {
+      // 记录扫码时的原始 URL，注册完成后跳回
+      const scanUrl = this.deviceId
+        ? `/pages/index/index?device_id=${this.deviceId}`
+        : '';
+      if (scanUrl) {
+        uni.setStorageSync('__scan_redirect_url', scanUrl);
+      }
+
+      const url = this.deviceId
+        ? `/pages/register/register?device_id=${this.deviceId}`
+        : '/pages/register/register';
+      uni.redirectTo({ url });
+    },
+
+    goToScan() {
+      uni.redirectTo({ url: '/pages/index/scan' });
+    },
+
+    /**
+     * Mock 登录（开发环境模拟不同用户状态）
+     */
+    async mockLogin() {
+      const mode = config.mockWechatLogin;
+      const mock = config.mockUser;
+
+      if (mode === 'register' || mode === 'login') {
+        // 调用真实登录接口，用测试 code
+        this.statusText = '模拟：获取授权信息...';
+        const appNo = uni.getStorageSync('app_no') || getAppNo(detectPlatform()) || config.mockAppNo;
+
+        try {
+          const res = await gatewayPost('/api/v1/user/login', {
+            app_no: appNo,
+            code: 'test_code',
+          });
+
+          const data = res.data || {};
+          if (data.code === 0 && data.data) {
+            const result = data.data;
+
+            if (result.register) {
+              // 已注册
+              uni.setStorageSync('token', result.token);
+              uni.setStorageSync('user_info', result.user_info);
+              console.log('[Auth] Mock: existing user → home');
+              this.goToHome();
+            } else {
+              // 未注册 → 存真实的 temp_token，合并 mock 头像昵称
+              const authInfo = {
+                ...mock.user_info,
+                ...result.auth_info,
+              };
+              uni.setStorageSync('temp_token', result.temp_token);
+              uni.setStorageSync('auth_info', authInfo);
+              console.log('[Auth] Mock: new user → register, temp_token:', result.temp_token);
+              this.goToRegister();
+            }
+          } else {
+            uni.showToast({ title: data.message || '登录接口返回异常', icon: 'none' });
+            console.error('[Auth] Mock login failed:', data);
+          }
+        } catch (e) {
+          console.error('[Auth] Mock login error:', e);
+          uni.showToast({ title: '网络请求失败', icon: 'none' });
+        }
+
+      } else {
+        // 'skip' → 直接登录
+        this.statusText = '模拟登录中...';
+        uni.setStorageSync('token', mock.token);
+        uni.setStorageSync('user_info', mock.user_info);
+        console.log('[Auth] Mock: skip → home');
+        setTimeout(() => this.goToHome(), 500);
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+page {
+  height: 100%;
+  background-color: #fff;
+}
+
+.loading-page {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 100vh;
+  background-color: #fff;
+}
+
+.loading-spinner {
+  width: 64rpx;
+  height: 64rpx;
+  border: 6rpx solid #e5e5e5;
+  border-top-color: #2979ff;
+  border-radius: 50%;
+  animation: spin 0.8s linear infinite;
+  margin-bottom: 32rpx;
+}
+
+@keyframes spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.loading-text {
+  font-size: 28rpx;
+  color: #999;
+}
+</style>
@@ -67,24 +67,33 @@

      <!-- 底部导航栏 -->
      <view class="tab-bar">
-        <view class="tab-item" :class="{ active: currentTab === 'home' }" @click="switchTab('home')">
-          <view class="home-icon">
-            <view class="home-roof"></view>
-            <view class="home-body"></view>
+        <view class="tab-bar-row">
+          <view class="tab-item" :class="{ active: currentTab === 'home' }" @click="switchTab('home')">
+            <view class="home-icon">
+              <view class="home-roof"></view>
+              <view class="home-body"></view>
+            </view>
+            <text class="tab-text">首页</text>
+          </view>
+
+          <view class="door-btn-wrapper" @click="handleOpenDoor">
+            <view class="door-btn">开门</view>
+          </view>
+
+          <view class="tab-item" :class="{ active: currentTab === 'mine' }" @click="switchTab('mine')">
+            <view class="mine-icon">
+              <view class="mine-head"></view>
+              <view class="mine-body"></view>
+            </view>
+            <text class="tab-text">我的</text>
          </view>
-          <text class="tab-text">首页</text>
        </view>

-        <view class="door-btn-wrapper" @click="handleOpenDoor">
-          <view class="door-btn">开门</view>
-        </view>
-
-        <view class="tab-item" :class="{ active: currentTab === 'mine' }" @click="switchTab('mine')">
-          <view class="mine-icon">
-            <view class="mine-head"></view>
-            <view class="mine-body"></view>
-          </view>
-          <text class="tab-text">我的</text>
+        <!-- 支付分信息（仅微信环境显示） -->
+        <view v-if="isWechat" class="payscore-info">
+          <image class="payscore-logo" src="/static/payscore-logo.png" mode="aspectFit" />
+          <view class="payscore-divider"></view>
+          <text class="payscore-text">微信支付分 | 550分及以上优享</text>
        </view>
      </view>
    </view>
@@ -169,6 +178,7 @@ export default {
        { title: '公众号信息', action: 'qrcode' }
      ],
      servicePhone: config.servicePhone,
+      isWechat: false,
      isDev: process.env.NODE_ENV === 'development',
      vconsoleEnabled: false
    };
@@ -194,6 +204,14 @@ export default {
    }
  },
  onLoad(options) {
+    // 检测是否在微信环境中打开
+    // #ifdef MP-WEIXIN
+    this.isWechat = true;
+    // #endif
+    // #ifdef H5
+    this.isWechat = /MicroMessenger/i.test(navigator.userAgent);
+    // #endif
+
    // 支持通过 tab 参数切换到"我的"页面
    if (options.tab === 'mine') {
      this.currentTab = 'mine';
@@ -236,11 +254,13 @@ export default {
    // 从缓存加载用户信息
    loadUserInfo() {
      const cached = getCachedUserInfo();
+      console.log('[index] getCachedUserInfo:', JSON.stringify(cached, null, 2));
      if (cached) {
        this.userInfo = { ...this.userInfo, ...cached };
      } else {
        this.userInfo = { nickname: '', phone: '', avatar: '' };
      }
+      console.log('[index] this.userInfo:', JSON.stringify(this.userInfo, null, 2));
    },
    async fetchProducts() {
      this.loading = true;
@@ -337,10 +357,11 @@ page { height: 100%; background-color: #fff; }
 .price-num { font-size: 32rpx; }

 /* 底部占位 */
-.bottom-spacer { height: 160rpx; }
+.bottom-spacer { height: 200rpx; }

 /* 底部导航栏 */
-.tab-bar { position: absolute; bottom: 0; left: 0; right: 0; height: 120rpx; background: #fff; display: flex; align-items: center; justify-content: space-around; box-shadow: 0 -2rpx 16rpx rgba(0,0,0,0.08); z-index: 999; padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); }
+.tab-bar { position: absolute; bottom: 0; left: 0; right: 0; background: #fff; display: flex; flex-direction: column; align-items: center; box-shadow: 0 -2rpx 16rpx rgba(0,0,0,0.08); z-index: 999; padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); }
+.tab-bar-row { width: 100%; height: 120rpx; display: flex; align-items: center; justify-content: space-around; }
 .tab-bar .tab-item { flex: 1; display: flex; align-items: center; justify-content: center; height: 100%; }
 .tab-bar .tab-text { font-size: 28rpx; color: #999; font-weight: normal; }
 .tab-bar .tab-item.active .tab-text { color: #2979ff; }
@@ -413,6 +434,10 @@ page { height: 100%; background-color: #fff; }
 }
 .door-btn-wrapper { position: relative; display: flex; align-items: center; justify-content: center; margin-top: -80rpx; }
 .door-btn { width: 160rpx; height: 160rpx; border-radius: 50%; background: linear-gradient(135deg, #2979ff, #1e60e0); color: #fff; font-size: 38rpx; font-weight: bold; display: flex; align-items: center; justify-content: center; box-shadow: 0 10rpx 36rpx rgba(41,121,255,0.55); }
+.payscore-info { display: flex; align-items: center; padding-bottom: 16rpx; }
+.payscore-logo { width: 34rpx; height: 34rpx; }
+.payscore-divider { width: 2rpx; height: 24rpx; background-color: rgba(102, 102, 102, 0.6); margin: 0 10rpx; }
+.payscore-text { font-size: 24rpx; color: #666; white-space: nowrap; }

 /* 空状态 / Loading */
 .empty-tip, .loading-tip { text-align: center; padding: 60rpx; color: #999; font-size: 28rpx; }
@@ -67,7 +67,15 @@ export default {
    };
  },
  onLoad(options) {
-    // 1. query 参数中携带设备编号
+    // 1. 检查 JWT（App.vue 已处理首次跳转，这里兜底）
+    const token = uni.getStorageSync('token');
+    if (!token) {
+      // 无 JWT → 跳转授权 Loading 页
+      uni.redirectTo({ url: '/pages/auth/loading' });
+      return;
+    }
+
+    // 2. 有 JWT + query 参数中携带设备编号
    if (options.device_id) {
      uni.redirectTo({
        url: '/pages/index/index?device_id=' + options.device_id,
@@ -76,7 +84,7 @@ export default {
    }

    // #ifdef H5
-    // 2. URL 路径中携带设备编号（如 http://xxx/A1036）
+    // 3. URL 路径中携带设备编号（如 http://xxx/A1036）
    const path = window.location.pathname;
    const segments = path.split('/').filter(Boolean);
    if (segments.length > 0) {
@@ -6,6 +6,12 @@
      <view class="subtitle">请输入手机号获取验证码完成注册</view>
    </view>

+    <!-- 用户信息展示（来自微信授权） -->
+    <view v-if="authInfo.nickname" class="auth-info">
+      <image class="auth-avatar" :src="authInfo.avatar || '/static/default-avatar.png'" mode="aspectFill" />
+      <text class="auth-nickname">{{ authInfo.nickname }}</text>
+    </view>
+
    <!-- 表单区域 -->
    <view class="form-area">
      <!-- 手机号 -->
@@ -62,8 +68,7 @@
 </template>

 <script>
-import config from '@/config/env.js';
-import { post } from '@/utils/request.js';
+import { gatewayPost } from '@/utils/request.js';

 export default {
  data() {
@@ -71,7 +76,10 @@ export default {
      phone: '',
      code: '',
      countdown: 0,
-      timer: null
+      timer: null,
+      tempToken: '',
+      authInfo: { nickname: '', avatar: '' },
+      deviceId: '',
    };
  },
  computed: {
@@ -79,8 +87,22 @@ export default {
      return this.phone.length === 11 && this.code.length >= 4;
    }
  },
+  onLoad(options) {
+    this.deviceId = options.device_id || '';
+
+    // 从缓存读取授权信息（loading 页写入）
+    this.tempToken = uni.getStorageSync('temp_token') || '';
+    const cachedAuthInfo = uni.getStorageSync('auth_info');
+    if (cachedAuthInfo) {
+      this.authInfo = cachedAuthInfo;
+    }
+
+    // 如果没有 temp_token，提示用户重新授权
+    if (!this.tempToken) {
+      uni.showToast({ title: '授权信息已过期，请重新登录', icon: 'none' });
+    }
+  },
  beforeDestroy() {
-    // 清除定时器
    if (this.timer) {
      clearInterval(this.timer);
      this.timer = null;
@@ -91,15 +113,21 @@ export default {
    async handleGetCode() {
      if (this.countdown > 0) return;

-      // 验证手机号
      if (!/^1[3-9]\d{9}$/.test(this.phone)) {
        uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
        return;
      }

+      if (!this.tempToken) {
+        uni.showToast({ title: '授权信息已过期，请重新登录', icon: 'none' });
+        return;
+      }
+
      try {
-        const res = await post('/auth/send-sms-code', {
-          phone: this.phone
+        const res = await gatewayPost('/api/v1/user/sms/send', {
+          phone: this.phone,
+          temp_token: this.tempToken,
+          purpose: 'register',
        });

        const ret = res.data || {};
@@ -114,7 +142,6 @@ export default {
      }
    },

-    // 开始倒计时
    startCountdown() {
      this.countdown = 60;
      this.timer = setInterval(() => {
@@ -130,51 +157,61 @@ export default {
    async handleRegister() {
      if (!this.canSubmit) return;

-      // 验证手机号
      if (!/^1[3-9]\d{9}$/.test(this.phone)) {
        uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
        return;
      }

-      // 验证验证码
      if (this.code.length < 4) {
        uni.showToast({ title: '请输入验证码', icon: 'none' });
        return;
      }

+      if (!this.tempToken) {
+        uni.showToast({ title: '授权信息已过期，请重新登录', icon: 'none' });
+        return;
+      }
+
      uni.showLoading({ title: '注册中...' });

      try {
-        const res = await post('/auth/register', {
+        const res = await gatewayPost('/api/v1/user/register', {
+          temp_token: this.tempToken,
          phone: this.phone,
-          code: this.code
+          code: this.code,
        });

        const ret = res.data || {};
-        if (ret.code === 0) {
-          // 保存 token
-          const token = ret.data && ret.data.token;
-          if (token) {
-            uni.setStorageSync('token', token);
-          }
+        if (ret.code === 0 && ret.data) {
+          // 合并微信授权信息（头像、昵称）到 user_info
+          const authInfo = uni.getStorageSync('auth_info') || {};
+          const userInfo = {
+            ...authInfo,
+            ...ret.data.user_info,
+          };

-          // 保存用户信息
-          const userInfo = ret.data && ret.data.userInfo;
-          if (userInfo) {
-            uni.setStorageSync('userInfo', userInfo);
-          }
+          // 保存 token 和用户信息
+          uni.setStorageSync('token', ret.data.token);
+          uni.setStorageSync('user_info', userInfo);
+
+          // 清除临时数据
+          uni.removeStorageSync('temp_token');
+          uni.removeStorageSync('auth_info');

          uni.hideLoading();
          uni.showToast({ title: '注册成功', icon: 'success' });

-          // 返回上一页或跳转首页
+          // 跳转到扫码时的页面（优先使用缓存的扫码URL）
          setTimeout(() => {
-            const pages = getCurrentPages();
-            if (pages.length > 1) {
-              uni.navigateBack();
-            } else {
-              uni.redirectTo({ url: '/pages/index/index' });
-            }
+            const scanRedirectUrl = uni.getStorageSync('__scan_redirect_url');
+            uni.removeStorageSync('__scan_redirect_url'); // 使用后立即清除
+
+            const url = scanRedirectUrl
+              ? scanRedirectUrl
+              : this.deviceId
+                ? `/pages/index/index?device_id=${this.deviceId}`
+                : '/pages/index/index';
+            uni.redirectTo({ url });
          }, 1500);
        } else {
          uni.hideLoading();
@@ -186,7 +223,6 @@ export default {
      }
    },

-    // 显示协议
    showAgreement(type) {
      const title = type === 'user' ? '用户协议' : '隐私政策';
      uni.showToast({ title: title + '开发中', icon: 'none' });
@@ -210,7 +246,7 @@ page {
 /* 顶部标题 */
 .header {
  padding-top: 180rpx;
-  margin-bottom: 80rpx;
+  margin-bottom: 40rpx;
 }

 .title {
@@ -225,6 +261,29 @@ page {
  color: #999;
 }

+/* 微信授权信息 */
+.auth-info {
+  display: flex;
+  align-items: center;
+  padding: 24rpx 0;
+  margin-bottom: 40rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+
+.auth-avatar {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  margin-right: 20rpx;
+  background-color: #e0e0e0;
+}
+
+.auth-nickname {
+  font-size: 30rpx;
+  color: #333;
+  font-weight: 500;
+}
+
 /* 表单区域 */
 .form-area {
  width: 100%;
@@ -302,10 +361,8 @@ page {

 /* 底部协议 */
 .agreement {
-  position: absolute;
-  bottom: 80rpx;
-  left: 0;
-  right: 0;
+  margin-top: 80rpx;
+  padding-bottom: env(safe-area-inset-bottom);
  display: flex;
  align-items: center;
  justify-content: center;
@@ -1,20 +1,12 @@
 /**
 * 用户授权工具
- * 登录检查、授权跳转、回调处理、绑定手机号
+ * 登录检查、授权跳转、退出登录
 *
- * 授权相关接口（auth/url、auth/callback、sms/send、bindPhone）走网关 apiGatewayUrl
- * 业务接口（商品列表等）走 apiBaseUrl
+ * 新流程：
+ * - App.vue 检查 JWT，无则跳转 /pages/auth/loading
+ * - loading 页发起 OAuth → 获取 code → 调用 /login
+ * - 未注册用户跳转 /pages/register/register
 */
-import config from '@/config/env.js';
-import { gatewayGet, gatewayPost } from './request.js';
-
-// 场景提示文案
-const SCENE_TIPS = {
-  order: '登录后即可查看订单',
-  mine: '登录后即可查看个人信息',
-  pay: '登录后即可下单购买',
-  bindPhone: '需要绑定手机号完成登录',
-};

 /**
 * 检查是否已登录
@@ -25,13 +17,19 @@ export function isLoggedIn() {
 }

 /**
- * 检查登录状态，未登录时弹窗引导授权
- * @param {string} scene - 触发场景：'order' | 'mine' | 'pay' | 'bindPhone'
+ * 检查登录状态，未登录时弹窗引导
+ * @param {string} scene - 触发场景：'order' | 'mine' | 'pay'
 * @returns {boolean} 是否已登录
 */
 export function checkLoginWithPrompt(scene = '') {
  if (isLoggedIn()) return true;

+  const SCENE_TIPS = {
+    order: '登录后即可查看订单',
+    mine: '登录后即可查看个人信息',
+    pay: '登录后即可下单购买',
+  };
+
  uni.showModal({
    title: '提示',
    content: SCENE_TIPS[scene] || '需要登录后操作',
@@ -39,7 +37,8 @@ export function checkLoginWithPrompt(scene = '') {
    cancelText: '暂不',
    success: (res) => {
      if (res.confirm) {
-        startAuth();
+        // 跳转到授权 Loading 页
+        uni.redirectTo({ url: '/pages/auth/loading' });
      }
    },
  });
@@ -48,153 +47,15 @@ export function checkLoginWithPrompt(scene = '') {
 }

 /**
- * 检查登录状态，未登录时静默跳转授权（不弹窗）
+ * 检查登录状态，未登录时静默跳转
 * @returns {boolean} 是否已登录
 */
 export function requireLogin() {
  if (isLoggedIn()) return true;
-  startAuth();
+  uni.redirectTo({ url: '/pages/auth/loading' });
  return false;
 }

-/**
- * 发起授权跳转
- * 获取 auth_url 后跳转到微信/支付宝授权页
- */
-export async function startAuth() {
-  const appNo = uni.getStorageSync('app_no') || '';
-
-  if (!appNo) {
-    uni.showToast({ title: '当前环境不支持授权', icon: 'none' });
-    return;
-  }
-
-  try {
-    const res = await gatewayGet('/api/v1/user/auth/url', {
-      app_no: appNo,
-      scopes: '',
-      redirect_uri: config.authRedirectUri || '',
-    });
-
-    const data = res.data || {};
-    if (data.code === 0 && data.data && data.data.auth_url) {
-      // #ifdef H5
-      window.location.href = data.data.auth_url;
-      // #endif
-      // #ifndef H5
-      // 小程序环境走其他授权方式
-      uni.setStorageSync('pending_auth', true);
-      // #endif
-    } else {
-      uni.showToast({ title: data.message || '获取授权地址失败', icon: 'none' });
-    }
-  } catch (e) {
-    console.error('[Auth] startAuth error:', e);
-    uni.showToast({ title: '网络请求失败', icon: 'none' });
-  }
-}
-
-/**
- * 处理授权回调
- * 解析 URL 中的 code/auth_code 参数，调用后端回调接口
- * @returns {Promise<Object>} 回调结果
- */
-export async function handleAuthCallback() {
-  // #ifdef H5
-  const urlParams = new URLSearchParams(window.location.search);
-  const code = urlParams.get('code') || urlParams.get('auth_code') || '';
-  const appNo = urlParams.get('state') || uni.getStorageSync('app_no') || '';
-
-  if (!code) return null;
-
-  try {
-    const res = await gatewayGet('/api/v1/user/auth/callback', {
-      app_no: appNo,
-      code,
-      state: appNo,
-    });
-
-    const data = res.data || {};
-    if (data.code === 0 && data.data) {
-      return data.data;
-    }
-    return null;
-  } catch (e) {
-    return null;
-  }
-  // #endif
-
-  // #ifndef H5
-  return null;
-  // #endif
-}
-
-/**
- * 授权成功后处理
- * 缴存 token 和用户信息
- * @param {Object} authResult - 后端返回的授权结果
- */
-export function onAuthSuccess(authResult) {
-  if (!authResult) return;
-
-  const { token, user_info, auth_info } = authResult;
-
-  if (token) {
-    uni.setStorageSync('token', token);
-  }
-
-  if (user_info) {
-    uni.setStorageSync('user_info', user_info);
-  }
-
-  if (auth_info) {
-    uni.setStorageSync('auth_info', auth_info);
-  }
-}
-
-/**
- * 发送短信验证码
- * @param {string} phone - 手机号
- * @param {string} tempToken - 临时 token
- * @returns {Promise<Object>}
- */
-export async function sendSmsCode(phone, tempToken) {
-  const res = await gatewayPost('/api/v1/user/sms/send', {
-    phone,
-    temp_token: tempToken,
-    purpose: 'bindPhone',
-  });
-
-  const data = res.data || {};
-  return data.code === 0;
-}
-
-/**
- * 绑定手机号
- * @param {string} tempToken - 临时 token
- * @param {string} phone - 手机号
- * @param {string} code - 验证码
- * @returns {Promise<Object>} 绑定结果（含 token 和 user_info）
- */
-export async function bindPhone(tempToken, phone, code) {
-  const res = await gatewayPost('/api/v1/user/bindPhone', {
-    temp_token: tempToken,
-    phone,
-    code,
-  });
-
-  const data = res.data || {};
-  if (data.code === 0 && data.data) {
-    // 绑定成功，缓存 token 和用户信息
-    onAuthSuccess(data.data);
-    uni.removeStorageSync('temp_token');
-    return data.data;
-  }
-
-  uni.showToast({ title: data.message || '绑定失败', icon: 'none' });
-  return null;
-}
-
 /**
 * 退出登录
 */
@@ -211,36 +72,10 @@ export function logout() {
 */
 export function getCachedUserInfo() {
  try {
-    return uni.getStorageSync('user_info') || null;
+    const userInfo = uni.getStorageSync('user_info');
+    console.log('[auth-guard] getCachedUserInfo raw:', JSON.stringify(userInfo, null, 2));
+    return userInfo || null;
  } catch {
    return null;
  }
 }
-
-/**
- * 显示绑定手机号弹窗
- * @param {string} tempToken - 临时 token
- * @param {Function} onSuccess - 绑定成功回调
- */
-export function showBindPhoneDialog(tempToken, onSuccess) {
-  let phone = '';
-  let code = '';
-  let countdown = 0;
-  let timer = null;
-
-  // 使用 uni.showModal 不够灵活，这里用自定义弹窗
-  // 简化实现：先弹出手机号输入
-  uni.showModal({
-    title: '绑定手机号',
-    content: '请先绑定手机号完成注册',
-    confirmText: '去绑定',
-    cancelText: '取消',
-    success: async (res) => {
-      if (res.confirm) {
-        // 跳转到绑定手机号页面（预留）
-        // 后续可实现专门的绑定手机号页面
-        uni.showToast({ title: '绑定手机号功能开发中', icon: 'none' });
-      }
-    },
-  });
-}
@@ -37,8 +37,14 @@ export function request(options = {}) {
    ...options.header,
  };

-  // 公开接口（授权相关）不带 Authorization，避免 CORS 预检和 JWT 拦截
-  const publicPaths = ['/api/v1/user/auth/url', '/api/v1/user/auth/callback'];
+  // 公开接口（授权/登录/注册相关）不带 Authorization，避免 CORS 预检和 JWT 拦截
+  const publicPaths = [
+    '/api/v1/user/auth/url',
+    '/api/v1/user/auth/callback',
+    '/api/v1/user/login',
+    '/api/v1/user/register',
+    '/api/v1/user/sms/send',
+  ];
  const isPublic = publicPaths.some((p) => url.includes(p));

  if (token && !isPublic) {
@@ -1,8 +1,31 @@
 import { defineConfig } from 'vite'
 import uni from '@dcloudio/vite-plugin-uni'
+import { existsSync, readFileSync } from 'fs'
+import { resolve } from 'path'
+
+// 开发服务器：显式处理 public 目录下的静态文件，避免被 SPA history 路由拦截
+function servePublicFiles() {
+  return {
+    name: 'serve-public-files',
+    configureServer(server) {
+      server.middlewares.use((req, res, next) => {
+        if (req.url) {
+          const filePath = resolve(__dirname, 'public', req.url.slice(1))
+          if (existsSync(filePath) && filePath.endsWith('.txt')) {
+            const content = readFileSync(filePath, 'utf-8')
+            res.setHeader('Content-Type', 'text/plain; charset=utf-8')
+            res.end(content)
+            return
+          }
+        }
+        next()
+      })
+    },
+  }
+}

 export default defineConfig({
-  plugins: [uni()],
+  plugins: [servePublicFiles(), uni()],
  css: {
    preprocessorOptions: {
      scss: {
@@ -10,4 +33,5 @@ export default defineConfig({
      },
    },
  },
+  publicDir: 'public',
 })
Author	SHA1	Message	Date
kk	c84c9df5d4	注册后跳回首页/增加用户信息缓存日志 Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 45s Details	2026-07-10 15:13:53 +08:00
kk	71606ebfe5	mock清除登录状态机制/mock的user_info字段更新 Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 48s Details	2026-07-10 14:02:26 +08:00
kk	a7e0366fb7	支持用户授权注册登录mock	2026-07-09 18:49:56 +08:00
kk	5bb31516a0	保留code参数 Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 45s Details	2026-07-02 19:32:07 +08:00
kk	2560d9d529	上传验证文件 Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 42s Details	2026-07-02 19:20:08 +08:00
kk	6534723050	修改授权回调配置 Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 1m25s Details	2026-07-02 19:04:08 +08:00
kk	f031501286	显示处理public目录下的静态文件 Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 44s Details	2026-07-02 18:36:30 +08:00
kk	525f94cb80	用户授权/验证文件上传 Uni-app H5 Deploy (Prod + Staging) / deploy (release) Successful in 45s Details	2026-07-02 18:25:23 +08:00
kk	127834e8dc	首页增加支付分标识	2026-06-30 12:07:21 +08:00