From 09e3e47f41023947912d8b6c2d5f0b4544e8c7a8 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Wed, 4 Jun 2025 15:48:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(api):=20=E6=B7=BB=E5=8A=A0=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 apiRoute.js 中添加学生登录接口 xy_login
- 优化学生端登录逻辑，支持微信小程序 openid
-调整登录页面布局，移除多余的空视图
- 初始化登录页面时获取微信小程序 openid- 修改登录成功后的处理逻辑
---
 api/apiRoute.js               | 9 +++++++--
 pages/student/index/index.vue | 6 ++----
 pages/student/login/login.vue | 9 ++++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/api/apiRoute.js b/api/apiRoute.js
index 31c1436..3f5642e 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -396,8 +396,13 @@ export default {
 
 
     //↓↓↓↓↓↓↓↓↓↓↓↓-----学生接口相关-----↓↓↓↓↓↓↓↓↓↓↓↓
-
-
+    //学生登陆接口
+    xy_login(data = {}) {
+        let url = '/customerResourcesAuth/login'
+        return http.post(url, data).then(res => {
+            return res;
+        })
+    },
 
 
 
diff --git a/pages/student/index/index.vue b/pages/student/index/index.vue
index 175edb2..9b435a2 100644
--- a/pages/student/index/index.vue
+++ b/pages/student/index/index.vue
@@ -168,11 +168,9 @@
 			}
 		},
 		onLoad() {
-
-		},
-    onShow(){
       this.openViewHome()//检测首页是否正确跳转-不正确则进行重定向
-    },
+		},
+    onShow(){},
 		methods: {
 		  //初始化
       async init(){
diff --git a/pages/student/login/login.vue b/pages/student/login/login.vue
index 4cc961f..6fdaf19 100644
--- a/pages/student/login/login.vue
+++ b/pages/student/login/login.vue
@@ -25,7 +25,6 @@
         </fui-input>
       </view>
 
-      <view style="width: 95%;height: 30rpx;"></view>
       <view style="width: 95%;margin:30rpx auto;">
         <fui-input
             @click="picker_show_loginType=true"
@@ -98,7 +97,10 @@ export default {
   },
   methods: {
     async init(){
+      //条件编译 微信小程序
+      //#ifdef MP-WEIXIN
       await this.getMiNiWxOpenId()
+      //#endif
     },
     input(e) {
       console.log(e)
@@ -172,6 +174,7 @@ export default {
           'login_type': 2,
           'mini_wx_openid':this.mini_wx_openid,//微信小程序openid
         }
+        res = await apiRoute.xy_login(params)
       }
 
       if(!res.code){
@@ -259,8 +262,8 @@ export default {
         this.password1= '123123' //密码
       }else{
         //学生端
-        this.user= '' //账户
-        this.password1= '' //密码
+        this.user= '15335526445' //账户
+        this.password1= '123123' //密码
       }
 
     },

From 01eb263ecc9822869888d52d3b33bf23a0f75bf5 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Wed, 4 Jun 2025 16:22:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(student):=20=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加学生详情接口 xy_memberInfo
- 优化学生信息展示逻辑
- 修复学生信息获取失败的异常处理
-调整页面初始化流程，确保信息加载顺序正确
---
 api/apiRoute.js               |  8 ++++++++
 pages/student/index/index.vue | 34 +++++++++++++++++++++-------------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/api/apiRoute.js b/api/apiRoute.js
index 3f5642e..5fe2aa9 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -403,6 +403,14 @@ export default {
             return res;
         })
     },
+    //学生详情
+    xy_memberInfo(data = {}) {
+        let url = '/customerResourcesAuth/info'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
+
 
 
 
diff --git a/pages/student/index/index.vue b/pages/student/index/index.vue
index 9b435a2..da57296 100644
--- a/pages/student/index/index.vue
+++ b/pages/student/index/index.vue
@@ -6,7 +6,7 @@
 		<view class="head">
 			<view class="head-img">
 				<!-- <fui-avatar width="136" :src="$util.img(member_info.headimg)"></fui-avatar> -->
-				<image class="pic" :src="$util.img(member_info.headimg)"></image>
+        <image class="pic" :src="member_info.memberHasOne ? member_info.memberHasOne.headimg : ''"></image>
 				<view class="head-text">{{member_info.name}}</view>
 			</view>
 		</view>
@@ -123,6 +123,8 @@
 
 <script>
   import {Api_url} from "@/common/config";
+	import apiRoute from '@/api/apiRoute.js';
+
 	import memberApi from '@/api/member.js';
 	import AQTabber from "@/components/AQ/AQTabber.vue"
 	export default {
@@ -136,7 +138,8 @@
         uploadImageApiUrl: `${Api_url}/file/image`,
         uploadVideoApiUrl: `${Api_url}/file/video`,
 
-				member_info: [],
+				member_info: {},//学生信息
+
         assignmentsList: [],//作业列表
         jobAssignmentsInfo: [],//待完成的作业
 
@@ -172,9 +175,9 @@
 		},
     onShow(){},
 		methods: {
-		  //初始化
+		  //学生页面初始化
       async init(){
-        this.member_init()
+        await this.member_init()
         this.getMemberIndex()
         this.getList()
         this.getJobAssignmentsInfo()
@@ -199,7 +202,7 @@
             url: this.openPath
           })
         }else{
-          //页面正确的情况下
+          //页面正确的情况下->执行学生页面初始化
           this.init()
         }
 
@@ -267,15 +270,20 @@
       },
 
 			//获取学员信息
