From 04e21969424ec048cbb4256cb188e18ad8b18b00 Mon Sep 17 00:00:00 2001
From: chenghuan <chenghuanv587@qq.com>
Date: Fri, 12 Dec 2025 11:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/modules/auth.ts          |  4 ++--
 api/modules/common.ts        |  2 +-
 api/modules/user.ts          |  4 ++--
 pages/course/index.vue       | 18 ++++++++----------
 pages/login/forget.vue       | 10 ++++++----
 pages/login/login.vue        | 13 +++++++------
 style/tailwind.css           | 36 ++++++++++++++++++++++++++++++++++++
 types/{user.ts => user.d.ts} |  7 ++++---
 8 files changed, 66 insertions(+), 28 deletions(-)
 rename types/{user.ts => user.d.ts} (93%)

diff --git a/api/modules/auth.ts b/api/modules/auth.ts
index 651f47c..ed095e7 100644
--- a/api/modules/auth.ts
+++ b/api/modules/auth.ts
@@ -8,7 +8,7 @@ import type { ILoginResponse } from '@/types/user'
  * @param code 验证码
  */
 export async function loginWithCode(tel: string, code: string) {
-  const res = await mainClient.request<IApiResponse<ILoginResponse>>({
+  const res = await mainClient.request<ILoginResponse>({
     url: 'book/user/registerOrLogin',
     method: 'GET',
     data: { tel, code }
@@ -22,7 +22,7 @@ export async function loginWithCode(tel: string, code: string) {
  * @param password 密码
  */
 export async function loginWithPassword(phone: string, password: string) {
-  const res = await mainClient.request<IApiResponse<ILoginResponse>>({
+  const res = await mainClient.request<ILoginResponse>({
     url: 'book/user/login',
     method: 'POST',
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
diff --git a/api/modules/common.ts b/api/modules/common.ts
index f8860ae..2871b65 100644
--- a/api/modules/common.ts
+++ b/api/modules/common.ts
@@ -22,7 +22,7 @@ export const commonApi = {
 	 * @param id 协议 ID (111: 用户协议, 112: 隐私政策)
 	 */
 	getAgreement: async (id: number) => {
-		const res = await mainClient.request<IApiResponse<IAgreement>>({
+		const res = await skeletonClient.request<IApiResponse<IAgreement>>({
 		  url: 'sys/agreement/getAgreement',
 		  method: 'POST',
 		  data: { id }
diff --git a/api/modules/user.ts b/api/modules/user.ts
index 302164f..1663d5e 100644
--- a/api/modules/user.ts
+++ b/api/modules/user.ts
@@ -1,5 +1,5 @@
 // api/modules/user.ts
-import { mainClient } from '@/api/clients/main'
+import { mainClient, skeletonClient } from '@/api/clients'
 import { paymentClient } from '@/api/clients/payment'
 import type { IApiResponse } from '@/api/types'
 import type { 
@@ -17,7 +17,7 @@ import { SERVICE_MAP } from '@/api/config'
  * 获取用户信息
  */
 export async function getUserInfo() {
-  const res = await mainClient.request<IApiResponse<{ user: IUserInfo }>>({
+  const res = await skeletonClient.request<IApiResponse<{ user: IUserInfo }>>({
     url: 'common/user/getUserInfo',
     method: 'POST'
   })
diff --git a/pages/course/index.vue b/pages/course/index.vue
index 829ac1e..ca99dd9 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -220,18 +220,16 @@
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
-import { onShow, onHide, onPullDownRefresh, onPageScroll, onLoad } from '@dcloudio/uni-app'
-import { useI18n } from 'vue-i18n'
+import { onShow, onHide, onPullDownRefresh, onPageScroll } from '@dcloudio/uni-app'
 import { courseApi } from '@/api/modules/course'
 import { courseSubjectClassificationApi } from '@/api/modules/cousre_subject_classification'
 import { commonApi } from '@/api/modules/common'
 import { getNotchHeight } from '@/utils/system'
 // import { onPageJump } from '@/utils'
-import type { IMedicalTag, ICourse, INews } from '@/types/course'
+import type { ICategory, ICourse, INews } from '@/types/course'
 import { useUserStore } from '@/stores/user'
 
 const userStore = useUserStore()
-const { t } = useI18n()
 
 // 系统信息
 const scrollTop = ref<number>(0)            // 滚动位置
@@ -246,10 +244,10 @@ const handleSearch = ({ value }: { value: string }) => {
 }
 
 // 分类相关
-const curseTagList = ref<IMedicalTag[]>([])           // 一级分类标签列表
-const sbuMedicalTagsList = ref<IMedicalTag[]>([])     // 二级分类标签列表
+const curseTagList = ref<ICategory[]>([])           // 一级分类标签列表
+const sbuMedicalTagsList = ref<ICategory[]>([])     // 二级分类标签列表
 const currentIndex = ref<number>(0)                    // 当前选中的一级分类索引
-const currentItem = ref<IMedicalTag | null>(null)     // 当前选中的一级分类项
+const currentItem = ref<ICategory | null>(null)     // 当前选中的一级分类项
 
 // 学科数据
 const firstLevelCategories = ref<string[]>(['医学', '心理学', '国学'])
@@ -287,7 +285,7 @@ const getMedicineMenusSuccess = (res: any) => {
  * 医学
  * 一级分类点击处理
  */
-const curseClick = (item: IMedicalTag, index: number) => {
+const curseClick = (item: ICategory, index: number) => {
   currentItem.value = item
   currentIndex.value = index
   
@@ -350,7 +348,7 @@ const handleFirstLevelClick = (item: string) => {
 /**
  * 终极分类点击处理
  */
-const curseClickJump = (item: IMedicalTag) => {
+const curseClickJump = (item: ICategory) => {
 	getPrompt()
 	if(!uni.getStorageSync('token')) return
 	uni.navigateTo({
@@ -512,7 +510,7 @@ onPullDownRefresh(() => {
 /**
  * 页面滚动
  */
-onPageScroll((e) => {
+onPageScroll((e: any) => {
   scrollTop.value = e.scrollTop
 })
 </script>
diff --git a/pages/login/forget.vue b/pages/login/forget.vue
index 96c2570..a954a3b 100644
--- a/pages/login/forget.vue
+++ b/pages/login/forget.vue
@@ -1,6 +1,8 @@
 <template>
   <view class="page">
-    <view class="title" :style="{ 'margin-top': getNotchHeight() + 'px' }">{{ $t('forget.title') }}</view>
+    <!-- 自定义导航栏 -->
+    <nav-bar :title="$t('forget.title')" />
+    <!-- <view class="title" :style="{ 'margin-top': getNotchHeight() + 'px' }">{{ $t('forget.title') }}</view> -->
     
     <!-- 邮箱输入 -->
     <view class="input-box">
@@ -33,7 +35,7 @@
       <input 
         class="input-text" 
         type="password" 
-        maxlength="20" 
+        :maxlength="20" 
         v-model="password" 
         :placeholder="$t('forget.passwordPlaceholder')" 
         @input="inputMethod(password)" 
@@ -54,8 +56,8 @@
       <input 
         class="input-text" 
         type="password"
-        minlength="8"
-        maxlength="20" 
+        :minlength="8"
+        :maxlength="20" 
         v-model="confirmPassword" 
         :placeholder="$t('forget.passwordAgainPlaceholder')" 
       />
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 02acc11..d02c9a4 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -34,7 +34,7 @@
             v-model="code" 
             :placeholder="$t('login.codePlaceholder')" 
             placeholder-class="grey" 
-            maxlength="6"
+            :maxlength="6"
             @confirm="onSubmit"
           />
           <wd-button type="info" :class="['code-btn', { 'active': !readonly }]" @click="onSetCode">
@@ -116,7 +116,7 @@
 
       <!-- 游客体验 -->
       <view class="youke-l" v-if="!isAndorid">
-        <view @click="onPageJump('/pages/course/index')">
+        <view @click="onPageSwitch('/pages/course/index')">
           {{ $t('login.noLogin') }}
         </view>
       </view>
@@ -147,6 +147,7 @@ import { loginWithCode, loginWithPassword } from '@/api/modules/auth'
 import { commonApi } from '@/api/modules/common'
 import { validateEmail } from '@/utils/validator'
 import { onPageJump } from '@/utils'
+import { ILoginResponse } from '@/types/user'
 
 import { t } from '@/utils/i18n'
 
@@ -303,14 +304,14 @@ const passwordLogin = async () => {
 const onSubmit = async () => {
   if(!isAgree()) return false
 
-  let res = null
+  let res: ILoginResponse | null = null
 	
 	switch (loginType.value) {
 		case 2000:
-			res = await verifyCodeLogin()
+			res = await verifyCodeLogin() as ILoginResponse
 			break
 		case 1000:
-			res = await passwordLogin()
+			res = await passwordLogin() as ILoginResponse
 			break
 	}
 
@@ -399,7 +400,7 @@ const yszc = () => {
 /**
  * 页面跳转
  */
-const onPageJump = (url: string) => {
+const onPageSwitch = (url: string) => {
   uni.switchTab({
     url: url,
   })
diff --git a/style/tailwind.css b/style/tailwind.css
index 89bafe6..e26e97b 100644
--- a/style/tailwind.css
+++ b/style/tailwind.css
@@ -217,9 +217,18 @@
   .mt-2 {
     margin-top: calc(var(--spacing) * 2);
   }
+  .mt-2\! {
+    margin-top: calc(var(--spacing) * 2) !important;
+  }
+  .mt-2\.5\! {
+    margin-top: calc(var(--spacing) * 2.5) !important;
+  }
   .mt-3 {
     margin-top: calc(var(--spacing) * 3);
   }
+  .mt-3\! {
+    margin-top: calc(var(--spacing) * 3) !important;
+  }
   .mt-5 {
     margin-top: calc(var(--spacing) * 5);
   }
@@ -229,12 +238,27 @@
   .mt-20 {
     margin-top: calc(var(--spacing) * 20);
   }
+  .mt-20\! {
+    margin-top: calc(var(--spacing) * 20) !important;
+  }
   .mt-\[20rpx\]\! {
     margin-top: 20rpx !important;
   }
+  .mr-\[20rpx\] {
+    margin-right: 20rpx;
+  }
+  .mr-\[20rpx\]\! {
+    margin-right: 20rpx !important;
+  }
   .mb-1 {
     margin-bottom: calc(var(--spacing) * 1);
   }
+  .mb-1\! {
+    margin-bottom: calc(var(--spacing) * 1) !important;
+  }
+  .mb-1\.5\! {
+    margin-bottom: calc(var(--spacing) * 1.5) !important;
+  }
   .mb-2 {
     margin-bottom: calc(var(--spacing) * 2);
   }
@@ -259,6 +283,12 @@
   .ml-2\.5\! {
     margin-left: calc(var(--spacing) * 2.5) !important;
   }
+  .ml-\[20rpx\] {
+    margin-left: 20rpx;
+  }
+  .ml-\[20rpx\]\! {
+    margin-left: 20rpx !important;
+  }
   .block {
     display: block;
   }
@@ -332,6 +362,9 @@
   .p-2 {
     padding: calc(var(--spacing) * 2);
   }
+  .p-2\.5 {
+    padding: calc(var(--spacing) * 2.5);
+  }
   .p-3 {
     padding: calc(var(--spacing) * 3);
   }
@@ -341,6 +374,9 @@
   .p-\[20rpx\] {
     padding: 20rpx;
   }
+  .p-\[20rpx\]\! {
+    padding: 20rpx !important;
+  }
   .p-\[30rpx\] {
     padding: 30rpx;
   }
diff --git a/types/user.ts b/types/user.d.ts
similarity index 93%
rename from types/user.ts
rename to types/user.d.ts
index 390b05c..1f5a638 100644
--- a/types/user.ts
+++ b/types/user.d.ts
@@ -1,4 +1,5 @@
 // types/user.ts
+import type { IApiResponse } from '@/api/types'
 
 /**
  * 用户信息接口
@@ -16,12 +17,12 @@ export interface IUserInfo {
 /**
  * 登录响应接口
  */
-export interface ILoginResponse {
-  userInfo: IUserInfo
+export interface ILoginResponse<T = IUserInfo> extends IApiResponse {
   token: {
     token: string
     [key: string]: any
-  }
+  },
+  userInfo: T
 }
 
 /**