From 0787fc6b447f570f04db5ca983da6dcd7ed07e0e Mon Sep 17 00:00:00 2001
From: lip <1040791966@qq.com>
Date: Mon, 3 Nov 2025 18:58:44 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BA=BA=E6=89=8D=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageRc/pages/index/index.vue      | 71 +++++++++++++++++++++++-----
 pages/index/components/index-one.vue | 10 ++--
 2 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/packageRc/pages/index/index.vue b/packageRc/pages/index/index.vue
index af88c8a..bef13b5 100644
--- a/packageRc/pages/index/index.vue
+++ b/packageRc/pages/index/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2025-10-16 15:15:47
- * @LastEditors: shirlwang
- * @LastEditTime: 2025-10-22 09:54:53
+ * @LastEditors: lip
+ * @LastEditTime: 2025-11-03 18:52:09
 -->
 <template>
   <!-- @scroll="handleScroll" @scrolltolower="scrollBottom" -->
@@ -38,20 +38,24 @@
         <view class="title-item" :class="{active: activeTitle == 1}" @click="activeTitle = 1"><view>推荐岗位</view></view>
         <view class="title-item" :class="{active: activeTitle == 2}" @click="activeTitle = 2"><view>热门岗位</view></view>
       </view>
-      <view v-for="(item, index) in jobList" :key="index" class="job-list">
+      <view v-for="(item, index) in recomList" :key="index" class="job-list">
         <view class="top-line">
-          <view class="salary">4000-8000/月</view>
-          <view class="time"><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons>发布日期：2025-10-20</view>
+          <view class="salary">{{item.minSalary}}-{{item.maxSalary}}/月</view>
+          <view class="time"><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons>发布日期：{{ item.postingDate }}</view>
         </view>
-        <view class="title">销售顾问</view>
+        <view class="title">{{ item.jobTitle }}</view>
         <view class="infos">
-          <view>大专</view>
-          <view>1-3年</view>
-          <view>喀什 市南区</view>
+          <view>
+             <dict-Label dictType="education" :value="item.education"></dict-Label>
+          </view>
+          <view>
+            <dict-Label dictType="experience" :value="item.experience"></dict-Label>
+          </view>
+          <view>{{ item.jobLocation }}</view>
         </view>
         <view class="bottom-line">
-          <view><uni-icons color="#A2A2A2" type="person" size="12"></uni-icons>6人</view>
-          <view>青岛xx公司</view>
+          <view><uni-icons color="#A2A2A2" type="person" size="12"></uni-icons>{{item.vacancies}}人</view>
+          <view>{{ item.companyName }}</view>
         </view>
       </view>
       <view class="view-more-btn" @click="viewMore">查看更多内容</view>
@@ -80,14 +84,19 @@
 
 <script setup>
 import { reactive, inject, watch, ref, onMounted, watchEffect, nextTick } from 'vue';
+const { $api, navTo, vacanciesTo, formatTotal, config } = inject('globalFunction');
 let activeTab = ref(1)
 let activeTitle = ref(1)
-let jobList = ref([{},{},{},{},{},{}])
+
 function back() {
   uni.navigateBack({
     delta: 1
   })
 }
+onMounted(()=>{
+  getJobRecommed()
+})
+
 function viewMore() {
   // uni.navigateTo({
   //   url: '/pages/jobList/jobList'
@@ -106,6 +115,44 @@ function tiao(){
     }
   });
 }
+import useUserStore from '@/stores/useUserStore';
+const conditionSearch = ref({});
+const pageState = reactive({
+    page: 0,
+    total: 0,
+    maxPage: 2,
+    pageSize: 10,
+    search: {
+        order: 0,
+    },
+});
+let jobList = ref([])
+let recomList = ref([])
+// 获取推荐岗位
+function getJobRecommed(){
+   let params = {
+        pageSize: pageState.pageSize,
+        sessionId: useUserStore().seesionId,
+        ...pageState.search,
+        ...conditionSearch.value,
+        isPublish: 1,
+    };
+  $api.createRequest('/app/job/recommend', params).then((resData) => {
+        const { data, total } = resData;
+        console.log(resData)
+        recomList.value = resData.data
+        pageState.total = 0;
+    });
+}
+
+// 获取岗位列表
+function getJobList(){
+  $api.createRequest('/app/job/list', params).then((resData) => {
+    console.log(resData)
+    });
+}
+
+
 </script>
 
 <style lang="less" scoped>
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index ff417f2..2dff06c 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -1001,16 +1001,16 @@ function dataToImg(data) {
 }
 
 // import { loginRc } from '@/apiRc/login/login.js';
-import storeRc from '@/utilsRc/store/index.js';
+// import storeRc from '@/utilsRc/store/index.js';
 // 跳转到高校毕业页面
 function goRc(){
     if (checkLogin()) {
-        let userInfo = uni.getStorageSync('userInfo')
-        console.log(uni.getStorageSync('userInfo'), "uni.getStorageSync('userInfo')");
-        storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
+        // let userInfo = uni.getStorageSync('userInfo')
+        // console.log(uni.getStorageSync('userInfo'), "uni.getStorageSync('userInfo')");
+        // storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
             // console.log(res, "'res");
             navTo('/packageRc/pages/index/index');
-        });
+        // });
     }
 }
 

From 78d3bd8eb3b700dff24c34d5c4240f8fc2515f4f Mon Sep 17 00:00:00 2001
From: lip <1040791966@qq.com>
Date: Tue, 4 Nov 2025 08:35:50 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E4=B8=8A=E7=8F=AD=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=B8=8B=E5=AE=9E=E4=B9=A0=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E5=92=8C=E7=A4=BE=E5=8C=BA=E5=AE=9E=E8=B7=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageRc/pages/index/index.vue | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/packageRc/pages/index/index.vue b/packageRc/pages/index/index.vue
index bef13b5..3ec2cdb 100644
--- a/packageRc/pages/index/index.vue
+++ b/packageRc/pages/index/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2025-10-16 15:15:47
  * @LastEditors: lip
- * @LastEditTime: 2025-11-03 18:52:09
+ * @LastEditTime: 2025-11-04 08:31:51
 -->
 <template>
   <!-- @scroll="handleScroll" @scrolltolower="scrollBottom" -->
@@ -35,10 +35,10 @@
         <view class="tab" :class="{active: activeTab == 3}" @click="activeTab = 3">社区实践</view>
       </view>
       <view class="titles">
-        <view class="title-item" :class="{active: activeTitle == 1}" @click="activeTitle = 1"><view>推荐岗位</view></view>
-        <view class="title-item" :class="{active: activeTitle == 2}" @click="activeTitle = 2"><view>热门岗位</view></view>
+        <view class="title-item" :class="{active: activeTitle == 1}" @click="activeTitle = 1,getJobRecommed()"><view>推荐岗位</view></view>
+        <view class="title-item" :class="{active: activeTitle == 2}" @click="activeTitle = 2,getJobList()"><view>热门岗位</view></view>
       </view>
