Explorar el Código

苹果微信浏览器适配

Zhangbw hace 2 meses
padre
commit
0ee68c69ba
Se han modificado 1 ficheros con 53 adiciones y 13 borrados
  1. 53 13
      src/pages/order/order.vue

+ 53 - 13
src/pages/order/order.vue

@@ -78,7 +78,6 @@
 <script setup>
 import { ref, onMounted, onUnmounted } from 'vue'
 import { onLoad, onShow, onHide } from '@dcloudio/uni-app'
-import { isLoggedIn as checkLoginStatus } from '../../utils/auth.js'
 import { getUserOrders, repayOrder, wxPay, queryOrder } from '../../utils/api.js'
 
 const orders = ref([])
@@ -103,23 +102,51 @@ const stopAutoRefresh = () => {
   }
 }
 
-const checkLogin = () => {
-  isLoggedIn.value = checkLoginStatus()
+const checkLogin = async () => {
+  try {
+    const token = await uni.getStorage({ key: 'user_token' }).then(res => res.data).catch(() => null)
+    isLoggedIn.value = !!token
+    console.log('[订单页面] 检查登录状态, token存在:', !!token, 'isLoggedIn:', isLoggedIn.value)
+    return !!token
+  } catch (e) {
+    console.error('[订单页面] 检查登录状态失败:', e)
+    isLoggedIn.value = false
+    return false
+  }
 }
 
 const loadOrders = async () => {
-  if (!isLoggedIn.value) return
+  console.log('[订单页面] 开始加载订单, isLoggedIn:', isLoggedIn.value)
+
+  if (!isLoggedIn.value) {
+    console.warn('[订单页面] 未登录,跳过加载订单')
+    return
+  }
+
   loading.value = true
-  
+  console.log('[订单页面] loading设置为true')
+
   try {
+    console.log('[订单页面] 调用 getUserOrders API')
     const res = await getUserOrders()
+    console.log('[订单页面] API 响应:', res)
+
     if (res.code === 200) {
       orders.value = res.data || []
+      console.log('[订单页面] 订单加载成功,数量:', orders.value.length)
+      console.log('[订单页面] 订单数据:', JSON.stringify(orders.value))
+      console.log('[订单页面] loading值:', loading.value)
+      console.log('[订单页面] orders.length:', orders.value.length)
+    } else {
+      console.error('[订单页面] API 返回错误:', res.message)
     }
   } catch (e) {
-    console.error('加载订单记录失败:', e)
+    console.error('[订单页面] 加载订单记录失败:', e)
+    console.error('[订单页面] 错误详情:', e.message, e.stack)
   } finally {
     loading.value = false
+    console.log('[订单页面] loading设置为false')
+    console.log('[订单页面] 最终状态 - loading:', loading.value, 'orders.length:', orders.value.length)
   }
 }
 
@@ -179,13 +206,25 @@ const getStatusClass = (status) => {
   }
 }
 
-onLoad(() => checkLogin())
-onMounted(() => {
-  if (isLoggedIn.value) loadOrders()
+onLoad(async () => {
+  console.log('[订单页面] onLoad 触发')
+  await checkLogin()
 })
-onShow(() => {
-  checkLogin()
-  if (isLoggedIn.value) loadOrders()
+
+onMounted(async () => {
+  console.log('[订单页面] onMounted 触发, isLoggedIn:', isLoggedIn.value)
+  await checkLogin()
+  if (isLoggedIn.value) {
+    loadOrders()
+  }
+})
+
+onShow(async () => {
+  console.log('[订单页面] onShow 触发')
+  await checkLogin()
+  if (isLoggedIn.value) {
+    loadOrders()
+  }
   startAutoRefresh()
 })
 onHide(() => {
@@ -251,7 +290,8 @@ onUnmounted(() => {
 /* 滚动区域 */
 .scroll-view {
   flex: 1;
-  height: 0;
+  height: 100vh;
+  -webkit-overflow-scrolling: touch;
 }
 
 .content-wrapper {