fix: defer mini program phone auth until login

miniprogram/pages/web-view/index.js

@@ -1,3 +1,6 @@
+/* global Page, wx */
+/* eslint-disable no-console */
+
 const {
   API_BASE_URL,
   MINI_PROGRAM_APP_ID,
@@ -10,6 +13,8 @@ const MINI_PROGRAM_CLIENT_TYPE = 'mini_program';
 const MINI_PROGRAM_CLIENT_RUNTIME = 'wechat_mini_program';
 const CLIENT_INSTANCE_STORAGE_KEY = 'genarrative:mini-program-client-instance-id';
 const PAY_RESULT_STORAGE_KEY = 'genarrative:wechat-pay-result';
+const AUTH_RESULT_STORAGE_KEY = 'genarrative:mini-program-auth-result';
+const AUTH_ACTION_LOGIN = 'login';
 
 function isConfiguredEntryUrl(value) {
   const trimmed = String(value || '').trim();
@@ -57,6 +62,18 @@ function appendHashParams(url, params) {
   return `${baseUrl}#${rawHash}${separator}${pairs.join('&')}`;
 }
 
+function parseBooleanQueryFlag(value) {
+  return value === true || value === '1' || value === 'true' || value === 'yes';
+}
+
+function shouldStartAuthFromQuery(query) {
+  return String((query && query.authAction) || '').trim() === AUTH_ACTION_LOGIN;
+}
+
+function shouldReturnToPreviousPage(query) {
+  return String((query && query.returnTo) || '').trim() === 'previous';
+}
+
 function resolveWebViewUrl(authResult) {
   const entryUrl = String(WEB_VIEW_ENTRY_URL || '').trim();
   if (!isConfiguredEntryUrl(entryUrl)) {
@@ -75,6 +92,38 @@ function resolveWebViewUrl(authResult) {
   });
 }
 
+function persistAuthResult(authResult) {
+  wx.setStorageSync(AUTH_RESULT_STORAGE_KEY, JSON.stringify(authResult));
+}
+
+function consumeAuthResult() {
+  const rawValue = wx.getStorageSync(AUTH_RESULT_STORAGE_KEY);
+  if (!rawValue) {
+    return null;
+  }
+
+  wx.removeStorageSync(AUTH_RESULT_STORAGE_KEY);
+  try {
+    const parsed = JSON.parse(String(rawValue));
+    if (!parsed || typeof parsed !== 'object') {
+      return null;
+    }
+
+    const token = String(parsed.token || '').trim();
+    if (!token) {
+      return null;
+    }
+
+    return {
+      token,
+      bindingStatus: String(parsed.bindingStatus || 'pending_bind_phone'),
+    };
+  } catch (error) {
+    console.error('[web-view] parse auth result failed', error);
+    return null;
+  }
+}
+
 function getClientInstanceId() {
   const stored = wx.getStorageSync(CLIENT_INSTANCE_STORAGE_KEY);
   if (stored) {
@@ -217,10 +266,12 @@ Page({
     errorMessage: '',
     loading: true,
     phoneBindingRequired: false,
+    returnToPreviousPage: false,
     webViewUrl: '',
   },
 
-  async onLoad() {
+  async onLoad(query = {}) {
+    this._lastLaunchQuery = query;
     // 中文注释：web-view 只能打开已配置业务域名；未配置时展示本地提示，避免空白页误判。
     if (!isConfiguredEntryUrl(WEB_VIEW_ENTRY_URL)) {
       this.setData({
@@ -231,6 +282,20 @@ Page({
       return;
     }
 
+    const forcedPhoneBinding = parseBooleanQueryFlag(query.phoneBindingRequired);
+    const returnToPreviousPage = shouldReturnToPreviousPage(query);
+    if (!shouldStartAuthFromQuery(query) && !forcedPhoneBinding) {
+      this.setData({
+        authResult: null,
+        errorMessage: '',
+        loading: false,
+        phoneBindingRequired: false,
+        returnToPreviousPage: false,
+        webViewUrl: resolveWebViewUrl(null),
+      });
+      return;
+    }
+
     if (!isConfiguredApiBaseUrl(API_BASE_URL)) {
       this.setData({
         errorMessage: '请先在 miniprogram/config.js 填写 API_BASE_URL。',
@@ -240,6 +305,14 @@ Page({
       return;
     }
 
+    this.setData({
+      loading: true,
+      phoneBindingRequired: false,
+      returnToPreviousPage,
+      errorMessage: '',
+      webViewUrl: '',
+    });
+
     try {
       const authResult = await resolveAuthResult();
       if (authResult.bindingStatus === 'pending_bind_phone') {
@@ -248,44 +321,56 @@ Page({
           errorMessage: '',
           loading: false,
           phoneBindingRequired: true,
+          returnToPreviousPage,
           webViewUrl: '',
         });
         return;
       }
 
+      if (returnToPreviousPage) {
+        persistAuthResult(authResult);
+        wx.navigateBack();
+        return;
+      }
+
       this.setData({
         authResult,
         errorMessage: '',
         loading: false,
         phoneBindingRequired: false,
+        returnToPreviousPage,
         webViewUrl: resolveWebViewUrl(authResult),
       });
     } catch (error) {
       this.setData({
         authResult: null,
         errorMessage:
-          error && error.message
-            ? error.message
-            : '微信登录失败，请稍后重试。',
+          error && error.message ? error.message : '微信登录失败，请稍后重试。',
         loading: false,
         phoneBindingRequired: false,
+        returnToPreviousPage,
         webViewUrl: '',
       });
     }
   },
 
   onShow() {
-    const result = wx.getStorageSync(PAY_RESULT_STORAGE_KEY);
-    if (!result || !this.data.webViewUrl) {
-      return;
+    const authResult = consumeAuthResult();
+    if (authResult) {
+      this.setData({
+        webViewUrl: resolveWebViewUrl(authResult),
+      });
     }
 
-    wx.removeStorageSync(PAY_RESULT_STORAGE_KEY);
-    this.setData({
-      webViewUrl: appendHashParams(this.data.webViewUrl, {
-        wx_pay_result: result,
-      }),
-    });
+    const result = wx.getStorageSync(PAY_RESULT_STORAGE_KEY);
+    if (result && this.data.webViewUrl) {
+      wx.removeStorageSync(PAY_RESULT_STORAGE_KEY);
+      this.setData({
+        webViewUrl: appendHashParams(this.data.webViewUrl, {
+          wx_pay_result: result,
+        }),
+      });
+    }
   },
 
   async handleGetPhoneNumber(event) {
@@ -318,6 +403,17 @@ Page({
         token: response.token,
         bindingStatus: 'active',
       };
+      if (this.data.returnToPreviousPage) {
+        persistAuthResult(nextAuthResult);
+        this.setData({
+          bindingPhone: false,
+          errorMessage: '',
+          loading: false,
+          phoneBindingRequired: false,
+        });
+        wx.navigateBack();
+        return;
+      }
       this.setData({
         authResult: nextAuthResult,
         bindingPhone: false,
@@ -344,9 +440,10 @@ Page({
       errorMessage: '',
       loading: true,
       phoneBindingRequired: false,
+      returnToPreviousPage: false,
       webViewUrl: '',
     });
-    this.onLoad();
+    this.onLoad(this._lastLaunchQuery || { authAction: AUTH_ACTION_LOGIN });
   },
 
   handleWebViewLoad(event) {

miniprogram/pages/web-view/index.wxml

@@ -1,5 +1,6 @@
 <block wx:if="{{webViewUrl}}">
   <web-view
+    id="genarrative-web-view"
     src="{{webViewUrl}}"
     bindload="handleWebViewLoad"
     binderror="handleWebViewError"
@@ -19,6 +20,9 @@
     <view wx:if="{{errorMessage}}" class="setup-text setup-text--danger">
       {{errorMessage}}
     </view>
+    <view wx:if="{{returnToPreviousPage}}" class="setup-text">
+      登录完成后将自动返回。
+    </view>
     <button
       class="retry-button"
       open-type="getPhoneNumber"