-      <view v-for="(item, index) in recomList" :key="index" class="job-list">
+        <view v-for="(item, index) in jobList" :key="index" class="job-list">
         <view class="top-line">
           <view class="salary">{{item.minSalary}}-{{item.maxSalary}}/月</view>
           <view class="time"><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons>发布日期：{{ item.postingDate }}</view>
@@ -57,7 +57,8 @@
           <view><uni-icons color="#A2A2A2" type="person" size="12"></uni-icons>{{item.vacancies}}人</view>
           <view>{{ item.companyName }}</view>
         </view>
-      </view>
+       </view>
+      
       <view class="view-more-btn" @click="viewMore">查看更多内容</view>
       <view class="titles" style="justify-content: space-between;">
         <view class="title-item active"><view>政策专区</view></view>
@@ -127,7 +128,6 @@ const pageState = reactive({
     },
 });
 let jobList = ref([])
-let recomList = ref([])
 // 获取推荐岗位
 function getJobRecommed(){
    let params = {
@@ -138,17 +138,23 @@ function getJobRecommed(){
         isPublish: 1,
     };
   $api.createRequest('/app/job/recommend', params).then((resData) => {
-        const { data, total } = resData;
-        console.log(resData)
-        recomList.value = resData.data
+        jobList.value = resData.data
         pageState.total = 0;
     });
 }
 
 // 获取岗位列表
 function getJobList(){
+  let params = {
+        current: pageState.page,
+        pageSize: pageState.pageSize,
+        ...pageState.search,
+        // ...conditionSearch.value,
+    };
   $api.createRequest('/app/job/list', params).then((resData) => {
-    console.log(resData)
+       jobList.value = resData.rows
+       console.log(jobList.value)
+        pageState.total = 0;
     });
 }
 

From 0b3c32348b6fd2a0308e9fb1862312f744ada22e Mon Sep 17 00:00:00 2001
From: WX0lxh <2062408239@qq.com>
Date: Tue, 4 Nov 2025 10:33:49 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageB/train/mockExam/examList.vue   | 141 ++++++++++++++++++++++++-
 packageB/train/mockExam/viewGrades.vue |  65 ++++++++++++
 pages.json                             |   9 ++
 3 files changed, 213 insertions(+), 2 deletions(-)
 create mode 100644 packageB/train/mockExam/viewGrades.vue

diff --git a/packageB/train/mockExam/examList.vue b/packageB/train/mockExam/examList.vue
index f9364ae..fa2ad83 100644
--- a/packageB/train/mockExam/examList.vue
+++ b/packageB/train/mockExam/examList.vue
@@ -1,6 +1,30 @@
 <template>
 	<div class="app-box">
 		<div class="con-box">
+			<template #headContent>
+			    <view class="collection-search">
+			        <view class="search-content">
+			            <view class="header-input button-click">
+			                <uni-icons class="iconsearch" color="#6A6A6A" type="search" size="22"></uni-icons>
+			                <input
+			                    class="input"
+			                    v-model="searchKeyword"
+			                    @confirm="searchVideo"
+			                    placeholder="输入考试名称"
+			                    placeholder-class="inputplace"
+			                />
+			                <uni-icons 
+			                    v-if="searchKeyword" 
+			                    class="clear-icon" 
+			                    type="clear" 
+			                    size="24" 
+			                    color="#999" 
+			                    @click="clearSearch"
+			                />
+			            </view>
+			        </view>
+			    </view>
+			</template>
 			<scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
 				<div class="cards">
 					<div class="cardHead">
@@ -17,18 +41,53 @@
 						<div class="conten">及格分数：60分</div>
 						<div class="conten">截止日期：2025-12-31</div>
 					</div>
+					<div class="flooter">
+						<div @click="jumps('/packageB/train/mockExam/viewGrades')">查看成绩</div>
+						<div>详情</div>
+						<div>收藏</div>
+					</div>
 				</div>
 				<div class="cards"></div>
 				<div class="cards"></div>
 			</scroll-view>
 		</div>
+		<div class="cards2" v-if="dialogVisible">
+			<div class="cardCon">
+				<div class="cardHead">
+					<div></div>
+					<div style="font-size: 40rpx;" @click="clones()">×</div>
+				</div>
+				
+			</div>
+		</div>
 	</div>
 </template>
 
-<script>
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
+const searchKeyword = ref('');
+const pageState = reactive({
+    page: 0,
+    list: [],
+    total: 0,
+    maxPage: 1,
+    pageSize: 12,
+    search: {},
+});
+const baseUrl = config.imgBaseUrl
+const dialogVisible = ref(false);
 const handleScrollToLower = () => {
     
 };
+function jumps(url){
+	navTo(url);
+}
+function clones(){
+	dialogVisible.value=false
+}
 </script>
 
 <style lang="stylus" scoped>
@@ -46,6 +105,48 @@ const handleScrollToLower = () => {
 		padding: 20rpx 28rpx;
 		box-sizing: border-box;
 		overflow: hidden;
+		.collection-search{
+		    padding: 10rpx 20rpx;
+		    .search-content{
+		        position: relative
+		        display: flex
+		        align-items: center
+		        padding: 14rpx 0
+		        .header-input{
+		            padding: 0
+		            width: calc(100%);
+		            position: relative
+		            .iconsearch{
+		                position: absolute
+		                left: 30rpx;
+		                top: 50%
+		                transform: translate(0, -50%)
+		                z-index: 1
+		            }
+		            .input{
+		                padding: 0 80rpx 0 80rpx
+		                height: 80rpx;
+		                background: #FFFFFF;
+		                border-radius: 75rpx 75rpx 75rpx 75rpx;
+		                border: 2rpx solid #ECECEC
+		                font-size: 28rpx;
+		            }
+		            .clear-icon{
+		                position: absolute
+		                right: 30rpx;
+		                top: 50%
+		                transform: translate(0, -50%)
+		                z-index: 1
+		                cursor: pointer
+		            }
+		            .inputplace{
+		                font-weight: 400;
+		                font-size: 28rpx;
+		                color: #B5B5B5;
+		            }
+		        }
+		    }
+		}
 		.main-scroll {
 		    width: 100%;
 		    height: 100%;
@@ -57,7 +158,7 @@ const handleScrollToLower = () => {
 				border-radius: 12rpx;
 				border: 2px solid #EDF5FF;
 				margin-bottom: 30rpx;
-				padding: 30rpx 40rpx;
+				padding: 30rpx 40rpx 0;
 				box-sizing: border-box
 				.cardHead{
 					display: flex;
@@ -128,8 +229,44 @@ const handleScrollToLower = () => {
 						margin-bottom: 20rpx;
 					}
 				}
+				.flooter{
+					border-top: 1px solid #ccc;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					view{
+						font-size: 28rpx;
+						margin-left: 30rpx;
+						color: #2175F3;
+					}
+				}
 			}
 		}
 	}
