From 8427d35fb3cf616eded4a64e99925d5fe71798c1 Mon Sep 17 00:00:00 2001
From: Guoguo <i@qwq.trade>
Date: Thu, 7 May 2026 05:54:37 -0700
Subject: [PATCH] chore: remove debug code and restore phone authorization as
 required
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Remove debug register page entry and console.log from login
- Remove phone skip option, phone authorization is mandatory
- Restore incomplete registration check (no phone → redirect to register)
---
 miniprogram/pages/login/login.js         |  7 +------
 miniprogram/pages/login/login.wxml       |  3 ---
 miniprogram/pages/login/login.wxss       |  8 --------
 miniprogram/pages/register/register.js   | 25 ++++--------------------
 miniprogram/pages/register/register.wxml | 10 +---------
 miniprogram/pages/register/register.wxss | 20 ++-----------------
 6 files changed, 8 insertions(+), 65 deletions(-)

diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js
index 7fe044c..3f27340 100644
--- a/miniprogram/pages/login/login.js
+++ b/miniprogram/pages/login/login.js
@@ -16,8 +16,7 @@ Page({
 
     app.doLogin().then(function (data) {
       self.setData({ loading: false })
-      console.log('[login] doLogin result:', JSON.stringify(data))
-      if (data && data.is_new_user) {
+      if (data && (data.is_new_user || !data.user_info || !data.user_info.phone)) {
         wx.redirectTo({ url: '/pages/register/register' })
       } else {
         wx.switchTab({ url: '/pages/index/index' })
@@ -30,9 +29,5 @@ Page({
 
   onAgreement: function () {
     wx.showModal({ title: '提示', content: '用户协议和隐私政策内容建设中', showCancel: false })
-  },
-
-  onDebugRegister: function () {
-    wx.navigateTo({ url: '/pages/register/register' })
   }
 })
diff --git a/miniprogram/pages/login/login.wxml b/miniprogram/pages/login/login.wxml
index 7a7fb69..24caa7f 100644
--- a/miniprogram/pages/login/login.wxml
+++ b/miniprogram/pages/login/login.wxml
@@ -17,8 +17,5 @@
     </button>
 
     <view class="agreement" bindtap="onAgreement">登录即表示同意《用户协议》和《隐私政策》</view>
-
-    <!-- 临时调试入口，上线前删除 -->
-    <view class="debug-entry" bindtap="onDebugRegister">[ 调试 ] 进入注册页</view>
   </view>
 </view>
diff --git a/miniprogram/pages/login/login.wxss b/miniprogram/pages/login/login.wxss
index 7e70abe..87c1884 100644
--- a/miniprogram/pages/login/login.wxss
+++ b/miniprogram/pages/login/login.wxss
@@ -53,11 +53,3 @@
   color: #999999;
   margin-top: 32rpx;
 }
-
-.debug-entry {
-  text-align: center;
-  font-size: 24rpx;
-  color: #E6508C;
-  margin-top: 40rpx;
-  padding: 16rpx;
-}
diff --git a/miniprogram/pages/register/register.js b/miniprogram/pages/register/register.js
index e90b62c..4bae382 100644
--- a/miniprogram/pages/register/register.js
+++ b/miniprogram/pages/register/register.js
@@ -18,8 +18,7 @@ Page({
     loading: false,
     avatarUrl: DEFAULT_AVATAR,
     nickname: '',
-    phone: '',
-    phoneSkipped: false
+    phone: ''
   },
 
   onLoad: function () {
@@ -48,26 +47,10 @@ Page({
     }
   },
 
-  onSkipPhone: function () {
-    var self = this
-    wx.showModal({
-      title: '跳过手机号',
-      content: '跳过后部分功能可能受限，确定跳过吗？',
-      success: function (res) {
-        if (res.confirm) {
-          self.setData({ phoneSkipped: true })
-        }
-      }
-    })
-  },
-
   onGetPhoneNumber: function (e) {
     var self = this
-    console.log('[register] getPhoneNumber detail:', JSON.stringify(e.detail))
     if (!e.detail || !e.detail.code) {
-      var errMsg = (e.detail && e.detail.errMsg) || ''
-      console.log('[register] getPhoneNumber failed:', errMsg)
-      wx.showToast({ title: '手机号授权未成功，可跳过此步骤', icon: 'none' })
+      wx.showToast({ title: '需要授权手机号才能完成注册', icon: 'none' })
       return
     }
     self.setData({ loading: true })
@@ -113,8 +96,8 @@ Page({
     var nickname = (self.data.nickname || '').trim()
     var avatarUrl = self.data.avatarUrl
 
-    if (!self.data.phone && !self.data.phoneSkipped) {
-      wx.showToast({ title: '请先授权手机号，或点击跳过', icon: 'none' })
+    if (!self.data.phone) {
+      wx.showToast({ title: '请先授权手机号', icon: 'none' })
       return
     }
 
diff --git a/miniprogram/pages/register/register.wxml b/miniprogram/pages/register/register.wxml
index ade23ea..1359309 100644
--- a/miniprogram/pages/register/register.wxml
+++ b/miniprogram/pages/register/register.wxml
@@ -26,19 +26,11 @@
           <text class="phone-text">{{phone}}</text>
         </view>
       </block>
-      <block wx:elif="{{phoneSkipped}}">
-        <view class="phone-done phone-skipped">
-          <text class="phone-text">已跳过，可稍后在设置中授权</text>
-        </view>
-      </block>
       <block wx:else>
         <button class="phone-btn" open-type="getPhoneNumber" bindgetphonenumber="onGetPhoneNumber" disabled="{{loading}}">
           授权手机号
         </button>
-        <view class="phone-actions">
-          <view class="phone-hint">手机号用于接收服务通知</view>
-          <view class="phone-skip" bindtap="onSkipPhone">跳过</view>
-        </view>
+        <view class="phone-hint">手机号用于接收服务通知，必须授权</view>
       </block>
     </view>
 
diff --git a/miniprogram/pages/register/register.wxss b/miniprogram/pages/register/register.wxss
index 0c1b2cb..89b297f 100644
--- a/miniprogram/pages/register/register.wxss
+++ b/miniprogram/pages/register/register.wxss
@@ -84,27 +84,11 @@
   border: none;
 }
 
-.phone-actions {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 12rpx;
-  padding: 0 8rpx;
-}
-
 .phone-hint {
   font-size: 24rpx;
   color: #999999;
-}
-
-.phone-skip {
-  font-size: 24rpx;
-  color: #E6508C;
-}
-
-.phone-skipped {
-  background: #f5f5f5;
-  border-color: #d9d9d9;
+  text-align: center;
+  margin-top: 12rpx;
 }
 
 .phone-done {