From fb41aabca8dc2a0444e01b2ccaf5fbdbdd874fb0 Mon Sep 17 00:00:00 2001
From: H1d3rOne <H1d3rOne@users.noreply.github.com>
Date: Sun, 8 Mar 2026 07:04:40 +0800
Subject: [PATCH] =?UTF-8?q?debug:=20=E6=B7=BB=E5=8A=A0=E6=9B=B4=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=E7=9A=84=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97=E6=8E=92?=
 =?UTF-8?q?=E6=9F=A5=E6=95=B0=E6=8D=AE=E4=BC=A0=E9=80=92=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xuan-deduct-uniapp/src/pages/bazi/bazi.vue   | 18 +++++----
 xuan-deduct-uniapp/src/pages/bazi/result.vue | 40 ++++++++++----------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/xuan-deduct-uniapp/src/pages/bazi/bazi.vue b/xuan-deduct-uniapp/src/pages/bazi/bazi.vue
index 69d4a96..7ce29ad 100644
--- a/xuan-deduct-uniapp/src/pages/bazi/bazi.vue
+++ b/xuan-deduct-uniapp/src/pages/bazi/bazi.vue
@@ -202,28 +202,32 @@ export default {
           dateType: this.dateType
         })
         
-        console.log('API返回结果:', JSON.stringify(result))
+        console.log('=== 测算页面 - API返回结果 ===')
+        console.log('原始result:', result)
         console.log('result类型:', typeof result)
-        console.log('result.data:', result.data)
         console.log('result.success:', result.success)
+        console.log('result.data:', result.data)
         
         let resultData = null
-        if (result && result.success && result.data) {
-          resultData = result.data
-        } else if (result && result.data) {
+        if (result && result.data) {
           resultData = result.data
+          console.log('使用result.data:', resultData)
         } else {
           resultData = result
+          console.log('使用result:', resultData)
         }
         
-        console.log('解析后的数据:', JSON.stringify(resultData))
+        console.log('最终resultData:', resultData)
         console.log('resultData.name:', resultData.name)
         console.log('resultData.baZi:', resultData.baZi)
         
+        console.log('保存到globalData之前')
         getApp().globalData.baziResult = resultData
+        console.log('保存到globalData之后')
+        console.log('getApp().globalData.baziResult:', getApp().globalData.baziResult)
         
+        console.log('准备跳转到结果页面')
         uni.hideLoading()
-        
         uni.navigateTo({
           url: '/pages/bazi/result'
         })
diff --git a/xuan-deduct-uniapp/src/pages/bazi/result.vue b/xuan-deduct-uniapp/src/pages/bazi/result.vue
index ecd19e2..596e42c 100644
--- a/xuan-deduct-uniapp/src/pages/bazi/result.vue
+++ b/xuan-deduct-uniapp/src/pages/bazi/result.vue
@@ -1,13 +1,5 @@
 <template>
   <view class="container">
-    <view class="debug-card" style="background: #ffeb3b; padding: 20rpx; margin-bottom: 20rpx; border-radius: 10rpx;">
-      <text style="color: #333; font-size: 24rpx;">调试信息:</text>
-      <text style="color: #333; font-size: 22rpx; display: block;">result.name: {{ result.name }}</text>
-      <text style="color: #333; font-size: 22rpx; display: block;">result.baZi: {{ result.baZi }}</text>
-      <text style="color: #333; font-size: 22rpx; display: block;">result.lunar: {{ result.lunar }}</text>
-      <text style="color: #333; font-size: 22rpx; display: block;">result.shengXiao: {{ result.shengXiao }}</text>
-    </view>
-    
     <view class="header-card">
       <view class="header-row">
         <view class="header-icon">
@@ -218,21 +210,31 @@ export default {
     }
   },
   onLoad() {
-    const app = getApp()
     console.log('===== 结果页面 onLoad =====')
-    console.log('app:', app)
+    const app = getApp()
+    console.log('app对象:', app)
     console.log('app.globalData:', app.globalData)
     
-    if (app.globalData && app.globalData.baziResult) {
-      this.result = app.globalData.baziResult
-      console.log('结果数据已加载')
-      console.log('this.result:', this.result)
-      console.log('this.result.name:', this.result.name)
-      console.log('this.result.baZi:', this.result.baZi)
-      console.log('this.result.lunar:', this.result.lunar)
-      console.log('this.result.shengXiao:', this.result.shengXiao)
+    if (app.globalData) {
+      console.log('app.globalData.baziResult:', app.globalData.baziResult)
+      
+      if (app.globalData.baziResult) {
+        this.result = app.globalData.baziResult
+        console.log('结果数据已加载')
+        console.log('this.result:', this.result)
+        console.log('this.result.name:', this.result.name)
+        console.log('this.result.baZi:', this.result.baZi)
+        console.log('this.result.lunar:', this.result.lunar)
+        console.log('this.result.shengXiao:', this.result.shengXiao)
+      } else {
+        console.log('app.globalData.baziResult 是 undefined 或 null')
+        uni.showToast({
+          title: '未获取到排盘数据',
+          icon: 'none'
+        })
+      }
     } else {
-      console.log('未获取到排盘数据')
+      console.log('app.globalData 是 undefined')
       uni.showToast({
         title: '未获取到排盘数据',
         icon: 'none'