+	.cards2{
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100vh;
+		background-color: rgba(0,0,0,0.5);
+		z-index: 10000;
+		padding: 100rpx 50rpx;
+		box-sizing: border-box;
+		.cardCon{
+			height: 100%;
+			background-color: #fff;
+			padding: 20rpx;
+			box-sizing: border-box;
+			.cardHead{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				font-size: 30rpx;
+				font-weight: 600;
+			}
+			
+		}
+	}
 }
 </style>
\ No newline at end of file
diff --git a/packageB/train/mockExam/viewGrades.vue b/packageB/train/mockExam/viewGrades.vue
new file mode 100644
index 0000000..5bd0ad2
--- /dev/null
+++ b/packageB/train/mockExam/viewGrades.vue
@@ -0,0 +1,65 @@
+<template>
+	<div class="app-box">
+		<div class="con-box">
+			<div class="tabCon">
+				<div class="tabLeft">
+					<div><span>考试名称：</span>456546456</div>
+					<div><span>考试时间：</span>456546456</div>
+					<div><span>考试成绩：</span>456546456</div>
+				</div>
+				<div class="tabRight">查看</div>
+				<div class="tabLeft"></div>
+				<div class="tabRight">查看</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+</script>
+
+<style lang="stylus" scoped>
+.app-box{
+	width: 100%;
+	height: 100vh;
+	position: relative;
+	.con-box{
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top:0;
+		z-index: 10;
+		padding: 20rpx 28rpx;
+		box-sizing: border-box;
+		overflow-y: auto;
+		.tabCon{
+			border-top: 1px solid #ccc;
+			border-left: 1px solid #ccc;
+			display: flex;
+			flex-wrap: wrap;
+			.tabLeft{
+				width: 80%;
+				height: 140rpx;
+				border-bottom: 1px solid #ccc;
+				border-right: 1px solid #ccc;
+				box-sizing: border-box;
+				view{
+					line-height: 45rpx
+				}
+			}
+			.tabRight{
+				width: 20%;
+				height: 140rpx;
+				border-bottom: 1px solid #ccc;
+				border-right: 1px solid #ccc;
+				box-sizing: border-box;
+				font-size: 30rpx;
+				text-align: center;
+				line-height: 140rpx;
+				color: #2175F3;
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 7db83be..245dfe7 100644
--- a/pages.json
+++ b/pages.json
@@ -411,6 +411,15 @@
 			        "navigationBarTitleTextSize": "30rpx"
 			        // "navigationStyle": "custom"
 			    }
+			},
+			{
+			    "path" : "train/mockExam/viewGrades",
+			    "style" :
+			    {
+			        "navigationBarTitleText" : "查看成绩",
+			        "navigationBarTitleTextSize": "30rpx"
+			        // "navigationStyle": "custom"
+			    }
 			}
 	    ]
 	},

From 9cf00a1449ba7adfd13490006978a7c69870b48a Mon Sep 17 00:00:00 2001
From: lip <1040791966@qq.com>
Date: Tue, 4 Nov 2025 11:52:58 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageRc/pages/index/index.vue | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/packageRc/pages/index/index.vue b/packageRc/pages/index/index.vue
index 3ec2cdb..7990425 100644
--- a/packageRc/pages/index/index.vue
+++ b/packageRc/pages/index/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2025-10-16 15:15:47
  * @LastEditors: lip
- * @LastEditTime: 2025-11-04 08:31:51
+ * @LastEditTime: 2025-11-04 11:50:05
 -->
 <template>
   <!-- @scroll="handleScroll" @scrolltolower="scrollBottom" -->
@@ -30,9 +30,9 @@
         </view>
       </view>
       <view class="tabs">
-        <view class="tab" :class="{active: activeTab == 1}" @click="activeTab = 1">岗位列表</view>
-        <view class="tab" :class="{active: activeTab == 2}" @click="activeTab = 2">实习实训</view>
-        <view class="tab" :class="{active: activeTab == 3}" @click="activeTab = 3">社区实践</view>
+        <view class="tab" :class="{active: pageState.type == ''}" @click="changeJobType('')">岗位列表</view>
+        <view class="tab" :class="{active: pageState.type == 2}" @click="changeJobType(2)">实习实训</view>
+        <view class="tab" :class="{active: pageState.type == 3}" @click="changeJobType(3)">社区实践</view>
       </view>
       <view class="titles">
         <view class="title-item" :class="{active: activeTitle == 1}" @click="activeTitle = 1,getJobRecommed()"><view>推荐岗位</view></view>