-			member_init() {
-				memberApi.member().then(res => {
-					if(res.code == 1){
-						this.member_info = res.data
-					}else{
-						this.member_info = []
-					}					
-				})
+			async member_init() {
+        let res = await apiRoute.xy_memberInfo({})
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+          return
+        }
+        this.member_info = res.data
+        console.log('xxxx',this.member_info)
 			},
+
+      //跳转页面-作业详情
 			details() {
 				uni.navigateTo({
 					url: '/pages/student/index/work_details'

From 95a32da0691dac3ed209648c1dc831abdb867061 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Wed, 4 Jun 2025 17:51:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(student):=20=E4=BC=98=E5=8C=96=E5=AD=A6?=
 =?UTF-8?q?=E5=91=98=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E5=92=8C=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在学员首页和登录页添加标记位控制 init 只执行一次
- 修复学员首页头像显示逻辑，添加默认头像
-优化登录页跳转逻辑，确保正确跳转到对应角色首页- 调整 my 页面 member_init 方法，添加测试 alert
---
 pages/student/index/index.vue | 29 +++++++++++++-------
 pages/student/login/login.vue | 50 +++++++++++++++++++++++++++++++++--
 2 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/pages/student/index/index.vue b/pages/student/index/index.vue
index da57296..5539070 100644
--- a/pages/student/index/index.vue
+++ b/pages/student/index/index.vue
@@ -6,7 +6,7 @@
 		<view class="head">
 			<view class="head-img">
 				<!-- <fui-avatar width="136" :src="$util.img(member_info.headimg)"></fui-avatar> -->
-        <image class="pic" :src="member_info.memberHasOne ? member_info.memberHasOne.headimg : ''"></image>
+        <image class="pic" :src="member_info.memberHasOne ? member_info.memberHasOne.headimg : $util.img('/uniapp_src/static/images/common/yong_hu.png')"></image>
 				<view class="head-text">{{member_info.name}}</view>
 			</view>
 		</view>
@@ -133,6 +133,8 @@
 		},
 		data() {
 			return {
+        inited: false, // 添加标记位控制 init 只执行一次
+
         //上传接口地址
         uploadApiUrl: ``,
         uploadImageApiUrl: `${Api_url}/file/image`,
@@ -173,7 +175,13 @@
 		onLoad() {
       this.openViewHome()//检测首页是否正确跳转-不正确则进行重定向
 		},
-    onShow(){},
+    onShow(){
+      // 防止 onShow 触发后重复 init
+      if (!this.inited) {
+        this.init()
+        this.inited = true
+      }
+    },
 		methods: {
 		  //学生页面初始化
       async init(){
@@ -184,8 +192,8 @@
       },
 
 
-      //检测首页是否正确跳转-不正确则进行重定向
-      async openViewHome(){
+
+      async openViewHome_COPY(){
         //获取当前页面路径
         let pages = getCurrentPages();
         //当前页面路径
@@ -195,21 +203,24 @@
 
         this.openPath = this.path_arr[userType]
 
+        console.log(
+            '跳转',
+            this.thisPath,
+            userType,
+            this.path_arr[userType]
+        )
         if(this.thisPath != this.openPath){
+          console.log('打印1')
           //跳转tabBar首页-页面
           uni.setStorageSync('tabBerIndex', 0)
           uni.navigateTo({
             url: this.openPath
           })
+          return
         }else{
           //页面正确的情况下->执行学生页面初始化
           this.init()
         }
-
-
-        console.log(123123123123,this.thisPath,userType,this.path_arr[userType])
-
-
       },
 
       async getMemberIndex(){
diff --git a/pages/student/login/login.vue b/pages/student/login/login.vue
index 6fdaf19..efe201c 100644
--- a/pages/student/login/login.vue
+++ b/pages/student/login/login.vue
@@ -63,6 +63,8 @@ import apiRoute from '@/api/apiRoute.js';
 export default {
   data() {
     return {
+      inited: false, // 添加标记位控制 init 只执行一次
+
       password: true,
       user: '', //账户
       password1: '', //密码
@@ -85,6 +87,13 @@ export default {
         }
       ],
       picker_show_loginType:false,//是否显示下拉窗组件
+
+
+      path_arr:{
+        '1':'/pages/coach/home/index',//教练
+        '2':'/pages/market/index/index',//销售
+        '3':'/pages/student/index/index',//学员
+      },
     }
   },
   onLoad(options) {
@@ -93,7 +102,11 @@ export default {
     this.loginType_str = selectedItem ? selectedItem.text : '未知类型';
     // uni.hideHomeButton()
     // console.log(uni.getStorageSync('um_id'))
-    this.init()
+    // 防止 onShow 触发后重复 init
+    if (!this.inited) {
+      this.openViewHome()
+      this.inited = true
+    }
   },
   methods: {
     async init(){
@@ -103,7 +116,7 @@ export default {
       //#endif
     },
     input(e) {
-      console.log(e)
+      //console.log(e)
     },
     change() {
       this.password = !this.password
@@ -267,6 +280,39 @@ export default {
       }
 
     },
+
+    //检测首页是否正确跳转-不正确则进行重定向
+    async openViewHome() {
+      const userType = String(uni.getStorageSync('userType') || '');
+      const token = uni.getStorageSync('token') || ''
+
+      if(!userType || !token){
+        return
+      }
+
+      const pages = getCurrentPages();
+      const currentPage = pages[pages.length - 1];
+      const thisPath = '/' + currentPage.route;
+
+
+      const openPath = this.path_arr[userType];
+
+      console.log('当前路径:', thisPath);
+      console.log('用户类型:', userType);
+      console.log('应跳转路径:', openPath);
+
+      if (thisPath !== openPath) {
+        // 如果不是正确的首页路径，则跳转到对应角色首页
+        uni.setStorageSync('tabBerIndex', 0)
+
+        // 使用 redirectTo 替代 navigateTo，避免页面栈堆积
+        uni.redirectTo({
+          url: openPath
+        });
+        return
+      }
+      // 如果是正确的路径，交给 onShow 控制初始化
+    },
   }
 }
 </script>