@@ -126,18 +126,20 @@ const pageState = reactive({
     search: {
         order: 0,
     },
+    type:'',
 });
 let jobList = ref([])
 // 获取推荐岗位
 function getJobRecommed(){
-   let params = {
+    let params = {
         pageSize: pageState.pageSize,
         sessionId: useUserStore().seesionId,
         ...pageState.search,
         ...conditionSearch.value,
         isPublish: 1,
+        type:pageState.type
     };
-  $api.createRequest('/app/job/recommend', params).then((resData) => {
+    $api.createRequest('/app/job/recommend', params).then((resData) => {
         jobList.value = resData.data
         pageState.total = 0;
     });
@@ -150,13 +152,22 @@ function getJobList(){
         pageSize: pageState.pageSize,
         ...pageState.search,
         // ...conditionSearch.value,
+        type:pageState.type
     };
   $api.createRequest('/app/job/list', params).then((resData) => {
-       jobList.value = resData.rows
-       console.log(jobList.value)
+        jobList.value = resData.rows
         pageState.total = 0;
     });
 }
+// 更改实习实训等
+function changeJobType(val){
+  pageState.type = val
+  if(activeTitle.value == 1){
+    getJobRecommed()
+  }else{
+    getJobList()
+  }
+}
 
 
 </script>

From 66d1122dea962f8f6723b9f053f20b65dab47d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E8=BE=89?= <13935151924@163.com>
Date: Tue, 4 Nov 2025 14:30:40 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E7=AE=80=E5=8E=86=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageA/pages/myResume/myResume.vue | 198 ++++++++++++++++++++++++++-
 1 file changed, 194 insertions(+), 4 deletions(-)

diff --git a/packageA/pages/myResume/myResume.vue b/packageA/pages/myResume/myResume.vue
index 3950683..babf046 100644
--- a/packageA/pages/myResume/myResume.vue
+++ b/packageA/pages/myResume/myResume.vue
@@ -122,7 +122,7 @@
         </view>
 
         <!-- 4. 新增：简历上传区域（固定在页面底部） -->
-        <!-- <view class="resume-upload-section">
+        <view class="resume-upload-section">
             <button class="upload-btn" @click="handleResumeUpload" :loading="isUploading" :disabled="isUploading">
                 <uni-icons type="cloud-upload" size="20"></uni-icons>
                 <text class="upload-text">
@@ -138,7 +138,7 @@
                 <text class="file-name">{{ uploadedResumeName }}</text>
                 <button class="delete-file-btn" size="mini" @click.stop="handleDeleteResume">删除</button>
             </view>
-        </view> -->
+        </view>
     </view>
 </template>
 
@@ -267,12 +267,202 @@ const handleDeleteItem = async (item, index) => {
 };
 
 // 简历上传核心逻辑
-const handleResumeUpload = () => {};
+const handleResumeUpload = () => {
+    // 从缓存获取用户ID（参考首页实现方式）
+    // 优先从store获取，如果为空则从缓存获取
+    const storeUserId = userInfo.value?.userId;
+    const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+    const cachedUserId = cachedUserInfo.userId;
+    
+    // 获取用户ID：优先使用store中的userId，如果store中没有，使用缓存中的userId
+    const userId = storeUserId || cachedUserId;
+    
+    if (!userId) {
+        $api.msg('请先登录');
+        return;
+    }
+
+    // 检查是否正在上传
+    if (isUploading.value) {
+        return;
+    }
+
+    // 选择文件（微信小程序使用 wx.chooseMessageFile，uni-app 中对应 uni.chooseMessageFile）
+    uni.chooseMessageFile({
+        count: 1, // 只能选择一个文件
+        type: 'file', // 选择任意文件类型
+        success: (res) => {
+            // 注意：文件路径在 res.tempFiles[0].path
+            const file = res.tempFiles[0];
+            const tempFilePath = file.path; // 获取临时文件路径
+            const fileName = file.name; // 获取文件名
+            
+            // 检查文件大小（20MB = 20 * 1024 * 1024 字节）
+            const maxSize = 20 * 1024 * 1024;
+            if (file.size > maxSize) {
+                $api.msg('文件大小不能超过 20MB');
+                return;
+            }
+
+            // 检查文件类型
+            const allowedTypes = ['pdf', 'doc', 'docx'];
+            const fileExtension = fileName.split('.').pop()?.toLowerCase();
+            if (!fileExtension || !allowedTypes.includes(fileExtension)) {
+                $api.msg('仅支持 PDF、Word 格式');
+                return;
+            }
+
+            // 开始上传
+            uploadResumeFile(tempFilePath, fileName, userId);
+        },
+        fail: (err) => {
+            console.error('选择文件失败:', err);
+            // 用户取消选择不提示错误
+            if (err.errMsg && !err.errMsg.includes('cancel')) {
+                $api.msg('选择文件失败，请重试');
+            }
+        }
+    });
+};
+
+// 上传简历文件到服务器（使用 wx.uploadFile，uni-app 中对应 uni.uploadFile）
+const uploadResumeFile = (filePath, fileName, userId) => {
+    // 确保 userId 存在且有效
+    if (!userId) {
+        // 如果传入的userId为空，尝试从缓存再次获取
+        const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+        const cachedUserId = cachedUserInfo.userId;
+        
+        if (!cachedUserId) {
+            $api.msg('用户ID不存在，无法上传');
+            return;
+        }
+        
+        // 使用缓存中的userId
+        userId = cachedUserId;
+    }
+
+    isUploading.value = true;
+    
+    // 获取token（从缓存获取，参考首页实现方式）
+    let Authorization = '';
+    const tokenValue = uni.getStorageSync('token') || '';
+    if (tokenValue) {
+        Authorization = tokenValue;
+    } else {
+        // 如果缓存中没有token，尝试从store获取
+        const userStore = useUserStore();
+        if (userStore.token) {
+            Authorization = userStore.token;
+        }
+    }
+
+    // 根据接口文档，bussinessId 应该作为 Query 参数传递，而不是 formData
+    // 将 bussinessId 拼接到 URL 上作为查询参数
+    const uploadUrl = `${config.baseUrl}/app/file/upload?bussinessId=${encodeURIComponent(String(userId))}`;
+
+    // 打印调试信息
+    console.log('上传文件参数:', {
+        url: uploadUrl,
+        fileName: fileName,
+        bussinessId: userId,
+        userId: userId,
+        token: Authorization ? '已获取' : '未获取'
+    });
+
+    // 上传文件（参考微信小程序 wx.uploadFile API）
+    uni.uploadFile({
+        url: uploadUrl, // 开发者服务器的上传接口（必须是 HTTPS），bussinessId 作为 Query 参数
+        filePath: filePath, // 本地文件路径（临时路径）
+        name: 'file', // 服务器端接收文件的字段名（需与后端一致）
+        // 注意：根据接口文档，bussinessId 通过 Query 参数传递，不需要 formData
+        header: {
+            'Authorization': encodeURIComponent(Authorization)
+        },
+        success: (uploadRes) => {
+            try {
+                // 注意：res.data 是字符串，需转为 JSON（如果后端返回 JSON）
+                // 参考方案：const result = JSON.parse(data);
+                let resData;
+                if (typeof uploadRes.data === 'string') {
+                    resData = JSON.parse(uploadRes.data);
+                } else {
+                    resData = uploadRes.data;
+                }
+
+                // 判断上传是否成功
+                if (uploadRes.statusCode === 200 && resData.code === 200) {
+                    // 上传成功，处理返回结果
+                    uploadedResumeName.value = fileName;
+                    uploadedResumeUrl.value = resData.data || resData.msg || resData.url || '';
+                    $api.msg('简历上传成功');
+                    console.log('上传成功', resData);
+                    
+                    // 可以在这里保存简历信息到后端（如果需要）
+                    // saveResumeInfo(userId, uploadedResumeUrl.value, fileName);
+                } else {
+                    // 上传失败
+                    const errorMsg = resData.msg || resData.message || '上传失败，请重试';
+                    $api.msg(errorMsg);
+                    console.error('上传失败:', resData);
+                }
+            } catch (error) {
+                // 解析响应数据失败
+                console.error('解析上传响应失败:', error);
+                console.error('原始响应数据:', uploadRes.data);
+                $api.msg('上传失败，请重试');
+            }
+        },
+        fail: (err) => {
+            // 上传失败
+            console.error('上传文件失败:', err);
+            $api.msg('上传失败，请检查网络连接');
+        },
+        // 上传进度监听（可选）
+        progress: (res) => {
+            const progress = res.progress; // 上传进度（0-100）
+            console.log('上传进度：', progress + '%');
+            // 可以在这里更新进度条 UI（如果需要）
+        },
+        complete: () => {
+            // 上传完成（无论成功或失败）
+            isUploading.value = false;
+        }
+    });
+};
 
 // 删除已上传的简历
-const handleDeleteResume = () => {};
+const handleDeleteResume = () => {
+    if (!uploadedResumeName.value) {
+        return;
+    }
+
+    uni.showModal({
+        title: '确认删除',
+        content: '确定要删除已上传的简历吗？',
+        success: (res) => {
+            if (res.confirm) {
+                // 清除本地数据
+                uploadedResumeName.value = '';
+                uploadedResumeUrl.value = '';
+                $api.msg('已删除');
+                
+                // 如果需要，可以调用后端接口删除服务器上的文件
+                // deleteResumeFile(userId);
+            }
+        }
+    });
+};
 </script>
 
+<style lang="stylus">
+/* 修复页面滚动问题：覆盖全局的 overflow: hidden */
+page {
+    overflow-y: auto !important;
+    overflow-x: hidden;
+}
+</style>
+
 <style lang="stylus" scoped>
 image{
     width: 100%;

From 6e02708ed36a995a54c03d64668ff7a865c0c037 Mon Sep 17 00:00:00 2001
From: lijie_ycrj <1540286404@qq.com>
Date: Tue, 4 Nov 2025 14:31:37 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E8=A7=86=E9=A2=91=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                            |   1 +
 packageB/train/video/videoDetail.vue | 558 ++++++++++++++-------------
 packageB/train/video/videoList.vue   | 140 +++----
 utils/request.js                     |   6 +-
 4 files changed, 340 insertions(+), 365 deletions(-)

diff --git a/config.js b/config.js
index 08c5c64..088e85f 100644
--- a/config.js
+++ b/config.js
@@ -5,6 +5,7 @@ export default {
 	LCBaseUrl:'http://10.110.145.145:9100',//招聘、培训、帮扶
 	LCBaseUrlInner:'http://10.110.145.145:10100',//内网端口
 	imgBaseUrl:'http://10.110.145.145/images', //图片基础url
+	trainVideoImgUrl:'http://10.110.145.145:9100/file/file/minio',
     // sseAI+
     // StreamBaseURl: 'http://39.98.44.136:8000',
     StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai',
diff --git a/packageB/train/video/videoDetail.vue b/packageB/train/video/videoDetail.vue
index e6b052e..0210e6a 100644
--- a/packageB/train/video/videoDetail.vue
+++ b/packageB/train/video/videoDetail.vue
@@ -1,316 +1,338 @@
 <template>
-    <AppLayout :title="title" :show-bg-image="false" @onScrollBottom="getDataList('add')">
- <!--       <template #headerleft>
+    <AppLayout :title="title" :show-bg-image="false">
+  <!--      <template #headerleft>
             <view class="btnback">
                 <image src="@/static/icon/back.png" @click="navBack"></image>
             </view>
         </template> -->
-        <template #headContent>
-            <view class="collection-search">
-                <view class="search-content">
-                    <view class="header-input button-click">
-                        <uni-icons class="iconsearch" color="#6A6A6A" type="search" size="22"></uni-icons>
-                        <input
-                            class="input"
-                            v-model="searchKeyword"
-                            @confirm="searchVideo"
-                            placeholder="输入视频名称"
-                            placeholder-class="inputplace"
-                        />
-                        <uni-icons 
-                            v-if="searchKeyword" 
-                            class="clear-icon" 
-                            type="clear" 
-                            size="24" 
-                            color="#999" 
-                            @click="clearSearch"
-                        />
-                    </view>
-                </view>
-            </view>
-        </template>
-        <view class="main-list">
-			<view class="list-title">
-				<text>视频列表</text>
-				<view class="title-line"></view>
+		<view class="video-box">
+			<view class="video-detail-container">
+			    <!-- 视频播放组件 -->
+			    <view class="video-wrapper">
+					<video id="myVideo" :src="videoInfo.currentUrl" :poster="trainVideoImgUrl+ videoInfo.cover"
+						 enable-danmu controls style="width: 100%;"></video>
+			    </view>
 			</view>
-            <view class="video-grid" v-if="pageState.list.length">
-                <view 
-                    v-for="video in pageState.list" 
-                    :key="video.id || video.videoId"
-                    class="video-item"
-					:style="getItemBackgroundStyle('video-bg.png')"
-                    @click="playVideo(video)"
-                >
-                    <view class="video-cover">
-                        <image 
-                            :src="video.coverImage || video.videoCover || '/static/icon/video.png'" 
-                            mode="aspectFill"
-                        ></image>
-                    </view>
-                    <view class="video-info">
-                        {{ video.title || video.videoName || '未命名视频' }}
-                    </view>
-                </view>
-            </view>
-            <empty v-else pdTop="200"></empty>
-        </view>
+			<view class="video-info" :style="getItemBackgroundStyle('video-bj2.png')">
+				<view class="video-title">
+					<text>视频详情</text>
+					<view class="title-line"></view>
+				</view>
+				<view class="info-detail">
+					<view class="info-left">
+						<view class="info-item">
+							<image class="icon-img" src="../../../static/images/train/zs.png" mode=""></image>
+							<view class="info-label">
+								分类：
+							</view>
+							<view class="info-value">
+								{{getCategoryLabelByValue(videoInfo.category)}}
+							</view>
+						</view>
+					</view>
+					<view class="info-right">
+						<view class="info-item">
+							<image class="icon-img" src="../../../static/images/train/zs.png" mode=""></image>
+							<view class="info-label">
+								等级：
+							</view>
+							<view class="info-value">
+								{{getLevelLabelByValue(videoInfo.level)}}
+							</view>
+						</view>
+						<view class="info-item">
+							<image class="icon-img" src="../../../static/images/train/zs.png" mode=""></image>
+							<view class="info-label">
+								讲师：
+							</view>
+							<view class="info-value">
+								{{videoInfo.teacherName}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="info-detail">
+					<view class="info-left">
+						<view class="info-item">
+							<image class="icon-img" src="../../../static/images/train/zs.png" mode=""></image>
+							<view class="info-label">
+								时长：
+							</view>
+							<view class="info-value">
+								{{videoInfo.hour}}分钟
+							</view>
+						</view>
+					</view>
+					<view class="info-right">
+						<view class="info-item">
+							<image class="icon-img" src="../../../static/images/train/zs.png" mode=""></image>
+							<view class="info-label">
+								发布时间：
+							</view>
+							<view class="info-value">
+								{{videoInfo.uploadTime}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="video-intro" :style="videoIntroBackgroundStyle('video-bj.png')">
+					<view class="intro-title">
+						<image class="intro-img1" src="../../../static/images/train/video-kc.png" mode=""></image>
+						<view class="title1">
+							课程
+						</view>
+						<view class="title2">
+							简介
+						</view>
+						<image class="intro-img2" src="../../../static/images/train/video-sc.png" mode=""></image>
+					</view>
+					<view class="intro-content">
+						 {{videoInfo.introduce}}
+					</view>
+				</view>
+				<view class="video-title">
+					<text>学习进度</text>
+					<view class="title-line"></view>
+				</view>
+				<view class="progress-box">
+					<progress :percent="videoInfo.percentage" activeColor="#30A0FF" backgroundColor="#B0DBFF"  stroke-width="6" border-radius="10" />
+					<view class="progress-info">
+						<view class="progress-left">
+							已观看
+						</view>
+						<view class="progress-right">
+							{{videoInfo.percentage}}%
+						</view>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+        
     </AppLayout>
 </template>
 
 <script setup>
-import { inject, ref, reactive } from 'vue';
+import { inject, reactive,ref, onMounted, onUnmounted, nextTick } from 'vue';
 import { onLoad } from '@dcloudio/uni-app';
 const { $api, navTo, navBack } = inject('globalFunction');
+import config from "@/config.js"
 
 // state
 const title = ref('');
-const searchKeyword = ref('');
-const pageState = reactive({
-    page: 0,
-    list: [],
-    total: 0,
-    maxPage: 1,
-    pageSize: 12,
-    search: {},
-});
-const baseUrl = 'http://10.110.145.145/images/train/';
+const videoId=ref('')
+const userId=ref('')
+const videoInfo=ref({})
+const trainVideoImgUrl=config.trainVideoImgUrl
+const categories=ref([])
+const levalLabels=ref([])
+const videoContext = ref(null);
+const videoUrl = ref('');
+const posterUrl = ref('');
+const videoTitle = ref('');
+const baseUrl = config.imgBaseUrl
 const getItemBackgroundStyle = (imageName) => ({
-    backgroundImage: `url(${baseUrl + imageName})`,
-    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundImage: `url(${baseUrl}/train/${imageName})`,
+    backgroundSize: '100% 100%',      // 覆盖整个容器
     backgroundPosition: 'center', // 居中
     backgroundRepeat: 'no-repeat'
 });
-// 模拟视频数据
-const mockVideoData = [
-    {
-        id: '1',
-        title: '职业技能培训基础课程',
-        coverImage: '/static/icon/server1.png',
-        videoUrl: ''
-    },
-    {
-        id: '2',
-        title: '面试技巧分享',
-        coverImage: '/static/icon/server2.png',
-        videoUrl: ''
-    },
-    {
-        id: '3',
-        title: '简历制作指南',
-        coverImage: '/static/icon/server3.png',
-        videoUrl: ''
-    },
-    {
-        id: '4',
-        title: '职场沟通技巧',
-        coverImage: '/static/icon/server4.png',
-        videoUrl: ''
-    },
-    {
-        id: '5',
-        title: '职业规划讲座',
-        coverImage: '/static/icon/flame.png',
-        videoUrl: ''
-    },
-    {
-        id: '6',
-        title: '行业趋势分析',
-        coverImage: '/static/icon/flame2.png',
-        videoUrl: ''
-    }
-];
-
-onLoad(() => {
-    getDataList('refresh');
+const videoIntroBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/train/${imageName})`,
+    backgroundSize: '100% 100%',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const params = reactive({
+		videoId: '',
+		userId: ''
+	})
+onLoad((options) => {
+	console.log("options",options)
+	videoId.value=options.id
+	userId.value=uni.getStorageSync('userInfo').userId
+	getDictionary()
+	getData()
 });
 
-// 搜索视频
-function searchVideo() {
-    getDataList('refresh');
+onMounted(() => {
+    // 初始化视频上下文
+    // nextTick(() => {
+    //     videoContext.value = uni.createVideoContext('videoPlayer');
+    // });
+});
+function getData() {
+	params.videoId=videoId.value
+	params.userId=userId.value
+	$api.myRequest('/train/public/trainVideo/updateWatchCount',{videoId:videoId.value}).then((resData) => {
+		console.log("视频更新次数成功")
+	});
+	let header={
+		'Authorization':uni.getStorageSync('Padmin-Token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	$api.myRequest('/train/public/trainVideo/model', params,'post',9100,header).then((resData) => {
+		console.log("resData",resData)
+		videoInfo.value=resData
+		videoInfo.value.currentUrl=trainVideoImgUrl+videoInfo.value.trainClassList[0].url
+		console.log("videoInfo.value.currentUrl",videoInfo.value.currentUrl)
+		videoInfo.value.percentage=(videoInfo.value.process/(videoInfo.value.hour*60))*100
+		console.log("videoInfo",videoInfo.value)
+	});
+}
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/train_category', {},'get',9100).then((resData) => {
+		categories.value=resData.data
+	});
+	$api.myRequest('/system/public/dict/data/type/train_level', {},'get',9100).then((resData) => {
+		levalLabels.value=resData.data
+	});
+}
+function getCategoryLabelByValue(value) {
+	if (!Array.isArray(categories.value)) {
+	    console.warn('categories 不是数组:', categories.value)
+	    return ''
+	  }
+	  const item = categories.value.find(item => item.dictValue === String(value))
+	  return item ? item.dictLabel : '暂无分类'
+}
+function getLevelLabelByValue(value) {
+	if (!Array.isArray(levalLabels.value)) {
+	    console.warn('levalLabels 不是数组:', levalLabels.value)
+	    return ''
+	  }
+	  const item = levalLabels.value.find(item => item.dictValue === String(value))
+	  return item ? item.dictLabel : '暂无等级'
 }
 
-// 清除搜索内容
-function clearSearch() {
-    searchKeyword.value = '';
-    getDataList('refresh');
-}
-
-// 获取视频列表
-function getDataList(type = 'add') {
-    if (type === 'refresh') {
-        pageState.page = 1;
-        pageState.maxPage = 1;
+onUnmounted(() => {
+    // 组件卸载时停止播放并退出全屏
+    if (videoContext.value) {
+        videoContext.value.pause();
+        videoContext.value.exitFullScreen();
     }
-    if (type === 'add' && pageState.page < pageState.maxPage) {
-        pageState.page += 1;
-    }
-    
-    // 模拟API请求延迟
-    setTimeout(() => {
-        // 在实际项目中，这里应该调用真实的API接口
-        // 目前使用模拟数据
-        let filteredList = [...mockVideoData];
-        
-        // 如果有搜索关键词，进行过滤
-        if (searchKeyword.value.trim()) {
-            filteredList = filteredList.filter(video => 
-                video.title.toLowerCase().includes(searchKeyword.value.toLowerCase())
-            );
-        }
-        
-        const start = 0;
-        const end = pageState.pageSize;
-        const pageData = filteredList.slice(start, end);
-        
-        if (type === 'add') {
-            pageState.list = [...pageState.list, ...pageData];
-        } else {
-            pageState.list = pageData;
-        }
-        
-        pageState.total = filteredList.length;
-        pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
-    }, 300);
-}
+});
+
+
+
 
-// 播放视频
-function playVideo(video) {
-    // 在实际项目中，这里应该导航到视频播放页面
-    // 或者调用视频播放组件
-    console.log('播放视频:', video.title);
-    // 示例：navTo(`/pages/videoPlayer/videoPlayer?id=${video.id}`);
-    $api.msg(`准备播放: ${video.title}`);
-}
 </script>
 
 <style lang="stylus" scoped>
-.btnback{
-    width: 64rpx;
-    height: 64rpx;
+.video-box{
+	padding: 10rpx 20rpx;
 }
-.btn {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    width: 52rpx;
-    height: 52rpx;
-}
-image {
-    height: 100%;
+.video-detail-container{
     width: 100%;
-}
-.collection-search{
-    padding: 10rpx 20rpx;
-    .search-content{
-        position: relative
-        display: flex
-        align-items: center
-        padding: 14rpx 0
-        .header-input{
-            padding: 0
-            width: calc(100%);
-            position: relative
-            .iconsearch{
-                position: absolute
-                left: 30rpx;
-                top: 50%
-                transform: translate(0, -50%)
-                z-index: 1
-            }
-            .input{
-                padding: 0 80rpx 0 80rpx
-                height: 80rpx;
-                background: #FFFFFF;
-                border-radius: 75rpx 75rpx 75rpx 75rpx;
-                border: 2rpx solid #ECECEC
-                font-size: 28rpx;
-            }
-            .clear-icon{
-                position: absolute
-                right: 30rpx;
-                top: 50%
-                transform: translate(0, -50%)
-                z-index: 1
-                cursor: pointer
-            }
-            .inputplace{
-                font-weight: 400;
-                font-size: 28rpx;
-                color: #B5B5B5;
-            }
-        }
-    }
-}
-.main-list{
     background-color: #ffffff;
-    padding: 20rpx 20rpx 28rpx 20rpx;
-	margin:10rpx 30rpx ;
-	box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1);
-	border-radius: 12px;
 }
-.list-title{
-	font-weight: bold;
-	font-size: 36rpx;
+
+.video-wrapper{
+    position: relative;
+    width: 100%;
+    background-color: #000000;
+	height: auto;
+}
+.video-info{
+	width:100%;
+	margin-top:30rpx;
+	padding: 20rpx 30rpx;
+	box-sizing: border-box;
+}
+.video-title{
+	font-size: 32rpx;
 	color: #404040;
+	font-weight: bold;
 	position: relative;
-	margin-bottom: 20px;
+	margin-bottom: 40rpx;
 }
 .title-line{
 	position: absolute;
 	bottom: -10rpx;
 	left: 36rpx;
-	width: 70rpx;
+	width: 60rpx;
 	height: 8rpx;
 	background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%);
-	border-radius: 2px;
-}
-.video-grid{
-    display: grid;
-    grid-template-columns: repeat(2, 1fr);
-    gap: 20rpx;
-}
-.video-item{
-    border-radius: 12rpx;
-    overflow: hidden;
-    box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-    transition: transform 0.2s;
-	padding: 20rpx
-}
-.video-item:active{
-    transform: scale(0.98);
-}
-.video-cover{
-    position: relative;
-    width: 100%;
-    padding-top: 56.25%; /* 16:9 比例 */
-    background: #f0f0f0;
 	border-radius: 4rpx;
 }
-.video-cover image{
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
+.info-detail{
+	display: flex;
+	flex-wrap: nowrap;
+	align-items: center;
+	margin-bottom: 30rpx;
 }
-.video-info{
-    padding: 16rpx 16rpx 0 16rpx;
+.info-left{
+	width: 35%;
+}
+.info-right{
+	width: 65%;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.info-item{
+	display: flex;
+	align-items: center;
+}
+.icon-img{
+	width: 24rpx;
+	height: 28rpx;
+}
+.info-label{
+	font-weight: bold;
+	font-size: 28rpx;
+	color: #0068C8;
+}
+.info-value{
+	font-size: 28rpx;
+	color: #404040;
+}
+.video-intro{
+	padding: 20rpx;
+	margin-bottom: 30rpx;
+}
+.intro-title{
+	display: flex;
+	align-items: center;
+	margin-bottom: 10rpx;
+}
+.intro-img1{
+	width: 36rpx;
+	height: 30rpx;
+	margin-right: 10rpx;
+}
+.intro-img2{
+	width: 30rpx;
+	height: 30rpx;
+	margin-left: 10rpx;
+}
+.title1{
 	font-size: 26rpx;
-	color: #333;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	text-align: center;
+	font-weight: bold;
+	color: #333333;
 }
-.video-title{
-    font-size: 28rpx;
-    color: #333;
-    line-height: 40rpx;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-    overflow: hidden;
-    text-overflow: ellipsis;
+.title2{
+	color: #077DF5;
+	font-size: 26rpx;
+	font-weight: bold;
+}
+.intro-content{
+	font-size: 24rpx;
+	color: #333333;
+	line-height: 1.5;
+}
+.progress-box{
+	background: linear-gradient(0deg, #DFEDFF 0%, #F8FCFF 100%);
+	box-shadow: 0px 0px 10px 0px rgba(0,48,107,0.1);
+	border-radius: 16rpx;
+	padding: 40rpx 30rpx;
+}
+.progress-info{
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	font-size: 24rpx;
+	color: #333333;
+	margin-top: 20rpx;
 }
 </style>
diff --git a/packageB/train/video/videoList.vue b/packageB/train/video/videoList.vue
index 6f3d588..90996a5 100644
--- a/packageB/train/video/videoList.vue
+++ b/packageB/train/video/videoList.vue
@@ -34,9 +34,9 @@
 				<text>视频列表</text>
 				<view class="title-line"></view>
 			</view>
-            <view class="video-grid" v-if="pageState.list.length">
+            <view class="video-grid" v-if="dataList.length>0">
                 <view 
-                    v-for="video in pageState.list" 
+                    v-for="video in dataList" 
                     :key="video.id || video.videoId"
                     class="video-item"
 					:style="getItemBackgroundStyle('video-bg.png')"
@@ -44,12 +44,12 @@
                 >
                     <view class="video-cover">
                         <image 
-                            :src="video.coverImage || video.videoCover || '/static/icon/video.png'" 
+                            :src="trainVideoImgUrl+ video.cover" 
                             mode="aspectFill"
                         ></image>
                     </view>
                     <view class="video-info">
-                        {{ video.title || video.videoName || '未命名视频' }}
+                        {{ video.videoTitle || '未命名视频' }}
                     </view>
                 </view>
             </view>
@@ -67,14 +67,10 @@ import config from "@/config.js"
 // state
 const title = ref('');
 const searchKeyword = ref('');
-const pageState = reactive({
-    page: 0,
-    list: [],
-    total: 0,
-    maxPage: 1,
-    pageSize: 12,
-    search: {},
-});
+const dataList=ref([])
+const pageSize=ref(10)
+const pageNum=ref(1)
+const totalNum=ref(0)
 const baseUrl = config.imgBaseUrl
 const getItemBackgroundStyle = (imageName) => ({
     backgroundImage: `url(${baseUrl}/train/${imageName})`,
@@ -82,45 +78,7 @@ const getItemBackgroundStyle = (imageName) => ({
     backgroundPosition: 'center', // 居中
     backgroundRepeat: 'no-repeat'
 });
-// 模拟视频数据
-const mockVideoData = [
-    {
-        id: '1',
-        title: '职业技能培训基础课程',
-        coverImage: '/static/icon/server1.png',
-        videoUrl: ''
-    },
-    {
-        id: '2',
-        title: '面试技巧分享',
-        coverImage: '/static/icon/server2.png',
-        videoUrl: ''
-    },
-    {
-        id: '3',
-        title: '简历制作指南',
-        coverImage: '/static/icon/server3.png',
-        videoUrl: ''
-    },
-    {
-        id: '4',
-        title: '职场沟通技巧',
-        coverImage: '/static/icon/server4.png',
-        videoUrl: ''
-    },
-    {
-        id: '5',
-        title: '职业规划讲座',
-        coverImage: '/static/icon/flame.png',
-        videoUrl: ''
-    },
-    {
-        id: '6',
-        title: '行业趋势分析',
-        coverImage: '/static/icon/flame2.png',
-        videoUrl: ''
-    }
-];
+const trainVideoImgUrl=config.trainVideoImgUrl
 
 onLoad(() => {
     getDataList('refresh');
@@ -139,49 +97,46 @@ function clearSearch() {
 
 // 获取视频列表
 function getDataList(type = 'add') {
+	let maxPage=Math.ceil(totalNum.value/pageSize.value)
+	let params={}
     if (type === 'refresh') {
-        pageState.page = 1;
-        pageState.maxPage = 1;
+        pageNum.value = 1;
+		params={
+			category:'',
+			hour:'',
+			level:'',
+			searchValue:searchKeyword.value,
+			orderStr:'',
+			pageSize:pageSize.value,
+			pageNum:pageNum.value
+		}
+		$api.myRequest('/train/public/trainVideo/trainVideoList', params).then((resData) => {
+			dataList.value=resData.rows
+			totalNum.value=resData.total
+		});
     }
-    if (type === 'add' && pageState.page < pageState.maxPage) {
-        pageState.page += 1;
-    }
-    
-    // 模拟API请求延迟
-    setTimeout(() => {
-        // 在实际项目中，这里应该调用真实的API接口
-        // 目前使用模拟数据
-        let filteredList = [...mockVideoData];
-        
-        // 如果有搜索关键词，进行过滤
-        if (searchKeyword.value.trim()) {
-            filteredList = filteredList.filter(video => 
-                video.title.toLowerCase().includes(searchKeyword.value.toLowerCase())
-            );
-        }
-        
-        const start = 0;
-        const end = pageState.pageSize;
-        const pageData = filteredList.slice(start, end);
-        
-        if (type === 'add') {
-            pageState.list = [...pageState.list, ...pageData];
-        } else {
-            pageState.list = pageData;
-        }
-        
-        pageState.total = filteredList.length;
-        pageState.maxPage = Math.ceil(pageState.total / pageState.pageSize);
-    }, 300);
+    if (type === 'add' && pageNum.value < maxPage) {
+        pageNum.value += 1;
+		params={
+			category:'',
+			hour:'',
+			level:'',
+			searchValue:searchKeyword.value,
+			orderStr:'',
+			pageSize:pageSize.value,
+			pageNum:pageNum.value
+		}
+		$api.myRequest('/train/public/trainVideo/trainVideoList', params).then((resData) => {
+			dataList.value=dataList.value.concat(resData.rows)
+			totalNum.value=resData.total
+		});
+	}
 }
+	
 
 // 播放视频
 function playVideo(video) {
-    // 在实际项目中，这里应该导航到视频播放页面
-    // 或者调用视频播放组件
-    console.log('播放视频:', video);
-    navTo(`/packageB/train/video/videoDetail?id=${video.id}`);
-    // $api.msg(`准备播放: ${video.title}`);
+    navTo(`/packageB/train/video/videoDetail?id=${video.videoId}`);
 }
 </script>
 
@@ -190,13 +145,6 @@ function playVideo(video) {
     width: 64rpx;
     height: 64rpx;
 }
-.btn {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    width: 52rpx;
-    height: 52rpx;
-}
 image {
     height: 100%;
     width: 100%;
@@ -264,7 +212,7 @@ image {
 	width: 70rpx;
 	height: 8rpx;
 	background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%);
-	border-radius: 2px;
+	border-radius: 4rpx;
 }
 .video-grid{
     display: grid;
diff --git a/utils/request.js b/utils/request.js
index 4c01086..8e448e6 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -54,7 +54,7 @@ export function request({
 				err.error = resData
 				reject(err)
 			},
-			fail: err => reject(err),
+			fail: err => reject(err) ,
 			complete() {
 				if (load) {
 					uni.hideLoading();
@@ -207,6 +207,10 @@ export function myRequest(url, data = {}, method = 'GET', port = 9100, headers =
 							code,
 							msg
 						} = resData.data
+						if(resData.data?.code == undefined){
+							resolve(resData.data)
+							return
+						}
 						if (code === 200) {
 							resolve(resData.data)
 							return

From cb7d68a57ff16ce018233beffee0715fcfbb79cc Mon Sep 17 00:00:00 2001
From: lijie_ycrj <1540286404@qq.com>
Date: Tue, 4 Nov 2025 14:35:00 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore                                 | 8 ++++++++
 .idea/ks-app-employment-service.iml              | 9 +++++++++
 .idea/modules.xml                                | 8 ++++++++
 .idea/vcs.xml                                    | 6 ++++++
 unpackage/dist/dev/mp-weixin/project.config.json | 3 ++-
 5 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/ks-app-employment-service.iml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..35410ca
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/ks-app-employment-service.iml b/.idea/ks-app-employment-service.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/ks-app-employment-service.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..331c8ce
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/ks-app-employment-service.iml" filepath="$PROJECT_DIR$/.idea/ks-app-employment-service.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json
index c937c3b..d63cc50 100644
--- a/unpackage/dist/dev/mp-weixin/project.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.config.json
@@ -15,7 +15,8 @@
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
-    }
+    },
+    "condition": false
   },
   "compileType": "miniprogram",
   "libVersion": "3.10.3",

From e5526cc930a39bf309852e5f731962ce3600fa5f Mon Sep 17 00:00:00 2001
From: WX0lxh <2062408239@qq.com>
Date: Tue, 4 Nov 2025 14:40:12 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dist/dev/mp-weixin/project.config.json    | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json
index 259a170..c937c3b 100644
--- a/unpackage/dist/dev/mp-weixin/project.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.config.json
@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -9,28 +10,20 @@
     "postcss": true,
     "minified": true,
     "newFeature": true,
-    "bigPackageSizeSupport": true
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
   },
   "compileType": "miniprogram",
-  "libVersion": "3.5.7",
+  "libVersion": "3.10.3",
   "appid": "wx9d1cbc11c8c40ba7",
   "projectname": "qingdao-employment-service",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
-    }
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }
\ No newline at end of file