From 0f374530a1591c066311494b899ca8c15fd81338 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Wed, 14 Jan 2026 00:01:27 +0800
Subject: [PATCH 01/38] 111

---
 pages/index/components/index-one.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 0f6e00b..478a0da 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -614,7 +614,7 @@ const isLoaded = ref(false);
 const isInitialized = ref(false); // 添加初始化标志
 
 const { columnCount, columnSpace } = useColumnCount(() => {
-    pageState.pageSize = 10 * (columnCount.value - 1);
+    pageState.pageSize = 10 * (columnCount.value - 1) + 10;
     
     // 只在首次初始化时调用，避免重复调用
     if (!isInitialized.value) {

From 74b9c32b033fbec40a51a6b6e0fb10e90563826b Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Wed, 14 Jan 2026 00:14:26 +0800
Subject: [PATCH 02/38] =?UTF-8?q?=E4=B8=80=E4=BD=93=E6=9C=BA=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=BB=91=E5=8A=A8=E4=BF=AE=E6=94=B9=E3=80=81=E7=AE=80?=
 =?UTF-8?q?=E5=8E=86=E7=9F=A5=E9=81=93=E9=A1=B5=E9=9D=A2=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=88=B6=E4=BD=9C=E7=AE=80=E5=8E=86=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/resume-guide/resume-guide.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pages/resume-guide/resume-guide.vue b/pages/resume-guide/resume-guide.vue
index 8b1ac4a..1630227 100644
--- a/pages/resume-guide/resume-guide.vue
+++ b/pages/resume-guide/resume-guide.vue
@@ -49,9 +49,11 @@
 
       <!-- 行动按钮 -->
       <view class="action-buttons">
+        <!-- #ifdef MP-WEIXIN -->
         <view class="primary-button button-click" @click="startCreateResume">
           开始制作简历
         </view>
+        <!-- #endif -->
         <view class="secondary-button button-click" @click="viewExampleResume">
           查看简历示例
         </view>

From 33faac2ff250709665177ca2a9c8c84f6a040720 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Wed, 14 Jan 2026 12:19:04 +0800
Subject: [PATCH 03/38] =?UTF-8?q?=E4=B8=80=E4=BD=93=E6=9C=BA=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=96=AA=E9=85=AC=E4=BF=A1=E6=81=AF=E3=80=81=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E7=9A=84=E6=97=B6=E5=80=99=E5=A2=9E=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=8D=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/components/index-one.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 478a0da..0fbff41 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -75,9 +75,9 @@
             <!-- H5端专用按钮 -->
             <!-- #ifdef H5 -->
             <view class="h5-action-buttons" v-if="shouldShowJobSeekerContent">
-                <view class="h5-action-btn press-button" @click="handleH5SalaryClick">
+                <!-- <view class="h5-action-btn press-button" @click="handleH5SalaryClick">
                     <view class="btn-text">薪酬信息</view>
-                </view>
+                </view> -->
                 <view class="h5-action-btn press-button" @click="handleServiceClick('resume-creation')">
                     <view class="btn-text">简历指导</view>
                 </view>
@@ -996,7 +996,7 @@ function getJobRecommend(type = 'add') {
         if (waterfallsFlowRef.value) waterfallsFlowRef.value.refresh();
     }
     let params = {
-        pageSize: pageState.pageSize,
+        pageSize: pageState.pageSize + 10,
         sessionId: useUserStore().seesionId,
         ...pageState.search,
         ...conditionSearch.value,
@@ -1084,7 +1084,7 @@ function getJobList(type = 'add') {
     $api.createRequest('/app/job/list', params).then((resData) => {
         const { rows, total } = resData;
         if (type === 'add') {
-            const str = pageState.pageSize * (pageState.page - 1);
+            const str = pageState.pageSize * (pageState.page - 1) + 10;
             const end = list.value.length;
             const reslist = dataToImg(rows);
             list.value.splice(str, end, ...reslist);

From d8bd4e7759084a275706bb4e00182ec3d7bd3e68 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Wed, 14 Jan 2026 14:25:05 +0800
Subject: [PATCH 04/38] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageA/pages/UnitDetails/UnitDetails.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packageA/pages/UnitDetails/UnitDetails.vue b/packageA/pages/UnitDetails/UnitDetails.vue
index 2cf6817..1a6e958 100644
--- a/packageA/pages/UnitDetails/UnitDetails.vue
+++ b/packageA/pages/UnitDetails/UnitDetails.vue
@@ -25,9 +25,7 @@
 			</view>
 			<view class="conetent-info" :class="{ expanded: isExpanded }">
 				<view class="info-title">公司介绍</view>
-				<view class="info-desirption">{{
-          companyInfo?.description || '暂无公司介绍'
-        }}</view>
+				<view class="info-desirption" v-html="companyInfo?.description"></view>
 				<!-- <view class="info-title title2">公司地址</view>
                 <view class="locationCompany"></view> -->
 			</view>
@@ -443,8 +441,13 @@
 				font-size: 28rpx;
 				color: #495265;
 				text-align: justified;
+				:deep(span) {
+					background-color: transparent !important;
+				}
+				:deep(p > span) {
+					background-color: transparent !important;
+				}
 			}
-
 			.title2 {
 				margin-top: 48rpx;
 			}

From daa2ce254add381bb21ba633fb826f8bb24f34a3 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Wed, 14 Jan 2026 17:44:38 +0800
Subject: [PATCH 05/38] 11

---
 pages/mine/company-info.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pages/mine/company-info.vue b/pages/mine/company-info.vue
index 52a71a3..1a6a3c8 100644
--- a/pages/mine/company-info.vue
+++ b/pages/mine/company-info.vue
@@ -5,7 +5,7 @@
             <view class="avatar-label">编辑信息</view>
             <view class="avatar-container">
                 <image class="company-avatar" :src="companyInfo.avatar || '/static/imgs/avatar.jpg'"></image>
-                <uni-icons color="#A2A2A2" type="right" size="16"></uni-icons>
+                <!-- <uni-icons color="#A2A2A2" type="right" size="16"></uni-icons> -->
             </view>
         </view>
 
@@ -15,7 +15,7 @@
                 <view class="info-label">企业名称</view>
                 <view class="info-content">
                     <text class="info-value">{{ companyInfo.name || '暂无公司名称' }}</text>
-                    <uni-icons color="#A2A2A2" type="right" size="16"></uni-icons>
+                    <!-- <uni-icons color="#A2A2A2" type="right" size="16"></uni-icons> -->
                 </view>
             </view>
 
@@ -23,7 +23,7 @@
                 <view class="info-label">统一社会代码</view>
                 <view class="info-content">
                     <text class="info-value">{{ companyInfo.socialCode || '暂无统一社会代码' }}</text>
-                    <uni-icons color="#A2A2A2" type="right" size="16"></uni-icons>
+                    <!-- <uni-icons color="#A2A2A2" type="right" size="16"></uni-icons> -->
                 </view>
             </view>
 
@@ -31,7 +31,7 @@
                 <view class="info-label">企业注册地点</view>
                 <view class="info-content">
                     <text class="info-value">{{ companyInfo.location || '暂无注册地点' }}</text>
-                    <uni-icons color="#A2A2A2" type="right" size="16"></uni-icons>
+                    <!-- <uni-icons color="#A2A2A2" type="right" size="16"></uni-icons> -->
                 </view>
             </view>
 
@@ -39,7 +39,7 @@
                 <view class="info-label">企业信息介绍</view>
                 <view class="info-content">
                     <text class="info-value">{{ companyInfo.description || '暂无企业介绍' }}</text>
-                    <uni-icons color="#A2A2A2" type="right" size="16"></uni-icons>
+                    <!-- <uni-icons color="#A2A2A2" type="right" size="16"></uni-icons> -->
                 </view>
             </view>
 
@@ -47,7 +47,7 @@
                 <view class="info-label">企业法人姓名</view>
                 <view class="info-content">
                     <text class="info-value">{{ companyInfo.legalPerson || '暂无法人信息' }}</text>
-                    <uni-icons color="#A2A2A2" type="right" size="16"></uni-icons>
+                    <!-- <uni-icons color="#A2A2A2" type="right" size="16"></uni-icons> -->
                 </view>
             </view>
 

From cc6da8adfd1ffae7c65c85878d86b9414e870154 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Wed, 14 Jan 2026 18:46:13 +0800
Subject: [PATCH 06/38] =?UTF-8?q?H5=E7=8E=AF=E5=A2=83=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue    | 12 +++++++++++-
 pages/login/h5-login.vue |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index b32f937..6e7bbfa 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -19,10 +19,20 @@ import IndexOne from './components/index-one.vue';
 // import IndexTwo from './components/index-two.vue';
 import { storeToRefs } from 'pinia';
 import { useReadMsg } from '@/stores/useReadMsg';
+import useUserStore from '@/stores/useUserStore';
 import { tabbarManager } from '@/utils/tabbarManager';
 const { unreadCount } = storeToRefs(useReadMsg());
+const userStore = useUserStore();
 
-onLoad(() => {
+onLoad((options) => {
+    // H5环境下从URL获取token并自动登录
+    // #ifdef H5
+        const token = options.token || '';
+        alert(token)
+        if (token) {
+            userStore.loginSetToken(token);
+        }
+    // #endif
     // useReadMsg().fetchMessages();
 });
 
diff --git a/pages/login/h5-login.vue b/pages/login/h5-login.vue
index cd58ace..41eb30c 100644
--- a/pages/login/h5-login.vue
+++ b/pages/login/h5-login.vue
@@ -194,7 +194,7 @@ const handleLogin = async () => {
 				icon: 'success'
 			})
 			// window.location.assign('http://222.80.110.161:11111/mechine-dual-vue/login')
-			window.location.assign('https://www.xjksly.cn/mechine-single-vue/login')
+			// window.location.assign('https://www.xjksly.cn/mechine-single-vue/login')
 			// // 跳转到首页
 			// uni.reLaunch({
 			// 	url: '/pages/index/index'

From 30e3804dfa51a7103a9ddec1bc945802f3f2c98d Mon Sep 17 00:00:00 2001
From: lip <1040791966@qq.com>
Date: Wed, 14 Jan 2026 21:26:21 +0800
Subject: [PATCH 07/38] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=BF=E7=AD=96?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageB/priority/recommend.vue       | 1 -
 packageRc/pages/index/index.vue       | 8 +++-----
 packageRc/pages/policy/policyList.vue | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packageB/priority/recommend.vue b/packageB/priority/recommend.vue
index d9fc6f7..a127a6d 100644
--- a/packageB/priority/recommend.vue
+++ b/packageB/priority/recommend.vue
@@ -93,7 +93,6 @@
           {{ item.zcmc }}</view
         >
         <view class="infos">
-          <view v-if="item.zclx">{{ item.zclx }}</view>
           <view v-if="item.zcLevel">{{ item.zcLevel }}</view>
           <view v-if="item.sourceUnit">{{ item.sourceUnit }}</view>
         </view>
diff --git a/packageRc/pages/index/index.vue b/packageRc/pages/index/index.vue
index 6d9ff81..16d62f2 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-12-08 16:10:47
+ * @LastEditors: lip
+ * @LastEditTime: 2026-01-14 21:21:21
 -->
 <template>
   <!-- @scroll="handleScroll" @scrolltolower="scrollBottom" -->
@@ -72,13 +72,11 @@
           <image src="../../../packageRc/static/zcLeft.png"/>
           {{item.zcmc}}</view>
         <view class="infos">
-          <view v-if="item.zclx">{{item.zclx}}</view>
           <view v-if="item.zcLevel">{{item.zcLevel}}</view>
           <view v-if="item.sourceUnit">{{item.sourceUnit}}</view>
         </view>
         <view class="bottom-line">
           <view><uni-icons color="#A2A2A2" type="info" size="12"></uni-icons>发布日期：{{item.createTime}}</view>
-          <view>浏览数<text style="color: #6AA7E8">{{item.viewNum}}</text></view>
         </view>
       </view>
     </view>
@@ -92,7 +90,7 @@ const { $api, navTo, vacanciesTo, formatTotal, config } = inject('globalFunction
 import { getPolicyList } from '@/packageRc/apiRc/policy';
 let policyList = ref([])
 function getPolicy() {
-  getPolicyList({pageNum: 1, pageSize: 10}).then(res => {
+  getPolicyList({pageNum: 1, pageSize: 10,zclx:'1'}).then(res => {
     policyList.value = res.rows
   })
 }
diff --git a/packageRc/pages/policy/policyList.vue b/packageRc/pages/policy/policyList.vue
index ebbaa68..85402e1 100644
--- a/packageRc/pages/policy/policyList.vue
+++ b/packageRc/pages/policy/policyList.vue
@@ -22,7 +22,6 @@
             <image src="../../../packageRc/static/zcLeft.png"/>
             {{item.zcmc}}</view>
           <view class="infos">
-            <view v-if="item.zclx">{{item.zclx}}</view>
             <view v-if="item.zcLevel">{{item.zcLevel}}</view>
             <view v-if="item.sourceUnit">{{item.sourceUnit}}</view>
           </view>
@@ -162,6 +161,7 @@ import { getPolicyList } from "@/packageRc/apiRc/policy";
 			// 获取列表
 			async getList() {
 				this.loading = true;
+				this.queryParams.zclx ='1';
         getPolicyList(this.queryParams).then((res) => {
           this.gettedData(res)
         });

From 0cfe2d544871d01823f6bedf312732769079fb20 Mon Sep 17 00:00:00 2001
From: lip <1040791966@qq.com>
Date: Wed, 14 Jan 2026 21:33:36 +0800
Subject: [PATCH 08/38] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=AF=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageRc/pages/index/index.vue       | 4 ++--
 packageRc/pages/policy/policyList.vue | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packageRc/pages/index/index.vue b/packageRc/pages/index/index.vue
index 16d62f2..6c8799c 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: 2026-01-14 21:21:21
+ * @LastEditTime: 2026-01-14 21:33:18
 -->
 <template>
   <!-- @scroll="handleScroll" @scrolltolower="scrollBottom" -->
@@ -96,7 +96,7 @@ function getPolicy() {
 }
 
 function toPolicyList() {
-  navTo(`/packageRc/pages/policy/policyList`)
+  navTo(`/packageRc/pages/policy/policyList?zclx=1`)
 }
 function toPolicyDetail(item) {
   navTo(`/packageRc/pages/policy/policyDetail?id=${item.id}`)
diff --git a/packageRc/pages/policy/policyList.vue b/packageRc/pages/policy/policyList.vue
index 85402e1..64aba58 100644
--- a/packageRc/pages/policy/policyList.vue
+++ b/packageRc/pages/policy/policyList.vue
@@ -66,6 +66,10 @@ import { getPolicyList } from "@/packageRc/apiRc/policy";
 		onLoad() {
 			this.getCheckData()
 		},
+		onLoad(options) {
+			this.queryParams.zclx = options.zclx
+      		this.getCheckData(options.zclx);
+		},
 		onShow() {
 			this.search();
 		},
@@ -85,7 +89,7 @@ import { getPolicyList } from "@/packageRc/apiRc/policy";
 					}
 				}
 			},
-			async getCheckData() {
+			async getCheckData(zclx) {
 				let workExperienceYears
 				await this.$getDict('qcjy_gznx').then(res => {
 					workExperienceYears = res.data
@@ -161,7 +165,6 @@ import { getPolicyList } from "@/packageRc/apiRc/policy";
 			// 获取列表
 			async getList() {
 				this.loading = true;
-				this.queryParams.zclx ='1';
         getPolicyList(this.queryParams).then((res) => {
           this.gettedData(res)
         });

From d2653c8394ef5601d95a9865a0eeb35431562e4b Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Wed, 14 Jan 2026 22:02:07 +0800
Subject: [PATCH 09/38] =?UTF-8?q?token=E6=89=93=E5=8D=B0=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/components/index-one.vue | 14 +++++++++++++-
 pages/index/index.vue                |  9 ---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 0fbff41..a7a482f 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -81,9 +81,10 @@
                 <view class="h5-action-btn press-button" @click="handleServiceClick('resume-creation')">
                     <view class="btn-text">简历指导</view>
                 </view>
+                
             </view>
             <!-- #endif -->
-            
+            <view style="margin-top: 20rpx;padding:0 20px">token:{{myToken}}</view>
             <!-- 服务功能网格 -->
             <!-- #ifndef H5 -->
             <view class="service-grid" v-if="shouldShowJobSeekerContent">
@@ -746,6 +747,17 @@ const handleLoginSuccess = () => {
     //四级联动单点及权限
     getIsFourLevelLinkagePurview()
 };
+const myToken = ref('');
+// H5环境下从URL获取token并自动登录
+onLoad((options) => {
+    // #ifdef H5
+        const token = options.token || '';
+        myToken.value = token;
+        if (token) {
+            useUserStore().loginSetToken(token);
+        }
+    // #endif
+});
 
 // 处理附近工作点击
 const handleNearbyClick = () => {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6e7bbfa..c903289 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -23,16 +23,7 @@ import useUserStore from '@/stores/useUserStore';
 import { tabbarManager } from '@/utils/tabbarManager';
 const { unreadCount } = storeToRefs(useReadMsg());
 const userStore = useUserStore();
-
 onLoad((options) => {
-    // H5环境下从URL获取token并自动登录
-    // #ifdef H5
-        const token = options.token || '';
-        alert(token)
-        if (token) {
-            userStore.loginSetToken(token);
-        }
-    // #endif
     // useReadMsg().fetchMessages();
 });
 

From b7c54c3c2e17bf04c9767242dfe65bf5ac2fbc2e Mon Sep 17 00:00:00 2001
From: lip <1040791966@qq.com>
Date: Wed, 14 Jan 2026 22:23:48 +0800
Subject: [PATCH 10/38] =?UTF-8?q?zh=E6=94=BF=E7=AD=96=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageRc/pages/policy/policyList.vue | 67 +--------------------------
 1 file changed, 2 insertions(+), 65 deletions(-)

diff --git a/packageRc/pages/policy/policyList.vue b/packageRc/pages/policy/policyList.vue
index 64aba58..8b1aaed 100644
--- a/packageRc/pages/policy/policyList.vue
+++ b/packageRc/pages/policy/policyList.vue
@@ -6,16 +6,12 @@
 				<input style="width: 100%;" placeholder="请输入政策名称进行搜索" v-model="queryParams.searchValue" border="none" />
 				<img src="https://rc.jinan.gov.cn/qcwjyH5/static/images/person/search.png" class="search-icon" @click="search()" />
 			</view>
-			<!-- <view class="inner"
-				style="width: calc(100% + 64rpx);margin-left: -32rpx;height: 122rpx;position: relative;z-index: 2;">
-				<PopupList :checkData="checkData" @searchCheck="search" ref="PopupList" @popupSearch="popupSearch" />
-			</view> -->
 			<view v-if="total" style="position: relative;padding: 32rpx 0;color: #000;">
 			<!-- <view v-if="total" style="position: relative;padding-bottom: 16px;color: #000;"> -->
 				<text>共 {{ total }} 条</text>
 			</view>
 			<!-- <scroll-view :scroll-y="true" style="height: calc(100vh - 342rpx);position: relative;z-index: 1;" -->
-			<scroll-view :scroll-y="true" style="height: calc(100vh - 202rpx);position: relative;z-index: 1;"
+			<scroll-view :scroll-y="true" style="height: calc(100vh - 232rpx);position: relative;z-index: 1;"
 				@scrolltolower="getBottomList">
         <view style="margin-bottom: 24rpx;border-radius: 16rpx;" class="policy-list" v-for="(item, index) in tableData" :key="index" @click="goPolicyDetail(item)">
           <view class="title">
@@ -52,7 +48,6 @@ import { getPolicyList } from "@/packageRc/apiRc/policy";
 		},
 		data() {
 			return {
-				checkData: [],
 				queryParams: {
 					pageNum: 1,
 					pageSize: 10,
@@ -63,12 +58,8 @@ import { getPolicyList } from "@/packageRc/apiRc/policy";
 				loading: false,
 			}
 		},
-		onLoad() {
-			this.getCheckData()
-		},
 		onLoad(options) {
 			this.queryParams.zclx = options.zclx
-      		this.getCheckData(options.zclx);
 		},
 		onShow() {
 			this.search();
@@ -79,64 +70,10 @@ import { getPolicyList } from "@/packageRc/apiRc/policy";
 					url: `/packageRc/pages/policy/policyDetail?id=${item.id}`
 				})
 			},
-			getDictLabel(value, list) {
-				if (list) {
-					let arr = list.filter(ele => ele.dictValue == value)
-					if (arr.length) {
-						return arr[0].dictLabel
-					} else {
-						return '--'
-					}
-				}
-			},
-			async getCheckData(zclx) {
-				let workExperienceYears
-				await this.$getDict('qcjy_gznx').then(res => {
-					workExperienceYears = res.data
-				})
-				await this.$getDict('qcjy_xqlc').then(res => {
-					this.currentStatusList = res.data;
-					console.log(res.data)
-				})
-				this.checkData = [
-					{
-						name: "需求类型",
-						type: "demandType",
-						data: [{dictLabel: '求职需求', dictValue: '1'},{dictLabel: '创业需求', dictValue: '3'},{dictLabel: '培训需求', dictValue: '4'},{dictLabel: '其他需求', dictValue: '5'}],
-						activeIndex: 0,
-					},
-					{
-						name: "需求状态",
-						type: "currentStatus",
-						data: [{
-							dictLabel: '全部',
-							dictValue: ''
-						}].concat(this.currentStatusList),
-						activeIndex: 0,
-					},
-					// {
-					// 	name: "工作经验",
-					// 	type: "workExperienceYears",
-					// 	data: [{dictLabel: '全部', dictValue: ''}].concat(workExperienceYears),
-					// 	activeIndex: 0,
-					// },
-
-				];
-			},
-			popupSearch(queryParams) {
-				queryParams.forEach((item, index) => {
-					if (item.data[item.activeIndex].dictLabel == "全部") {
-						this.queryParams[item.type] = "";
-					} else {
-						this.queryParams[item.type] = item.data[item.activeIndex].dictValue;
-					}
-				});
-				this.search()
-			},
 			search() {
 				this.showMorePage = true;
 				this.queryParams.pageNum = 1;
-				this.queryParams.pageSize = 10;
+				this.queryParams.pageSize = 20;
 				this.tableData = [];
 				this.total = 0;
 				this.getList();

From 3246958704530bbda6194438b006e1338fded704 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Wed, 14 Jan 2026 22:27:54 +0800
Subject: [PATCH 11/38] 111

---
 pages/index/components/index-one.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index a7a482f..c4607a0 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -751,7 +751,7 @@ const myToken = ref('');
 // H5环境下从URL获取token并自动登录
 onLoad((options) => {
     // #ifdef H5
-        const token = options.token || '';
+        const token = options.token || uni.getStorageSync('zkr-token');
         myToken.value = token;
         if (token) {
             useUserStore().loginSetToken(token);

From a299608fcab1e709640e1fda694ad7ed6bdbdaa4 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Wed, 14 Jan 2026 23:07:09 +0800
Subject: [PATCH 12/38] =?UTF-8?q?=E6=8A=95=E9=80=92=E7=AE=80=E5=8E=86?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E9=AA=8C=E8=AF=81=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageA/pages/post/post.vue         |  6 +++++-
 pages/index/components/index-one.vue | 12 +-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/packageA/pages/post/post.vue b/packageA/pages/post/post.vue
index a6a4860..031d7bf 100644
--- a/packageA/pages/post/post.vue
+++ b/packageA/pages/post/post.vue
@@ -289,7 +289,6 @@ onShow(() => {
     }
     // #endif
 });
-
 function initLoad(option) {
     const jobId = decodeURIComponent(option.jobId);
     if (jobId !== jobIdRef.value) {
@@ -413,6 +412,11 @@ function getCompetivetuveness(jobId) {
 
 // 申请岗位
 function jobApply() {
+    const tokenValue = uni.getStorageSync('token') || '';
+    if (!tokenValue) {
+        $api.msg('请您先登录');
+        return;
+    }
     const jobId = jobInfo.value.jobId;
     $api.createRequest(`/app/job/apply/${jobId}`, {}, 'GET').then((resData) => {
             getDetail(jobId);
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index c4607a0..838b657 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -84,7 +84,6 @@
                 
             </view>
             <!-- #endif -->
-            <view style="margin-top: 20rpx;padding:0 20px">token:{{myToken}}</view>
             <!-- 服务功能网格 -->
             <!-- #ifndef H5 -->
             <view class="service-grid" v-if="shouldShowJobSeekerContent">
@@ -747,7 +746,6 @@ const handleLoginSuccess = () => {
     //四级联动单点及权限
     getIsFourLevelLinkagePurview()
 };
-const myToken = ref('');
 // H5环境下从URL获取token并自动登录
 onLoad((options) => {
     // #ifdef H5
@@ -890,15 +888,7 @@ function clearfindJob(job) {
 }
 
 function nextDetail(job) {
-    // 登录检查
-    if (checkLogin()) {
-        // 记录岗位类型，用作数据分析
-        if (job.jobCategory) {
-            const recordData = recommedIndexDb.JobParameter(job);
-            recommedIndexDb.addRecord(recordData);
-        }
-        navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}`);
-    }
+    navTo(`/packageA/pages/post/post?jobId=${encodeURIComponent(job.jobId)}`);
 }
 
 function navToService(serviceType) {

From a663010b61140cfb2b076ed127121d8db4d5bbc2 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Thu, 15 Jan 2026 19:59:55 +0800
Subject: [PATCH 13/38] =?UTF-8?q?=E5=9C=A8=E6=8B=9B=E8=81=8C=E4=BD=8D?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageA/pages/UnitDetails/UnitDetails.vue |  4 ++++
 packageA/pages/jobExpect/jobExpect.vue     | 10 ++++-----
 packageA/pages/myResume/myResume.vue       |  2 +-
 packageA/pages/post/post.vue               | 24 ++++++++++++++++++----
 pages/complete-info/complete-info.vue      | 10 ++++-----
 pages/index/components/index-one.vue       | 15 ++------------
 6 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/packageA/pages/UnitDetails/UnitDetails.vue b/packageA/pages/UnitDetails/UnitDetails.vue
index 1a6e958..13e4745 100644
--- a/packageA/pages/UnitDetails/UnitDetails.vue
+++ b/packageA/pages/UnitDetails/UnitDetails.vue
@@ -140,6 +140,8 @@
 					isCollection: resData.data.isCollection || 0,
 					jobList: resData.data.jobList || [] // 使用正确的jobList字段
 				};
+				// 将职位列表数据赋值给jobInfoList，用于页面渲染
+				jobInfoList.value = resData.data.jobList || [];
 				console.log('Company details loaded successfully');
 			} else {
 				console.error('Failed to load company details:', resData?.msg || 'Unknown error');
@@ -151,6 +153,7 @@
 					isCollection: 0,
 					jobList: []
 				};
+				jobInfoList.value = [];
 			}
 		}).catch((error) => {
 			console.error('API error when fetching company details:', error);
@@ -162,6 +165,7 @@
 				isCollection: 0,
 				jobList: []
 			};
+			jobInfoList.value = [];
 		});
 	}
 
diff --git a/packageA/pages/jobExpect/jobExpect.vue b/packageA/pages/jobExpect/jobExpect.vue
index 7542a16..708e47c 100644
--- a/packageA/pages/jobExpect/jobExpect.vue
+++ b/packageA/pages/jobExpect/jobExpect.vue
@@ -67,9 +67,9 @@ const { dictLabel, oneDictData, getDictData } = useDictStore();
 const selectJobsModel = ref();
 const selectPopupRef = ref();
 const percent = ref('0%');
-const salay = [2, 5, 10, 15, 20, 25, 30, 50, 80, 100];
+const salay = [2000, 5000, 10000, 15000, 20000, 25000, 30000, 50000, 80000, 100000];
 const state = reactive({
-    lfsalay: [2, 5, 10, 15, 20, 25, 30, 50],
+    lfsalay: [2000, 5000, 10000, 15000, 20000, 25000, 30000, 50000],
     risalay: JSON.parse(JSON.stringify(salay)),
     salayText: '',
     areaText: '',
@@ -137,10 +137,10 @@ const changeSalary = () => {
         title: '薪资',
         maskClick: true,
         data: [state.lfsalay, state.risalay],
-        unit: 'k',
+        unit: '元',
         success: (_, [min, max]) => {
-            fromValue.salaryMin = min.value * 1000;
-            fromValue.salaryMax = max.value * 1000;
+            fromValue.salaryMin = min.value;
+            fromValue.salaryMax = max.value;
             state.salayText = `${fromValue.salaryMin}-${fromValue.salaryMax}`;
         },
         change(e) {
diff --git a/packageA/pages/myResume/myResume.vue b/packageA/pages/myResume/myResume.vue
index babf046..1079235 100644
--- a/packageA/pages/myResume/myResume.vue
+++ b/packageA/pages/myResume/myResume.vue
@@ -51,7 +51,7 @@
             </view>
             <view class="mys-text">
                 <text>期望薪资：</text>
-                <text>{{ userInfo.salaryMin / 1000 }}k-{{ userInfo.salaryMax / 1000 }}k</text>
+                <text>{{ userInfo.salaryMin }}元-{{ userInfo.salaryMax }}元</text>
             </view>
             <view class="mys-text">
                 <text>期望工作地：</text>
diff --git a/packageA/pages/post/post.vue b/packageA/pages/post/post.vue
index 031d7bf..16514e1 100644
--- a/packageA/pages/post/post.vue
+++ b/packageA/pages/post/post.vue
@@ -107,7 +107,7 @@
                     <text class="title">公司信息</text>
                     <text
                         class="btntext button-click"
-                        @click="navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${jobInfo.company.companyId}`)"
+                        @click="handleCompanyDetailClick"
                     >
                         单位详情
                     </text>
@@ -340,9 +340,14 @@ function getDetail(jobId) {
 }
 
 function getCompanyIsAJobs(companyId) {
-    $api.createRequest(`/app/company/count/${companyId}`).then((resData) => {
-        companyCount.value = resData.data;
-    });
+    if (companyId) {
+        $api.createRequest(`/app/company/count/${companyId}`).then((resData) => {
+            companyCount.value = resData.data;
+        });
+    }
+    // $api.createRequest(`/app/company/count/${companyId}`).then((resData) => {
+    //     companyCount.value = resData.data;
+    // });
 }
 
 function getTextWidth(text, size = 12) {
@@ -508,6 +513,17 @@ function previewImage(url, index) {
 function viewResume(userId) {
     navTo(`/packageA/pages/resumeDetail/resumeDetail?userId=${userId}`);
 }
+
+// 处理查看单位详情
+function handleCompanyDetailClick() {
+    // console.log('----企业ID--', jobInfo.value.company?.companyId)
+    // console.log('----企业data--', jobInfo.value)
+    if (jobInfo.value.company?.companyId) {
+        navTo(`/packageA/pages/UnitDetails/UnitDetails?companyId=${jobInfo.value.company.companyId}`);
+    } else {
+        $api.msg('没有企业信息');
+    }
+}
 </script>
 
 <style lang="stylus" scoped>
diff --git a/pages/complete-info/complete-info.vue b/pages/complete-info/complete-info.vue
index fbbc7e5..88bcf8a 100644
--- a/pages/complete-info/complete-info.vue
+++ b/pages/complete-info/complete-info.vue
@@ -268,11 +268,11 @@ const openSelectPopup = (config) => {
     // #endif
 };
 const tabCurrent = ref(1);
-const salay = [2, 5, 10, 15, 20, 25, 30, 50, 80, 100];
+const salay = [2000, 5000, 10000, 15000, 20000, 25000, 30000, 50000, 80000, 100000];
 const state = reactive({
     station: [],
     stationCateLog: 1,
-    lfsalay: [2, 5, 10, 15, 20, 25, 30, 50],
+    lfsalay: [2000, 5000, 10000, 15000, 20000, 25000, 30000, 50000],
     risalay: JSON.parse(JSON.stringify(salay)),
     areaText: '',
     educationText: '',
@@ -614,10 +614,10 @@ function changeSalay() {
         title: '薪资',
         maskClick: true,
         data: [state.lfsalay, state.risalay],
-        unit: 'k',
+        unit: '元',
         success: (_, [min, max]) => {
-            fromValue.salaryMin = min.value * 1000;
-            fromValue.salaryMax = max.value * 1000;
+            fromValue.salaryMin = min.value;
+            fromValue.salaryMax = max.value;
             state.salayText = `${fromValue.salaryMin}-${fromValue.salaryMax}`;
         },
         change(e) {
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 838b657..9e29425 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -148,12 +148,12 @@
                     </view>
                     <view class="service-title">职业规划推荐</view>
                 </view>
-                <view class="service-item press-button" @click="handleSalaryInfoClick">
+                <!-- <view class="service-item press-button" @click="handleSalaryInfoClick">
                     <view class="service-icon service-icon-12">
                         <span style="display:block;width:40rpx;height:40rpx;border-radius:100%;border:4rpx #ffffff solid;line-height:40rpx;text-align:center;">￥</span>
                     </view>
                     <view class="service-title">薪酬信息</view>
-                </view>
+                </view> -->
                 <view class="service-item press-button" @click="handleJobFairClick">
                     <view class="service-icon service-icon-1">
                         <uni-icons type="shop" size="32" color="#FFFFFF"></uni-icons>
@@ -804,17 +804,6 @@ const handleLiveClick = () => {
 const handleSalaryInfoClick = () => {
     navTo('/pages/service/salary-info');
 };
-const handleJobFairClick = () => {
-    navTo('/pages/careerfair/careerfair');
-};
-const handleH5SalaryClick = () => {
-    const salaryUrl = "https://www.mohrss.gov.cn/SYrlzyhshbzb/laodongguanxi_/fwyd/202506/t20250627_544623.html";
-    window.location.assign(salaryUrl);
-};
-// 处理帮扶
-const helpClick = () => {
-    navTo('/packageB/priority/helpFilter');
-};
 async function loadData() {
     try {
         if (isLoaded.value) return;

From 07c84cef8a863036486b9a0b96d5f48bdce9761d Mon Sep 17 00:00:00 2001
From: lijie_ycrj <1540286404@qq.com>
Date: Fri, 16 Jan 2026 09:38:44 +0800
Subject: [PATCH 14/38] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E5=9F=B9=E8=AE=AD?=
 =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=8F=8A=E5=85=AC=E5=91=8A=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageB/institution/evaluationAgency.vue    | 400 +++++++++++++++++++
 packageB/institution/trainingInstitution.vue | 400 +++++++++++++++++++
 packageB/notice/index.vue                    | 400 +++++++++++++++++++
 pages.json                                   |  20 +-
 pages/index/components/index-one.vue         |  37 +-
 5 files changed, 1255 insertions(+), 2 deletions(-)
 create mode 100644 packageB/institution/evaluationAgency.vue
 create mode 100644 packageB/institution/trainingInstitution.vue
 create mode 100644 packageB/notice/index.vue

diff --git a/packageB/institution/evaluationAgency.vue b/packageB/institution/evaluationAgency.vue
new file mode 100644
index 0000000..7546523
--- /dev/null
+++ b/packageB/institution/evaluationAgency.vue
@@ -0,0 +1,400 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="info-box">
+			<view class="info-item info-line">
+				<image class="info-img" :src="baseUrl+'/dispatch/person-icon.png'" mode=""></image>
+				<view class="info-label">
+					人员姓名
+				</view>
+				<view class="info-value">
+					{{personInfo.name}}
+				</view>
+			</view>
+			<view class="info-item">
+				<image class="info-img" :src="baseUrl+'/dispatch/help-icon.png'" mode=""></image>
+				<view class="info-label">
+					帮扶类型
+				</view>
+				<view class="info-value">
+					{{personInfo.taskType}}
+				</view>
+			</view>
+		</view>
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>新增跟进记录</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+			
+            <view class="form-container">
+                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
+                  <!-- 跟进日期 -->
+                  <uni-forms-item label="跟进日期：" name="followDate" required >
+					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.followDate" @change="onFollowDateChange" />
+                  </uni-forms-item>
+            
+                  <!-- 跟进方式 -->
+                  <uni-forms-item label="跟进方式：" name="followWay" required >
+					  <uni-data-select v-model="formData.followWay" placeholder="请选择跟进方式" :localdata="followWays" @change="onMethodChange"></uni-data-select>
+                  </uni-forms-item>
+            
+                  <!-- 跟进内容 -->
+                  <uni-forms-item label="跟进内容：" name="content" required>
+					  <uni-easyinput type="textarea" v-model="formData.content" placeholder="请输入跟进内容"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 跟进结果 -->
+                  <uni-forms-item label="跟进结果：" name="result" required>
+					  <uni-easyinput type="textarea" v-model="formData.result" placeholder="请输入跟进结果"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 下一步计划 -->
+                  <uni-forms-item label="下一步计划：" name="nextPlan">
+					  <uni-easyinput type="textarea" v-model="formData.nextPlan" placeholder="请输入下一步计划（可选）"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 下次联系时间 -->
+                  <uni-forms-item label="下次联系：" name="nextContactDate" >
+					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.nextContactDate" @change="onDateChange" />
+                  </uni-forms-item>
+                </uni-forms>
+            
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleSubmit">保存跟进</button>
+                  <button class="btn reset-btn"  @click="handleReset">重置</button>
+                </view>
+			</view>
+        </view>
+		<view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>跟进历史记录</text>
+					<view class="title-line"></view>
+				</view>
+				<view class="title-total">
+					共<text class="total-num">{{followListNum}}</text>条记录
+				</view>
+			</view>
+			<view class="list-box" v-if="followListNum>0">
+				<uni-steps :options="followList" active-color="#007AFF" :active="active" direction="column" />
+			</view>
+			<empty v-else pdTop="200"></empty>
+		</view>
+    </AppLayout>
+</template>
+
+<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 title = ref('');
+const formData = reactive({
+  goalPersonId:'',
+  followDate: '',
+  followWay: '',
+  content: '',
+  result: '',
+  nextPlan: '',
+  nextContactDate: ''
+})
+const personInfo=ref({
+	goalPersonId:'',
+	name:'',
+	taskType:'',
+	task_id:''
+})
+const followWays = ref([])
+const followList = ref([])
+const followListNum=ref(0)
+const active=ref(null)
+// 表单引用
+const formRef = ref(null)
+
+// 校验规则
+const rules = {
+	followDate: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择跟进日期'
+		}]
+	},
+	followWay: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择跟进方式'
+		}]
+	},
+	content: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写跟进内容'
+		}]
+	},
+	result: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写跟进结果'
+		}]
+	}
+}
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+
+const onFollowDateChange = (e)=>{
+	formData.followDate=e
+}
+const onMethodChange = (e) => {
+	formData.followWay=e
+}
+// 事件处理
+const onDateChange = ( e) => {
+  formData.nextContactDate=e
+}
+function getFollowList(){
+	let header={
+		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		personId:personInfo.value.person_id,
+		taskId:personInfo.value.task_id
+	}
+	$api.myRequest('/dispatch/assist/records/getFollowList', params,'get',9100,header).then((resData) => {
+		console.log("resData",resData)
+		if(resData && resData.code == 200){
+			if(resData.data && resData.data.length>0){
+				followListNum.value=resData.data.length
+				resData.data.forEach(item=>{
+					const obj={
+						title:item.followDate,
+						desc:`跟进方式：${getFollowWaysLabelByValue(item.followWay)}\n跟进人：${item.createByName}\n跟进内容：${item.content}`
+					}
+					followList.value.push(obj)
+				})
+			}
+			
+		}
+	});
+}
+
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/assist_follow_way').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				followWays.value.push(obj)
+			})
+		}
+	});
+}
+function getFollowWaysLabelByValue(value) {
+	if (!Array.isArray(followWays.value)) {
+	    return ''
+	  }
+	  const item = followWays.value.find(item => item.value === String(value))
+	  return item ? item.text : '暂无跟进方式'
+}
+const handleSubmit = () => {
+  formRef.value?.validate()
+    .then(() => {
+		let header={
+			'Authorization':uni.getStorageSync('fourLevelLinkage-token')
+		}
+		formData.goalPersonId=personInfo.value.goalPersonId
+		$api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => {
+			console.log("resData",resData)
+			if(resData && resData.code == 200){
+				handleReset()
+				uni.showToast({
+				  title: '保存成功',
+				  icon: 'success',
+				  duration: 2000 
+				});
+			}else{
+				uni.showToast({
+				  title: resData.msg,
+				  icon: 'none',
+				  duration: 2000
+				});
+			}
+			
+		});
+    })
+    .catch((errors) => {
+      console.log('校验失败:', errors);
+    });
+};
+
+const handleReset = () => {
+	  formData.followDate = '';
+	  formData.followWay = '';
+	  formData.content = '';
+	  formData.result = '';
+	  formData.nextPlan = '';
+	  formData.nextContactDate = '';
+}
+onLoad((options) => {
+	personInfo.value.person_id=options.person_id
+	personInfo.value.name=options.name
+	personInfo.value.taskType=options.taskType
+	personInfo.value.task_id=options.task_id
+	getDictionary()
+	getFollowList()
+});
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.info-box
+  margin: 30rpx 30rpx
+  background: linear-gradient(0deg, #D9ECFF 0%, #F0F7FF 100%)
+  border-radius: 20rpx
+  padding: 40rpx 0
+  display: flex
+  align-items: center
+.info-img
+  width: 40rpx
+  height: 40rpx
+  margin-bottom: 20rpx
+.info-line
+  border-right: 2rpx solid #B7D6FF
+.info-item
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  width: 50%
+.info-label
+  font-size: 26rpx
+  color: #6E7E9B
+  margin-bottom: 20rpx
+.info-value
+  font-weight: bold
+  font-size: 28rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+.list-box
+  margin-top: 40rpx
+
+.form-container 
+  margin-top: 30rpx
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+:deep(.uni-steps__column-circle )
+  width: 24rpx !important
+  height: 24rpx !important
+  background: radial-gradient(circle, 
+    #00C0FA 0%, 
+    #015EEA 50%, 
+    #FFFFFF 51%,  
+    #FFFFFF 100%) !important
+  border-radius: 50%
+  border: 2rpx solid #015EEA
+:deep(.uni-steps__column-title)
+  font-size: 28rpx !important
+  color: #006CFF !important
+  margin-bottom: 24rpx
+:deep(.uni-steps__column-desc)
+  font-size: 28rpx
+  color: #898989 !important
+  line-height: 1.5
+:deep(.uni-steps__column-text )
+  padding: 16rpx 0 !important
+  border: none
+:deep(.uni-steps__column-line)
+  background-color: #368BFF !important
+:deep(.uni-steps__column-line--before)
+  background-color:rgba(0,0,0,0) !important
+:deep(.uni-date-x)
+  background: rgba(0,0,0,0) !important
+:deep(.uni-stat-box)
+  background: rgba(0,0,0,0) !important
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>
diff --git a/packageB/institution/trainingInstitution.vue b/packageB/institution/trainingInstitution.vue
new file mode 100644
index 0000000..7546523
--- /dev/null
+++ b/packageB/institution/trainingInstitution.vue
@@ -0,0 +1,400 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="info-box">
+			<view class="info-item info-line">
+				<image class="info-img" :src="baseUrl+'/dispatch/person-icon.png'" mode=""></image>
+				<view class="info-label">
+					人员姓名
+				</view>
+				<view class="info-value">
+					{{personInfo.name}}
+				</view>
+			</view>
+			<view class="info-item">
+				<image class="info-img" :src="baseUrl+'/dispatch/help-icon.png'" mode=""></image>
+				<view class="info-label">
+					帮扶类型
+				</view>
+				<view class="info-value">
+					{{personInfo.taskType}}
+				</view>
+			</view>
+		</view>
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>新增跟进记录</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+			
+            <view class="form-container">
+                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
+                  <!-- 跟进日期 -->
+                  <uni-forms-item label="跟进日期：" name="followDate" required >
+					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.followDate" @change="onFollowDateChange" />
+                  </uni-forms-item>
+            
+                  <!-- 跟进方式 -->
+                  <uni-forms-item label="跟进方式：" name="followWay" required >
+					  <uni-data-select v-model="formData.followWay" placeholder="请选择跟进方式" :localdata="followWays" @change="onMethodChange"></uni-data-select>
+                  </uni-forms-item>
+            
+                  <!-- 跟进内容 -->
+                  <uni-forms-item label="跟进内容：" name="content" required>
+					  <uni-easyinput type="textarea" v-model="formData.content" placeholder="请输入跟进内容"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 跟进结果 -->
+                  <uni-forms-item label="跟进结果：" name="result" required>
+					  <uni-easyinput type="textarea" v-model="formData.result" placeholder="请输入跟进结果"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 下一步计划 -->
+                  <uni-forms-item label="下一步计划：" name="nextPlan">
+					  <uni-easyinput type="textarea" v-model="formData.nextPlan" placeholder="请输入下一步计划（可选）"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 下次联系时间 -->
+                  <uni-forms-item label="下次联系：" name="nextContactDate" >
+					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.nextContactDate" @change="onDateChange" />
+                  </uni-forms-item>
+                </uni-forms>
+            
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleSubmit">保存跟进</button>
+                  <button class="btn reset-btn"  @click="handleReset">重置</button>
+                </view>
+			</view>
+        </view>
+		<view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>跟进历史记录</text>
+					<view class="title-line"></view>
+				</view>
+				<view class="title-total">
+					共<text class="total-num">{{followListNum}}</text>条记录
+				</view>
+			</view>
+			<view class="list-box" v-if="followListNum>0">
+				<uni-steps :options="followList" active-color="#007AFF" :active="active" direction="column" />
+			</view>
+			<empty v-else pdTop="200"></empty>
+		</view>
+    </AppLayout>
+</template>
+
+<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 title = ref('');
+const formData = reactive({
+  goalPersonId:'',
+  followDate: '',
+  followWay: '',
+  content: '',
+  result: '',
+  nextPlan: '',
+  nextContactDate: ''
+})
+const personInfo=ref({
+	goalPersonId:'',
+	name:'',
+	taskType:'',
+	task_id:''
+})
+const followWays = ref([])
+const followList = ref([])
+const followListNum=ref(0)
+const active=ref(null)
+// 表单引用
+const formRef = ref(null)
+
+// 校验规则
+const rules = {
+	followDate: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择跟进日期'
+		}]
+	},
+	followWay: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择跟进方式'
+		}]
+	},
+	content: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写跟进内容'
+		}]
+	},
+	result: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写跟进结果'
+		}]
+	}
+}
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+
+const onFollowDateChange = (e)=>{
+	formData.followDate=e
+}
+const onMethodChange = (e) => {
+	formData.followWay=e
+}
+// 事件处理
+const onDateChange = ( e) => {
+  formData.nextContactDate=e
+}
+function getFollowList(){
+	let header={
+		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		personId:personInfo.value.person_id,
+		taskId:personInfo.value.task_id
+	}
+	$api.myRequest('/dispatch/assist/records/getFollowList', params,'get',9100,header).then((resData) => {
+		console.log("resData",resData)
+		if(resData && resData.code == 200){
+			if(resData.data && resData.data.length>0){
+				followListNum.value=resData.data.length
+				resData.data.forEach(item=>{
+					const obj={
+						title:item.followDate,
+						desc:`跟进方式：${getFollowWaysLabelByValue(item.followWay)}\n跟进人：${item.createByName}\n跟进内容：${item.content}`
+					}
+					followList.value.push(obj)
+				})
+			}
+			
+		}
+	});
+}
+
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/assist_follow_way').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				followWays.value.push(obj)
+			})
+		}
+	});
+}
+function getFollowWaysLabelByValue(value) {
+	if (!Array.isArray(followWays.value)) {
+	    return ''
+	  }
+	  const item = followWays.value.find(item => item.value === String(value))
+	  return item ? item.text : '暂无跟进方式'
+}
+const handleSubmit = () => {
+  formRef.value?.validate()
+    .then(() => {
+		let header={
+			'Authorization':uni.getStorageSync('fourLevelLinkage-token')
+		}
+		formData.goalPersonId=personInfo.value.goalPersonId
+		$api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => {
+			console.log("resData",resData)
+			if(resData && resData.code == 200){
+				handleReset()
+				uni.showToast({
+				  title: '保存成功',
+				  icon: 'success',
+				  duration: 2000 
+				});
+			}else{
+				uni.showToast({
+				  title: resData.msg,
+				  icon: 'none',
+				  duration: 2000
+				});
+			}
+			
+		});
+    })
+    .catch((errors) => {
+      console.log('校验失败:', errors);
+    });
+};
+
+const handleReset = () => {
+	  formData.followDate = '';
+	  formData.followWay = '';
+	  formData.content = '';
+	  formData.result = '';
+	  formData.nextPlan = '';
+	  formData.nextContactDate = '';
+}
+onLoad((options) => {
+	personInfo.value.person_id=options.person_id
+	personInfo.value.name=options.name
+	personInfo.value.taskType=options.taskType
+	personInfo.value.task_id=options.task_id
+	getDictionary()
+	getFollowList()
+});
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.info-box
+  margin: 30rpx 30rpx
+  background: linear-gradient(0deg, #D9ECFF 0%, #F0F7FF 100%)
+  border-radius: 20rpx
+  padding: 40rpx 0
+  display: flex
+  align-items: center
+.info-img
+  width: 40rpx
+  height: 40rpx
+  margin-bottom: 20rpx
+.info-line
+  border-right: 2rpx solid #B7D6FF
+.info-item
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  width: 50%
+.info-label
+  font-size: 26rpx
+  color: #6E7E9B
+  margin-bottom: 20rpx
+.info-value
+  font-weight: bold
+  font-size: 28rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+.list-box
+  margin-top: 40rpx
+
+.form-container 
+  margin-top: 30rpx
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+:deep(.uni-steps__column-circle )
+  width: 24rpx !important
+  height: 24rpx !important
+  background: radial-gradient(circle, 
+    #00C0FA 0%, 
+    #015EEA 50%, 
+    #FFFFFF 51%,  
+    #FFFFFF 100%) !important
+  border-radius: 50%
+  border: 2rpx solid #015EEA
+:deep(.uni-steps__column-title)
+  font-size: 28rpx !important
+  color: #006CFF !important
+  margin-bottom: 24rpx
+:deep(.uni-steps__column-desc)
+  font-size: 28rpx
+  color: #898989 !important
+  line-height: 1.5
+:deep(.uni-steps__column-text )
+  padding: 16rpx 0 !important
+  border: none
+:deep(.uni-steps__column-line)
+  background-color: #368BFF !important
+:deep(.uni-steps__column-line--before)
+  background-color:rgba(0,0,0,0) !important
+:deep(.uni-date-x)
+  background: rgba(0,0,0,0) !important
+:deep(.uni-stat-box)
+  background: rgba(0,0,0,0) !important
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>
diff --git a/packageB/notice/index.vue b/packageB/notice/index.vue
new file mode 100644
index 0000000..7546523
--- /dev/null
+++ b/packageB/notice/index.vue
@@ -0,0 +1,400 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" >
+		<view class="info-box">
+			<view class="info-item info-line">
+				<image class="info-img" :src="baseUrl+'/dispatch/person-icon.png'" mode=""></image>
+				<view class="info-label">
+					人员姓名
+				</view>
+				<view class="info-value">
+					{{personInfo.name}}
+				</view>
+			</view>
+			<view class="info-item">
+				<image class="info-img" :src="baseUrl+'/dispatch/help-icon.png'" mode=""></image>
+				<view class="info-label">
+					帮扶类型
+				</view>
+				<view class="info-value">
+					{{personInfo.taskType}}
+				</view>
+			</view>
+		</view>
+        <view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>新增跟进记录</text>
+					<view class="title-line"></view>
+				</view>
+			</view>
+			
+            <view class="form-container">
+                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
+                  <!-- 跟进日期 -->
+                  <uni-forms-item label="跟进日期：" name="followDate" required >
+					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.followDate" @change="onFollowDateChange" />
+                  </uni-forms-item>
+            
+                  <!-- 跟进方式 -->
+                  <uni-forms-item label="跟进方式：" name="followWay" required >
+					  <uni-data-select v-model="formData.followWay" placeholder="请选择跟进方式" :localdata="followWays" @change="onMethodChange"></uni-data-select>
+                  </uni-forms-item>
+            
+                  <!-- 跟进内容 -->
+                  <uni-forms-item label="跟进内容：" name="content" required>
+					  <uni-easyinput type="textarea" v-model="formData.content" placeholder="请输入跟进内容"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 跟进结果 -->
+                  <uni-forms-item label="跟进结果：" name="result" required>
+					  <uni-easyinput type="textarea" v-model="formData.result" placeholder="请输入跟进结果"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 下一步计划 -->
+                  <uni-forms-item label="下一步计划：" name="nextPlan">
+					  <uni-easyinput type="textarea" v-model="formData.nextPlan" placeholder="请输入下一步计划（可选）"></uni-easyinput>
+                  </uni-forms-item>
+            
+                  <!-- 下次联系时间 -->
+                  <uni-forms-item label="下次联系：" name="nextContactDate" >
+					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.nextContactDate" @change="onDateChange" />
+                  </uni-forms-item>
+                </uni-forms>
+            
+                <!-- 按钮组 -->
+                <view class="button-group">
+				  <button class="btn submit-btn" @click="handleSubmit">保存跟进</button>
+                  <button class="btn reset-btn"  @click="handleReset">重置</button>
+                </view>
+			</view>
+        </view>
+		<view class="main-list" :style="getBackgroundStyle('k.png')">
+			<view class="list-top">
+				<view class="list-title">
+					<text>跟进历史记录</text>
+					<view class="title-line"></view>
+				</view>
+				<view class="title-total">
+					共<text class="total-num">{{followListNum}}</text>条记录
+				</view>
+			</view>
+			<view class="list-box" v-if="followListNum>0">
+				<uni-steps :options="followList" active-color="#007AFF" :active="active" direction="column" />
+			</view>
+			<empty v-else pdTop="200"></empty>
+		</view>
+    </AppLayout>
+</template>
+
+<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 title = ref('');
+const formData = reactive({
+  goalPersonId:'',
+  followDate: '',
+  followWay: '',
+  content: '',
+  result: '',
+  nextPlan: '',
+  nextContactDate: ''
+})
+const personInfo=ref({
+	goalPersonId:'',
+	name:'',
+	taskType:'',
+	task_id:''
+})
+const followWays = ref([])
+const followList = ref([])
+const followListNum=ref(0)
+const active=ref(null)
+// 表单引用
+const formRef = ref(null)
+
+// 校验规则
+const rules = {
+	followDate: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择跟进日期'
+		}]
+	},
+	followWay: {
+		rules: [{
+			required: true,
+			errorMessage: '请选择跟进方式'
+		}]
+	},
+	content: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写跟进内容'
+		}]
+	},
+	result: {
+		rules: [{
+			required: true,
+			errorMessage: '请填写跟进结果'
+		}]
+	}
+}
+const baseUrl = config.imgBaseUrl
+const getBackgroundStyle = (imageName) => ({
+    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+
+const onFollowDateChange = (e)=>{
+	formData.followDate=e
+}
+const onMethodChange = (e) => {
+	formData.followWay=e
+}
+// 事件处理
+const onDateChange = ( e) => {
+  formData.nextContactDate=e
+}
+function getFollowList(){
+	let header={
+		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
+		'Content-Type': "application/x-www-form-urlencoded"
+	}
+	let params={
+		personId:personInfo.value.person_id,
+		taskId:personInfo.value.task_id
+	}
+	$api.myRequest('/dispatch/assist/records/getFollowList', params,'get',9100,header).then((resData) => {
+		console.log("resData",resData)
+		if(resData && resData.code == 200){
+			if(resData.data && resData.data.length>0){
+				followListNum.value=resData.data.length
+				resData.data.forEach(item=>{
+					const obj={
+						title:item.followDate,
+						desc:`跟进方式：${getFollowWaysLabelByValue(item.followWay)}\n跟进人：${item.createByName}\n跟进内容：${item.content}`
+					}
+					followList.value.push(obj)
+				})
+			}
+			
+		}
+	});
+}
+
+function getDictionary(){
+	$api.myRequest('/system/public/dict/data/type/assist_follow_way').then((resData) => {
+		if(resData && resData.code == 200){
+			resData.data.forEach(item=>{
+				const obj = {
+				    value: item.dictValue,
+				    text: item.dictLabel
+				}
+				followWays.value.push(obj)
+			})
+		}
+	});
+}
+function getFollowWaysLabelByValue(value) {
+	if (!Array.isArray(followWays.value)) {
+	    return ''
+	  }
+	  const item = followWays.value.find(item => item.value === String(value))
+	  return item ? item.text : '暂无跟进方式'
+}
+const handleSubmit = () => {
+  formRef.value?.validate()
+    .then(() => {
+		let header={
+			'Authorization':uni.getStorageSync('fourLevelLinkage-token')
+		}
+		formData.goalPersonId=personInfo.value.goalPersonId
+		$api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => {
+			console.log("resData",resData)
+			if(resData && resData.code == 200){
+				handleReset()
+				uni.showToast({
+				  title: '保存成功',
+				  icon: 'success',
+				  duration: 2000 
+				});
+			}else{
+				uni.showToast({
+				  title: resData.msg,
+				  icon: 'none',
+				  duration: 2000
+				});
+			}
+			
+		});
+    })
+    .catch((errors) => {
+      console.log('校验失败:', errors);
+    });
+};
+
+const handleReset = () => {
+	  formData.followDate = '';
+	  formData.followWay = '';
+	  formData.content = '';
+	  formData.result = '';
+	  formData.nextPlan = '';
+	  formData.nextContactDate = '';
+}
+onLoad((options) => {
+	personInfo.value.person_id=options.person_id
+	personInfo.value.name=options.name
+	personInfo.value.taskType=options.taskType
+	personInfo.value.task_id=options.task_id
+	getDictionary()
+	getFollowList()
+});
+
+
+</script>
+
+<style lang="stylus" scoped>
+image
+  height: 100%
+  width: 100%
+.info-box
+  margin: 30rpx 30rpx
+  background: linear-gradient(0deg, #D9ECFF 0%, #F0F7FF 100%)
+  border-radius: 20rpx
+  padding: 40rpx 0
+  display: flex
+  align-items: center
+.info-img
+  width: 40rpx
+  height: 40rpx
+  margin-bottom: 20rpx
+.info-line
+  border-right: 2rpx solid #B7D6FF
+.info-item
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  width: 50%
+.info-label
+  font-size: 26rpx
+  color: #6E7E9B
+  margin-bottom: 20rpx
+.info-value
+  font-weight: bold
+  font-size: 28rpx
+  color: #3D61AC
+.main-list
+  background-color: #ffffff
+  padding: 20rpx 20rpx 28rpx 20rpx
+  margin: 30rpx 30rpx
+  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
+  border-radius: 12px
+.list-top
+  display: flex
+  align-items: center
+  justify-content: space-between
+.list-title
+  font-weight: bold
+  font-size: 36rpx
+  color: #404040
+  position: relative
+
+.title-line
+  position: absolute
+  bottom: -10rpx
+  left: 70rpx
+  width: 70rpx
+  height: 8rpx
+  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
+  border-radius: 4rpx
+.title-total
+  font-size: 24rpx
+  color: #999999
+.total-num
+  color: #3088FF
+  margin-left: 4rpx
+  margin-right: 4rpx
+  font-weight: bold
+  font-size: 26rpx
+
+.label
+  width: 160rpx
+  font-size: 28rpx
+  color: #404040
+
+.input,
+.picker
+  flex: 1
+
+.picker-value
+  color: #666
+.list-box
+  margin-top: 40rpx
+
+.form-container 
+  margin-top: 30rpx
+:deep(.uni-forms-item__label)
+  width: 194rpx !important
+  font-size: 28rpx;
+  color: #404040;
+
+.button-group {
+  display: flex;
+  justify-content: space-between;
+  padding: 40rpx 20rpx 20rpx;
+}
+
+.btn {
+  width: 45%;
+  height: 80rpx;
+  font-size: 30rpx;
+  border-radius: 8rpx;
+}
+
+.reset-btn {
+  background-color: #D8E9FF;
+  color: #1176FF;
+}
+
+.submit-btn {
+  background-color: #368BFF;
+  color: white;
+}
+:deep(.uni-steps__column-circle )
+  width: 24rpx !important
+  height: 24rpx !important
+  background: radial-gradient(circle, 
+    #00C0FA 0%, 
+    #015EEA 50%, 
+    #FFFFFF 51%,  
+    #FFFFFF 100%) !important
+  border-radius: 50%
+  border: 2rpx solid #015EEA
+:deep(.uni-steps__column-title)
+  font-size: 28rpx !important
+  color: #006CFF !important
+  margin-bottom: 24rpx
+:deep(.uni-steps__column-desc)
+  font-size: 28rpx
+  color: #898989 !important
+  line-height: 1.5
+:deep(.uni-steps__column-text )
+  padding: 16rpx 0 !important
+  border: none
+:deep(.uni-steps__column-line)
+  background-color: #368BFF !important
+:deep(.uni-steps__column-line--before)
+  background-color:rgba(0,0,0,0) !important
+:deep(.uni-date-x)
+  background: rgba(0,0,0,0) !important
+:deep(.uni-stat-box)
+  background: rgba(0,0,0,0) !important
+:deep(.uni-easyinput__content)
+  background: rgba(0,0,0,0) !important
+</style>
diff --git a/pages.json b/pages.json
index 47cb4c9..81232c8 100644
--- a/pages.json
+++ b/pages.json
@@ -419,7 +419,25 @@
 		    "style": {
 		      "navigationBarTitleText": "错题详情"
 		    }
-		  }
+		  },
+		  {
+		    "path": "notice/index",
+		    "style": {
+		      "navigationBarTitleText": "培训评价公告"
+		    }
+		  },
+		  {
+		    "path": "institution/evaluationAgency",
+		    "style": {
+		      "navigationBarTitleText": "评价机构"
+		    }
+		  },
+		  {
+		    "path": "institution/trainingInstitution",
+		    "style": {
+		      "navigationBarTitleText": "培训机构"
+		    }
+		  },
         ]
       },
       {
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 9e29425..678bf89 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -166,6 +166,24 @@
 				    </view>
 				    <view class="service-title">帮扶</view>
 				</view>
+                <view class="service-item press-button" @click="handleNoticeClick">
+                    <view class="service-icon service-icon-12">
+                        <span style="display:block;width:40rpx;height:40rpx;border-radius:100%;border:4rpx #ffffff solid;line-height:40rpx;text-align:center;">￥</span>
+                    </view>
+                    <view class="service-title">培训评价公告</view>
+                </view>
+                <view class="service-item press-button" @click="handleInstitutionClick('training')">
+                    <view class="service-icon service-icon-7">
+                        <IconfontIcon name="suzhicepingtiku" :size="48" color="#FFFFFF" />
+                    </view>
+                    <view class="service-title">培训机构</view>
+                </view>
+                <view class="service-item press-button" @click="handleInstitutionClick('evaluate')">
+                    <view class="service-icon service-icon-7">
+                        <IconfontIcon name="suzhicepingtiku" :size="48" color="#FFFFFF" />
+                    </view>
+                    <view class="service-title">评价机构</view>
+                </view>
             </view>
             <!-- #endif -->
         </view>
@@ -679,6 +697,7 @@ const goToCompanyInfo = () => {
     navTo('/pages/mine/company-info');
 };
 
+
 // 组件初始化时加载数据
 onMounted(() => {
     // 获取企业信息
@@ -763,7 +782,23 @@ const handleNearbyClick = () => {
         navTo('/pages/nearby/nearby');
     }
 };
-
+const handleNoticeClick = () =>{
+	uni.navigateTo({
+		url:'/packageB/notice/index'
+	})
+}
+function handleInstitutionClick(type){
+	if(type=='evaluate'){
+		uni.navigateTo({
+			url:'/packageB/institution/evaluationAgency'
+		})
+	}else if (type=='training'){
+		uni.navigateTo({
+			url:'/packageB/institution/trainingInstitution'
+		})
+	}
+	
+}
 // 处理服务功能点击
 const handleServiceClick = (serviceType) => {
     if (checkLogin()) {

From f506c4154aacdfd2ecda2e21bd08a1d96d15327c Mon Sep 17 00:00:00 2001
From: WX0lxh <2062408239@qq.com>
Date: Fri, 16 Jan 2026 10:08:59 +0800
Subject: [PATCH 15/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages.json b/pages.json
index 81232c8..28814c2 100644
--- a/pages.json
+++ b/pages.json
@@ -437,7 +437,7 @@
 		    "style": {
 		      "navigationBarTitleText": "培训机构"
 		    }
-		  },
+		  }
         ]
       },
       {

From 211c950ab7f6699e2240d14e72084f0879d32ca8 Mon Sep 17 00:00:00 2001
From: WX0lxh <2062408239@qq.com>
Date: Fri, 16 Jan 2026 10:14:09 +0800
Subject: [PATCH 16/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/components/index-one.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 678bf89..9f4497b 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -176,13 +176,13 @@
                     <view class="service-icon service-icon-7">
                         <IconfontIcon name="suzhicepingtiku" :size="48" color="#FFFFFF" />
                     </view>
-                    <view class="service-title">培训机构</view>
+                    <view class="service-title">培训机构信息</view>
                 </view>
                 <view class="service-item press-button" @click="handleInstitutionClick('evaluate')">
                     <view class="service-icon service-icon-7">
                         <IconfontIcon name="suzhicepingtiku" :size="48" color="#FFFFFF" />
                     </view>
-                    <view class="service-title">评价机构</view>
+                    <view class="service-title">评价机构信息</view>
                 </view>
             </view>
             <!-- #endif -->

From ef25f954a4fc93bef9cba66781ed54421481a3ca Mon Sep 17 00:00:00 2001
From: WX0lxh <2062408239@qq.com>
Date: Fri, 16 Jan 2026 11:30:48 +0800
Subject: [PATCH 17/38] =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageB/institution/trainingInstitution.vue  | 708 +++++++++---------
 .../institution/trainingInstitutionDetail.vue |   9 +
 pages.json                                    |  10 +-
 3 files changed, 353 insertions(+), 374 deletions(-)
 create mode 100644 packageB/institution/trainingInstitutionDetail.vue

diff --git a/packageB/institution/trainingInstitution.vue b/packageB/institution/trainingInstitution.vue
index 7546523..660c57c 100644
--- a/packageB/institution/trainingInstitution.vue
+++ b/packageB/institution/trainingInstitution.vue
@@ -1,400 +1,364 @@
 <template>
-    <AppLayout :title="title" :show-bg-image="false" >
-		<view class="info-box">
-			<view class="info-item info-line">
-				<image class="info-img" :src="baseUrl+'/dispatch/person-icon.png'" mode=""></image>
-				<view class="info-label">
-					人员姓名
-				</view>
-				<view class="info-value">
-					{{personInfo.name}}
-				</view>
-			</view>
-			<view class="info-item">
-				<image class="info-img" :src="baseUrl+'/dispatch/help-icon.png'" mode=""></image>
-				<view class="info-label">
-					帮扶类型
-				</view>
-				<view class="info-value">
-					{{personInfo.taskType}}
-				</view>
-			</view>
-		</view>
-        <view class="main-list" :style="getBackgroundStyle('k.png')">
-			<view class="list-top">
-				<view class="list-title">
-					<text>新增跟进记录</text>
-					<view class="title-line"></view>
-				</view>
-			</view>
-			
-            <view class="form-container">
-                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
-                  <!-- 跟进日期 -->
-                  <uni-forms-item label="跟进日期：" name="followDate" required >
-					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.followDate" @change="onFollowDateChange" />
-                  </uni-forms-item>
-            
-                  <!-- 跟进方式 -->
-                  <uni-forms-item label="跟进方式：" name="followWay" required >
-					  <uni-data-select v-model="formData.followWay" placeholder="请选择跟进方式" :localdata="followWays" @change="onMethodChange"></uni-data-select>
-                  </uni-forms-item>
-            
-                  <!-- 跟进内容 -->
-                  <uni-forms-item label="跟进内容：" name="content" required>
-					  <uni-easyinput type="textarea" v-model="formData.content" placeholder="请输入跟进内容"></uni-easyinput>
-                  </uni-forms-item>
-            
-                  <!-- 跟进结果 -->
-                  <uni-forms-item label="跟进结果：" name="result" required>
-					  <uni-easyinput type="textarea" v-model="formData.result" placeholder="请输入跟进结果"></uni-easyinput>
-                  </uni-forms-item>
-            
-                  <!-- 下一步计划 -->
-                  <uni-forms-item label="下一步计划：" name="nextPlan">
-					  <uni-easyinput type="textarea" v-model="formData.nextPlan" placeholder="请输入下一步计划（可选）"></uni-easyinput>
-                  </uni-forms-item>
-            
-                  <!-- 下次联系时间 -->
-                  <uni-forms-item label="下次联系：" name="nextContactDate" >
-					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.nextContactDate" @change="onDateChange" />
-                  </uni-forms-item>
-                </uni-forms>
-            
-                <!-- 按钮组 -->
-                <view class="button-group">
-				  <button class="btn submit-btn" @click="handleSubmit">保存跟进</button>
-                  <button class="btn reset-btn"  @click="handleReset">重置</button>
-                </view>
-			</view>
-        </view>
-		<view class="main-list" :style="getBackgroundStyle('k.png')">
-			<view class="list-top">
-				<view class="list-title">
-					<text>跟进历史记录</text>
-					<view class="title-line"></view>
-				</view>
-				<view class="title-total">
-					共<text class="total-num">{{followListNum}}</text>条记录
-				</view>
-			</view>
-			<view class="list-box" v-if="followListNum>0">
-				<uni-steps :options="followList" active-color="#007AFF" :active="active" direction="column" />
-			</view>
-			<empty v-else pdTop="200"></empty>
-		</view>
-    </AppLayout>
+	<div class="app-box">
+		<div class="con-box">
+		    <!-- <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> -->
+			<scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+				<div class="cards" v-for="(item,index) in dataList" :key="item.examPaperId">
+					<div class="cardHead">
+						<div class="cardHeadLeft">
+							<div class="cardTitle">{{item.organName}}</div>
+						</div>
+						<div class="rightBtn" @click="handleOperation(item)">机构详情</div>
+					</div>
+					<div class="heng"></div>
+					<div class="cardCon">
+						<div class="conten">机构联系人：{{item.contactName}}</div>
+						<div class="conten">联系方式：{{item.contactPhone}}</div>
+						<div class="conten">机构地址：{{item.address}}</div>
+					</div>
+				</div>
+			</scroll-view>
+		</div>
+		
+	</div>
 </template>
 
 <script setup>
 import { inject, ref, reactive } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
-const { $api, navTo, navBack } = inject('globalFunction');
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack,urls } = inject('globalFunction');
 import config from "@/config.js"
-
-const title = ref('');
-const formData = reactive({
-  goalPersonId:'',
-  followDate: '',
-  followWay: '',
-  content: '',
-  result: '',
-  nextPlan: '',
-  nextContactDate: ''
-})
-const personInfo=ref({
-	goalPersonId:'',
-	name:'',
-	taskType:'',
-	task_id:''
-})
-const followWays = ref([])
-const followList = ref([])
-const followListNum=ref(0)
-const active=ref(null)
-// 表单引用
-const formRef = ref(null)
-
-// 校验规则
-const rules = {
-	followDate: {
-		rules: [{
-			required: true,
-			errorMessage: '请选择跟进日期'
-		}]
-	},
-	followWay: {
-		rules: [{
-			required: true,
-			errorMessage: '请选择跟进方式'
-		}]
-	},
-	content: {
-		rules: [{
-			required: true,
-			errorMessage: '请填写跟进内容'
-		}]
-	},
-	result: {
-		rules: [{
-			required: true,
-			errorMessage: '请填写跟进结果'
-		}]
-	}
-}
+const userInfo = ref({});
+const Authorization = ref('');
+const searchKeyword = ref('');
+const dataList=ref([])
+const pageSize=ref(10)
+const pageNum=ref(1)
+const totalNum=ref(0)
 const baseUrl = config.imgBaseUrl
-const getBackgroundStyle = (imageName) => ({
-    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
-    backgroundSize: 'cover',      // 覆盖整个容器
-    backgroundPosition: 'center', // 居中
-    backgroundRepeat: 'no-repeat'
+const handleScrollToLower = () => {
+    getDataList('add');
+};
+onLoad(() => {
+	
 });
-
-const onFollowDateChange = (e)=>{
-	formData.followDate=e
-}
-const onMethodChange = (e) => {
-	formData.followWay=e
-}
-// 事件处理
-const onDateChange = ( e) => {
-  formData.nextContactDate=e
-}
-function getFollowList(){
-	let header={
-		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
-		'Content-Type': "application/x-www-form-urlencoded"
-	}
-	let params={
-		personId:personInfo.value.person_id,
-		taskId:personInfo.value.task_id
-	}
-	$api.myRequest('/dispatch/assist/records/getFollowList', params,'get',9100,header).then((resData) => {
-		console.log("resData",resData)
-		if(resData && resData.code == 200){
-			if(resData.data && resData.data.length>0){
-				followListNum.value=resData.data.length
-				resData.data.forEach(item=>{
-					const obj={
-						title:item.followDate,
-						desc:`跟进方式：${getFollowWaysLabelByValue(item.followWay)}\n跟进人：${item.createByName}\n跟进内容：${item.content}`
-					}
-					followList.value.push(obj)
-				})
-			}
-			
-		}
-	});
+onShow(()=>{
+	Authorization.value=uni.getStorageSync('Padmin-Token')||''
+	getDataList('refresh');
+})
+// 搜索视频
+function searchVideo() {
+    getDataList('refresh');
 }
 
-function getDictionary(){
-	$api.myRequest('/system/public/dict/data/type/assist_follow_way').then((resData) => {
-		if(resData && resData.code == 200){
-			resData.data.forEach(item=>{
-				const obj = {
-				    value: item.dictValue,
-				    text: item.dictLabel
-				}
-				followWays.value.push(obj)
-			})
-		}
-	});
+// 清除搜索内容
+function clearSearch() {
+    searchKeyword.value = '';
+    getDataList('refresh');
 }
-function getFollowWaysLabelByValue(value) {
-	if (!Array.isArray(followWays.value)) {
-	    return ''
-	  }
-	  const item = followWays.value.find(item => item.value === String(value))
-	  return item ? item.text : '暂无跟进方式'
-}
-const handleSubmit = () => {
-  formRef.value?.validate()
-    .then(() => {
-		let header={
-			'Authorization':uni.getStorageSync('fourLevelLinkage-token')
+// 获取考试列表
+function getDataList(type = 'add') {
+	let maxPage=Math.ceil(totalNum.value/pageSize.value)
+	let params={}
+    if (type === 'refresh') {
+        pageNum.value = 1;
+		params={
+			address:"",
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
 		}
-		formData.goalPersonId=personInfo.value.goalPersonId
-		$api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => {
-			console.log("resData",resData)
-			if(resData && resData.code == 200){
-				handleReset()
-				uni.showToast({
-				  title: '保存成功',
-				  icon: 'success',
-				  duration: 2000 
-				});
-			}else{
-				uni.showToast({
-				  title: resData.msg,
-				  icon: 'none',
-				  duration: 2000
-				});
+		$api.myRequest('/train/public/train/organ/table', params).then((resData) => {
+			if(resData.code==200){
+				dataList.value=resData.rows
+				totalNum.value=resData.total
 			}
 			
 		});
-    })
-    .catch((errors) => {
-      console.log('校验失败:', errors);
-    });
-};
-
-const handleReset = () => {
-	  formData.followDate = '';
-	  formData.followWay = '';
-	  formData.content = '';
-	  formData.result = '';
-	  formData.nextPlan = '';
-	  formData.nextContactDate = '';
+    }
+    if (type === 'add' && pageNum.value < maxPage) {
+        pageNum.value += 1;
+		params={
+			address:"",
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+		}
+		$api.myRequest('/train/public/train/organ/table', params).then((resData) => {
+			if(resData.code==200){
+				dataList.value=dataList.value.concat(resData.rows)
+				totalNum.value=resData.total
+			}
+		});
+	}
 }
-onLoad((options) => {
-	personInfo.value.person_id=options.person_id
-	personInfo.value.name=options.name
-	personInfo.value.taskType=options.taskType
-	personInfo.value.task_id=options.task_id
-	getDictionary()
-	getFollowList()
-});
-
 
+function handleOperation(row) {
+	navTo(`/packageB/institution/trainingInstitutionDetail?id=${row.id}`);
+}
 </script>
 
 <style lang="stylus" scoped>
-image
-  height: 100%
-  width: 100%
-.info-box
-  margin: 30rpx 30rpx
-  background: linear-gradient(0deg, #D9ECFF 0%, #F0F7FF 100%)
-  border-radius: 20rpx
-  padding: 40rpx 0
-  display: flex
-  align-items: center
-.info-img
-  width: 40rpx
-  height: 40rpx
-  margin-bottom: 20rpx
-.info-line
-  border-right: 2rpx solid #B7D6FF
-.info-item
-  display: flex
-  flex-direction: column
-  align-items: center
-  justify-content: center
-  width: 50%
-.info-label
-  font-size: 26rpx
-  color: #6E7E9B
-  margin-bottom: 20rpx
-.info-value
-  font-weight: bold
-  font-size: 28rpx
-  color: #3D61AC
-.main-list
-  background-color: #ffffff
-  padding: 20rpx 20rpx 28rpx 20rpx
-  margin: 30rpx 30rpx
-  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
-  border-radius: 12px
-.list-top
-  display: flex
-  align-items: center
-  justify-content: space-between
-.list-title
-  font-weight: bold
-  font-size: 36rpx
-  color: #404040
-  position: relative
-
-.title-line
-  position: absolute
-  bottom: -10rpx
-  left: 70rpx
-  width: 70rpx
-  height: 8rpx
-  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
-  border-radius: 4rpx
-.title-total
-  font-size: 24rpx
-  color: #999999
-.total-num
-  color: #3088FF
-  margin-left: 4rpx
-  margin-right: 4rpx
-  font-weight: bold
-  font-size: 26rpx
-
-.label
-  width: 160rpx
-  font-size: 28rpx
-  color: #404040
-
-.input,
-.picker
-  flex: 1
-
-.picker-value
-  color: #666
-.list-box
-  margin-top: 40rpx
-
-.form-container 
-  margin-top: 30rpx
-:deep(.uni-forms-item__label)
-  width: 194rpx !important
-  font-size: 28rpx;
-  color: #404040;
-
-.button-group {
-  display: flex;
-  justify-content: space-between;
-  padding: 40rpx 20rpx 20rpx;
+.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: 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%;
+			.cards{
+				width: 100%;
+				min-height: 260rpx;
+				height: auto;
+				background: linear-gradient(0deg, #E3EFFF 0%, #FBFDFF 100%);
+				// box-shadow: 0px 0px 6px 0px rgba(0,71,200,0.32);
+				border-radius: 12rpx;
+				border: 2px solid #EDF5FF;
+				margin-bottom: 30rpx;
+				padding: 30rpx 40rpx 0;
+				box-sizing: border-box
+				.cardHead{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.cardHeadLeft{
+						display: flex;
+						align-items: center
+						width: 70%;
+						.cardTitle{
+							font-weight: bold;
+							font-size: 28rpx;
+							color: #0069CB;
+							max-width: 100%;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+						.titleType{
+							border-radius: 4px;
+							font-size: 22rpx;
+							color: #157EFF;
+							width: 100rpx;
+							height: 38rpx;
+							text-align: center;
+							line-height: 38rpx;
+							margin-left: 10rpx;
+						}
+						
+					}
+					
+				}
+				.heng{
+					width: 30%;
+					height: 4rpx;
+					background: linear-gradient(88deg, #015EEA 0%, #00C0FA 100%);
+					margin: 10rpx 0 20rpx;
+				}
+				.cardCon{
+					display: flex;
+					flex-wrap: wrap;
+					.conten{
+						width: 100%;
+						font-size: 24rpx;
+						color: #666666;
+						display: flex;
+						align-items: center
+						margin-bottom: 10rpx;
+					}
+					.status-tags{
+						display: flex;
+						align-items: center;
+					}
+				}
+				.flooter{
+					border-top: 1px solid #ccc;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					view{
+						font-size: 28rpx;
+						margin-left: 30rpx;
+						color: #2175F3;
+						padding-top: 14rpx;
+					}
+				}
+			}
+		}
+	}
+	.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: 70%;
+			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;
+			}
+			
+		}
+	}
+}
+.titleType{
+	display: inline-block
+	border-radius: 4px;
+	font-size: 22rpx;
+	color: #157EFF;
+	width: 100rpx;
+	height: 38rpx;
+	text-align: center;
+	line-height: 38rpx;
+	margin-left: 10rpx;
+}
+.primary{
+	border: 1px solid #157EFF!important;
+	color: #157EFF!important
+}
+.success{
+	border: 1px solid #05A636!important;
+	color: #05A636!important
+}
+.info{
+	border: 1px solid #898989!important;
+	color: #898989!important
+}
+.tertiary{
+	border: 1px solid #E6A340!important;
+	color: #E6A340!important
+}
+.primary2{
+	border: 1px solid #F56C6C!important;
+	color: #F56C6C!important
+}
+.rightBtn{
+	width: 140rpx;
+	height: 44rpx;
+	line-height: 44rpx;
+	background: linear-gradient(90deg, #00C0FA 0%, #1271FF 100%);
+	border-radius: 4px;
+	color: #fff;
+	font-size: 24rpx;
+	text-align: center;
+}
+.detailTitle{
+	font-size: 32rpx;
+	font-weight: 600;
+	margin: 30rpx 0;
+}
+.detailCon{
+	font-size: 28rpx;
+	line-height: 40rpx;
+}
+.exam-info {
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: 35rpx;
+	margin-top: 20rpx;
 }
 
-.btn {
-  width: 45%;
-  height: 80rpx;
-  font-size: 30rpx;
-  border-radius: 8rpx;
+.info-item {
+	flex: 1;
+	text-align: center;
 }
 
-.reset-btn {
-  background-color: #D8E9FF;
-  color: #1176FF;
+.info-value {
+	font-family: 'D-DIN-Medium';
+	font-size: 26rpx;
+	font-weight: 600;
+	color: #409EFF;
+	margin-bottom: 8rpx;
 }
 
-.submit-btn {
-  background-color: #368BFF;
-  color: white;
+.info-label {
+	font-size: 26rpx;
+	color: #333;
+}
+
+.info-divider {
+	width: 2px;
+	background-color: #C3E1FF;
 }
-:deep(.uni-steps__column-circle )
-  width: 24rpx !important
-  height: 24rpx !important
-  background: radial-gradient(circle, 
-    #00C0FA 0%, 
-    #015EEA 50%, 
-    #FFFFFF 51%,  
-    #FFFFFF 100%) !important
-  border-radius: 50%
-  border: 2rpx solid #015EEA
-:deep(.uni-steps__column-title)
-  font-size: 28rpx !important
-  color: #006CFF !important
-  margin-bottom: 24rpx
-:deep(.uni-steps__column-desc)
-  font-size: 28rpx
-  color: #898989 !important
-  line-height: 1.5
-:deep(.uni-steps__column-text )
-  padding: 16rpx 0 !important
-  border: none
-:deep(.uni-steps__column-line)
-  background-color: #368BFF !important
-:deep(.uni-steps__column-line--before)
-  background-color:rgba(0,0,0,0) !important
-:deep(.uni-date-x)
-  background: rgba(0,0,0,0) !important
-:deep(.uni-stat-box)
-  background: rgba(0,0,0,0) !important
-:deep(.uni-easyinput__content)
-  background: rgba(0,0,0,0) !important
 </style>
diff --git a/packageB/institution/trainingInstitutionDetail.vue b/packageB/institution/trainingInstitutionDetail.vue
new file mode 100644
index 0000000..717e85e
--- /dev/null
+++ b/packageB/institution/trainingInstitutionDetail.vue
@@ -0,0 +1,9 @@
+<template>
+	<div>详情</div>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 28814c2..c3ba787 100644
--- a/pages.json
+++ b/pages.json
@@ -429,13 +429,19 @@
 		  {
 		    "path": "institution/evaluationAgency",
 		    "style": {
-		      "navigationBarTitleText": "评价机构"
+		      "navigationBarTitleText": "评价机构信息"
 		    }
 		  },
 		  {
 		    "path": "institution/trainingInstitution",
 		    "style": {
-		      "navigationBarTitleText": "培训机构"
+		      "navigationBarTitleText": "培训机构信息"
+		    }
+		  },
+		  {
+		    "path": "institution/trainingInstitutionDetail",
+		    "style": {
+		      "navigationBarTitleText": "培训机构信息详情"
 		    }
 		  }
         ]

From e444f07dc48ece7a1206914b5c9e08b7e8ce0961 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Fri, 16 Jan 2026 11:58:07 +0800
Subject: [PATCH 18/38] =?UTF-8?q?=E5=B8=AE=E6=89=B6=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/components/index-one.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 9e29425..3b727a3 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -804,6 +804,17 @@ const handleLiveClick = () => {
 const handleSalaryInfoClick = () => {
     navTo('/pages/service/salary-info');
 };
+const handleJobFairClick = () => {
+    navTo('/pages/careerfair/careerfair');
+};
+const handleH5SalaryClick = () => {
+    const salaryUrl = "https://www.mohrss.gov.cn/SYrlzyhshbzb/laodongguanxi_/fwyd/202506/t20250627_544623.html";
+    window.location.assign(salaryUrl);
+};
+// 处理帮扶
+const helpClick = () => {
+    navTo('/packageB/priority/helpFilter');
+};
 async function loadData() {
     try {
         if (isLoaded.value) return;

From 1508a1a717d1fcfc7dd830c352e263b9dcb9ed67 Mon Sep 17 00:00:00 2001
From: xuchao <1151716571@qq.com>
Date: Fri, 16 Jan 2026 12:42:04 +0800
Subject: [PATCH 19/38] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E6=8B=9B=E8=81=98=E4=BC=9A=E3=80=81=E5=B8=AE=E6=89=B6=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B7=B3=E8=BD=AC=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/components/index-one.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 9f4497b..27c6a90 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -608,6 +608,14 @@ const wxAuthLoginRef = ref(null);
 const state = reactive({
     tabIndex: 'all',
 });
+//帮扶模块跳转
+const helpClick = () => {
+    navTo('/packageB/priority/helpFilter');
+};
+//招聘会模块跳转
+const handleJobFairClick = () => {
+    navTo('/pages/careerfair/careerfair');
+};
 const list = ref([]);
 const pageState = reactive({
     page: 0,

From d6b6fdcc38c2bfe7fec9d538e445738ae0b91ccc Mon Sep 17 00:00:00 2001
From: xuchao <1151716571@qq.com>
Date: Fri, 16 Jan 2026 12:42:44 +0800
Subject: [PATCH 20/38] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BD=93=E5=A4=A9=E6=97=A5=E6=9C=9F=E7=B2=BE?=
 =?UTF-8?q?=E5=87=86=E8=87=B3=E6=97=B6=E5=88=86=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageB/train/mockExam/examList.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packageB/train/mockExam/examList.vue b/packageB/train/mockExam/examList.vue
index a8e3a68..ea00968 100644
--- a/packageB/train/mockExam/examList.vue
+++ b/packageB/train/mockExam/examList.vue
@@ -129,6 +129,7 @@
 <script setup>
 import { inject, ref, reactive } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
+import dayjs from "dayjs";
 const { $api, navTo, navBack,urls } = inject('globalFunction');
 import config from "@/config.js"
 const userInfo = ref({});
@@ -152,13 +153,7 @@ onLoad(() => {
 });
 onShow(()=>{
 	getDictionary()
-	const date = new Date();
-	let year = date.getFullYear();
-	let month = date.getMonth() + 1; // 月份从0开始，需要加1
-	let day = date.getDate();
-	month=month>9?month:'0'+month
-	day=day>9?day:'0'+day
-	dates.value=year+'-'+month+'-'+day
+	dates.value=dayjs().format('YYYY-MM-DD HH:mm:ss')
 	Authorization.value=uni.getStorageSync('Padmin-Token')||''
 	getHeart();
 })

From f8a7f9443369afcbae24d13ecf103f478ba69208 Mon Sep 17 00:00:00 2001
From: WX0lxh <2062408239@qq.com>
Date: Fri, 16 Jan 2026 16:04:00 +0800
Subject: [PATCH 21/38] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageB/institution/trainingInstitution.vue  |   2 +-
 .../institution/trainingInstitutionDetail.vue | 264 +++++++++++++++++-
 2 files changed, 262 insertions(+), 4 deletions(-)

diff --git a/packageB/institution/trainingInstitution.vue b/packageB/institution/trainingInstitution.vue
index 660c57c..4a63fe2 100644
--- a/packageB/institution/trainingInstitution.vue
+++ b/packageB/institution/trainingInstitution.vue
@@ -113,7 +113,7 @@ function getDataList(type = 'add') {
 }
 
 function handleOperation(row) {
-	navTo(`/packageB/institution/trainingInstitutionDetail?id=${row.id}`);
+	navTo(`/packageB/institution/trainingInstitutionDetail?organId=${row.organId}`);
 }
 </script>
 
diff --git a/packageB/institution/trainingInstitutionDetail.vue b/packageB/institution/trainingInstitutionDetail.vue
index 717e85e..e5f69b3 100644
--- a/packageB/institution/trainingInstitutionDetail.vue
+++ b/packageB/institution/trainingInstitutionDetail.vue
@@ -1,9 +1,267 @@
 <template>
-	<div>详情</div>
+	<div class="app-box">
+		<div class="con-box">
+			<div class="cards">
+				<div class="cardHead">
+					<div class="cardHeadLeft">
+						<div class="cardTitle">{{trainOrgan.organName}}</div>
+					</div>
+					<div class="rightBtn" @click="handleOperation()"></div>
+				</div>
+				<div class="heng"></div>
+				<div class="cardCon">
+					<div class="conten">机构联系人：{{trainOrgan.contactName}}</div>
+					<div class="conten">联系方式：{{trainOrgan.contactPhone}}</div>
+					<div class="conten">机构地址：{{trainOrgan.address}}</div>
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom: 40rpx;">
+				<div class="title">
+					<div></div>
+					<div>课程介绍</div>
+				</div>
+				<div class="kcCon">
+					<div class="kcIntroduction" v-for="(item, index) in courses" :key="index">{{item}}</div>
+					<div v-if="courses.length==0" style="text-align: center;line-height: 100rpx;">暂无数据</div>
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom: 40rpx;">
+				<div class="title">
+					<div></div>
+					<div>师资团队</div>
+				</div>
+				<div class="kcCon">
+					<div class="faculty" v-for="(item, index) in teams" :key = "index">
+						<div class="facultyHead">{{item.tramName}}</div>
+						<div class="facultyCon">老师介绍：{{item.tramContent}}</div>
+					</div>
+					<div v-if="teams.length==0" style="text-align: center;line-height: 100rpx;">暂无数据</div>
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom: 30rpx;">
+				<div class="title">
+					<div></div>
+					<div>资质证书</div>
+				</div>
+				<div class="kcCon">
+					<div v-for="(item, index) in certs":key = "index" style="width: 100%;">
+						<div v-for="(url, index2) in item" :key = "index2" style="width: 100%;">
+							<image :src="url" mode="" style="width: 100%;"></image>
+						</div>
+					</div>
+					<div v-if="certs.length==0" style="text-align: center;line-height: 100rpx;">暂无数据</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </template>
 
-<script>
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack,urls } = inject('globalFunction');
+import config from "@/config.js"
+const trainOrgan = ref({});
+const courses = ref([]);
+const certs = ref([]);
+const certs2 = ref([]);
+const teams=ref([])
+const certIndex=ref(1)
+const organId=ref('')
+const Authorization=ref('')
+onLoad((options) => {
+	organId.value=options.organId
+});
+onShow(()=>{
+	Authorization.value=uni.getStorageSync('Padmin-Token')||''
+	let params={
+		organId:organId.value
+	}
+	$api.myRequest('/train/public/train/organ/model', params).then((resData) => {
+		if(resData.code==200){
+			trainOrgan.value = (resData.data ? resData.data :{});
+			courses.value = (resData ? (resData.data.course ? (resData.data.course + "").split(",") :[]) :[]);
+			certs2.value = (resData ? JSON.parse(resData.data.zhengshu):[]);
+			list()
+		}
+		
+	});
+})
+function list(){
+	$api.myRequest('/train/public/train/organ/team/list', {organId:organId.value}).then((res) => {
+		if(res.code==200){
+			teams.value=res.data;
+			for(var i =0;i<certs2.value.length;i++){
+			  certs2.value[i].url =config.LCBaseUrl + "/file/minio" + certs2.value[i].url;
+			}
+			var certsArr = [];var flag = 0;
+			for(var i =0;i<certs2.value.length;i++){
+			  flag ++
+			  certsArr.push(certs2.value[i])
+			  if(flag == 3){
+			    var arrs = [];
+			    for(var j =0;j<3;j++){
+			      arrs.push(certsArr[j].url)
+			    }
+			    certs.value.push(arrs);
+			    certsArr = [];
+			    flag = 0;
+			  }else{
+			    if(i == certs2.value.length -1){
+			      var arrs = [];
+			      for(var j =0;j<certsArr.length;j++){
+			        arrs.push(certsArr[j].url)
+			      }
+			      certs.value.push(arrs);
+			    }
+			  }
+			}
+		}
+	})
+}
 </script>
 
-<style>
+<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: hidden;
+			.cards{
+				width: 100%;
+				min-height: 260rpx;
+				height: auto;
+				background: linear-gradient(0deg, #D4E3FE 0%, #EBF1FF 100%);
+				border-radius: 12rpx;
+				border: 2px solid #EDF5FF;
+				margin-bottom: 40rpx;
+				padding: 20rpx 30rpx 0;
+				box-sizing: border-box
+				.cardHead{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.cardHeadLeft{
+						display: flex;
+						align-items: center
+						width: 100%;
+						.cardTitle{
+							font-weight: bold;
+							font-size: 32rpx;
+							color: #0069CB;
+							max-width: 100%;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+						.titleType{
+							border-radius: 4px;
+							font-size: 22rpx;
+							color: #157EFF;
+							width: 100rpx;
+							height: 38rpx;
+							text-align: center;
+							line-height: 38rpx;
+							margin-left: 10rpx;
+						}
+						
+					}
+					
+				}
+				.heng{
+					width: 30%;
+					height: 4rpx;
+					background: linear-gradient(88deg, #015EEA 0%, #00C0FA 100%);
+					margin: 10rpx 0 20rpx;
+				}
+				.cardCon{
+					display: flex;
+					flex-wrap: wrap;
+					.conten{
+						width: 100%;
+						font-size: 26rpx;
+						color: #666666;
+						display: flex;
+						align-items: center
+						margin-bottom: 10rpx;
+					}
+					.status-tags{
+						display: flex;
+						align-items: center;
+					}
+				}
+				.flooter{
+					border-top: 1px solid #ccc;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					view{
+						font-size: 28rpx;
+						margin-left: 30rpx;
+						color: #2175F3;
+						padding-top: 14rpx;
+					}
+				}
+			}
+		}
+	}
+	.title{
+		width: 100%
+		display: flex
+		align-items: center
+		font-size: 32rpx
+		font-weight: 600
+	}
+	.title>view:first-child{
+		width: 10rpx;
+		height: 46rpx;
+		background-color: #FD7565;
+		margin-right: 20rpx;
+		border-radius: 10rpx;
+	}
+	.kcCon{
+		margin-top: 20rpx;
+		width: 100%
+	}
+	.kcIntroduction{
+		background: rgba(20,136,245,0.1);
+		padding: 20rpx;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		margin-bottom: 20rpx;
+	}
+	.faculty{
+		border: 1px solid #ddd;
+		border-radius: 10rpx;
+		padding: 10rpx;
+		margin-bottom: 20rpx;
+		box-sizing: border-box;
+		.facultyHead{
+			width: 100%;
+			height: 80rpx;
+			border-radius: 10rpx;
+			color: #fff;
+			font-size: 30rpx;
+			background: linear-gradient(88deg, #3E8BFF 0%, #0DB5FB 100%);
+			display: flex;
+			align-items: center
+			padding: 0 20rpx;
+			box-sizing: border-box;
+		}
+		.facultyCon{
+			font-size: 26rpx;
+			color: #666666;
+			padding: 20rpx 0;
+			box-sizing: border-box;
+		}
+	}
 </style>
\ No newline at end of file

From ce7d261e4b31c3ad119cfa76ef322e062d62eabc Mon Sep 17 00:00:00 2001
From: WX0lxh <2062408239@qq.com>
Date: Fri, 16 Jan 2026 16:34:46 +0800
Subject: [PATCH 22/38] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageB/institution/evaluationAgency.vue     | 708 +++++++++---------
 .../institution/evaluationAgencyDetail.vue    | 256 +++++++
 pages.json                                    |   6 +
 3 files changed, 598 insertions(+), 372 deletions(-)
 create mode 100644 packageB/institution/evaluationAgencyDetail.vue

diff --git a/packageB/institution/evaluationAgency.vue b/packageB/institution/evaluationAgency.vue
index 7546523..6c8f7fe 100644
--- a/packageB/institution/evaluationAgency.vue
+++ b/packageB/institution/evaluationAgency.vue
@@ -1,400 +1,364 @@
 <template>
-    <AppLayout :title="title" :show-bg-image="false" >
-		<view class="info-box">
-			<view class="info-item info-line">
-				<image class="info-img" :src="baseUrl+'/dispatch/person-icon.png'" mode=""></image>
-				<view class="info-label">
-					人员姓名
-				</view>
-				<view class="info-value">
-					{{personInfo.name}}
-				</view>
-			</view>
-			<view class="info-item">
-				<image class="info-img" :src="baseUrl+'/dispatch/help-icon.png'" mode=""></image>
-				<view class="info-label">
-					帮扶类型
-				</view>
-				<view class="info-value">
-					{{personInfo.taskType}}
-				</view>
-			</view>
-		</view>
-        <view class="main-list" :style="getBackgroundStyle('k.png')">
-			<view class="list-top">
-				<view class="list-title">
-					<text>新增跟进记录</text>
-					<view class="title-line"></view>
-				</view>
-			</view>
-			
-            <view class="form-container">
-                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
-                  <!-- 跟进日期 -->
-                  <uni-forms-item label="跟进日期：" name="followDate" required >
-					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.followDate" @change="onFollowDateChange" />
-                  </uni-forms-item>
-            
-                  <!-- 跟进方式 -->
-                  <uni-forms-item label="跟进方式：" name="followWay" required >
-					  <uni-data-select v-model="formData.followWay" placeholder="请选择跟进方式" :localdata="followWays" @change="onMethodChange"></uni-data-select>
-                  </uni-forms-item>
-            
-                  <!-- 跟进内容 -->
-                  <uni-forms-item label="跟进内容：" name="content" required>
-					  <uni-easyinput type="textarea" v-model="formData.content" placeholder="请输入跟进内容"></uni-easyinput>
-                  </uni-forms-item>
-            
-                  <!-- 跟进结果 -->
-                  <uni-forms-item label="跟进结果：" name="result" required>
-					  <uni-easyinput type="textarea" v-model="formData.result" placeholder="请输入跟进结果"></uni-easyinput>
-                  </uni-forms-item>
-            
-                  <!-- 下一步计划 -->
-                  <uni-forms-item label="下一步计划：" name="nextPlan">
-					  <uni-easyinput type="textarea" v-model="formData.nextPlan" placeholder="请输入下一步计划（可选）"></uni-easyinput>
-                  </uni-forms-item>
-            
-                  <!-- 下次联系时间 -->
-                  <uni-forms-item label="下次联系：" name="nextContactDate" >
-					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.nextContactDate" @change="onDateChange" />
-                  </uni-forms-item>
-                </uni-forms>
-            
-                <!-- 按钮组 -->
-                <view class="button-group">
-				  <button class="btn submit-btn" @click="handleSubmit">保存跟进</button>
-                  <button class="btn reset-btn"  @click="handleReset">重置</button>
-                </view>
-			</view>
-        </view>
-		<view class="main-list" :style="getBackgroundStyle('k.png')">
-			<view class="list-top">
-				<view class="list-title">
-					<text>跟进历史记录</text>
-					<view class="title-line"></view>
-				</view>
-				<view class="title-total">
-					共<text class="total-num">{{followListNum}}</text>条记录
-				</view>
-			</view>
-			<view class="list-box" v-if="followListNum>0">
-				<uni-steps :options="followList" active-color="#007AFF" :active="active" direction="column" />
-			</view>
-			<empty v-else pdTop="200"></empty>
-		</view>
-    </AppLayout>
+	<div class="app-box">
+		<div class="con-box">
+		    <!-- <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> -->
+			<scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+				<div class="cards" v-for="(item,index) in dataList" :key="item.examPaperId">
+					<div class="cardHead">
+						<div class="cardHeadLeft">
+							<div class="cardTitle">{{item.organName}}</div>
+						</div>
+						<div class="rightBtn" @click="handleOperation(item)">机构详情</div>
+					</div>
+					<div class="heng"></div>
+					<div class="cardCon">
+						<div class="conten">机构联系人：{{item.contactName}}</div>
+						<div class="conten">联系方式：{{item.contactPhone}}</div>
+						<div class="conten">机构地址：{{item.address}}</div>
+					</div>
+				</div>
+			</scroll-view>
+		</div>
+		
+	</div>
 </template>
 
 <script setup>
 import { inject, ref, reactive } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
-const { $api, navTo, navBack } = inject('globalFunction');
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack,urls } = inject('globalFunction');
 import config from "@/config.js"
-
-const title = ref('');
-const formData = reactive({
-  goalPersonId:'',
-  followDate: '',
-  followWay: '',
-  content: '',
-  result: '',
-  nextPlan: '',
-  nextContactDate: ''
-})
-const personInfo=ref({
-	goalPersonId:'',
-	name:'',
-	taskType:'',
-	task_id:''
-})
-const followWays = ref([])
-const followList = ref([])
-const followListNum=ref(0)
-const active=ref(null)
-// 表单引用
-const formRef = ref(null)
-
-// 校验规则
-const rules = {
-	followDate: {
-		rules: [{
-			required: true,
-			errorMessage: '请选择跟进日期'
-		}]
-	},
-	followWay: {
-		rules: [{
-			required: true,
-			errorMessage: '请选择跟进方式'
-		}]
-	},
-	content: {
-		rules: [{
-			required: true,
-			errorMessage: '请填写跟进内容'
-		}]
-	},
-	result: {
-		rules: [{
-			required: true,
-			errorMessage: '请填写跟进结果'
-		}]
-	}
-}
+const userInfo = ref({});
+const Authorization = ref('');
+const searchKeyword = ref('');
+const dataList=ref([])
+const pageSize=ref(10)
+const pageNum=ref(1)
+const totalNum=ref(0)
 const baseUrl = config.imgBaseUrl
-const getBackgroundStyle = (imageName) => ({
-    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
-    backgroundSize: 'cover',      // 覆盖整个容器
-    backgroundPosition: 'center', // 居中
-    backgroundRepeat: 'no-repeat'
+const handleScrollToLower = () => {
+    getDataList('add');
+};
+onLoad(() => {
+	
 });
-
-const onFollowDateChange = (e)=>{
-	formData.followDate=e
-}
-const onMethodChange = (e) => {
-	formData.followWay=e
-}
-// 事件处理
-const onDateChange = ( e) => {
-  formData.nextContactDate=e
-}
-function getFollowList(){
-	let header={
-		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
-		'Content-Type': "application/x-www-form-urlencoded"
-	}
-	let params={
-		personId:personInfo.value.person_id,
-		taskId:personInfo.value.task_id
-	}
-	$api.myRequest('/dispatch/assist/records/getFollowList', params,'get',9100,header).then((resData) => {
-		console.log("resData",resData)
-		if(resData && resData.code == 200){
-			if(resData.data && resData.data.length>0){
-				followListNum.value=resData.data.length
-				resData.data.forEach(item=>{
-					const obj={
-						title:item.followDate,
-						desc:`跟进方式：${getFollowWaysLabelByValue(item.followWay)}\n跟进人：${item.createByName}\n跟进内容：${item.content}`
-					}
-					followList.value.push(obj)
-				})
-			}
-			
-		}
-	});
+onShow(()=>{
+	Authorization.value=uni.getStorageSync('Padmin-Token')||''
+	getDataList('refresh');
+})
+// 搜索视频
+function searchVideo() {
+    getDataList('refresh');
 }
 
-function getDictionary(){
-	$api.myRequest('/system/public/dict/data/type/assist_follow_way').then((resData) => {
-		if(resData && resData.code == 200){
-			resData.data.forEach(item=>{
-				const obj = {
-				    value: item.dictValue,
-				    text: item.dictLabel
-				}
-				followWays.value.push(obj)
-			})
-		}
-	});
+// 清除搜索内容
+function clearSearch() {
+    searchKeyword.value = '';
+    getDataList('refresh');
 }
-function getFollowWaysLabelByValue(value) {
-	if (!Array.isArray(followWays.value)) {
-	    return ''
-	  }
-	  const item = followWays.value.find(item => item.value === String(value))
-	  return item ? item.text : '暂无跟进方式'
-}
-const handleSubmit = () => {
-  formRef.value?.validate()
-    .then(() => {
-		let header={
-			'Authorization':uni.getStorageSync('fourLevelLinkage-token')
+// 获取考试列表
+function getDataList(type = 'add') {
+	let maxPage=Math.ceil(totalNum.value/pageSize.value)
+	let params={}
+    if (type === 'refresh') {
+        pageNum.value = 1;
+		params={
+			address:"",
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
 		}
-		formData.goalPersonId=personInfo.value.goalPersonId
-		$api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => {
-			console.log("resData",resData)
-			if(resData && resData.code == 200){
-				handleReset()
-				uni.showToast({
-				  title: '保存成功',
-				  icon: 'success',
-				  duration: 2000 
-				});
-			}else{
-				uni.showToast({
-				  title: resData.msg,
-				  icon: 'none',
-				  duration: 2000
-				});
+		$api.myRequest('/train/public/rate/organ/table', params).then((resData) => {
+			if(resData.code==200){
+				dataList.value=resData.rows
+				totalNum.value=resData.total
 			}
 			
 		});
-    })
-    .catch((errors) => {
-      console.log('校验失败:', errors);
-    });
-};
-
-const handleReset = () => {
-	  formData.followDate = '';
-	  formData.followWay = '';
-	  formData.content = '';
-	  formData.result = '';
-	  formData.nextPlan = '';
-	  formData.nextContactDate = '';
+    }
+    if (type === 'add' && pageNum.value < maxPage) {
+        pageNum.value += 1;
+		params={
+			address:"",
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+		}
+		$api.myRequest('/train/public/rate/organ/table', params).then((resData) => {
+			if(resData.code==200){
+				dataList.value=dataList.value.concat(resData.rows)
+				totalNum.value=resData.total
+			}
+		});
+	}
 }
-onLoad((options) => {
-	personInfo.value.person_id=options.person_id
-	personInfo.value.name=options.name
-	personInfo.value.taskType=options.taskType
-	personInfo.value.task_id=options.task_id
-	getDictionary()
-	getFollowList()
-});
-
 
+function handleOperation(row) {
+	navTo(`/packageB/institution/evaluationAgencyDetail?organId=${row.organId}`);
+}
 </script>
 
 <style lang="stylus" scoped>
-image
-  height: 100%
-  width: 100%
-.info-box
-  margin: 30rpx 30rpx
-  background: linear-gradient(0deg, #D9ECFF 0%, #F0F7FF 100%)
-  border-radius: 20rpx
-  padding: 40rpx 0
-  display: flex
-  align-items: center
-.info-img
-  width: 40rpx
-  height: 40rpx
-  margin-bottom: 20rpx
-.info-line
-  border-right: 2rpx solid #B7D6FF
-.info-item
-  display: flex
-  flex-direction: column
-  align-items: center
-  justify-content: center
-  width: 50%
-.info-label
-  font-size: 26rpx
-  color: #6E7E9B
-  margin-bottom: 20rpx
-.info-value
-  font-weight: bold
-  font-size: 28rpx
-  color: #3D61AC
-.main-list
-  background-color: #ffffff
-  padding: 20rpx 20rpx 28rpx 20rpx
-  margin: 30rpx 30rpx
-  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
-  border-radius: 12px
-.list-top
-  display: flex
-  align-items: center
-  justify-content: space-between
-.list-title
-  font-weight: bold
-  font-size: 36rpx
-  color: #404040
-  position: relative
-
-.title-line
-  position: absolute
-  bottom: -10rpx
-  left: 70rpx
-  width: 70rpx
-  height: 8rpx
-  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
-  border-radius: 4rpx
-.title-total
-  font-size: 24rpx
-  color: #999999
-.total-num
-  color: #3088FF
-  margin-left: 4rpx
-  margin-right: 4rpx
-  font-weight: bold
-  font-size: 26rpx
-
-.label
-  width: 160rpx
-  font-size: 28rpx
-  color: #404040
-
-.input,
-.picker
-  flex: 1
-
-.picker-value
-  color: #666
-.list-box
-  margin-top: 40rpx
-
-.form-container 
-  margin-top: 30rpx
-:deep(.uni-forms-item__label)
-  width: 194rpx !important
-  font-size: 28rpx;
-  color: #404040;
-
-.button-group {
-  display: flex;
-  justify-content: space-between;
-  padding: 40rpx 20rpx 20rpx;
+.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: 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%;
+			.cards{
+				width: 100%;
+				min-height: 260rpx;
+				height: auto;
+				background: linear-gradient(0deg, #E3EFFF 0%, #FBFDFF 100%);
+				// box-shadow: 0px 0px 6px 0px rgba(0,71,200,0.32);
+				border-radius: 12rpx;
+				border: 2px solid #EDF5FF;
+				margin-bottom: 30rpx;
+				padding: 30rpx 40rpx 0;
+				box-sizing: border-box
+				.cardHead{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.cardHeadLeft{
+						display: flex;
+						align-items: center
+						width: 70%;
+						.cardTitle{
+							font-weight: bold;
+							font-size: 28rpx;
+							color: #0069CB;
+							max-width: 100%;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+						.titleType{
+							border-radius: 4px;
+							font-size: 22rpx;
+							color: #157EFF;
+							width: 100rpx;
+							height: 38rpx;
+							text-align: center;
+							line-height: 38rpx;
+							margin-left: 10rpx;
+						}
+						
+					}
+					
+				}
+				.heng{
+					width: 30%;
+					height: 4rpx;
+					background: linear-gradient(88deg, #015EEA 0%, #00C0FA 100%);
+					margin: 10rpx 0 20rpx;
+				}
+				.cardCon{
+					display: flex;
+					flex-wrap: wrap;
+					.conten{
+						width: 100%;
+						font-size: 24rpx;
+						color: #666666;
+						display: flex;
+						align-items: center
+						margin-bottom: 10rpx;
+					}
+					.status-tags{
+						display: flex;
+						align-items: center;
+					}
+				}
+				.flooter{
+					border-top: 1px solid #ccc;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					view{
+						font-size: 28rpx;
+						margin-left: 30rpx;
+						color: #2175F3;
+						padding-top: 14rpx;
+					}
+				}
+			}
+		}
+	}
+	.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: 70%;
+			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;
+			}
+			
+		}
+	}
+}
+.titleType{
+	display: inline-block
+	border-radius: 4px;
+	font-size: 22rpx;
+	color: #157EFF;
+	width: 100rpx;
+	height: 38rpx;
+	text-align: center;
+	line-height: 38rpx;
+	margin-left: 10rpx;
+}
+.primary{
+	border: 1px solid #157EFF!important;
+	color: #157EFF!important
+}
+.success{
+	border: 1px solid #05A636!important;
+	color: #05A636!important
+}
+.info{
+	border: 1px solid #898989!important;
+	color: #898989!important
+}
+.tertiary{
+	border: 1px solid #E6A340!important;
+	color: #E6A340!important
+}
+.primary2{
+	border: 1px solid #F56C6C!important;
+	color: #F56C6C!important
+}
+.rightBtn{
+	width: 140rpx;
+	height: 44rpx;
+	line-height: 44rpx;
+	background: linear-gradient(90deg, #00C0FA 0%, #1271FF 100%);
+	border-radius: 4px;
+	color: #fff;
+	font-size: 24rpx;
+	text-align: center;
+}
+.detailTitle{
+	font-size: 32rpx;
+	font-weight: 600;
+	margin: 30rpx 0;
+}
+.detailCon{
+	font-size: 28rpx;
+	line-height: 40rpx;
+}
+.exam-info {
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: 35rpx;
+	margin-top: 20rpx;
 }
 
-.btn {
-  width: 45%;
-  height: 80rpx;
-  font-size: 30rpx;
-  border-radius: 8rpx;
+.info-item {
+	flex: 1;
+	text-align: center;
 }
 
-.reset-btn {
-  background-color: #D8E9FF;
-  color: #1176FF;
+.info-value {
+	font-family: 'D-DIN-Medium';
+	font-size: 26rpx;
+	font-weight: 600;
+	color: #409EFF;
+	margin-bottom: 8rpx;
 }
 
-.submit-btn {
-  background-color: #368BFF;
-  color: white;
+.info-label {
+	font-size: 26rpx;
+	color: #333;
+}
+
+.info-divider {
+	width: 2px;
+	background-color: #C3E1FF;
 }
-:deep(.uni-steps__column-circle )
-  width: 24rpx !important
-  height: 24rpx !important
-  background: radial-gradient(circle, 
-    #00C0FA 0%, 
-    #015EEA 50%, 
-    #FFFFFF 51%,  
-    #FFFFFF 100%) !important
-  border-radius: 50%
-  border: 2rpx solid #015EEA
-:deep(.uni-steps__column-title)
-  font-size: 28rpx !important
-  color: #006CFF !important
-  margin-bottom: 24rpx
-:deep(.uni-steps__column-desc)
-  font-size: 28rpx
-  color: #898989 !important
-  line-height: 1.5
-:deep(.uni-steps__column-text )
-  padding: 16rpx 0 !important
-  border: none
-:deep(.uni-steps__column-line)
-  background-color: #368BFF !important
-:deep(.uni-steps__column-line--before)
-  background-color:rgba(0,0,0,0) !important
-:deep(.uni-date-x)
-  background: rgba(0,0,0,0) !important
-:deep(.uni-stat-box)
-  background: rgba(0,0,0,0) !important
-:deep(.uni-easyinput__content)
-  background: rgba(0,0,0,0) !important
 </style>
diff --git a/packageB/institution/evaluationAgencyDetail.vue b/packageB/institution/evaluationAgencyDetail.vue
new file mode 100644
index 0000000..fd35289
--- /dev/null
+++ b/packageB/institution/evaluationAgencyDetail.vue
@@ -0,0 +1,256 @@
+<template>
+	<div class="app-box">
+		<div class="con-box">
+			<div class="cards">
+				<div class="cardHead">
+					<div class="cardHeadLeft">
+						<div class="cardTitle">{{organ.organName}}</div>
+					</div>
+					<div class="rightBtn" @click="handleOperation()"></div>
+				</div>
+				<div class="heng"></div>
+				<div class="cardCon">
+					<div class="conten">机构联系人：{{organ.contactName}}</div>
+					<div class="conten">联系方式：{{organ.contactPhone}}</div>
+					<div class="conten">机构地址：{{organ.address}}</div>
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom: 40rpx;">
+				<div class="title">
+					<div></div>
+					<div>评价流程说明</div>
+				</div>
+				<div class="kcCon">
+					<div class="kcIntroduction" v-if="organ.processDescription">{{organ.processDescription}}</div>
+					<div v-else style="text-align: center;line-height: 100rpx;">暂无数据</div>
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom: 40rpx;">
+				<div class="title">
+					<div></div>
+					<div>评价项目</div>
+				</div>
+				<div class="kcCon">
+					<div class="kcIntroduction" v-if="organ.organContent">{{organ.organContent}}</div>
+					<div v-else style="text-align: center;line-height: 100rpx;">暂无数据</div>
+				</div>
+			</div>
+			<div style="width: 100%;margin-bottom: 30rpx;">
+				<div class="title">
+					<div></div>
+					<div>资质证书</div>
+				</div>
+				<div class="kcCon">
+					<div v-for="(item, index) in certs":key = "index" style="width: 100%;">
+						<div v-for="(url, index2) in item" :key = "index2" style="width: 100%;">
+							<image :src="url" mode="" style="width: 100%;"></image>
+						</div>
+					</div>
+					<div v-if="certs.length==0" style="text-align: center;line-height: 100rpx;">暂无数据</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup>
+import { inject, ref, reactive } from 'vue';
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack,urls } = inject('globalFunction');
+import config from "@/config.js"
+const organ = ref({});
+const courses = ref([]);
+const certs = ref([]);
+const certs2 = ref([]);
+const teams=ref([])
+const certIndex=ref(1)
+const organId=ref('')
+const Authorization=ref('')
+onLoad((options) => {
+	organId.value=options.organId
+});
+onShow(()=>{
+	Authorization.value=uni.getStorageSync('Padmin-Token')||''
+	let params={
+		organId:organId.value
+	}
+	$api.myRequest('/train/public/rate/organ/model', params).then((resData) => {
+		if(resData.code==200){
+			organ.value = (resData.data ? resData.data :{});
+			certs2.value = (resData ? JSON.parse(resData.data.zhengshu):[]);
+			for(var i =0;i<certs2.value.length;i++){
+			  certs2.value[i].url =config.LCBaseUrl + "/file/minio" + certs2.value[i].url;
+			}
+			var certsArr = [];var flag = 0;
+			for(var i =0;i<certs2.value.length;i++){
+			  flag ++
+			  certsArr.push(certs2.value[i])
+			  if(flag == 3){
+			    var arrs = [];
+			    for(var j =0;j<3;j++){
+			      arrs.push(certsArr[j].url)
+			    }
+			    certs.value.push(arrs);
+			    certsArr = [];
+			    flag = 0;
+			  }else{
+			    if(i == certs2.value.length -1){
+			      var arrs = [];
+			      for(var j =0;j<certsArr.length;j++){
+			        arrs.push(certsArr[j].url)
+			      }
+			      certs.value.push(arrs);
+			    }
+			  }
+			}
+		}
+		
+	});
+})
+
+</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: hidden;
+			.cards{
+				width: 100%;
+				min-height: 260rpx;
+				height: auto;
+				background: linear-gradient(0deg, #D4E3FE 0%, #EBF1FF 100%);
+				border-radius: 12rpx;
+				border: 2px solid #EDF5FF;
+				margin-bottom: 40rpx;
+				padding: 20rpx 30rpx 0;
+				box-sizing: border-box
+				.cardHead{
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					.cardHeadLeft{
+						display: flex;
+						align-items: center
+						width: 100%;
+						.cardTitle{
+							font-weight: bold;
+							font-size: 32rpx;
+							color: #0069CB;
+							max-width: 100%;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							white-space: nowrap;
+						}
+						.titleType{
+							border-radius: 4px;
+							font-size: 22rpx;
+							color: #157EFF;
+							width: 100rpx;
+							height: 38rpx;
+							text-align: center;
+							line-height: 38rpx;
+							margin-left: 10rpx;
+						}
+						
+					}
+					
+				}
+				.heng{
+					width: 30%;
+					height: 4rpx;
+					background: linear-gradient(88deg, #015EEA 0%, #00C0FA 100%);
+					margin: 10rpx 0 20rpx;
+				}
+				.cardCon{
+					display: flex;
+					flex-wrap: wrap;
+					.conten{
+						width: 100%;
+						font-size: 26rpx;
+						color: #666666;
+						display: flex;
+						align-items: center
+						margin-bottom: 10rpx;
+					}
+					.status-tags{
+						display: flex;
+						align-items: center;
+					}
+				}
+				.flooter{
+					border-top: 1px solid #ccc;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					view{
+						font-size: 28rpx;
+						margin-left: 30rpx;
+						color: #2175F3;
+						padding-top: 14rpx;
+					}
+				}
+			}
+		}
+	}
+	.title{
+		width: 100%
+		display: flex
+		align-items: center
+		font-size: 32rpx
+		font-weight: 600
+	}
+	.title>view:first-child{
+		width: 10rpx;
+		height: 46rpx;
+		background-color: #FD7565;
+		margin-right: 20rpx;
+		border-radius: 10rpx;
+	}
+	.kcCon{
+		margin-top: 20rpx;
+		width: 100%
+	}
+	.kcIntroduction{
+		background: rgba(20,136,245,0.1);
+		padding: 20rpx;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		margin-bottom: 20rpx;
+	}
+	.faculty{
+		border: 1px solid #ddd;
+		border-radius: 10rpx;
+		padding: 10rpx;
+		margin-bottom: 20rpx;
+		box-sizing: border-box;
+		.facultyHead{
+			width: 100%;
+			height: 80rpx;
+			border-radius: 10rpx;
+			color: #fff;
+			font-size: 30rpx;
+			background: linear-gradient(88deg, #3E8BFF 0%, #0DB5FB 100%);
+			display: flex;
+			align-items: center
+			padding: 0 20rpx;
+			box-sizing: border-box;
+		}
+		.facultyCon{
+			font-size: 26rpx;
+			color: #666666;
+			padding: 20rpx 0;
+			box-sizing: border-box;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index c3ba787..3469836 100644
--- a/pages.json
+++ b/pages.json
@@ -432,6 +432,12 @@
 		      "navigationBarTitleText": "评价机构信息"
 		    }
 		  },
+		  {
+		    "path": "institution/evaluationAgencyDetail",
+		    "style": {
+		      "navigationBarTitleText": "评价机构信息详情"
+		    }
+		  },
 		  {
 		    "path": "institution/trainingInstitution",
 		    "style": {

From fb95e1c74e785d0f6e5798e5bf190162ae4c04aa Mon Sep 17 00:00:00 2001
From: WX0lxh <2062408239@qq.com>
Date: Fri, 16 Jan 2026 16:40:55 +0800
Subject: [PATCH 23/38] =?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/startExam.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packageB/train/mockExam/startExam.vue b/packageB/train/mockExam/startExam.vue
index 583528d..570e1c8 100644
--- a/packageB/train/mockExam/startExam.vue
+++ b/packageB/train/mockExam/startExam.vue
@@ -606,6 +606,8 @@ function exit(){
 			}
 			.questionNums{
 			  width: 100%;
+			  height: 90vh;
+			  overflow-y: auto;
 			  display: flex;
 			  flex-wrap: wrap;
 			}
@@ -618,6 +620,7 @@ function exit(){
 			  border: 2px solid #E0E0E0;
 			  font-size: 28rpx;
 			  margin-right: 15px;
+			  margin-bottom: 15px;
 			  cursor: pointer;
 			}
 			.questionsActive{

From d983bb272b0b1452c015c521bfcdf29791772995 Mon Sep 17 00:00:00 2001
From: lijie_ycrj <1540286404@qq.com>
Date: Fri, 16 Jan 2026 16:50:06 +0800
Subject: [PATCH 24/38] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageB/notice/detail.vue |  79 ++++++
 packageB/notice/index.vue  | 547 ++++++++++++-------------------------
 pages.json                 |   6 +
 3 files changed, 259 insertions(+), 373 deletions(-)
 create mode 100644 packageB/notice/detail.vue

diff --git a/packageB/notice/detail.vue b/packageB/notice/detail.vue
new file mode 100644
index 0000000..1b1af5b
--- /dev/null
+++ b/packageB/notice/detail.vue
@@ -0,0 +1,79 @@
+<template>
+	<AppLayout :show-bg-image="false">
+		<view class="main-list" >
+		    <view class="title">
+		      {{ dataInfo.title }}
+			</view>
+			<view class="publishTime">
+			  发布日期：{{ dataInfo.publishTime }}
+			</view>
+		    <view >
+		      <view class="gk-l-i-bottom" v-html="dataInfo.content"></view>
+		    </view>
+		</view>
+	</AppLayout>
+</template>
+
+<script setup>
+import { inject, ref, reactive, onMounted } from "vue";
+import { onLoad, onShow } from '@dcloudio/uni-app';
+const { $api, navTo, navBack, vacanciesTo } = inject("globalFunction");
+import config from "@/config.js";
+import AppLayout from "@/components/AppLayout/AppLayout.vue";
+const baseUrl = config.imgBaseUrl;
+const dataInfo = ref([]);
+const id = ref('');
+const getBackgroundStyle = (imageName) => ({
+  backgroundImage: `url(${baseUrl}/${imageName})`,
+  backgroundSize: "cover", // 覆盖整个容器
+  backgroundPosition: "center", // 居中
+  backgroundRepeat: "no-repeat",
+});
+onLoad((options) => {
+	id.value=options.id
+	getData();
+});
+
+function getData() {
+
+	let params={
+		id:id.value
+	}
+	$api.myRequest('/train/public/announcement/selectById', params).then((resData) => {
+		if(resData.code==200){
+			var td = new RegExp("<td", "g")
+			var table = new RegExp('<table style="width: auto;', "g")
+			resData.data.content  = (resData.data.content + "").replace(td, '<td style = "border:1px solid #cecece;font-size:0.8rem;" ')
+			resData.data.content  = (resData.data.content + "").replace(table, '<table style="width: auto; border-collapse: collapse;" ')
+			dataInfo.value=resData.data
+		}
+		
+	});
+}
+
+</script>
+
+<style lang="scss" scoped>
+.main-list {
+  background-color: #ffffff;
+  padding: 20rpx 25rpx 28rpx 25rpx;
+  margin: 30rpx 30rpx;
+  box-shadow: 0px 3px 20px 0px rgba(0, 105, 234, 0.1);
+  border-radius: 12px;
+}
+.title {
+	font-size: 32rpx;
+	font-weight: bold;
+	color: #282828;
+	margin-bottom: 16rpx;
+	display: flex;
+	justify-content: center;
+}
+.publishTime{
+	text-align: center;
+	font-size: 24rpx;
+	color: #a2a2a2;
+	margin-top: 12rpx;
+	margin-bottom: 20rpx;
+}
+</style>
\ No newline at end of file
diff --git a/packageB/notice/index.vue b/packageB/notice/index.vue
index 7546523..41f8273 100644
--- a/packageB/notice/index.vue
+++ b/packageB/notice/index.vue
@@ -1,400 +1,201 @@
 <template>
-    <AppLayout :title="title" :show-bg-image="false" >
-		<view class="info-box">
-			<view class="info-item info-line">
-				<image class="info-img" :src="baseUrl+'/dispatch/person-icon.png'" mode=""></image>
-				<view class="info-label">
-					人员姓名
-				</view>
-				<view class="info-value">
-					{{personInfo.name}}
-				</view>
-			</view>
-			<view class="info-item">
-				<image class="info-img" :src="baseUrl+'/dispatch/help-icon.png'" mode=""></image>
-				<view class="info-label">
-					帮扶类型
-				</view>
-				<view class="info-value">
-					{{personInfo.taskType}}
-				</view>
-			</view>
+  <AppLayout :title="title" :show-bg-image="false">
+	<view class="tab-container">
+		<view class="tab-item" :class="{ active: currentTab === 'train' }" @click="switchTab('train')">
+		  培训公告
 		</view>
-        <view class="main-list" :style="getBackgroundStyle('k.png')">
-			<view class="list-top">
-				<view class="list-title">
-					<text>新增跟进记录</text>
-					<view class="title-line"></view>
-				</view>
-			</view>
-			
-            <view class="form-container">
-                <uni-forms ref="formRef" v-model="formData" :rules="rules" validate-trigger="submit" >
-                  <!-- 跟进日期 -->
-                  <uni-forms-item label="跟进日期：" name="followDate" required >
-					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.followDate" @change="onFollowDateChange" />
-                  </uni-forms-item>
-            
-                  <!-- 跟进方式 -->
-                  <uni-forms-item label="跟进方式：" name="followWay" required >
-					  <uni-data-select v-model="formData.followWay" placeholder="请选择跟进方式" :localdata="followWays" @change="onMethodChange"></uni-data-select>
-                  </uni-forms-item>
-            
-                  <!-- 跟进内容 -->
-                  <uni-forms-item label="跟进内容：" name="content" required>
-					  <uni-easyinput type="textarea" v-model="formData.content" placeholder="请输入跟进内容"></uni-easyinput>
-                  </uni-forms-item>
-            
-                  <!-- 跟进结果 -->
-                  <uni-forms-item label="跟进结果：" name="result" required>
-					  <uni-easyinput type="textarea" v-model="formData.result" placeholder="请输入跟进结果"></uni-easyinput>
-                  </uni-forms-item>
-            
-                  <!-- 下一步计划 -->
-                  <uni-forms-item label="下一步计划：" name="nextPlan">
-					  <uni-easyinput type="textarea" v-model="formData.nextPlan" placeholder="请输入下一步计划（可选）"></uni-easyinput>
-                  </uni-forms-item>
-            
-                  <!-- 下次联系时间 -->
-                  <uni-forms-item label="下次联系：" name="nextContactDate" >
-					  <uni-datetime-picker class="picker-value" type="date" placeholder="请选择跟进日期"  v-model="formData.nextContactDate" @change="onDateChange" />
-                  </uni-forms-item>
-                </uni-forms>
-            
-                <!-- 按钮组 -->
-                <view class="button-group">
-				  <button class="btn submit-btn" @click="handleSubmit">保存跟进</button>
-                  <button class="btn reset-btn"  @click="handleReset">重置</button>
-                </view>
-			</view>
-        </view>
-		<view class="main-list" :style="getBackgroundStyle('k.png')">
-			<view class="list-top">
-				<view class="list-title">
-					<text>跟进历史记录</text>
-					<view class="title-line"></view>
-				</view>
-				<view class="title-total">
-					共<text class="total-num">{{followListNum}}</text>条记录
-				</view>
-			</view>
-			<view class="list-box" v-if="followListNum>0">
-				<uni-steps :options="followList" active-color="#007AFF" :active="active" direction="column" />
-			</view>
-			<empty v-else pdTop="200"></empty>
+		<view class="tab-item" :class="{ active: currentTab === 'evaluate' }"  @click="switchTab('evaluate')">
+		  评价公告
 		</view>
-    </AppLayout>
+	</view>
+	<scroll-view scroll-y class="main-scroll" @scrolltolower="handleScrollToLower">
+		<view class="main-list" >
+		  <view
+			:style="getBackgroundStyle('frame-activity.png')"
+		    class="policy-list"
+		    v-for="(item, index) in policyList"
+		    :key="index"
+		    @click="goPolicyDetail(item)" >
+		    <view class="title">
+		      {{ item.title }}
+			</view>
+			<view class="bottom-line">
+				<view>
+				  <uni-icons color="#A2A2A2" type="info" size="12"></uni-icons>
+				  发布日期：{{ item.publishTime }}
+				</view>
+			</view>
+		    <view >
+		      <view class="gk-l-i-bottom" v-html="item.content"></view>
+		    </view>
+		    
+		  </view>
+		</view>
+	</scroll-view>
+	
+    
+  </AppLayout>
 </template>
 
 <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"
+import { inject, ref, reactive, onMounted } from "vue";
+const { $api, navTo, navBack, vacanciesTo } = inject("globalFunction");
+import config from "@/config.js";
+import AppLayout from "@/components/AppLayout/AppLayout.vue";
+const title = ref("");
+const baseUrl = config.imgBaseUrl;
+const pageSize=ref(10)
+const pageNum=ref(1)
+const totalNum=ref(0)
+// Tab 控制
+const currentTab = ref("train"); // 默认显示培训公告
 
-const title = ref('');
-const formData = reactive({
-  goalPersonId:'',
-  followDate: '',
-  followWay: '',
-  content: '',
-  result: '',
-  nextPlan: '',
-  nextContactDate: ''
-})
-const personInfo=ref({
-	goalPersonId:'',
-	name:'',
-	taskType:'',
-	task_id:''
-})
-const followWays = ref([])
-const followList = ref([])
-const followListNum=ref(0)
-const active=ref(null)
-// 表单引用
-const formRef = ref(null)
-
-// 校验规则
-const rules = {
-	followDate: {
-		rules: [{
-			required: true,
-			errorMessage: '请选择跟进日期'
-		}]
-	},
-	followWay: {
-		rules: [{
-			required: true,
-			errorMessage: '请选择跟进方式'
-		}]
-	},
-	content: {
-		rules: [{
-			required: true,
-			errorMessage: '请填写跟进内容'
-		}]
-	},
-	result: {
-		rules: [{
-			required: true,
-			errorMessage: '请填写跟进结果'
-		}]
-	}
+function switchTab(tabName) {
+  currentTab.value = tabName;
+  getPolicyData('refresh',currentTab)
 }
-const baseUrl = config.imgBaseUrl
+const handleScrollToLower = () => {
+    getPolicyData('add',currentTab);
+};
 const getBackgroundStyle = (imageName) => ({
-    backgroundImage: `url(${baseUrl}/dispatch/${imageName})`,
-    backgroundSize: 'cover',      // 覆盖整个容器
-    backgroundPosition: 'center', // 居中
-    backgroundRepeat: 'no-repeat'
+  backgroundImage: `url(${baseUrl}/${imageName})`,
+  backgroundSize: "100% 100%", // 覆盖整个容器
+  backgroundPosition: "center", // 居中
+  backgroundRepeat: "no-repeat",
 });
-
-const onFollowDateChange = (e)=>{
-	formData.followDate=e
-}
-const onMethodChange = (e) => {
-	formData.followWay=e
-}
-// 事件处理
-const onDateChange = ( e) => {
-  formData.nextContactDate=e
-}
-function getFollowList(){
-	let header={
-		'Authorization':uni.getStorageSync('fourLevelLinkage-token'),
-		'Content-Type': "application/x-www-form-urlencoded"
+onMounted(() => {
+  getPolicyData('refresh',currentTab);
+});
+const policyList = ref([]);
+function getPolicyData(type = 'add',currentTab='train') {
+	let current=ref('1')
+	if(currentTab.value=='train'){
+		current.value='1'
+	}else if(currentTab.value=='evaluate'){
+		current.value='2'
 	}
-	let params={
-		personId:personInfo.value.person_id,
-		taskId:personInfo.value.task_id
-	}
-	$api.myRequest('/dispatch/assist/records/getFollowList', params,'get',9100,header).then((resData) => {
-		console.log("resData",resData)
-		if(resData && resData.code == 200){
-			if(resData.data && resData.data.length>0){
-				followListNum.value=resData.data.length
-				resData.data.forEach(item=>{
-					const obj={
-						title:item.followDate,
-						desc:`跟进方式：${getFollowWaysLabelByValue(item.followWay)}\n跟进人：${item.createByName}\n跟进内容：${item.content}`
-					}
-					followList.value.push(obj)
-				})
-			}
-			
+	let maxPage=Math.ceil(totalNum.value/pageSize.value)
+	let params={}
+	if (type === 'refresh') {
+	    pageNum.value = 1;
+		params={
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+			type:current.value
 		}
-	});
-}
-
-function getDictionary(){
-	$api.myRequest('/system/public/dict/data/type/assist_follow_way').then((resData) => {
-		if(resData && resData.code == 200){
-			resData.data.forEach(item=>{
-				const obj = {
-				    value: item.dictValue,
-				    text: item.dictLabel
+		$api.myRequest('/train/public/announcement/list', params).then((resData) => {
+			if(resData.code==200){
+				for(var i = 0;i<resData.rows.length;i++){
+					resData.rows[i].content = resData.rows[i].content.replace(/<[^>]+>/g,"");
 				}
-				followWays.value.push(obj)
-			})
-		}
-	});
-}
-function getFollowWaysLabelByValue(value) {
-	if (!Array.isArray(followWays.value)) {
-	    return ''
-	  }
-	  const item = followWays.value.find(item => item.value === String(value))
-	  return item ? item.text : '暂无跟进方式'
-}
-const handleSubmit = () => {
-  formRef.value?.validate()
-    .then(() => {
-		let header={
-			'Authorization':uni.getStorageSync('fourLevelLinkage-token')
-		}
-		formData.goalPersonId=personInfo.value.goalPersonId
-		$api.myRequest('/dispatch/assist/records/addRecords', formData,'post',9100,header).then((resData) => {
-			console.log("resData",resData)
-			if(resData && resData.code == 200){
-				handleReset()
-				uni.showToast({
-				  title: '保存成功',
-				  icon: 'success',
-				  duration: 2000 
-				});
-			}else{
-				uni.showToast({
-				  title: resData.msg,
-				  icon: 'none',
-				  duration: 2000
-				});
+				policyList.value=resData.rows
+				totalNum.value=resData.total
 			}
 			
 		});
-    })
-    .catch((errors) => {
-      console.log('校验失败:', errors);
-    });
-};
-
-const handleReset = () => {
-	  formData.followDate = '';
-	  formData.followWay = '';
-	  formData.content = '';
-	  formData.result = '';
-	  formData.nextPlan = '';
-	  formData.nextContactDate = '';
+	}
+	if (type === 'add' && pageNum.value < maxPage) {
+	    pageNum.value += 1;
+		params={
+			pageSize:pageSize.value,
+			pageNum:pageNum.value,
+			type:current.value
+		}
+		$api.myRequest('/train/public/announcement/list', params).then((resData) => {
+			if(resData.code==200){
+				for(var i = 0;i<resData.rows.length;i++){
+					resData.rows[i].content = resData.rows[i].content.replace(/<[^>]+>/g,"");
+				}
+				policyList.value=policyList.value.concat(resData.rows)
+				totalNum.value=resData.total
+			}
+		});
+	}
 }
-onLoad((options) => {
-	personInfo.value.person_id=options.person_id
-	personInfo.value.name=options.name
-	personInfo.value.taskType=options.taskType
-	personInfo.value.task_id=options.task_id
-	getDictionary()
-	getFollowList()
-});
-
 
+function goPolicyDetail(item) {
+  uni.navigateTo({
+	  url:`/packageB/notice/detail?id=${item.id}`
+    // url: `/packageRc/pages/policy/policyDetail?id=${item.id}`
+  });
+}
 </script>
 
-<style lang="stylus" scoped>
-image
-  height: 100%
-  width: 100%
-.info-box
-  margin: 30rpx 30rpx
-  background: linear-gradient(0deg, #D9ECFF 0%, #F0F7FF 100%)
-  border-radius: 20rpx
-  padding: 40rpx 0
-  display: flex
-  align-items: center
-.info-img
-  width: 40rpx
-  height: 40rpx
-  margin-bottom: 20rpx
-.info-line
-  border-right: 2rpx solid #B7D6FF
-.info-item
-  display: flex
-  flex-direction: column
-  align-items: center
-  justify-content: center
-  width: 50%
-.info-label
-  font-size: 26rpx
-  color: #6E7E9B
-  margin-bottom: 20rpx
-.info-value
-  font-weight: bold
-  font-size: 28rpx
-  color: #3D61AC
-.main-list
-  background-color: #ffffff
-  padding: 20rpx 20rpx 28rpx 20rpx
-  margin: 30rpx 30rpx
-  box-shadow: 0px 3px 20px 0px rgba(0,105,234,0.1)
-  border-radius: 12px
-.list-top
-  display: flex
-  align-items: center
-  justify-content: space-between
-.list-title
-  font-weight: bold
-  font-size: 36rpx
-  color: #404040
-  position: relative
-
-.title-line
-  position: absolute
-  bottom: -10rpx
-  left: 70rpx
-  width: 70rpx
-  height: 8rpx
-  background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%)
-  border-radius: 4rpx
-.title-total
-  font-size: 24rpx
-  color: #999999
-.total-num
-  color: #3088FF
-  margin-left: 4rpx
-  margin-right: 4rpx
-  font-weight: bold
-  font-size: 26rpx
-
-.label
-  width: 160rpx
-  font-size: 28rpx
-  color: #404040
-
-.input,
-.picker
-  flex: 1
-
-.picker-value
-  color: #666
-.list-box
-  margin-top: 40rpx
-
-.form-container 
-  margin-top: 30rpx
-:deep(.uni-forms-item__label)
-  width: 194rpx !important
-  font-size: 28rpx;
-  color: #404040;
-
-.button-group {
+<style lang="scss" scoped>
+.main-list {
+  // background-color: #ffffff;
+  // padding: 20rpx 25rpx 28rpx 25rpx;
+  margin: 0 30rpx 30rpx 30rpx;
+  // box-shadow: 0px 3px 20px 0px rgba(0, 105, 234, 0.1);
+  // border-radius: 12px;
+}
+.tab-container {
   display: flex;
-  justify-content: space-between;
-  padding: 40rpx 20rpx 20rpx;
-}
-
-.btn {
-  width: 45%;
   height: 80rpx;
-  font-size: 30rpx;
-  border-radius: 8rpx;
+  background-color: #fff;
+  margin: 0 30rpx 20rpx;
+  border-radius: 12rpx;
+  overflow: hidden;
+  margin-top: 10rpx;
 }
 
-.reset-btn {
-  background-color: #D8E9FF;
-  color: #1176FF;
+.tab-item {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  color: #666;
+  transition: all 0.3s;
 }
 
-.submit-btn {
-  background-color: #368BFF;
-  color: white;
+.tab-item.active {
+  background-color: #ffffff;
+  color: #4c6efb;
+  font-weight: bold;
+  // box-shadow: 0 4rpx 10rpx rgba(0, 0, 0, 0.05);
+  border-bottom: 2rpx solid #4c6efb;
 }
-:deep(.uni-steps__column-circle )
-  width: 24rpx !important
-  height: 24rpx !important
-  background: radial-gradient(circle, 
-    #00C0FA 0%, 
-    #015EEA 50%, 
-    #FFFFFF 51%,  
-    #FFFFFF 100%) !important
-  border-radius: 50%
-  border: 2rpx solid #015EEA
-:deep(.uni-steps__column-title)
-  font-size: 28rpx !important
-  color: #006CFF !important
-  margin-bottom: 24rpx
-:deep(.uni-steps__column-desc)
-  font-size: 28rpx
-  color: #898989 !important
-  line-height: 1.5
-:deep(.uni-steps__column-text )
-  padding: 16rpx 0 !important
-  border: none
-:deep(.uni-steps__column-line)
-  background-color: #368BFF !important
-:deep(.uni-steps__column-line--before)
-  background-color:rgba(0,0,0,0) !important
-:deep(.uni-date-x)
-  background: rgba(0,0,0,0) !important
-:deep(.uni-stat-box)
-  background: rgba(0,0,0,0) !important
-:deep(.uni-easyinput__content)
-  background: rgba(0,0,0,0) !important
-</style>
+.gk-l-i-bottom{
+	margin-top: 16px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 3;
+	-webkit-box-orient: vertical;
+}
+.main-scroll {
+	width: 100%;
+	height: 90%;
+}
+
+.policy-list {
+  width: 100%;
+  margin: 0 auto;
+  color: #333333;
+  border-radius: 24rpx;
+  background: #ffffff;
+  margin-bottom: 24rpx;
+  padding: 28rpx 22rpx;
+  box-sizing: border-box;
+  position: relative;
+
+
+  .title {
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #282828;
+    margin-bottom: 16rpx;
+    display: flex;
+  }
+
+
+  .bottom-line {
+    display: flex;
+    justify-content: space-between;
+    font-size: 24rpx;
+    color: #a2a2a2;
+    margin-top: 12rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index c3ba787..c29ad4c 100644
--- a/pages.json
+++ b/pages.json
@@ -426,6 +426,12 @@
 		      "navigationBarTitleText": "培训评价公告"
 		    }
 		  },
+		  {
+		    "path": "notice/detail",
+		    "style": {
+		      "navigationBarTitleText": "公告详情"
+		    }
+		  },
 		  {
 		    "path": "institution/evaluationAgency",
 		    "style": {

From ba38158d4c130369b3d1aa4a295e561b135f45ba Mon Sep 17 00:00:00 2001
From: lijie_ycrj <1540286404@qq.com>
Date: Fri, 16 Jan 2026 17:03:03 +0800
Subject: [PATCH 25/38] =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/components/index-one.vue |   9 +++++----
 static/icon/pxjgxx.png               | Bin 0 -> 942 bytes
 static/icon/pxpjjg.png               | Bin 0 -> 1048 bytes
 static/icon/pxxxcj.png               | Bin 0 -> 1040 bytes
 4 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 static/icon/pxjgxx.png
 create mode 100644 static/icon/pxpjjg.png
 create mode 100644 static/icon/pxxxcj.png

diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 27c6a90..f05f669 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -167,14 +167,15 @@
 				    <view class="service-title">帮扶</view>
 				</view>
                 <view class="service-item press-button" @click="handleNoticeClick">
-                    <view class="service-icon service-icon-12">
-                        <span style="display:block;width:40rpx;height:40rpx;border-radius:100%;border:4rpx #ffffff solid;line-height:40rpx;text-align:center;">￥</span>
+                    <view class="service-icon service-icon-10">
+                        <uni-icons type="sound" size="32" color="#FFFFFF"></uni-icons>
                     </view>
                     <view class="service-title">培训评价公告</view>
                 </view>
                 <view class="service-item press-button" @click="handleInstitutionClick('training')">
-                    <view class="service-icon service-icon-7">
-                        <IconfontIcon name="suzhicepingtiku" :size="48" color="#FFFFFF" />
+                    <view class="service-icon service-icon-6">
+						<uni-icons type="map-pin-ellipse" size="32" color="#FFFFFF"></uni-icons>
+                        <!-- <image class="service-icon-img" src="/static/icon/pxjgxx.png" mode="aspectFit"></image> -->
                     </view>
                     <view class="service-title">培训机构信息</view>
                 </view>
diff --git a/static/icon/pxjgxx.png b/static/icon/pxjgxx.png
new file mode 100644
index 0000000000000000000000000000000000000000..f341d355062059a4a412ac2d8467e7aa1194c05e
GIT binary patch
literal 942
zcmV;f15x~mP)<h;3K|Lk000e1NJLTq001li001cn1^@s6PD#tM000AZNkl<ZScUDG
z$!k<W5XOJWWN|}-B5Gp51qCk}Py=y^QHg?L6h(}GfS2G^Q4zsI4gn8d)RPAV7u?V&
zco0z{QArf>;7yDk;+8-(E||rXG}MI7&^>v}WG0FqH1p{0SN%=BdR1Td%M%gC2$O(a
zKpjv9JOqvbgK?HC7z3^wf!)9kV3yTirRyDxV>}Zco}!+t29^WM9CP}CBA^$T1N@A<
znjsvq)riPB5$P5;`b6Zsh-?*+7HdX%j5R}rgn7JcfJ%Mbiyd=50QZ4*;5yK${fG6}
z#P9FO-VGST+qKmL6FqZo02hHfKwrdl0>Ni!DsTYU3oP`^c?p~aZUb*KMQAj*2q%DN
zz@n7?e)Zrr;7K+~+HetGYLOiRo&#5b3&8takhI|<Jj1#^1MJT}EkE)dBX%YFoNI!q
za1pjE$>iM7^20@VTq75RW4*Xx6Z!%zA_bm`W%R-q%_!d-<0fS`0H-7J4MjMiDXt{I
z+)cnvM}Ho0N`+E=h_#0iCM5E-1)ZA?dw@25TA>ie!zSHT0Na2<Pe>GMNL=>V_^xu)
zU?p%<bA3Z#77huw&XR&naipNto~pf05vdiCM=64|O++e!*vfX6C<X2TYk{Lyzw!19
zpm8(<*(Pkls$8!dRa<vh<406W&-WP!o7T*JtVT1&kYn8R|5Dj`%VWci{dV0_9a6Fe
zD^$8RIXxaCh6_DgAs60wVt7DAN<Hye>DX>PjuXS?ab5yG0$so-N9)#YQIx`9(%h1i
z3{z!ouR?p+_H?m`6gk=i5y?-JCDM7=ZgnCusQ0{zx(Q8UAi_Oi(X3B2k-A<k#7__>
zm08?I5RT&EYW?TFO4qAzzYFHR9=%?#+B=zT@^!pb-;spNKv?n90;~!!_k`}cQ}I<5
zU9*;W7dlipby_)l7-7Xv5VB~lcA-xX2{)&?*A$Jp9(fvC{A^LBRg@+qj2BOOY)sdE
zVlA*w9hMA<q#88m91nnbaS0pT)fN?o;7kpzmNYiZoMP8NwzGtIN_r}MFZKUT=$PZ5
zAZ(xf1c|pGun%W~eB-d^jQB+0BHUwL|Hu$wyS#P<nBQ#?9Z{OiHx6_DdmNapeI@#>
z!r&e7Is=4_D4(VzT0Mu}HcXyhtq!$Iy%@q*^sCQb0aG|kA=se*YJ3Cu1EHhcw_Nnh
QbpQYW07*qoM6N<$f_0^&@&Et;

literal 0
HcmV?d00001

diff --git a/static/icon/pxpjjg.png b/static/icon/pxpjjg.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bb21e40c2989509ba12e188869f37af413657b7
GIT binary patch
literal 1048
zcmV+z1n2vSP)<h;3K|Lk000e1NJLTq001li001fo1^@s6$lbXd000BuNkl<ZScT1*
zYlu}<6vuy~=Gd5KQyDlIebUMboU$xIESR(?3$c8CNDL(s#G(SBf{HRMBQn1fWD$`N
zMHu7|7*nD3Ap=Ewh&@ax($Pv&V@m(AWuI6r_kEmu&!w|qU)I`>wSRZtv-eqh-8M<I
zP?iAufp?3VVn~ZvM*uGabD}*GI8ub;K}9%m(gS>DV2QwmNYTJg0UrQertVMR@3H}p
z2etq!8XVtMN1szt1aR0`Ujo-QIQ}x=TVO5FQL}eAB^oSeNm{SdWuK&1C7p;Z$0c1*
zVUEF)J~bZpNSa)Yr%~9R2<Bz8q>+-wnfhwL9g=n?{M=C_@RNxNf;?gR%&ikRD=QNI
zW>f<nF6kUeXICg;C9a4o=;eD!)12ekIf03Q$DHr(6ma-<{gMt#`mI7aP+?WqNg9@z
zycY1)k~T;h>*_C-bkvLu^A7RAyDPv{lOvMmRavcCz?)**ACj(jZQX9(H$CvjIbnMx
zb=CNJs{t=d`0R1xm%H{$v$haR*yyJZcmp^yaRP=jyFa!!BZq;XfHB5LcspJNY>oEw
zz}@kT&g>hrbND0kO&)9FT+Z`IgiZX8Tg8L%T+aGTcI~I0cmJk4x5?G3SB?R*fcH%Q
zPT)CXe+KL@_Ci_|t>uxKz&_J|nTso4Gy3gi01mR)*-MPxYxM9uk1hjnfcnAMw;FvX
z@N?9M0^MZ*4zkhcmjk1st_Yn;S6P5}8$BGgV~uUER-I)5_BY`(j6PuWj<Nt>=<HvO
zZiD(mWdWXU^zb(Q(b%Jn{(BjKrvR52`$OPF)Q81Qn8~g(0Kekw7mYsAJQ4>&tnq&X
zuLi~$`wQR`W6wAGX5cRme6q!WRvrcJcXbx94Y<qLuaihs9d9`%oCmA{=DPYtz&FNz
zFs8hM9L@4`9(Vz8CD5LjDEt}+fro&vn*bi1fPENPXY8=q9yj*Ne}8>RTXNnwPD;9`
z$#{6BX}>oyexqq0uyJzu*q#$OleZ;xHV8aHQlF%25@R26^DMOOAwPUwypFV+^Uupb
z+|5&6eSZuOeg1bg@K)4AGVmhcmpUGo2Y_dc9fG2p|I;Jq)#ttntG&kcyR*g$r^-vt
zXUGT*P30x>mWh(KC7^dmniPFauM@ak(k+s<I$z(#<j!ehnz?AcP+_&_NSYEiXD#4S
ziSd0gKbM@h+1v4L6|zEm>&#w;^0XPZs@9y%0uxUPe`U8)3;29V?@PL&p81LZ&dSmT
zfpe82gP*nWX8XCTZ;Pc6DLPsU7sg4zv!*Wfnr~QI`N!gnm=oIz+*HUvNx(nIN1Y3k
S?{Yf;0000<MNUMnLSTZd4fO&5

literal 0
HcmV?d00001

diff --git a/static/icon/pxxxcj.png b/static/icon/pxxxcj.png
new file mode 100644
index 0000000000000000000000000000000000000000..75ac2bb1cc1e1051312d6d475cb093ecff57c7be
GIT binary patch
literal 1040
zcmV+r1n>KaP)<h;3K|Lk000e1NJLTq001Ze001fo1^@s6!8RFY000BmNkl<ZScUDG
zU5Hgx6vuyay{3*DhLcQ94rtH^iVwyx=tBk43_%ap_*D-R^-}1AiHe91y$BTuf(Qde
zB|?pYRAWdbC}{bGIu9X?AE6AIG7iJ!$4oRfvtteGT-NM4_nv*u9q&W<hr_vNf2{py
zt+m(Md)+GM92w96d<-lE9s@><h@8GJ1D^xmW?7&BA(-;{z@<ZbhBXRLoCfp29My#F
z{0CSLe33y9hk%XxyGq}afFYn4_^a4NOK=9T9asU>svt}70Wj5@{|)d*jNIwKhbl7(
z_krWUC%|vx#;Pi7oO9Pxnr>HudDf+rCs^gn$*HD(0G<iA*eC`Q`u|NSPw=JLWTOxh
zHvzwxwrjv{VA%KzYVP&GJk$0g&;?93W5utY0NznkN7x1om~l?Yybio(#=W6FtD~IT
z;Hmlj5@vfPgV_Z8O32JR=Z4JKExw5-d1}5}!UV^FPXkP4(Fwd;qF>hk+xspcALA?4
z2@7roeh1b7&jYj69ikl{g^x?RJGUpuo96l57(V%g$;HsF51L7a&A6N{k|{;`$V$*+
z$on2HJv<$96DjOr;1R)c@rYo#2-(F?0ekd45-`3Pa+<&8)Y1_;DTJV$<C@AK=Hn}1
zcIe;`6DOTo(&9l32b;adWU>$q?$nePono?P2qDr3eCD+esOv<^x|Nn-Kd?F@sSwCj
z;$`*CtLpEm2v!28fLG(z`Co(?K{HTa;vgV$?f@r%8yR>^RzDYWUr9?)Zf9+Q3&{=b
zY2aQ8a&oTR0o3XDUVFd|F>ynR#pIefGsXBf^;}tJ+FI=$DTH8~hKCTyVmAZFib=mK
z(kF@GX97)pPGexb#;dqEm{+rQ2a;Q+S6z#Pz;nP0+SWW8a-4G?c{i}ua%w37PfN_L
zFRI^EJLh_AN2SAz)OHSdZTo?@_4lCe<N_*5P<-xtuk9z@#Su;dbIo^mr3fwse)Zap
zX%zu2R!RR7(=QuyWhGKwqXuvb(d1kDEgCxyJZbuSfR}(jA2z`$z+tbg!;q`h%0rFm
zza5c7eXz<CFd-Lih4|Ow=KGLtln6&Xa?X;A2>MzqTJ6k$7Bi*K_?%oHP6ID`{f&Mu
z&uNmkST=zKZJIo1+B%g?gnrfBSzmzE2W9(T^x8W$9{H88IOMcCwHCNw`k(d6!#7kJ
z3p^QOvBg@K91o4)UuUfQS#)_>q%~kpuXApGsq7QQ!S@2nWJ!=}y@izDN<lWrB0c68
zh5t8%{4pbGCvx799W94V@u5vIB&C+P*&Jxa$HW(p0A~^<1OEXGt!kT8zy}Hd0000<
KMNUMnLSTYQ#^Y1~

literal 0
HcmV?d00001


From fe7eed4c1a4734263ffc8ae91fbe23c433912dc8 Mon Sep 17 00:00:00 2001
From: hanguangpu01 <hanguangpu01@inspur.com>
Date: Fri, 16 Jan 2026 17:29:07 +0800
Subject: [PATCH 26/38] =?UTF-8?q?feat(train):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=B8=93=E9=A1=B9=E8=AE=AD=E7=BB=83=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B9=B6=E8=B0=83=E6=95=B4=E7=BB=83=E4=B9=A0=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 startPracticingList.vue 页面用于展示专项训练列表
- 修改首页按钮跳转链接从 startPracticing 改为 startPracticingList
- 在 pages.json 中注册新的专项训练列表页面路由
- 更新 startPracticing.vue 页面接收分类参数并传递给接口
- 实现专项训练列表的分页加载和搜索功能
- 添加专项训练项目的分类显示和难度标识
---
 packageB/train/index.vue                      |   2 +-
 packageB/train/practice/startPracticing.vue   |   5 +-
 .../train/practice/startPracticingList.vue    | 392 ++++++++++++++++++
 pages.json                                    |   6 +
 4 files changed, 403 insertions(+), 2 deletions(-)
 create mode 100644 packageB/train/practice/startPracticingList.vue

diff --git a/packageB/train/index.vue b/packageB/train/index.vue
index bcef18e..541562b 100644
--- a/packageB/train/index.vue
+++ b/packageB/train/index.vue
@@ -13,7 +13,7 @@
 						</view>
 					</view>
 				</view> -->
-				<view class="btns" @click="jumps('/packageB/train/practice/startPracticing')">
+				<view class="btns" @click="jumps('/packageB/train/practice/startPracticingList')">
 					<image src="/packageB/static/images/train/zxxl-k.png" mode=""></image>
 					<view>
 						<text>专项练习</text>
diff --git a/packageB/train/practice/startPracticing.vue b/packageB/train/practice/startPracticing.vue
index d479e3a..76ee4dc 100644
--- a/packageB/train/practice/startPracticing.vue
+++ b/packageB/train/practice/startPracticing.vue
@@ -125,6 +125,7 @@ import useUserStore from '@/stores/useUserStore';
 import useDictStore from '@/stores/useDictStore';
 const userInfo = ref({});
 const Authorization = ref('');
+const cataType = ref('');
 const radio = ref('');
 const radio2 = ref('');
 const checkList = ref([]);
@@ -161,6 +162,7 @@ watch(questionIndex, (newVal, oldVal) => {
 // });
 
 onLoad((options) => {
+	cataType.value = options.cataType;
 	Authorization.value=uni.getStorageSync('Padmin-Token')||''
 	getHeart();
 });
@@ -202,7 +204,8 @@ function queryData(){
 		'Content-Type':"application/x-www-form-urlencoded"
 	}
 	$api.myRequest('/train/public/trainPractice/getQuestions', {
-		userId: userInfo.value.userId
+		userId: userInfo.value.userId,
+		category: cataType.value
 	},'post',9100,header).then((resData) => {
 		if(resData&&resData.code==200){
 			resData.data.forEach((item,i)=>{
diff --git a/packageB/train/practice/startPracticingList.vue b/packageB/train/practice/startPracticingList.vue
new file mode 100644
index 0000000..1c11977
--- /dev/null
+++ b/packageB/train/practice/startPracticingList.vue
@@ -0,0 +1,392 @@
+<template>
+    <AppLayout :title="title" :show-bg-image="false" @onScrollBottom="getDataList('add')">
+ <!--       <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>
+            <view class="video-grid" v-if="dataList.length>0">
+                <view 
+                    v-for="item in dataList" 
+                    :key="item.category_value"
+                    class="train-item"
+                >
+					<div class = "cards">
+						<div class="cardHead">
+							<div class="cardHeadLeft">
+								<div class="cardTitle">{{item.category}}</div>
+							</div>
+						</div>
+						<div class="heng"></div>
+						<div class="cardCon">
+							<div class="conten">难度：{{item.difficulty}}</div>
+						</div>
+						<div class="flooter">
+							<div @click="goZxxl(item)">去考试</div>
+						</div>
+					</div>
+                </view>
+            </view>
+            <empty v-else pdTop="200"></empty>
+        </view>
+    </AppLayout>
+</template>
+
+<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"
+
+// state
+const title = ref('');
+const searchKeyword = ref('');
+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})`,
+    backgroundSize: 'cover',      // 覆盖整个容器
+    backgroundPosition: 'center', // 居中
+    backgroundRepeat: 'no-repeat'
+});
+const trainVideoImgUrl=config.trainVideoImgUrl
+
+onLoad(async () => {
+    await thirdLogin()
+    getDataList('refresh');
+});
+
+// 搜索视频
+function searchVideo() {
+    getDataList('refresh');
+}
+
+// 清除搜索内容
+function clearSearch() {
+    searchKeyword.value = '';
+    getDataList('refresh');
+}
+
+// 获取视频列表
+function getDataList(type = 'add') {
+	let maxPage=Math.ceil(totalNum.value/pageSize.value)
+	let params={}
+    if (type === 'refresh') {
+        pageNum.value = 1;
+		params={
+			category:'',
+			hour:'',
+			level:'',
+			searchValue:searchKeyword.value,
+			orderStr:'',
+			pageSize:pageSize.value,
+			pageNum:pageNum.value
+		}
+		$api.myRequest('/train/public/trainQuestion/getQuestionTypes', params).then((resData) => {
+			dataList.value=resData.rows
+			totalNum.value=resData.total
+		});
+    }
+    if (type === 'add' && pageNum.value < maxPage) {
+        pageNum.value += 1;
+		params={
+			category:'',
+			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 goZxxl(item){
+	navTo(`/packageB/train/practice/startPracticing?cataType=${item.category_value}`);
+}
+
+// 播放视频
+async function playVideo(video) {
+	if(await thirdLogin()){
+	}
+}
+
+
+async function thirdLogin(){
+	let form={}
+	if (uni.getStorageSync('userInfo').isCompanyUser=='1'|| uni.getStorageSync('userInfo').isCompanyUser=='2') {
+		form={
+			usertype: '1',
+			idno: uni.getStorageSync('userInfo').idCard,
+			name: uni.getStorageSync('userInfo').name,
+			enterprisecode:"",
+			enterprisename: "",
+			contactperson: "",
+			contactphone: "",
+		}
+	}else if (uni.getStorageSync('userInfo').isCompanyUser=='0') {
+		form={
+			usertype: "2",
+			enterprisecode: uni.getStorageSync('userInfo').idCard,
+			enterprisename: uni.getStorageSync('userInfo').name,
+			contactperson: "",
+			contactphone: "",
+			idno: "",
+			name: ""
+		}
+	}else{
+		uni.showToast({
+			icon: 'none',
+			title: '请先登录'
+		})
+		return false;
+	}
+	var resLogin = await $api.myRequest('/auth/login2/ks',form,'post',10100);
+	if (resLogin.code=='200') {
+		uni.setStorageSync('Padmin-Token', resLogin.data.access_token)
+		return true;
+	}else{
+		uni.showToast({
+			icon: 'none',
+			title: '单点异常'
+		})
+		return false;
+	}
+}
+</script>
+
+<style lang="stylus" scoped>
+.btnback{
+    width: 64rpx;
+    height: 64rpx;
+}
+image {
+    height: 100%;
+    width: 100%;
+}
+.train-item{
+	width:100%;
+}
+
+.cards{
+	width: 100%;
+	height: 240rpx;
+	background: linear-gradient(0deg, #E3EFFF 0%, #FBFDFF 100%);
+	// box-shadow: 0px 0px 6px 0px rgba(0,71,200,0.32);
+	border-radius: 12rpx;
+	border: 2px solid #EDF5FF;
+	margin-bottom: 30rpx;
+	padding: 30rpx 40rpx 0;
+	box-sizing: border-box
+	.cardHead{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.cardHeadLeft{
+			display: flex;
+			align-items: center
+			width: 98%;
+			.cardTitle{
+				font-weight: bold;
+				font-size: 28rpx;
+				color: #0069CB;
+				max-width: 98%;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+			.titleType{
+				border-radius: 4px;
+				font-size: 22rpx;
+				color: #157EFF;
+				width: 100rpx;
+				height: 38rpx;
+				text-align: center;
+				line-height: 38rpx;
+				margin-left: 10rpx;
+			}
+			
+		}
+		
+	}
+	.heng{
+		width: 120rpx;
+		height: 4rpx;
+		background: linear-gradient(88deg, #015EEA 0%, #00C0FA 100%);
+		margin: 10rpx 0 20rpx;
+	}
+	.cardCon{
+		display: flex;
+		flex-wrap: wrap;
+		.conten{
+			width: 50%;
+			font-size: 22rpx;
+			color: #666666;
+			display: flex;
+			align-items: center
+			margin-bottom: 10rpx;
+		}
+		.status-tags{
+			display: flex;
+			align-items: center;
+		}
+	}
+	.flooter{
+		border-top: 1px solid #ccc;
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		view{
+			font-size: 28rpx;
+			margin-left: 30rpx;
+			color: #2175F3;
+			padding-top: 14rpx;
+		}
+	}
+}
+
+.events.data-v-4c19f00c {
+  pointer-events: none; /* 这会禁用所有指针事件 */
+  opacity: 0.5; /* 可选：改变透明度以视觉上表示不可点击 */
+  cursor: not-allowed; /* 可选：改变鼠标光标样式 */
+}
+.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;
+	color: #404040;
+	position: relative;
+	margin-bottom: 20px;
+}
+.title-line{
+	position: absolute;
+	bottom: -10rpx;
+	left: 36rpx;
+	width: 70rpx;
+	height: 8rpx;
+	background: linear-gradient(90deg, #FFAD58 0%, #FF7A5B 100%);
+	border-radius: 4rpx;
+}
+.video-grid{
+    display: flex;
+	flex-wrap: wrap;
+}
+.video-item{
+}
+.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%;
+}
+.video-info{
+    padding: 16rpx 16rpx 0 16rpx;
+	font-size: 26rpx;
+	color: #333;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	text-align: center;
+}
+.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;
+}
+</style>
diff --git a/pages.json b/pages.json
index 78cb9f8..3cc332c 100644
--- a/pages.json
+++ b/pages.json
@@ -342,6 +342,12 @@
               "navigationBarTitleText": "技能评价"
             }
           },
+          {
+            "path": "train/practice/startPracticingList",
+            "style": {
+              "navigationBarTitleText": "专项训练"
+            }
+          },
           {
             "path": "train/practice/startPracticing",
             "style": {

From afcb29c51cfe08aa94615b9300ecba852eeabdbe Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Mon, 19 Jan 2026 10:25:58 +0800
Subject: [PATCH 27/38] =?UTF-8?q?=E5=B8=AE=E6=89=B6=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=AF=E5=88=A0=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/wxAuthLogin/WxAuthLogin.vue |  1 -
 pages/index/components/index-one.vue   | 28 ++++++++++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/components/wxAuthLogin/WxAuthLogin.vue b/components/wxAuthLogin/WxAuthLogin.vue
index d580f71..ae055af 100644
--- a/components/wxAuthLogin/WxAuthLogin.vue
+++ b/components/wxAuthLogin/WxAuthLogin.vue
@@ -11,7 +11,6 @@
                 <view class="auth-header">
                     <image class="auth-logo" src="@/static/logo2-S.png" mode="aspectFit"></image>
                     <view class="auth-title">欢迎使用就业服务</view>
-                    <view class="auth-subtitle">需要您授权手机号登录</view>
                 </view>
                 
                 <!-- 角色选择 -->
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 3b727a3..9819ad9 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -78,7 +78,7 @@
                 <!-- <view class="h5-action-btn press-button" @click="handleH5SalaryClick">
                     <view class="btn-text">薪酬信息</view>
                 </view> -->
-                <view class="h5-action-btn press-button" @click="handleServiceClick('resume-creation')">
+                <view class="h5-action-btn press-button" @click="handelGoResumeGuide()">
                     <view class="btn-text">简历指导</view>
                 </view>
                 
@@ -747,10 +747,9 @@ const handleLoginSuccess = () => {
     getIsFourLevelLinkagePurview()
 };
 // H5环境下从URL获取token并自动登录
-onLoad((options) => {
+onLoad(() => {
     // #ifdef H5
-        const token = options.token || uni.getStorageSync('zkr-token');
-        myToken.value = token;
+        const token = uni.getStorageSync('zkr-token');
         if (token) {
             useUserStore().loginSetToken(token);
         }
@@ -758,10 +757,18 @@ onLoad((options) => {
 });
 
 // 处理附近工作点击
-const handleNearbyClick = () => {
+const handleNearbyClick = (options  ) => {
+    // #ifdef MP-WEIXIN
     if (checkLogin()) {
         navTo('/pages/nearby/nearby');
     }
+    // #endif
+    // #ifdef H5
+    const token = options.token || uni.getStorageSync('zkr-token');
+    if (token) {
+        navTo('/pages/nearby/nearby');
+    }
+    // #endif
 };
 
 // 处理服务功能点击
@@ -770,7 +777,16 @@ const handleServiceClick = (serviceType) => {
         navToService(serviceType);
     }
 };
-
+// H5的简历指导跳转
+const handelGoResumeGuide = () => {
+    const token = uni.getStorageSync('zkr-token');
+    // myToken.value = token;
+    if (token) {
+        // navTo()
+        navTo('/pages/resume-guide/resume-guide');
+    }
+    
+}
 // 处理直播按钮点击
 const handleLiveClick = () => {
     // #ifdef MP-WEIXIN

From cf3ed1bae2ca1aac3ceb967e95c701744037c07d Mon Sep 17 00:00:00 2001
From: xuchao <1151716571@qq.com>
Date: Mon, 19 Jan 2026 10:35:07 +0800
Subject: [PATCH 28/38] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=B8=AE=E6=89=B6?=
 =?UTF-8?q?=E3=80=81=E6=8B=9B=E8=81=98=E4=BC=9A=E5=A4=9A=E4=BD=99=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/components/index-one.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 553fa9b..65b1709 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -864,17 +864,12 @@ const handleLiveClick = () => {
 const handleSalaryInfoClick = () => {
     navTo('/pages/service/salary-info');
 };
-const handleJobFairClick = () => {
-    navTo('/pages/careerfair/careerfair');
-};
+
 const handleH5SalaryClick = () => {
     const salaryUrl = "https://www.mohrss.gov.cn/SYrlzyhshbzb/laodongguanxi_/fwyd/202506/t20250627_544623.html";
     window.location.assign(salaryUrl);
 };
-// 处理帮扶
-const helpClick = () => {
-    navTo('/packageB/priority/helpFilter');
-};
+
 async function loadData() {
     try {
         if (isLoaded.value) return;

From a1a94b264c7c164327bbf1a05da9f7a7e21263ed Mon Sep 17 00:00:00 2001
From: xuchao <1151716571@qq.com>
Date: Mon, 19 Jan 2026 10:46:22 +0800
Subject: [PATCH 29/38] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageB/train/mockExam/examList.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packageB/train/mockExam/examList.vue b/packageB/train/mockExam/examList.vue
index ea00968..8486218 100644
--- a/packageB/train/mockExam/examList.vue
+++ b/packageB/train/mockExam/examList.vue
@@ -332,13 +332,12 @@ function handleOperation(row,i) {
 		    height: 90%;
 			.cards{
 				width: 100%;
-				height: 280rpx;
 				background: linear-gradient(0deg, #E3EFFF 0%, #FBFDFF 100%);
 				// box-shadow: 0px 0px 6px 0px rgba(0,71,200,0.32);
 				border-radius: 12rpx;
 				border: 2px solid #EDF5FF;
 				margin-bottom: 30rpx;
-				padding: 30rpx 40rpx 0;
+				padding: 30rpx 40rpx 10rpx;
 				box-sizing: border-box
 				.cardHead{
 					display: flex;

From 9cf5905d5f3aa85baad2945679ca00f79bd80742 Mon Sep 17 00:00:00 2001
From: lintiantian <156569930@qq.com>
Date: Mon, 19 Jan 2026 11:36:17 +0800
Subject: [PATCH 30/38] =?UTF-8?q?=E7=B4=A0=E8=B4=A8=E6=B5=8B=E8=AF=84=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8Cweb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageCa/job/index.vue                            | 2 --
 packageCa/pagesTest/customTestTitle.vue            | 1 -
 packageCa/pagesTest/interestTestTitle.vue          | 1 -
 packageCa/pagesTest/personalTestTitle.vue          | 1 -
 packageCa/pagesTest/testList.vue                   | 1 -
 packageCa/pagesTest/workValuesTestTitle.vue        | 1 -
 packageCa/search/AIAudition.vue                    | 1 -
 packageCa/search/search.vue                        | 8 ++++++--
 packageCa/testReport/generalCareerTestReport.vue   | 1 -
 packageCa/testReport/interestTestReport.vue        | 1 -
 packageCa/testReport/multipleAbilityTestReport.vue | 1 -
 packageCa/testReport/personalTestReport.vue        | 1 -
 packageCa/testReport/workValuesTestReport.vue      | 1 -
 packageCa/userCenter/careerCompass.vue             | 1 -
 packageCa/userCenter/learningPlan.vue              | 1 -
 packageCa/userCenter/personDocument.vue            | 1 -
 packageCa/userCenter/professionPath.vue            | 1 -
 packageCa/userCenter/smartTarget.vue               | 1 -
 packageCa/utilCa/config.js                         | 7 ++-----
 19 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/packageCa/job/index.vue b/packageCa/job/index.vue
index e020249..626bcb2 100644
--- a/packageCa/job/index.vue
+++ b/packageCa/job/index.vue
@@ -14,7 +14,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- :style="{height: winHeight - barHeight - loginHeight + 'px'}" -->
 		<view class="u-menu-wrap" >
 			<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop"  :scroll-into-view="itemId">
 				<view v-for="(item,index) in jobList" :key="index" class="u-tab-item"
@@ -48,7 +47,6 @@
 			return {
 				kw: "", //搜索关键
 				user: uni.getStorageSync("CAuserInfo").user,
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				winHeight: wx.getWindowInfo().windowHeight,
 				jobDataList: [],
 				jobList,
diff --git a/packageCa/pagesTest/customTestTitle.vue b/packageCa/pagesTest/customTestTitle.vue
index f013f07..b60a486 100644
--- a/packageCa/pagesTest/customTestTitle.vue
+++ b/packageCa/pagesTest/customTestTitle.vue
@@ -56,7 +56,6 @@
     export default {
         data() {
             return {
-                barHeight: wx.getWindowInfo().statusBarHeight,
                 list: [],
                 allNum: 0, //总题目数
                 pageIndex: 0, //显示页
diff --git a/packageCa/pagesTest/interestTestTitle.vue b/packageCa/pagesTest/interestTestTitle.vue
index bfb3961..f9da56b 100644
--- a/packageCa/pagesTest/interestTestTitle.vue
+++ b/packageCa/pagesTest/interestTestTitle.vue
@@ -64,7 +64,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				list: [],
 				allNum: 0,//总题目数
 				pageIndex: 0, //显示页
diff --git a/packageCa/pagesTest/personalTestTitle.vue b/packageCa/pagesTest/personalTestTitle.vue
index af7ef1f..70a7e92 100644
--- a/packageCa/pagesTest/personalTestTitle.vue
+++ b/packageCa/pagesTest/personalTestTitle.vue
@@ -48,7 +48,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				list: [],
 				allNum: 0,//总题目数
 				pageIndex: 0, //显示页
diff --git a/packageCa/pagesTest/testList.vue b/packageCa/pagesTest/testList.vue
index 7fa3c7a..b8d3c06 100644
--- a/packageCa/pagesTest/testList.vue
+++ b/packageCa/pagesTest/testList.vue
@@ -29,7 +29,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				refreshIfNeeded: false, //是否返回刷新
 				dataList: [],
 			}
diff --git a/packageCa/pagesTest/workValuesTestTitle.vue b/packageCa/pagesTest/workValuesTestTitle.vue
index 99a2119..03b1723 100644
--- a/packageCa/pagesTest/workValuesTestTitle.vue
+++ b/packageCa/pagesTest/workValuesTestTitle.vue
@@ -47,7 +47,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				list: [],
 				allNum: 0,//总题目数
 				pageIndex: 0, //显示页
diff --git a/packageCa/search/AIAudition.vue b/packageCa/search/AIAudition.vue
index 602d299..3704c72 100644
--- a/packageCa/search/AIAudition.vue
+++ b/packageCa/search/AIAudition.vue
@@ -9,7 +9,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				user: null,//用户信息
 				userId: 0,
 				name: "",
diff --git a/packageCa/search/search.vue b/packageCa/search/search.vue
index ecf50cc..a1e322a 100644
--- a/packageCa/search/search.vue
+++ b/packageCa/search/search.vue
@@ -49,15 +49,19 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				user: null,//用户信息
 				name: "",
 				idCard: ""
 			}
 		},
 		onLoad(e) {
-			this.idCard = e.idCard;
+			if(e.idCard){
+				this.idCard = e.idCard;
+			}else {
+				this.idCard = e.userId;
+			}
 			this.name = e.name;
+			console.log(e);
 			this.queryKaShiToken();
 		},
 		methods: {
diff --git a/packageCa/testReport/generalCareerTestReport.vue b/packageCa/testReport/generalCareerTestReport.vue
index 5725eec..087e812 100644
--- a/packageCa/testReport/generalCareerTestReport.vue
+++ b/packageCa/testReport/generalCareerTestReport.vue
@@ -82,7 +82,6 @@
 		},
         data() {
             return {
-                barHeight: wx.getWindowInfo().statusBarHeight,
                 videoUrl: "",
 				introduceUrl: "",
                 id: "",
diff --git a/packageCa/testReport/interestTestReport.vue b/packageCa/testReport/interestTestReport.vue
index 1652a8b..17d7ff8 100644
--- a/packageCa/testReport/interestTestReport.vue
+++ b/packageCa/testReport/interestTestReport.vue
@@ -254,7 +254,6 @@
         data() {
             return {
                 platform: uni.getDeviceInfo().platform,
-                barHeight: wx.getWindowInfo().statusBarHeight,
                 showTip: false,
                 layerTitile: "",
                 layerDesc: "",
diff --git a/packageCa/testReport/multipleAbilityTestReport.vue b/packageCa/testReport/multipleAbilityTestReport.vue
index b5c9896..24632a5 100644
--- a/packageCa/testReport/multipleAbilityTestReport.vue
+++ b/packageCa/testReport/multipleAbilityTestReport.vue
@@ -123,7 +123,6 @@
         data() {
             return {
                 platform: uni.getDeviceInfo().platform,
-                barHeight: wx.getWindowInfo().statusBarHeight,
 				introduceUrl: "https://51xuanxiao.oss-cn-hangzhou.aliyuncs.com/Resource/xcx_sygh/report/multipleAbilityTestReport-1.png",
 				introduceUrl2: "https://51xuanxiao.oss-cn-hangzhou.aliyuncs.com/Resource/xcx_sygh/report/multipleAbilityTestReport-2.png",
                 videoUrl: "http://2-video.oss-cn-shenzhen.aliyuncs.com/2023%E5%B9%B4%E8%A7%86%E9%A2%91/%E5%88%9D%E4%B8%AD%E8%AF%BE%E7%A8%8B%E8%B5%84%E6%BA%90/%E5%A4%9A%E5%85%83%E6%99%BA%E8%83%BD%E6%B5%8B%E8%AF%84%E8%A7%A3%E8%AF%BB1.16%E4%BF%AE%E6%94%B92.mp4",
diff --git a/packageCa/testReport/personalTestReport.vue b/packageCa/testReport/personalTestReport.vue
index bab2f67..a8e6f1c 100644
--- a/packageCa/testReport/personalTestReport.vue
+++ b/packageCa/testReport/personalTestReport.vue
@@ -410,7 +410,6 @@
         data() {
             return {
                 platform: uni.getDeviceInfo().platform,
-                barHeight: wx.getWindowInfo().statusBarHeight,
                 showTip: false,
                 videoUrl: "http://2-video.oss-cn-shenzhen.aliyuncs.com/2023%E5%B9%B4%E8%A7%86%E9%A2%91/%E5%88%9D%E4%B8%AD%E8%AF%BE%E7%A8%8B%E8%B5%84%E6%BA%90/%E4%BA%BA%E6%A0%BC%E6%B5%8B%E8%AF%84%E8%A7%A3%E8%AF%BB1.16%E4%BF%AE%E6%94%B92.mp4",
                 introduceUrl: "https://51xuanxiao.oss-cn-hangzhou.aliyuncs.com/Resource/xcx_sygh/report/personalTestReport.png",
diff --git a/packageCa/testReport/workValuesTestReport.vue b/packageCa/testReport/workValuesTestReport.vue
index a171014..5aed32a 100644
--- a/packageCa/testReport/workValuesTestReport.vue
+++ b/packageCa/testReport/workValuesTestReport.vue
@@ -49,7 +49,6 @@
 		},
         data() {
             return {
-                barHeight: wx.getWindowInfo().statusBarHeight,
 				showVideo: false,
 				showIntroduce: false, // 测评介绍
                 videoUrl: "http://2-video.oss-cn-shenzhen.aliyuncs.com/2023%E5%B9%B4%E8%A7%86%E9%A2%91/%E5%88%9D%E4%B8%AD%E8%AF%BE%E7%A8%8B%E8%B5%84%E6%BA%90/%E5%B7%A5%E4%BD%9C%E4%BB%B7%E5%80%BC%E8%A7%82%E8%A7%A3%E8%AF%BB1.16%E4%BF%AE%E6%94%B92.mp4",
diff --git a/packageCa/userCenter/careerCompass.vue b/packageCa/userCenter/careerCompass.vue
index 50c8727..d0e9037 100644
--- a/packageCa/userCenter/careerCompass.vue
+++ b/packageCa/userCenter/careerCompass.vue
@@ -108,7 +108,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				compassList: [],//罗盘列表
 				checkedIndex: null,
 				jobList: [],//我的职业
diff --git a/packageCa/userCenter/learningPlan.vue b/packageCa/userCenter/learningPlan.vue
index 576ddbb..d9e33b8 100644
--- a/packageCa/userCenter/learningPlan.vue
+++ b/packageCa/userCenter/learningPlan.vue
@@ -124,7 +124,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				tabs:['目标一 ', '目标二 ', '目标三 ', '目标四 ', '目标五 '],
 				targetForm: {}, //当前选中的目标
 				targetList: [],//目标列表
diff --git a/packageCa/userCenter/personDocument.vue b/packageCa/userCenter/personDocument.vue
index d484c20..6d54f05 100644
--- a/packageCa/userCenter/personDocument.vue
+++ b/packageCa/userCenter/personDocument.vue
@@ -252,7 +252,6 @@ import api1 from "@/packageCa/apiCa/studentProfile.js"
 		data() {
 			return {
 				refreshIfNeeded: false, //是否返回刷新
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				user: uni.getStorageSync("CAuserInfo").user,
 				customInfo: uni.getStorageSync("customInfo"),
 				intentionJobList: [],//意向职业
diff --git a/packageCa/userCenter/professionPath.vue b/packageCa/userCenter/professionPath.vue
index d365432..9117ef5 100644
--- a/packageCa/userCenter/professionPath.vue
+++ b/packageCa/userCenter/professionPath.vue
@@ -130,7 +130,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				jobList: [],//
 				checkedCode: null,
 				jobIntroduce: "",
diff --git a/packageCa/userCenter/smartTarget.vue b/packageCa/userCenter/smartTarget.vue
index 1261450..65ccc69 100644
--- a/packageCa/userCenter/smartTarget.vue
+++ b/packageCa/userCenter/smartTarget.vue
@@ -178,7 +178,6 @@
 	export default {
 		data() {
 			return {
-				barHeight: wx.getWindowInfo().statusBarHeight,
 				tabs:['目标一 ', '目标二 ', '目标三 ', '目标四 ', '目标五 '],
 				targetList: [],////目标列表
 				checkedTargetCode: "",//// 目标码
diff --git a/packageCa/utilCa/config.js b/packageCa/utilCa/config.js
index 1f6a165..8e26f3e 100644
--- a/packageCa/utilCa/config.js
+++ b/packageCa/utilCa/config.js
@@ -1,11 +1,8 @@
 let baseUrl = ""
 // #ifdef MP-WEIXIN
 // 编译项目，因为使用插件lime-echart，echart文件过大，需要非压缩代码方式编译，不然会很慢，发布的时候才压缩代码方式编译
-if (wx.getAccountInfoSync().miniProgram.envVersion === 'develop') {
-    baseUrl = 'https://www.xjksly.cn/career' // 开发环境
-} else {
-    baseUrl = 'https://www.xjksly.cn/career' // 生产环境
-}
+
+baseUrl = 'https://www.xjksly.cn/career' // 生产环境
 // #endif
 
 export {

From 7dcfbd35feddee5581a7a7f3f660b1dbc3903495 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Mon, 19 Jan 2026 19:09:14 +0800
Subject: [PATCH 31/38] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9B=B6=E5=B7=A5?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/wxAuthLogin/WxAuthLogin.vue |  4 ++--
 pages/index/components/index-one.vue   | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/components/wxAuthLogin/WxAuthLogin.vue b/components/wxAuthLogin/WxAuthLogin.vue
index ae055af..0664095 100644
--- a/components/wxAuthLogin/WxAuthLogin.vue
+++ b/components/wxAuthLogin/WxAuthLogin.vue
@@ -25,7 +25,7 @@
                             <view class="role-icon">
                                 <uni-icons type="person" size="32" :color="userType === 1 ? '#256BFA' : '#999'"></uni-icons>
                             </view>
-                            <view class="role-text">我是求职者</view>
+                            <view class="role-text">个人</view>
                         </view>
                         <view 
                             class="role-item" 
@@ -35,7 +35,7 @@
                             <view class="role-icon">
                                 <uni-icons type="shop" size="32" :color="userType === 0 ? '#256BFA' : '#999'"></uni-icons>
                             </view>
-                            <view class="role-text">我是招聘者</view>
+                            <view class="role-text">单位</view>
                         </view>
                     </view>
                 </view>
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 65b1709..7c71594 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -636,6 +636,7 @@ const rangeOptions = ref([
     { value: 1, text: '最热' },
     { value: 2, text: '最新发布' },
     { value: 3, text: '疆外' },
+    { value: 4, text: '零工市场' }
 ]);
 const isLoaded = ref(false);
 const isInitialized = ref(false); // 添加初始化标志
@@ -1039,6 +1040,12 @@ function handelHostestSearch(val) {
     isShowJw.value = val.value;
     pageState.search.order = val.value;
     pageState.search.jobType = val.value === 3 ? 1 : 0;
+    if(val.value === 4) {
+        pageState.search.type = 4;
+    } else {
+        delete pageState.search.type;
+    }
+    
     if (state.tabIndex === 'all') {
         getJobRecommend('refresh');
     } else {
@@ -1059,6 +1066,10 @@ function getJobRecommend(type = 'add') {
         ...conditionSearch.value,
         isPublish: 1,
     };
+    // 当选中零工市场(4)或疆外(3)时，order参数传递0
+    if (pageState.search.order === 3 || pageState.search.order === 4) {
+        params.order = 0;
+    }
     // 优先从store获取，如果为空则从缓存获取
     const storeIsCompanyUser = userInfo.value?.isCompanyUser;
     const cachedUserInfo = uni.getStorageSync('userInfo') || {};
@@ -1137,6 +1148,10 @@ function getJobList(type = 'add') {
         ...pageState.search,
         // ...conditionSearch.value,
     };
+    // 当选中零工市场(4)或疆外(3)时，order参数传递0
+    if (pageState.search.order === 3 || pageState.search.order === 4) {
+        params.order = 0;
+    }
 
     $api.createRequest('/app/job/list', params).then((resData) => {
         const { rows, total } = resData;
@@ -1724,8 +1739,8 @@ defineExpose({ loadData });
                 font-weight: 400;
                 font-size: 32rpx;
                 color: #666D7F;
-                margin-right: 24rpx
-                padding: 0rpx 16rpx
+                margin-right: 8rpx
+                padding: 0rpx 6rpx
             .active
                 font-weight: 500;
                 font-size: 32rpx;

From abd2e79a15c663c3833a38405cebf44c38f264c6 Mon Sep 17 00:00:00 2001
From: lintiantian <156569930@qq.com>
Date: Tue, 20 Jan 2026 09:55:27 +0800
Subject: [PATCH 32/38] =?UTF-8?q?=E7=B4=A0=E8=B4=A8=E6=B5=8B=E8=AF=84=20ai?=
 =?UTF-8?q?=E9=9D=A2=E8=AF=95=E4=BF=AE=E6=94=B9=E5=9F=9F=E5=90=8D=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageCa/utilCa/config.js  | 16 ++++++++--------
 packageCa/utilCa/request.js |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packageCa/utilCa/config.js b/packageCa/utilCa/config.js
index 8e26f3e..19f84d5 100644
--- a/packageCa/utilCa/config.js
+++ b/packageCa/utilCa/config.js
@@ -1,10 +1,10 @@
-let baseUrl = ""
-// #ifdef MP-WEIXIN
-// 编译项目，因为使用插件lime-echart，echart文件过大，需要非压缩代码方式编译，不然会很慢，发布的时候才压缩代码方式编译
+// let baseUrl = ""
+// // #ifdef MP-WEIXIN
+// // 编译项目，因为使用插件lime-echart，echart文件过大，需要非压缩代码方式编译，不然会很慢，发布的时候才压缩代码方式编译
 
-baseUrl = 'https://www.xjksly.cn/career' // 生产环境
-// #endif
+// baseUrl = 'https://www.xjksly.cn/career' // 生产环境
+// // #endif
 
-export {
-    baseUrl
-}
+// export {
+//     baseUrl
+// }
diff --git a/packageCa/utilCa/request.js b/packageCa/utilCa/request.js
index db0294a..b5dd4f7 100644
--- a/packageCa/utilCa/request.js
+++ b/packageCa/utilCa/request.js
@@ -1,5 +1,5 @@
-import { baseUrl} from './config.js'
-
+// const baseUrl = "https://localhost:7026/career";
+const baseUrl = "https://www.xjksly.cn/career";
 const request = {}
 const headers = {}
 

From 5430678eaff68de336afb03076e514b944c46e0d Mon Sep 17 00:00:00 2001
From: xuchao <1151716571@qq.com>
Date: Tue, 20 Jan 2026 12:07:30 +0800
Subject: [PATCH 33/38] =?UTF-8?q?=E7=AE=80=E5=8E=86=E6=8A=95=E9=80=92?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A1=AE=E8=AE=A4=E5=BC=B9=E7=AA=97=E3=80=81?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=8B=9B=E8=81=98=E4=BC=9A=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=9F=E4=B8=80=E7=A4=BE=E4=BC=9A=E4=BF=A1?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81=E5=8F=8Auserid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageB/jobFair/detailPerson.vue | 85 ++++++++++++++++++-------------
 pages/careerfair/careerfair.vue   | 18 ++++++-
 2 files changed, 66 insertions(+), 37 deletions(-)

diff --git a/packageB/jobFair/detailPerson.vue b/packageB/jobFair/detailPerson.vue
index f9e8557..1c44d63 100644
--- a/packageB/jobFair/detailPerson.vue
+++ b/packageB/jobFair/detailPerson.vue
@@ -323,46 +323,59 @@
 	const deliveringJobs = reactive({});
 	// 岗位投递
 	function deliverResume(job) {
-		if(deliveringJobs[job.jobId]) return
-		deliveringJobs[job.jobId] = true
-		const raw = uni.getStorageSync("Padmin-Token");
-		const token = typeof raw === "string" ? raw.trim() : "";
-		const headers = token ? {
-			Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
-		} : {};
-	
-		$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData1) => {
-			if (resData1.code == 200) {
-				$api.myRequest("/system/user/login/user/info", {}, "GET", 10100, headers).then((resData) => {
-					$api.myRequest("/jobfair/public/job-fair-person-job/insert", {
-						jobFairId: job.jobFairId, // 招聘会id
-						personId: resData.info.userId, // 当前登录用户id
-						enterpriseId: job.companyId, // 企业id
-						jobId: job.jobId, // 岗位id
-						idCard:resData.info.personCardNo
-					}, "post", 9100, {
-						"Content-Type": "application/json"
-					}).then((data) => {
-						if (data && data.code === 200) {
-							$api.msg("简历投递成功");
-							if (!job.jobFairPersonJob) {
-								job.jobFairPersonJob = {};
-							}
-							job.jobFairPersonJob.status = "1";
-							getList(false);
+		uni.showModal({
+            title: "提示",
+            content: "请确认是否投递简历？",
+            showCancel: true,
+            confirmText: "确定",
+            cancelText: "取消",
+            success: (res) => {
+				if(res.confirm){
+					if(deliveringJobs[job.jobId]) return
+					deliveringJobs[job.jobId] = true
+					const raw = uni.getStorageSync("Padmin-Token");
+					const token = typeof raw === "string" ? raw.trim() : "";
+					const headers = token ? {
+						Authorization: raw.startsWith("Bearer ") ? raw : `Bearer ${token}`
+					} : {};
+				
+					$api.myRequest("/dashboard/auth/heart", {}, "POST", 10100, headers).then((resData1) => {
+						if (resData1.code == 200) {
+							$api.myRequest("/system/user/login/user/info", {}, "GET", 10100, headers).then((resData) => {
+								$api.myRequest("/jobfair/public/job-fair-person-job/insert", {
+									jobFairId: job.jobFairId, // 招聘会id
+									personId: resData.info.userId, // 当前登录用户id
+									enterpriseId: job.companyId, // 企业id
+									jobId: job.jobId, // 岗位id
+									idCard:resData.info.personCardNo
+								}, "post", 9100, {
+									"Content-Type": "application/json"
+								}).then((data) => {
+									if (data && data.code === 200) {
+										$api.msg("简历投递成功");
+										if (!job.jobFairPersonJob) {
+											job.jobFairPersonJob = {};
+										}
+										job.jobFairPersonJob.status = "1";
+										getList(false);
+									} else {
+										$api.msg((data && data.msg) || "简历投递失败");
+									}
+									deliveringJobs[job.jobId] = false
+								});
+							});
 						} else {
-							$api.msg((data && data.msg) || "简历投递失败");
+							$api.msg('请先登录');
+							deliveringJobs[job.jobId] =false
 						}
-						deliveringJobs[job.jobId] = false
+					}).catch(() => {
+						deliveringJobs[job.jobId] =false;
 					});
-				});
-			} else {
-				$api.msg('请先登录');
-				deliveringJobs[job.jobId] =false
+				}
+				
 			}
-		}).catch(() => {
-			deliveringJobs[job.jobId] =false;
-		});
+        })
+		
 	}
 
 	// 提交面试邀请
diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue
index db9a562..c9eae87 100644
--- a/pages/careerfair/careerfair.vue
+++ b/pages/careerfair/careerfair.vue
@@ -339,11 +339,27 @@
 			// 正确映射响应为用户信息（优先使用 data 字段）
 			const data = resData?.data ?? resData;
 			userInfo.value = data || {};
+			if(data?.info?.entCreditCode && data?.info?.userId){
+				updateEnterpriseId({
+					unifiedSocialCreditCode: data?.info?.entCreditCode,
+					userId: data?.info?.userId,
+				})
+			}
 			getFair("refresh");
 			return userInfo.value;
 		});
 	}
-
+	function updateEnterpriseId(params){
+		const headers = {
+			'Content-Type':'application/json'
+		}
+		return $api.myRequest("/jobfair/public/job-fair-sign-up-enterprise/update-enterprise-id", params, "POST", 9100, headers).then((resData) => {
+			if(resData.code == 200 && resData.data !=0){
+				state.current = 3
+				getMyFair("refresh");
+			}
+		});
+	}
 	function getMyFair(type = "add") {
 		if (type === "refresh") {
 			pageState.pageNum = 1;

From d817ce25241e463d2846a876dfd7e4c127034812 Mon Sep 17 00:00:00 2001
From: hanguangpu01 <hanguangpu01@inspur.com>
Date: Wed, 21 Jan 2026 11:30:17 +0800
Subject: [PATCH 34/38] =?UTF-8?q?fix(practice):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=BB=83=E4=B9=A0=E9=A1=B5=E9=9D=A2=E9=A2=98=E7=9B=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=BB=9A=E5=8A=A8=E5=92=8C=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为题目编号容器添加高度限制和滚动样式
- 修复练习列表页面接口地址错误，从 trainVideoList 改为 getQuestionTypes
- 优化题目列表的显示效果和用户体验
---
 packageB/train/practice/startPracticing.vue     | 2 +-
 packageB/train/practice/startPracticingList.vue | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packageB/train/practice/startPracticing.vue b/packageB/train/practice/startPracticing.vue
index 76ee4dc..7b722c2 100644
--- a/packageB/train/practice/startPracticing.vue
+++ b/packageB/train/practice/startPracticing.vue
@@ -109,7 +109,7 @@
 					<div>题号</div>
 					<div style="font-size: 40rpx;" @click="clones()">×</div>
 				</div>
-				<div class="questionNums">
+				<div class="questionNums" style = "height:77vh;overflow: auto;">
 				  <div class="questions" :class="item.whether=='正确'?'questionCorrect':item.whether=='错误'?'questionError':questionIndex==(index+1)?'questionsActive':''" @click="switchs(index)" v-for="(item,index) in problemList" :key="index">{{index+1}}</div>
 				</div>
 			</div>
diff --git a/packageB/train/practice/startPracticingList.vue b/packageB/train/practice/startPracticingList.vue
index 1c11977..8013433 100644
--- a/packageB/train/practice/startPracticingList.vue
+++ b/packageB/train/practice/startPracticingList.vue
@@ -126,10 +126,11 @@ function getDataList(type = 'add') {
 			pageSize:pageSize.value,
 			pageNum:pageNum.value
 		}
-		$api.myRequest('/train/public/trainVideo/trainVideoList', params).then((resData) => {
+		$api.myRequest('/train/public/trainQuestion/getQuestionTypes', params).then((resData) => {
 			dataList.value=dataList.value.concat(resData.rows)
 			totalNum.value=resData.total
 		});
+		
 	}
 }
 

From 98e0d5d83395bbc97e01383bdc0e2544c773732b Mon Sep 17 00:00:00 2001
From: xuchao <1151716571@qq.com>
Date: Wed, 21 Jan 2026 18:44:04 +0800
Subject: [PATCH 35/38] =?UTF-8?q?=E6=8B=9B=E8=81=98=E4=BC=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=8C=BA=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/careerfair/careerfair.vue | 282 +++++++++++++++++++++++++++++++-
 1 file changed, 278 insertions(+), 4 deletions(-)

diff --git a/pages/careerfair/careerfair.vue b/pages/careerfair/careerfair.vue
index c9eae87..32d3274 100644
--- a/pages/careerfair/careerfair.vue
+++ b/pages/careerfair/careerfair.vue
@@ -22,9 +22,65 @@
 						@click="getFair('refresh')"></uni-icons>
 					<input class="input" placeholder="招聘会" placeholder-class="inputplace"
 						v-model="pageState.jobFairTitle" />
+					<view class="btn-feel" v-show="state.current != 3" @click="openFilter">筛选</view>
 				</view>
 			</view>
+			 <uni-popup
+				ref="selectFilterModel"
+				type="bottom"
+				borderRadius="10px 10px 0 0"
+				background-color="#FFFFFF"
+				class="popup-fix"
+			>
+				<view class="popup-content">
+					<view class="popup-list">
+						<view class="content-wrapper">
+							<!-- 左侧筛选类别 -->
+							<!-- <scroll-view class="filter-nav" scroll-y>
+								<view
+									v-for="(item, index) in filterOptions"
+									:key="index"
+									class="nav-item button-click"
+									:class="{ active: activeTab === item.key }"
+									@click="scrollTo(item.key)"
+								>
+									{{ item.label }}
+								</view>
+							</scroll-view> -->
 
+							<!-- 右侧筛选内容 -->
+							<scroll-view class="filter-content" :scroll-into-view="activeTab" scroll-y>
+								<view v-for="(item, index) in filterOptions" :key="index">
+									<view class="content-item">
+										<view class="item-title" :id="item.key">{{ item.label }}</view>
+										<radio-group class="check-content" @change="handleSelect">
+											<label
+												v-for="option in item.options"
+												:key="option.value"
+												class="checkbox-item button-click"
+												:class="{
+													checkedstyle: selectedValues === String(option.value),
+												}"
+											>
+												<radio
+													style="display: none"
+													:value="String(option.value)"
+													:checked="selectedValues === String(option.value)"
+												/>
+												<text class="option-label">{{ option.label }}</text>
+											</label>
+										</radio-group>
+									</view>
+								</view>
+							</scroll-view>
+						</view>
+					</view>
+					<view class="popup-bottom">
+						<view class="btn-cancel btn-feel" @click="cleanup">重置</view>
+						<view class="btn-confirm btn-feel" @click="confirm">确认</view>
+					</view>
+				</view>
+			</uni-popup>
 			<!-- 主体内容区域 -->
 			<view class="container-main">
 				<scroll-view scroll-y class="main-scroll" :class="{fullHeightScroll:!showTabar}" @scrolltolower="handleScrollToLower">
@@ -151,10 +207,57 @@
 	onShow(() => {
 		// 更新自定义tabbar选中状态
 		tabbarManager.updateSelected(1);
+		getoptions();
 	});//
-	
-	
-	
+	//筛选
+	const filterOptions = ref([]);
+	const activeTab = ref('');
+	const selectFilterModel = ref(null);
+	const selectedValues = ref(null);
+	function openFilter() {
+		selectFilterModel.value?.open();
+	}
+	const scrollTo = (key) => {
+		activeTab.value = key;
+	};
+
+	const handleSelect = (e) => {
+		selectedValues.value = e.detail.value
+	};
+	function cleanup(){
+		selectedValues.value = null
+		confirm()
+	}
+	function confirm(){
+		getFair("refresh");
+		selectFilterModel.value?.close();
+	}
+	function getoptions() {
+		let headers = {
+			'Content-Type': 'application/x-www-form-urlencoded',
+		}
+		let params = {
+			dictType:'administrative_division',
+			dictParentValue:'653100000000',
+			childFlag:'1',
+		}
+		filterOptions.value = [{
+				label: '所在区域',
+				key: 'area',
+				options: []
+		}];
+		$api.myRequest('/system/public/dict/data/getByParentValue',params,'POST',9100,headers).then(res=>{
+			if (res.code == 200) {
+				filterOptions.value[0].options = res.data.map(item=>{
+					return {
+						label: item.dictLabel,
+						value: item.dictValue,
+					}
+				})
+			}
+		})
+		activeTab.value = 'area';
+	}
 	async function thirdLogin(needToast){
 		let form={}
 		if (uni.getStorageSync('userInfo') && (uni.getStorageSync('userInfo').isCompanyUser=='1' || uni.getStorageSync('userInfo').isCompanyUser=='2')) {
@@ -420,6 +523,7 @@
 			pageSize: pageState.pageSize,
 			jobFairTitle: pageState.jobFairTitle,
 			jobFairType: state.current,
+			dictValue: selectedValues.value,
 		};
 		if (isLogin.value) {
 			if (userInfo.value.userType == "ent") {
@@ -577,7 +681,168 @@
 		return dates;
 	}
 </script>
+<style lang="scss" scoped>
+.popup-fix {
+    z-index: 9999 !important;
+}
+.popup-content {
+    color: #000000;
+    height: 70vh;
+	padding-bottom: 20rpx;
+}
+.popup-bottom {
+    padding: 40rpx 28rpx 20rpx 28rpx;
+    display: flex;
+    justify-content: space-between;
+    .btn-cancel {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #666d7f;
+        line-height: 90rpx;
+        width: 33%;
+        min-width: 222rpx;
+        height: 90rpx;
+        background: #f5f5f5;
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+        text-align: center;
+    }
+    .btn-confirm {
+        font-weight: 400;
+        font-size: 32rpx;
+        color: #ffffff;
+        text-align: center;
+        width: 67%;
+        height: 90rpx;
+        margin-left: 28rpx;
+        line-height: 90rpx;
+        background: #256bfa;
+        min-width: 444rpx;
+        border-radius: 12rpx 12rpx 12rpx 12rpx;
+    }
+}
+.popup-list {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: center;
+    justify-content: space-evenly;
+    height: calc(77vh - 100rpx - 150rpx);
+    overflow: hidden;
+    .picker-view {
+        width: 100%;
+        height: 500rpx;
+        margin-top: 20rpx;
+        .uni-picker-view-mask {
+            background: rgba(0, 0, 0, 0);
+        }
+        .item {
+            line-height: 84rpx;
+            height: 84rpx;
+            text-align: center;
+            font-weight: 400;
+            font-size: 32rpx;
+            color: #cccccc;
+        }
+        .item-active {
+            color: #333333;
+        }
+        .uni-picker-view-indicator:after {
+            border-color: #e3e3e3;
+        }
+        .uni-picker-view-indicator:before {
+            border-color: #e3e3e3;
+        }
+    }
+    // .list {
+    //     .row {
+    //         font-weight: 400;
+    //         font-size: 32rpx;
+    //         color: #333333;
+    //         line-height: 84rpx;
+    //         text-align: center;
+    //     }
+    // }
+}
 
+.content-wrapper {
+    flex: 1;
+    display: flex;
+    overflow: hidden;
+    height: 100%;
+}
+
+.filter-nav {
+    width: 200rpx;
+    background-color: #ffffff;
+
+    .nav-item {
+        height: 100rpx;
+        line-height: 100rpx;
+        text-align: center;
+        font-weight: 400;
+        font-size: 28rpx;
+        color: #666d7f;
+        &.active {
+            font-weight: 500;
+            font-size: 28rpx;
+            color: #256bfa;
+        }
+    }
+}
+
+.filter-content {
+    flex: 1;
+    padding: 20rpx;
+    background-color: #f6f6f6;
+
+    .content-item {
+        margin-top: 30rpx;
+        .item-title {
+            font-weight: 400;
+            font-size: 28rpx;
+            color: #333333;
+            margin-bottom: 15rpx;
+        }
+    }
+    .content-item:first-child {
+        margin-top: 0rpx;
+    }
+
+    .check-content {
+        display: grid;
+        gap: 16rpx;
+        grid-template-columns: repeat(auto-fill, minmax(300rpx, 1fr));
+        place-items: stretch;
+
+        .checkbox-item {
+            display: flex;
+            align-items: center;
+            text-align: center;
+            background-color: #d9d9d9;
+
+            min-width: 0;
+            padding: 0 10rpx;
+            height: 80rpx;
+            background: #e8eaee;
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
+
+            .option-label {
+                font-size: 28rpx;
+                width: 100%;
+                white-space: nowrap;
+                overflow: hidden;
+            }
+        }
+        .checkedstyle {
+            height: 76rpx;
+            background: rgba(37, 107, 250, 0.06);
+            border-radius: 12rpx 12rpx 12rpx 12rpx;
+            border: 2rpx solid #256bfa;
+            color: #256bfa;
+        }
+    }
+}
+</style>
 <style scoped lang="stylus">
 	.app-custom-root {
 		position: fixed;
@@ -639,6 +904,8 @@
 		padding: 0 24rpx;
 		width: calc(100% - 48rpx);
 		position: relative;
+		display: flex;
+		align-items: center;
 	}
 
 	.app-container .container-header .header-input .iconsearch {
@@ -654,6 +921,7 @@
 		background: #ffffff;
 		border-radius: 75rpx;
 		font-size: 28rpx;
+		flex:1
 	}
 
 	.app-container .container-header .header-input .inputplace {
@@ -661,7 +929,13 @@
 		font-size: 28rpx;
 		color: #b5b5b5;
 	}
-
+	.app-container .container-header .header-input .btn-feel {
+		font-weight: 400;
+		font-size: 28rpx;
+		text-align: center;
+		color: #484444;
+		width: 80rpx;
+	}
 	.app-container .container-header .header-date {
 		padding: 28rpx;
 		display: flex;

From f73d3f7a8c100737d10c9394437c4e5b4642c899 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Thu, 22 Jan 2026 12:57:01 +0800
Subject: [PATCH 36/38] =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8CAI=E6=8E=A5=E5=8F=A3=E8=81=94?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                            |  10 +-
 pages.json                           |   6 +
 pages/chat/components/ai-paging.vue  |  36 +--
 pages/city-select/index.vue          | 425 +++++++++++++++++++++++++++
 pages/index/components/index-one.vue |  26 +-
 stores/userChatGroupStore.js         | 198 +++++++------
 utils/streamRequest.js               | 246 +++++++++++++++-
 7 files changed, 813 insertions(+), 134 deletions(-)
 create mode 100644 pages/city-select/index.vue

diff --git a/config.js b/config.js
index 972541c..c4e0710 100644
--- a/config.js
+++ b/config.js
@@ -6,9 +6,9 @@
  */
 export default {
     // baseUrl: 'http://39.98.44.136:8080', // 测试
-    baseUrl: 'https://www.xjksly.cn/api/ks', // 测试
     // baseUrl: 'https://www.xjksly.cn/api/ks', // 测试
-    // baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
+    // baseUrl: 'https://www.xjksly.cn/api/ks', // 测试
+    baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
 
 	// LCBaseUrl:'http://10.110.145.145:9100',//内网端口
 	// LCBaseUrlInner:'http://10.110.145.145:10100',//招聘、培训、帮扶
@@ -20,11 +20,11 @@ export default {
 	trainVideoImgUrl:'https://www.xjksly.cn/prod-api/file/file/minio',
     // sseAI+
     // StreamBaseURl: 'http://39.98.44.136:8000',
-    StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai',
+    StreamBaseURl: 'https://www.xjksly.cn/api/ks/app/chat',
     // StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai/test',
     // 语音转文字
-    // vioceBaseURl: 'ws://39.98.44.136:8080/speech-recognition',
-    vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/speech-recognition',
+    vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/ks/app/speech/asr',
+    // vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/speech-recognition',
     // 语音合成
     speechSynthesis: 'wss://qd.zhaopinzao8dian.com/api/speech-synthesis',
     // indexedDB
diff --git a/pages.json b/pages.json
index 3cc332c..f7fa64d 100644
--- a/pages.json
+++ b/pages.json
@@ -6,6 +6,12 @@
           "navigationBarTitleText": "喀什智慧就业平台"
         }
       },
+      {
+        "path": "pages/city-select/index",
+        "style": {
+          "navigationBarTitleText": "选择城市"
+        }
+      },
       {
         "path": "pages/mine/mine",
         "style": {
diff --git a/pages/chat/components/ai-paging.vue b/pages/chat/components/ai-paging.vue
index 2c5309f..81d4b09 100644
--- a/pages/chat/components/ai-paging.vue
+++ b/pages/chat/components/ai-paging.vue
@@ -551,7 +551,9 @@ const scrollToBottom = throttle(function () {
 }, 500);
 
 function getGuess() {
-    $api.chatRequest('/guest', { sessionId: chatSessionID.value }, 'POST').then((res) => {
+    // $api.chatRequest('/guest', { sessionId: chatSessionID.value }, 'POST').then((res) => {
+    $api.chatRequest('/guest', undefined, 'POST').then((res) => {
+        console.log('getGuess ---- res:', res);
         guessList.value = res.data;
         showGuess.value = true;
         nextTick(() => {
@@ -804,22 +806,22 @@ function refreshMarkdown(index) {
 }
 
 const jobSearchQueries = [
-    '青岛有哪些薪资 12K 以上的岗位适合我？',
-    '青岛 3 年工作经验能找到哪些 12K 以上的工作？',
-    '青岛哪些公司在招聘，薪资范围在 12K 以上？',
-    '青岛有哪些企业提供 15K 以上的岗位？',
-    '青岛哪些公司在招 3-5 年经验的岗位？',
-    '我有三年的工作经验，能否推荐一些适合我的青岛的国企 岗位？',
-    '青岛国企目前在招聘哪些岗位？',
-    '青岛有哪些适合 3 年经验的国企岗位？',
-    '青岛国企招聘的岗位待遇如何？',
-    '青岛国企岗位的薪资水平是多少？',
-    '青岛哪些国企支持双休 & 五险一金完善？',
-    '青岛有哪些公司支持远程办公？',
-    '青岛有哪些外企的岗位，薪资 12K 以上的多吗？',
-    '青岛哪些企业在招聘 Web3.0 相关岗位？',
-    '青岛哪些岗位支持海外远程？薪资如何？',
-    '青岛招聘 AI/大数据相关岗位的公司有哪些？',
+    '喀什地区有哪些薪资 12K 以上的岗位适合我？',
+    '喀什地区 3 年工作经验能找到哪些 12K 以上的工作？',
+    '喀什地区哪些公司在招聘，薪资范围在 12K 以上？',
+    '喀什地区有哪些企业提供 15K 以上的岗位？',
+    '喀什地区哪些公司在招 3-5 年经验的岗位？',
+    '我有三年的工作经验，能否推荐一些适合我的喀什地区的国企 岗位？',
+    '喀什地区国企目前在招聘哪些岗位？',
+    '喀什地区有哪些适合 3 年经验的国企岗位？',
+    '喀什地区国企招聘的岗位待遇如何？',
+    '喀什地区国企岗位的薪资水平是多少？',
+    '喀什地区哪些国企支持双休 & 五险一金完善？',
+    '喀什地区有哪些公司支持远程办公？',
+    '喀什地区有哪些外企的岗位，薪资 12K 以上的多吗？',
+    '喀什地区哪些企业在招聘 Web3.0 相关岗位？',
+    '喀什地区哪些岗位支持海外远程？薪资如何？',
+    '喀什地区招聘 AI/大数据相关岗位的公司有哪些？',
 ];
 
 function changeQueries(value) {
diff --git a/pages/city-select/index.vue b/pages/city-select/index.vue
new file mode 100644
index 0000000..c62b2ea
--- /dev/null
+++ b/pages/city-select/index.vue
@@ -0,0 +1,425 @@
+<template>
+    <view class="city-select-container">
+        <!-- 顶部导航栏 -->
+        <!-- <view class="nav-bar">
+            <view class="nav-left" @click="navBack">
+                <uni-icons type="left" size="24" color="#333"></uni-icons>
+            </view>
+            <view class="nav-title">选择城市</view>
+            <view class="nav-right"></view>
+        </view> -->
+        
+        <!-- 搜索框 -->
+        <view class="search-box">
+            <uni-icons class="search-icon" type="search" size="20" color="#999"></uni-icons>
+            <input 
+                class="search-input" 
+                placeholder="搜索城市名/拼音" 
+                placeholder-style="color: #999" 
+                v-model="searchText"
+                @input="handleSearch"
+            >
+        </view>
+        
+        <!-- 定位城市 -->
+        <!-- <view class="location-section">
+            <view class="section-title">定位城市</view>
+            <view class="location-city" :class="{ active: selectedCity.code === locationCity.code }" @click="selectCity(locationCity)">
+                {{ locationCity.name }}
+            </view>
+        </view> -->
+        
+        <!-- 热门城市 -->
+    <!-- <view class="hot-section">
+        <view class="section-title">热门城市</view>
+        <view class="hot-cities">
+            <view 
+                class="city-item" 
+                :class="{ active: selectedCity.code === item.code }" 
+                v-for="item in hotCities" 
+                :key="item.code"
+                @click="selectCity(item)"
+            >
+                {{ item.name }}
+            </view>
+        </view>
+    </view> -->
+    
+    <!-- 城市数量统计 -->
+    <!-- <view class="city-count" v-if="allCities.length > 0">
+        共找到 {{ allCities.length }} 个城市
+    </view> -->
+        
+        <!-- 城市列表 -->
+        <view class="city-list-section">
+            <scroll-view 
+                class="city-list-content" 
+                scroll-y
+                :scroll-into-view="currentScrollId"
+                :scroll-with-animation="true"
+            >
+                <view 
+                    class="city-group" 
+                    v-for="group in cityGroups" 
+                    :key="group.letter"
+                    :id="`city-group-${group.letter}`"
+                >
+                    <view class="group-title">{{ group.letter }}</view>
+                    <view 
+                        class="city-item" 
+                        :class="{ active: selectedCity.code === item.code }" 
+                        v-for="item in group.cities" 
+                        :key="item.code"
+                        @click="selectCity(item)"
+                    >
+                        {{ item.name }}
+                    </view>
+                </view>
+            </scroll-view>
+            
+            <!-- 右侧字母索引 -->
+            <view class="letter-index">
+                <view 
+                    class="letter-item" 
+                    v-for="letter in letters" 
+                    :key="letter"
+                    @click="scrollToLetter(letter)"
+                    :class="{ active: currentLetter === letter }"
+                >
+                    {{ letter }}
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted, computed, inject } from 'vue';
+const { $api, navTo } = inject('globalFunction');
+
+// 搜索文本
+const searchText = ref('');
+// 定位城市
+const locationCity = ref({ code: '110100', name: '北京' });
+// 选中的城市
+const selectedCity = ref({ code: '', name: '' });
+// 当前显示的字母
+const currentLetter = ref('');
+// 当前滚动到的城市组ID
+const currentScrollId = ref('');
+// 城市数据
+const allCities = ref([]);
+// 字母列表
+const letters = ref(['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']);
+
+
+// 按字母分组的城市
+const cityGroups = computed(() => {
+    const groups = {};
+    const filteredCities = allCities.value.filter(city => {
+        if (!searchText.value) return true;
+        return city.name.includes(searchText.value) || city.pinyin?.includes(searchText.value.toUpperCase());
+    });
+    
+    console.log('过滤后用于分组的城市:', filteredCities);
+    
+    // 初始化字母分组
+    letters.value.forEach(letter => {
+        groups[letter] = { letter, cities: [] };
+    });
+    
+    // 将城市分配到对应字母组
+    filteredCities.forEach(city => {
+        const firstLetter = city.pinyin || '#';
+        // 如果字母不在预定义列表中，将其添加到分组中
+        if (!groups[firstLetter]) {
+            groups[firstLetter] = { letter: firstLetter, cities: [] };
+        }
+        groups[firstLetter].cities.push(city);
+    });
+    
+    const result = Object.values(groups).filter(group => group.cities.length > 0);
+    
+    // 对城市组进行排序
+    result.sort((a, b) => {
+        // '#' 符号应该排在最前面
+        if (a.letter === '#') return -1;
+        if (b.letter === '#') return 1;
+        // 其他字母按字母顺序排序
+        return a.letter.localeCompare(b.letter);
+    });
+    
+    console.log('最终分组结果:', result);
+    
+    return result;
+});
+
+// 获取城市数据
+const getCityData = async () => {
+    try {
+        // 直接获取所有城市数据，新接口已经返回了所有层级的数据
+        const res = await $api.createRequest('/cms/dict/sysarea/listCity', {});
+        console.log('城市数据接口返回:', res);
+        if (res.code === 200 && res.data) {
+            console.log('原始城市数据:', res.data);
+            // 显示接口返回的所有城市数据
+            const filteredCities = res.data;
+            console.log('过滤后城市数据:', filteredCities);
+            
+            // 直接使用后端返回的zm字段作为拼音首字母，并转换为大写
+            allCities.value = filteredCities.map(city => ({
+                ...city,
+                pinyin: (city.zm || '#').toUpperCase()
+            }));
+            
+            console.log('使用后端zm字段的城市数据:', allCities.value);
+            
+            // 按拼音首字母排序
+            allCities.value.sort((a, b) => {
+                // 首先按拼音首字母排序
+                if (a.pinyin !== b.pinyin) {
+                    // '#' 符号应该排在最前面
+                    if (a.pinyin === '#') return -1;
+                    if (b.pinyin === '#') return 1;
+                    return a.pinyin.localeCompare(b.pinyin);
+                }
+                // 首字母相同时，按城市名称排序
+                return a.name.localeCompare(b.name);
+            });
+        }
+    } catch (error) {
+        console.error('获取城市数据失败:', error);
+    }
+};
+
+// 获取拼音首字母（使用更准确的映射表）
+const getPinyinFirstLetter = (name) => {
+    const firstChar = name.charAt(0);
+    
+    // 查找对应的拼音首字母
+    for (const [letter, chars] of Object.entries(pinyinMap)) {
+        if (chars.includes(firstChar)) {
+            return letter;
+        }
+    }
+    
+    // 如果没有找到，返回#
+    return '#';
+};
+
+// 处理搜索
+const handleSearch = () => {
+    // 搜索逻辑已在cityGroups计算属性中处理
+};
+
+// 选择城市
+const selectCity = (city) => {
+    selectedCity.value = city;
+    // 返回上一页并传递选择的城市
+    uni.navigateBack({
+        delta: 1,
+        success: () => {
+            // 发送事件通知首页选择了城市
+            uni.$emit('citySelected', city);
+        }
+    });
+};
+
+// 滚动到指定字母
+const scrollToLetter = (letter) => {
+    currentLetter.value = letter;
+    // 更新滚动ID，触发scroll-view滚动
+    currentScrollId.value = `city-group-${letter}`;
+};
+
+// 返回上一页
+const navBack = () => {
+    uni.navigateBack({ delta: 1 });
+};
+
+// 组件挂载时获取城市数据
+onMounted(() => {
+    getCityData();
+});
+</script>
+
+<style scoped>
+.city-select-container {
+    background-color: #f5f5f5;
+    min-height: 100vh;
+    padding-top: 16px;
+}
+
+/* 导航栏 */
+.nav-bar {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 44px;
+    padding: 0 16px;
+    background-color: #fff;
+    border-bottom: 1px solid #e5e5e5;
+}
+
+.nav-left,
+.nav-right {
+    width: 40px;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.nav-title {
+    font-size: 18px;
+    font-weight: 500;
+    color: #333;
+}
+
+/* 搜索框 */
+.search-box {
+    display: flex;
+    align-items: center;
+    margin: 12px 16px;
+    padding:8px 16px;
+    background-color: #fff;
+    border-radius: 20px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+}
+
+.search-icon {
+    margin-right: 8px;
+}
+
+.search-input {
+    flex: 1;
+    font-size: 14px;
+    color: #333;
+    border: none;
+    outline: none;
+}
+
+/* 定位城市 */
+.location-section {
+    padding: 16px;
+    background-color: #fff;
+    margin-bottom: 8px;
+}
+
+.section-title {
+    font-size: 14px;
+    color: #666;
+    margin-bottom: 12px;
+}
+
+.location-city {
+    display: inline-block;
+    padding: 8px 20px;
+    background-color: #f0f9ff;
+    color: #007aff;
+    border-radius: 20px;
+    font-size: 14px;
+}
+
+.location-city.active {
+    background-color: #007aff;
+    color: #fff;
+}
+
+/* 热门城市 */
+.hot-section {
+    padding: 16px;
+    background-color: #fff;
+    margin-bottom: 8px;
+}
+
+.city-count {
+    padding: 0 16px 12px;
+    background-color: #fff;
+    font-size: 12px;
+    color: #999;
+    margin-bottom: 8px;
+}
+
+.hot-cities {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 12px;
+}
+
+.city-item {
+    padding: 8px 20px;
+    background-color: #f5f5f5;
+    color: #333;
+    border-radius: 20px;
+    font-size: 14px;
+}
+
+.city-item.active {
+    background-color: #007aff;
+    color: #fff;
+}
+
+/* 城市列表 */
+.city-list-section {
+    display: flex;
+    background-color: #fff;
+    height: calc(100vh - 180px);
+}
+
+.city-list-content {
+    flex: 1;
+    overflow-y: auto;
+}
+
+.city-group {
+    padding: 0 16px;
+}
+
+.group-title {
+    font-size: 14px;
+    color: #666;
+    margin: 12px 0 8px 0;
+    padding-left: 4px;
+}
+
+.city-list-content .city-item {
+    display: block;
+    padding: 12px 4px;
+    margin-bottom: 0;
+    background-color: transparent;
+    border-radius: 0;
+    border-bottom: 1px solid #f0f0f0;
+}
+
+.city-list-content .city-item.active {
+    background-color: transparent;
+    color: #007aff;
+}
+
+/* 右侧字母索引 */
+.letter-index {
+    width: 30px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    background-color: #f5f5f5;
+}
+
+.letter-item {
+    width: 24px;
+    height: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 12px;
+    color: #666;
+    margin: 2px 0;
+}
+
+.letter-item.active {
+    color: #007aff;
+    font-weight: bold;
+}
+</style>
\ No newline at end of file
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 7c71594..23060b7 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -250,10 +250,16 @@
                         </view>
                     </view>
                 </scroll-view>
+                
                 <view class="jobs-add button-click" @click="navTo('/packageA/pages/addPosition/addPosition')">
                     <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
                     <text>添加</text>
                 </view>
+                <view class="jobs-add button-click" @click="navTo('/pages/city-select/index')" style="padding-right:0;">
+                    <!-- <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons> -->
+                    <text>{{ selectedCity.name || '地区' }}</text>
+                    <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
+                </view>
             </view>
             <view class="filter-bottom">
                 <view class="btm-left">
@@ -317,7 +323,7 @@
                                     <view class="falls-card-company" v-show="isShowJw !== 3">
                                         {{ config.appInfo.areaName }}
                                         <!-- {{ job.jobLocation }} -->
-                                        <dict-Label dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
+                                        <dict-Label dictType="jobLocationAreaCode" :value="job.jobLocationAreaCode"></dict-Label>
                                     </view>
                                     <view class="falls-card-pepleNumber">
                                         <view>
@@ -394,7 +400,7 @@
                                     <view class="falls-card-company" v-show="isShowJw !== 3">
                                         {{ config.appInfo.areaName }}
                                         <!-- {{ job.jobLocation }} -->
-                                        <dict-Label dictType="area" :value="job.jobLocationAreaCode"></dict-Label>
+                                        <dict-Label dictType="jobLocationAreaCode" :value="job.jobLocationAreaCode"></dict-Label>
                                     </view>
                                     <view class="falls-card-pepleNumber">
                                         <view>
@@ -631,6 +637,8 @@ const inputText = ref('');
 const showFilter = ref(false);
 const selectFilterModel = ref(null);
 const showModel = ref(false);
+// 选中的城市
+const selectedCity = ref({ code: '', name: '' });
 const rangeOptions = ref([
     { value: 0, text: '推荐' },
     { value: 1, text: '最热' },
@@ -723,6 +731,7 @@ onMounted(() => {
     // 在组件挂载时绑定事件监听，确保只绑定一次
     // 先移除可能存在的旧监听，避免重复绑定
     uni.$off('showLoginModal');
+    uni.$off('citySelected');
     
     // 绑定新的监听
     uni.$on('showLoginModal', () => {
@@ -731,6 +740,15 @@ onMounted(() => {
         pageNull.value = 0;
     });
     
+    // 监听城市选择事件
+    uni.$on('citySelected', (city) => {
+        console.log('收到citySelected事件，选择的城市:', city);
+        selectedCity.value = city;
+        // 可以在这里添加根据城市筛选职位的逻辑
+        conditionSearch.value.jobLocationAreaCode = city.code;
+        getJobRecommend('refresh');
+    });
+    
     // 获取企业信息
     getCompanyInfo();
 });
@@ -738,6 +756,7 @@ onMounted(() => {
 onUnmounted(() => {
     // 组件销毁时移除事件监听
     uni.$off('showLoginModal');
+    uni.$off('citySelected');
 });
 
 onShow(() => {
@@ -1728,6 +1747,9 @@ defineExpose({ loadData });
             min-width: 80rpx;
             padding: 8rpx 12rpx;
             white-space: nowrap;
+            .right-sx
+                width: 28rpx;
+                height: 28rpx;
     .filter-bottom
         display: flex
         justify-content: space-between
diff --git a/stores/userChatGroupStore.js b/stores/userChatGroupStore.js
index 9eb330f..ae21f54 100644
--- a/stores/userChatGroupStore.js
+++ b/stores/userChatGroupStore.js
@@ -107,102 +107,108 @@ const useChatGroupDBStore = defineStore("messageGroup", () => {
         return await baseDB.db.add(massageName.value, payload);
     }
 
-    async function getStearm(text, fileUrls = [], progress, options = {}) {
-
-        return new Promise((resolve, reject) => {
-            try {
-                toggleTyping(true);
-                const customDataID = 'message_' + UUID.generate()
-                const params = {
-                    data: text,
-                    sessionId: chatSessionID.value,
-                    dataId: customDataID
-                };
-                if (fileUrls && fileUrls.length) {
-                    params['fileUrl'] = fileUrls.map((item) => item.url);
-                }
-                // ------>
-                const MsgData = {
-                    text: text,
-                    self: true,
-                    displayText: text,
-                    files: fileUrls
-                };
-                addMessage(MsgData); // 添加message数据
-                // <------
-                const newMsg = {
-                    text: '', // 存储原始结构化内容
-                    self: false,
-                    displayText: '', // 用于流式渲染展示
-                    dataId: customDataID
-                };
-                const index = messages.value.length;
-                messages.value.push(newMsg);
-
-                const rawParts = Array.isArray(text) ? text : [text]; // 统一处理
-
-                // 用于追加每个部分的流式数据
-                let partIndex = 0;
-
-                function handleUnload() {
-                    newMsg.parentGroupId = chatSessionID.value;
-                    baseDB.db.add(massageName.value, newMsg).then((id) => {
-                        messages.value[index] = {
-                            ...newMsg,
-                            id
-                        };
-                    });
-                }
-                // #ifdef H5
-                if (typeof window !== 'undefined') {
-                    window.addEventListener("unload", handleUnload);
-                }
-                // #endif
-
-                function onDataReceived(data) {
-                    // 支持追加多个部分
-                    newMsg.text += data;
-                    newMsg.displayText += data;
-                    messages.value[index] = {
-                        ...newMsg
-                    };
-                    progress && progress();
-                    
-                    // 调用外部传入的onDataReceived回调
-                    if (options.onDataReceived) {
-                        options.onDataReceived(data, newMsg, index);
-                    }
-                }
-
-                function onError(error) {
-                    msg('服务响应异常');
-                    reject(error);
-                }
-
-                function onComplete() {
-                    messages.value[index] = {
-                        ...newMsg
-                    };
-                    toggleTyping(false);
-                    // #ifdef H5
-                    if (typeof window !== 'undefined') {
-                        window.removeEventListener("unload", handleUnload);
-                    }
-                    // #endif
-                    handleUnload();
-                    // 调用外部传入的onComplete回调
-                    if (options.onComplete) {
-                        options.onComplete();
-                    }
-                    resolve();
-                }
-
-                $api.streamRequest('/chat', params, onDataReceived, onError, onComplete);
-            } catch (err) {
-                console.log(err);
-                reject(err);
-            }
-        });
+    async function getStearm(text, fileUrls = [], progress, options = {}) {
+
+        return new Promise((resolve, reject) => {
+            try {
+                toggleTyping(true);
+                const customDataID = 'message_' + UUID.generate()
+                
+                // 对话历史管理：只保留最近的N条消息，防止token超限
+                // 计算消息数量，只保留最近的10条消息（可根据实际情况调整）
+                const MAX_HISTORY_MESSAGES = 10;
+                const historyMessages = messages.value.slice(-MAX_HISTORY_MESSAGES);
+                
+                const params = {
+                    data: text,
+                    sessionId: chatSessionID.value,
+                    dataId: customDataID
+                };
+                if (fileUrls && fileUrls.length) {
+                    params['fileUrl'] = fileUrls.map((item) => item.url);
+                }
+                // ------>
+                const MsgData = {
+                    text: text,
+                    self: true,
+                    displayText: text,
+                    files: fileUrls
+                };
+                addMessage(MsgData); // 添加message数据
+                // <------
+                const newMsg = {
+                    text: '', // 存储原始结构化内容
+                    self: false,
+                    displayText: '', // 用于流式渲染展示
+                    dataId: customDataID
+                };
+                const index = messages.value.length;
+                messages.value.push(newMsg);
+
+                const rawParts = Array.isArray(text) ? text : [text]; // 统一处理
+
+                // 用于追加每个部分的流式数据
+                let partIndex = 0;
+
+                function handleUnload() {
+                    newMsg.parentGroupId = chatSessionID.value;
+                    baseDB.db.add(massageName.value, newMsg).then((id) => {
+                        messages.value[index] = {
+                            ...newMsg,
+                            id
+                        };
+                    });
+                }
+                // #ifdef H5
+                if (typeof window !== 'undefined') {
+                    window.addEventListener("unload", handleUnload);
+                }
+                // #endif
+
+                function onDataReceived(data) {
+                    // 支持追加多个部分
+                    newMsg.text += data;
+                    newMsg.displayText += data;
+                    messages.value[index] = {
+                        ...newMsg
+                    };
+                    progress && progress();
+                    
+                    // 调用外部传入的onDataReceived回调
+                    if (options.onDataReceived) {
+                        options.onDataReceived(data, newMsg, index);
+                    }
+                }
+
+                function onError(error) {
+                    msg('服务响应异常');
+                    reject(error);
+                }
+
+                function onComplete() {
+                    messages.value[index] = {
+                        ...newMsg
+                    };
+                    toggleTyping(false);
+                    // #ifdef H5
+                    if (typeof window !== 'undefined') {
+                        window.removeEventListener("unload", handleUnload);
+                    }
+                    // #endif
+                    handleUnload();
+                    // 调用外部传入的onComplete回调
+                    if (options.onComplete) {
+                        options.onComplete();
+                    }
+                    resolve();
+                }
+
+                $api.streamRequest('/chat', params, onDataReceived, onError, onComplete);
+            } catch (err) {
+                console.log(err);
+                reject(err);
+            }
+        });
     }
 
     //  状态控制
diff --git a/utils/streamRequest.js b/utils/streamRequest.js
index 9a49cef..7073f97 100644
--- a/utils/streamRequest.js
+++ b/utils/streamRequest.js
@@ -27,6 +27,7 @@ function StreamRequestMiniProgram(url, data = {}, onDataReceived, onError, onCom
 
     return new Promise((resolve, reject) => {
         let buffer = '';
+        let hasReceivedContent = false;
         
         const requestTask = uni.request({
             url: config.StreamBaseURl + url,
@@ -55,15 +56,33 @@ function StreamRequestMiniProgram(url, data = {}, onDataReceived, onError, onCom
             try {
                 const decoder = new TextDecoder('utf-8');
                 const chunk = decoder.decode(new Uint8Array(res.data));
+                console.log('📦 收到分块数据:', chunk);
                 buffer += chunk;
                 
                 let lines = buffer.split("\n");
                 buffer = lines.pop() || ''; // 保留不完整的行
+                console.log('📝 解析到行:', lines.length, '行，缓冲区剩余:', buffer.length, '字符');
                 
                 for (let line of lines) {
-                    if (line.startsWith("data: ")) {
-                        const jsonData = line.slice(6).trim();
+                    console.log('🔍 处理行:', line);
+                    // 处理重复的 data: 前缀
+                    let processedLine = line;
+                    // 移除所有开头的 data: 前缀（无论是否有空格），直到只剩下一个或没有
+                    while (processedLine.startsWith("data:")) {
+                        // 检查是否还有另一个 data: 前缀
+                        const nextPart = processedLine.slice(5).trimStart();
+                        if (nextPart.startsWith("data:")) {
+                            processedLine = nextPart;
+                        } else {
+                            break;
+                        }
+                    }
+                    
+                    if (processedLine.startsWith("data: ")) {
+                        const jsonData = processedLine.slice(6).trim();
+                        console.log('📄 提取的JSON数据:', jsonData);
                         if (jsonData === "[DONE]") {
+                            console.log('✅ 收到结束标记 [DONE]');
                             onComplete && onComplete();
                             resolve();
                             return;
@@ -72,11 +91,35 @@ function StreamRequestMiniProgram(url, data = {}, onDataReceived, onError, onCom
                         if (jsonData && jsonData.trim()) {
                             try {
                                 const parsedData = JSON.parse(jsonData);
+                                console.log('🔧 解析后的JSON:', parsedData);
                                 
+                                // 检查是否有错误信息
+                                const finishReason = parsedData?.choices?.[0]?.finish_reason;
+                                if (finishReason === "error") {
+                                    let errorContent = parsedData?.choices?.[0]?.delta?.content || "流式请求失败";
+                                    console.error('❌ 收到错误信息:', errorContent);
+                                    
+                                    // 优化token超限错误提示
+                                    if (errorContent.includes("maximum input ids length")) {
+                                        errorContent = "对话历史过长，请尝试清除部分历史记录或简化问题";
+                                    }
+                                    
+                                    // 只有当未收到正常内容时才显示错误信息
+                                    if (!hasReceivedContent) {
+                                        // 显示错误信息给用户
+                                        uni.showToast({
+                                            title: errorContent,
+                                            icon: 'none',
+                                            duration: 3000
+                                        });
+                                    }
+                                }
                                 // 处理标准的choices格式
-                                if (parsedData?.choices?.[0]?.delta?.content) {
+                                else if (parsedData?.choices?.[0]?.delta?.content) {
                                     const content = parsedData.choices[0].delta.content;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(content):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -84,6 +127,8 @@ function StreamRequestMiniProgram(url, data = {}, onDataReceived, onError, onCom
                                 else if (parsedData?.choices?.[0]?.delta?.reasoning_content) {
                                     const content = parsedData.choices[0].delta.reasoning_content;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(reasoning_content):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -91,14 +136,42 @@ function StreamRequestMiniProgram(url, data = {}, onDataReceived, onError, onCom
                                 else if (parsedData?.tool?.response) {
                                     const content = parsedData.tool.response;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(tool.response):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
+                                // 处理其他可能的内容格式
+                                else if (parsedData?.content) {
+                                    // 直接返回content字段的情况
+                                    const content = parsedData.content;
+                                    if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(direct content):', content);
+                                        onDataReceived && onDataReceived(content);
+                                    }
+                                }
+                                // 处理完整的text字段（非流式）
+                                else if (parsedData?.choices?.[0]?.text) {
+                                    const content = parsedData.choices[0].text;
+                                    if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(full text):', content);
+                                        onDataReceived && onDataReceived(content);
+                                    }
+                                }
+                                else {
+                                    console.warn('⚠️ 未匹配到任何内容格式:', parsedData);
+                                }
                             } catch (e) {
-                                console.error("JSON 解析失败:", e.message);
+                                console.error("JSON 解析失败:", e.message, "原始数据:", jsonData);
                             }
                         }
                     }
+                    else if (processedLine.trim()) {
+                        // 处理非data:开头的行
+                        console.warn('⚠️ 收到非data:开头的行:', processedLine);
+                    }
                 }
             } catch (error) {
                 console.error('处理分块数据失败:', error);
@@ -135,6 +208,7 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
             let buffer = "";
             let retryCount = 0;
             const maxRetries = 3;
+            let hasReceivedContent = false;
             
             while (true) {
                 const {
@@ -157,9 +231,25 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                 console.log(`📦 Processing ${lines.length} lines, buffer length: ${buffer.length}`);
                 
                 for (let line of lines) {
-                    if (line.startsWith("data: ")) {
-                        const jsonData = line.slice(6).trim();
+                    console.log('🔍 处理行:', line);
+                    // 处理重复的 data: 前缀
+                    let processedLine = line;
+                    // 移除所有开头的 data: 前缀（无论是否有空格），直到只剩下一个或没有
+                    while (processedLine.startsWith("data:")) {
+                        // 检查是否还有另一个 data: 前缀
+                        const nextPart = processedLine.slice(5).trimStart();
+                        if (nextPart.startsWith("data:")) {
+                            processedLine = nextPart;
+                        } else {
+                            break;
+                        }
+                    }
+                    
+                    if (processedLine.startsWith("data: ")) {
+                        const jsonData = processedLine.slice(6).trim();
+                        console.log('📄 提取的JSON数据:', jsonData);
                         if (jsonData === "[DONE]") {
+                            console.log('✅ 收到结束标记 [DONE]');
                             onComplete && onComplete();
                             resolve();
                             return;
@@ -169,11 +259,35 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                             // 检查JSON数据是否完整
                             if (jsonData && jsonData.trim() && jsonData !== "[DONE]") {
                                 const parsedData = JSON.parse(jsonData);
+                                console.log('🔧 解析后的JSON:', parsedData);
                                 
+                                // 检查是否有错误信息
+                                const finishReason = parsedData?.choices?.[0]?.finish_reason;
+                                if (finishReason === "error") {
+                                    let errorContent = parsedData?.choices?.[0]?.delta?.content || "流式请求失败";
+                                    console.error('❌ 收到错误信息:', errorContent);
+                                    
+                                    // 优化token超限错误提示
+                                    if (errorContent.includes("maximum input ids length")) {
+                                        errorContent = "对话历史过长，请尝试清除部分历史记录或简化问题";
+                                    }
+                                    
+                                    // 只有当未收到正常内容时才显示错误信息
+                                    if (!hasReceivedContent) {
+                                        // 显示错误信息给用户
+                                        uni.showToast({
+                                            title: errorContent,
+                                            icon: 'none',
+                                            duration: 3000
+                                        });
+                                    }
+                                }
                                 // 处理标准的choices格式
-                                if (parsedData?.choices?.[0]?.delta?.content) {
+                                else if (parsedData?.choices?.[0]?.delta?.content) {
                                     const content = parsedData.choices[0].delta.content;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(content):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -181,6 +295,8 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                                 else if (parsedData?.choices?.[0]?.delta?.reasoning_content) {
                                     const content = parsedData.choices[0].delta.reasoning_content;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(reasoning_content):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -188,6 +304,27 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                                 else if (parsedData?.tool?.response) {
                                     const content = parsedData.tool.response;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(tool.response):', content);
+                                        onDataReceived && onDataReceived(content);
+                                    }
+                                }
+                                // 处理其他可能的内容格式
+                                else if (parsedData?.content) {
+                                    // 直接返回content字段的情况
+                                    const content = parsedData.content;
+                                    if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(direct content):', content);
+                                        onDataReceived && onDataReceived(content);
+                                    }
+                                }
+                                // 处理完整的text字段（非流式）
+                                else if (parsedData?.choices?.[0]?.text) {
+                                    const content = parsedData.choices[0].text;
+                                    if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(full text):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -201,6 +338,10 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                             // 不抛出错误，继续处理下一个数据块
                         }
                     }
+                    else if (processedLine.trim()) {
+                        // 处理非data:开头的行
+                        console.warn('⚠️ 收到非data:开头的行:', processedLine);
+                    }
                 }
             }
 
@@ -209,16 +350,55 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                 console.log("📦 Processing remaining buffer:", buffer.substring(0, 100) + "...");
                 const lines = buffer.split("\n");
                 for (let line of lines) {
-                    if (line.startsWith("data: ")) {
-                        const jsonData = line.slice(6).trim();
+                    console.log('🔍 处理剩余缓冲区行:', line);
+                    // 处理重复的 data: 前缀
+                    let processedLine = line;
+                    // 移除所有开头的 data: 前缀（无论是否有空格），直到只剩下一个或没有
+                    while (processedLine.startsWith("data:")) {
+                        // 检查是否还有另一个 data: 前缀
+                        const nextPart = processedLine.slice(5).trimStart();
+                        if (nextPart.startsWith("data:")) {
+                            processedLine = nextPart;
+                        } else {
+                            break;
+                        }
+                    }
+                    
+                    if (processedLine.startsWith("data: ")) {
+                        const jsonData = processedLine.slice(6).trim();
+                        console.log('📄 提取的剩余JSON数据:', jsonData);
                         if (jsonData && jsonData !== "[DONE]") {
                             try {
                                 const parsedData = JSON.parse(jsonData);
+                                console.log('🔧 解析后的剩余JSON:', parsedData);
                                 
+                                // 检查是否有错误信息
+                                const finishReason = parsedData?.choices?.[0]?.finish_reason;
+                                if (finishReason === "error") {
+                                    let errorContent = parsedData?.choices?.[0]?.delta?.content || "流式请求失败";
+                                    console.error('❌ 收到错误信息:', errorContent);
+                                    
+                                    // 优化token超限错误提示
+                                    if (errorContent.includes("maximum input ids length")) {
+                                        errorContent = "对话历史过长，请尝试清除部分历史记录或简化问题";
+                                    }
+                                    
+                                    // 只有当未收到正常内容时才显示错误信息
+                                    if (!hasReceivedContent) {
+                                        // 显示错误信息给用户
+                                        uni.showToast({
+                                            title: errorContent,
+                                            icon: 'none',
+                                            duration: 3000
+                                        });
+                                    }
+                                }
                                 // 处理标准的choices格式
-                                if (parsedData?.choices?.[0]?.delta?.content) {
+                                else if (parsedData?.choices?.[0]?.delta?.content) {
                                     const content = parsedData.choices[0].delta.content;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(content):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -226,6 +406,8 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                                 else if (parsedData?.choices?.[0]?.delta?.reasoning_content) {
                                     const content = parsedData.choices[0].delta.reasoning_content;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(reasoning_content):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -233,6 +415,27 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                                 else if (parsedData?.tool?.response) {
                                     const content = parsedData.tool.response;
                                     if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(tool.response):', content);
+                                        onDataReceived && onDataReceived(content);
+                                    }
+                                }
+                                // 处理其他可能的内容格式
+                                else if (parsedData?.content) {
+                                    // 直接返回content字段的情况
+                                    const content = parsedData.content;
+                                    if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(direct content):', content);
+                                        onDataReceived && onDataReceived(content);
+                                    }
+                                }
+                                // 处理完整的text字段（非流式）
+                                else if (parsedData?.choices?.[0]?.text) {
+                                    const content = parsedData.choices[0].text;
+                                    if (content) {
+                                        hasReceivedContent = true;
+                                        console.log('📤 调用onDataReceived(full text):', content);
                                         onDataReceived && onDataReceived(content);
                                     }
                                 }
@@ -241,6 +444,10 @@ function StreamRequestH5(url, data = {}, onDataReceived, onError, onComplete) {
                             }
                         }
                     }
+                    else if (processedLine.trim()) {
+                        // 处理非data:开头的行
+                        console.warn('⚠️ 收到非data:开头的剩余行:', processedLine);
+                    }
                 }
             }
             
@@ -295,16 +502,27 @@ export function chatRequest(url, data = {}, method = 'GET', loading = false, hea
                         return
                     }
                     uni.showToast({
-                        title: msg,
+                        title: msg || '请求失败',
                         icon: 'none'
                     })
+                    // 拒绝Promise并提供详细错误信息
+                    const err = new Error(msg || '请求失败，服务器返回错误码: ' + code)
+                    err.error = resData
+                    reject(err)
+                } else {
+                    // 处理非200状态码
+                    const errorMsg = `请求失败，HTTP状态码: ${resData.statusCode}`
+                    uni.showToast({
+                        title: errorMsg,
+                        icon: 'none'
+                    })
+                    const err = new Error(errorMsg)
+                    err.error = resData
+                    reject(err)
                 }
                 if (resData.data?.code === 401 || resData.data?.code === 402) {
                     useUserStore().logOut()
                 }
-                const err = new Error('请求出现异常，请联系工作人员')
-                err.error = resData
-                reject(err)
             },
             fail: (err) => {
                 reject(err)

From 96c89e021076dacf50bf282e2ec8ca852be47959 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Thu, 22 Jan 2026 13:25:42 +0800
Subject: [PATCH 37/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9api=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=B8=BA=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                            | 5 ++---
 pages/index/components/index-one.vue | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/config.js b/config.js
index c4e0710..7b4efda 100644
--- a/config.js
+++ b/config.js
@@ -6,9 +6,8 @@
  */
 export default {
     // baseUrl: 'http://39.98.44.136:8080', // 测试
-    // baseUrl: 'https://www.xjksly.cn/api/ks', // 测试
-    // baseUrl: 'https://www.xjksly.cn/api/ks', // 测试
-    baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
+    baseUrl: 'https://www.xjksly.cn/api/ks', // 正式环境
+    // baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
 
 	// LCBaseUrl:'http://10.110.145.145:9100',//内网端口
 	// LCBaseUrlInner:'http://10.110.145.145:10100',//招聘、培训、帮扶
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index 23060b7..e30814e 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -255,11 +255,10 @@
                     <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
                     <text>添加</text>
                 </view>
-                <view class="jobs-add button-click" @click="navTo('/pages/city-select/index')" style="padding-right:0;">
-                    <!-- <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons> -->
+                <!-- <view class="jobs-add button-click" @click="navTo('/pages/city-select/index')" style="padding-right:0;">
                     <text>{{ selectedCity.name || '地区' }}</text>
                     <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
-                </view>
+                </view> -->
             </view>
             <view class="filter-bottom">
                 <view class="btm-left">

From 80bd1ee181b83ee65f5ec773a51cc00723efa8f9 Mon Sep 17 00:00:00 2001
From: francis_fh <13935151924@163.com>
Date: Thu, 22 Jan 2026 14:05:22 +0800
Subject: [PATCH 38/38] =?UTF-8?q?AI=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/md-render/md-render.vue   | 183 ++++++++++++++++-----------
 config.js                            |   9 +-
 hook/useTTSPlayer.js                 |  21 ++-
 pages/chat/components/ai-paging.vue  |  99 +++++++++++----
 pages/index/components/index-one.vue |   4 +-
 utils/markdownParser.js              |  70 ++++++----
 6 files changed, 246 insertions(+), 140 deletions(-)

diff --git a/components/md-render/md-render.vue b/components/md-render/md-render.vue
index 4cc4e90..1865468 100644
--- a/components/md-render/md-render.vue
+++ b/components/md-render/md-render.vue
@@ -1,7 +1,12 @@
 <template>
     <view class="markdown-body">
+        <!-- 根据不同平台使用不同的渲染方式 -->
+        <!-- #ifdef MP-WEIXIN -->
         <rich-text class="markdownRich" id="markdown-content" :nodes="renderedHtml" @itemclick="handleItemClick" />
-        <!-- <view class="markdown-body" v-html="renderedHtml"></view> -->
+        <!-- #endif -->
+        <!-- #ifndef MP-WEIXIN -->
+        <view class="markdown-body" v-html="renderedHtml"></view>
+        <!-- #endif -->
     </view>
 </template>
 
@@ -267,7 +272,7 @@ ol {
 </style>
 
 <style lang="stylus">
-.custom-more{
+.custom-more
     display: flex
     justify-content: center
     align-items: center
@@ -282,15 +287,16 @@ ol {
     transition: all 0.3s ease
     position: relative
     overflow: hidden
-    .more-icon{
-        width: 32rpx;
-        height: 32rpx;
-        background: url('@/static/svg/seemore.svg') center center no-repeat;
+    
+    .more-icon
+        width: 32rpx
+        height: 32rpx
+        background: url('@/static/svg/seemore.svg') center center no-repeat
         background-size: 100% 100%
         margin-left: 12rpx
         filter: brightness(0) invert(1)
-    }
-    &::before {
+    
+    &::before
         content: ''
         position: absolute
         top: 0
@@ -299,93 +305,124 @@ ol {
         height: 100%
         background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent)
         transition: left 0.5s ease
-    }
-    &:active {
+    
+    &:active
         transform: translateY(2rpx)
         box-shadow: 0rpx 4rpx 16rpx rgba(37, 107, 250, 0.4)
-    }
-    &:active::before {
+    
+    &:active::before
         left: 100%
-    }
-}
+
+/* 为小程序专门优化的样式 */
+/* #ifdef MP-WEIXIN */
+.rich-text-container
+    padding: 0 20rpx
+
+.markdownRich
+    padding: 0
+/* #endif */
+
 .custom-card
-    background: #FFFFFF;
-    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04);
-    border-radius: 20rpx 20rpx 20rpx 20rpx;
-    padding: 28rpx 24rpx;
-    font-weight: 400;
-    font-size: 28rpx;
-    color: #333333;
-    margin-bottom: 20rpx;
-    position: relative;
-    display: flex;
+    background: #FFFFFF
+    box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.04)
+    border-radius: 20rpx
+    padding: 28rpx 24rpx
+    font-weight: 400
+    font-size: 28rpx
+    color: #333333
+    margin-bottom: 20rpx
+    position: relative
+    display: flex
     flex-direction: column
+    /* 确保在小程序中边距正确应用 */
+    /* #ifdef MP-WEIXIN */
+    margin-left: auto
+    margin-right: auto
+    width: 100%
+    box-sizing: border-box
+    /* #endif */
+    
     .card-title
-        font-weight: 600;
-        display: flex;
-        align-items: center;
+        font-weight: 600
+        display: flex
+        align-items: center
         justify-content: space-between
+        margin-bottom: 16rpx
+        
         .title-text
-            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif;
-            max-width: calc(100% - 160rpx);
+            font-family: 'PingFangSC-Medium', 'PingFang SC', 'Helvetica Neue', Helvetica, Arial, 'Microsoft YaHei', sans-serif
+            max-width: calc(100% - 160rpx)
             overflow: hidden
             text-overflow: ellipsis
             font-size: 30rpx
+            line-height: 1.4
+        
         .card-salary
-            font-family: DIN-Medium;
-            font-size: 28rpx;
-            color: #FF6E1C;
+            font-family: DIN-Medium
+            font-size: 28rpx
+            color: #FF6E1C
+            line-height: 1.4
 
     .card-company
-        margin-top: 16rpx;
-        max-width: calc(100%);
-        overflow: hidden;
+        margin-bottom: 22rpx
+        max-width: 100%
+        overflow: hidden
         text-overflow: ellipsis
-        color: #6C7282;
+        color: #6C7282
+        line-height: 1.4
+    
     .card-info
-        margin-top: 22rpx;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding-right: 40rpx;
+        display: flex
+        align-items: center
+        justify-content: space-between
+        padding-right: 40rpx
+        
         .info-item
-            display: flex;
-            position: relative;
-            align-items: center;
-            color: #256BFA;
-            font-size: 28rpx;
-            padding-right: 10rpx
+            display: flex
+            position: relative
+            align-items: center
+            
+            &:last-child
+                color: #256BFA
+                font-size: 28rpx
+                padding-right: 10rpx
+    
     .position-nav
-        position: absolute;
-        right: -10rpx;
-        top: 50%;
+        position: absolute
+        right: -10rpx
+        top: 50%
+        transform: translateY(-50%)
+    
     .position-nav::before
-        position: absolute;
-        left: 0;
-        top: -4rpx;
-        content: '';
-        width: 4rpx;
-        height: 16rpx;
+        position: absolute
+        left: 0
+        top: -4rpx
+        content: ''
+        width: 4rpx
+        height: 16rpx
         border-radius: 2rpx
-        background: #256BFA;
-        transform: translate(0, -50%) rotate(-45deg) ;
+        background: #256BFA
+        transform: translate(0, -50%) rotate(-45deg)
+    
     .position-nav::after
-        position: absolute;
-        left: 0;
-        top: -4rpx;
-        content: '';
-        width: 4rpx;
-        height: 16rpx;
+        position: absolute
+        left: 0
+        top: -4rpx
+        content: ''
+        width: 4rpx
+        height: 16rpx
         border-radius: 2rpx
-        background: #256BFA;
+        background: #256BFA
         transform: rotate(45deg)
+    
     .card-tag
-        font-weight: 500;
-        font-size: 24rpx;
-        color: #333333;
-        width: fit-content;
-        background: #F4F4F4;
-        border-radius: 4rpx 4rpx 4rpx 4rpx;
-        padding: 4rpx 20rpx;
-        margin-right: 16rpx;
+        font-weight: 500
+        font-size: 24rpx
+        color: #333333
+        width: fit-content
+        background: #F4F4F4
+        border-radius: 4rpx
+        padding: 4rpx 20rpx
+        margin-right: 16rpx
+        margin-bottom: 0
 </style>
diff --git a/config.js b/config.js
index 7b4efda..31333da 100644
--- a/config.js
+++ b/config.js
@@ -6,8 +6,8 @@
  */
 export default {
     // baseUrl: 'http://39.98.44.136:8080', // 测试
-    baseUrl: 'https://www.xjksly.cn/api/ks', // 正式环境
-    // baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
+    // baseUrl: 'https://www.xjksly.cn/api/ks', // 正式环境
+    baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 测试
 
 	// LCBaseUrl:'http://10.110.145.145:9100',//内网端口
 	// LCBaseUrlInner:'http://10.110.145.145:10100',//招聘、培训、帮扶
@@ -22,10 +22,11 @@ export default {
     StreamBaseURl: 'https://www.xjksly.cn/api/ks/app/chat',
     // StreamBaseURl: 'https://qd.zhaopinzao8dian.com/ai/test',
     // 语音转文字
-    vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/ks/app/speech/asr',
+    vioceBaseURl: 'https://www.xjksly.cn/api/ks/app/speech/asr',
     // vioceBaseURl: 'wss://qd.zhaopinzao8dian.com/api/speech-recognition',
     // 语音合成
-    speechSynthesis: 'wss://qd.zhaopinzao8dian.com/api/speech-synthesis',
+    speechSynthesis: 'https://www.xjksly.cn/api/ks/app/speech/tts',
+    // speechSynthesis: 'wss://qd.zhaopinzao8dian.com/api/speech-synthesis',
     // indexedDB
     DBversion: 2,
     // 只使用本地缓寸的数据
diff --git a/hook/useTTSPlayer.js b/hook/useTTSPlayer.js
index b11ff3a..24a2689 100644
--- a/hook/useTTSPlayer.js
+++ b/hook/useTTSPlayer.js
@@ -292,19 +292,14 @@ export function useTTSPlayer(wsUrl) {
     onHide(cancelAudio)
     onUnload(cancelAudio)
 
-    // 只在支持 AudioContext 的环境中初始化 WebSocket
-    if (audioContext) {
-        initWebSocket()
-    }
-
-    return {
-        speak,
-        pause,
-        resume,
-        cancelAudio,
-        isSpeaking,
-        isPaused,
-        isComplete
+    return {
+        speak,
+        pause,
+        resume,
+        cancelAudio,
+        isSpeaking,
+        isPaused,
+        isComplete
     }
 }
 
diff --git a/pages/chat/components/ai-paging.vue b/pages/chat/components/ai-paging.vue
index 81d4b09..e67e54b 100644
--- a/pages/chat/components/ai-paging.vue
+++ b/pages/chat/components/ai-paging.vue
@@ -134,9 +134,16 @@
                     <view class="message">{{ recognizedText }} {{ lastFinalText }}</view>
                 </view>
                 <view v-if="isTyping" class="self">
-                    <text class="message msg-loading">
-                        <span class="ai-loading"></span>
-                    </text>
+                    <view class="message msg-loading">
+                        <div class="loading-content">
+                            <span class="ai-loading">
+                                <span></span>
+                                <span></span>
+                                <span></span>
+                            </span>
+                            <text class="loading-text">AI正在思考中...</text>
+                        </div>
+                    </view>
                 </view>
             </view>
         </scroll-view>
@@ -1005,12 +1012,26 @@ image-margin-top = 40rpx
 .messageNull
     display: none
 .msg-loading{
-    background: transparent;
-    font-size: 24rpx;
-    color: #8f8d8e;
+    background: #F6F6F6;
+    border-radius: 20rpx 0 20rpx 20rpx;
+    padding: 20rpx;
+    width: fit-content;
     display: flex;
-    align-items: flex-end;
-    justify-content: flex-start;
+    align-items: center;
+    justify-content: center;
+    
+    .loading-content{
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 16rpx;
+    }
+    
+    .loading-text{
+        font-size: 28rpx;
+        color: #666666;
+        font-weight: 500;
+    }
 }
 .loaded{
     padding-left: 20rpx
@@ -1250,25 +1271,55 @@ image-margin-top = 40rpx
             .file-border
                 width: 160rpx !important;
 
-@keyframes ai-circle {
-    0% {
-        -webkit-transform: rotate(0);
-        transform: rotate(0);
+/* 更美观的loading动画 - 兼容H5和小程序 */
+@keyframes ai-loading-dots {
+    0%, 20%, 80%, 100% {
+        transform: scale(1);
+        opacity: 0.6;
     }
-    100% {
-        -webkit-transform: rotate(360deg);
-        transform: rotate(360deg);
+    40% {
+        transform: scale(1.2);
+        opacity: 1;
     }
 }
-.ai-loading
+
+/* 重置默认样式 */
+.ai-loading {
     display: inline-flex;
-    vertical-align: middle;
-    width: 28rpx;
-    height: 28rpx;
-    background: 0 0;
+    align-items: center;
+    justify-content: center;
+    gap: 8rpx;
+    width: auto;
+    height: auto;
+    background: transparent;
+    border: none;
+    border-radius: 0;
+    padding: 0;
+    margin: 0;
+}
+
+/* 三个点的样式 - 使用标准CSS语法，不使用嵌套 */
+.ai-loading span {
+    display: inline-block;
+    width: 12rpx;
+    height: 12rpx;
     border-radius: 50%;
-    border: 4rpx solid;
-    border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
-    -webkit-animation: ai-circle 1s linear infinite;
-    animation: ai-circle 1s linear infinite;
+    background-color: #256BFA;
+    animation: ai-loading-dots 1.4s ease-in-out infinite both;
+    margin: 0;
+    padding: 0;
+}
+
+/* 为每个点设置不同的动画延迟 */
+.ai-loading span:nth-child(1) {
+    animation-delay: -0.32s;
+}
+
+.ai-loading span:nth-child(2) {
+    animation-delay: -0.16s;
+}
+
+.ai-loading span:nth-child(3) {
+    animation-delay: 0s;
+}
 </style>
diff --git a/pages/index/components/index-one.vue b/pages/index/components/index-one.vue
index e30814e..a7aee53 100644
--- a/pages/index/components/index-one.vue
+++ b/pages/index/components/index-one.vue
@@ -255,10 +255,10 @@
                     <uni-icons class="iconsearch" color="#666D7F" type="plusempty" size="18"></uni-icons>
                     <text>添加</text>
                 </view>
-                <!-- <view class="jobs-add button-click" @click="navTo('/pages/city-select/index')" style="padding-right:0;">
+                <view class="jobs-add button-click" @click="navTo('/pages/city-select/index')" style="padding-right:0;">
                     <text>{{ selectedCity.name || '地区' }}</text>
                     <image class="right-sx" :class="{ active: showFilter }" src="@/static/icon/shaixun.png"></image>
-                </view> -->
+                </view>
             </view>
             <view class="filter-bottom">
                 <view class="btm-left">
diff --git a/utils/markdownParser.js b/utils/markdownParser.js
index 1611be9..451c4a1 100644
--- a/utils/markdownParser.js
+++ b/utils/markdownParser.js
@@ -19,38 +19,20 @@ const md = new MarkdownIt({
             const result = safeExtractJson(str);
             if (result) { // json解析成功
                 const jobId = result.appJobUrl.split('jobId=')[1]
-                let domContext = `
-                <a class="custom-card" data-job-id="${jobId}">
-                    <div class="card-title">
-                        <span class="title-text" >${result.jobTitle}</span>
-                        <div class="card-salary">${result.salary}</div>
-                    </div>
-                    <div class="card-company">${result.location}·${result.companyName}</div>
-                    <div class="card-info">
-                        <div class="info-item">
-                            <div class="card-tag">${result.education}</div>
-                            <div class="card-tag">${result.experience}</div>
-                        </div>
-                        <div class="info-item">查看详情<div class="position-nav"></div></div>
-                    </div>
-                </a>
-                `
+                let domContext = `<a class="custom-card" data-job-id="${jobId}"><div class="card-title"><span class="title-text">${result.jobTitle}</span><div class="card-salary">${result.salary}</div></div><div class="card-company">${result.location}·${result.companyName}</div><div class="card-info"><div class="info-item"><div class="card-tag">${result.education}</div><div class="card-tag">${result.experience}</div></div><div class="info-item">查看详情<div class="position-nav"></div></div></div></a>`
                 if (result.data) {
                     jobMoreMap.set(jobId, result.data)
-                    domContext +=
-                        `<a class="custom-more" data-job-id="${jobId}">查看更多岗位<div class="more-icon"></div></a>`
+                    domContext += `<a class="custom-more" data-job-id="${jobId}">查看更多岗位<div class="more-icon"></div></a>`
                 }
                 return domContext
             }
         }
-        // <div class="card-tag">${result.location}</div>
-        // <div class="info-item">${result.salary}</div>
         // 代码块
         let preCode = ""
         try {
             preCode = hljs.highlightAuto(str).value
         } catch (err) {
-            preCode = markdownIt.utils.escapeHtml(str);
+            preCode = md.utils.escapeHtml(str);
         }
         // 以换行进行分割 , 按行拆分代码
         const lines = preCode.split(/\n/).slice(0, -1);
@@ -58,7 +40,7 @@ const md = new MarkdownIt({
             .map((line, index) =>
                 line ?
                 `<li><span class="line-num" data-line="${index + 1}"></span>${line}</li>` :
-                ''
+                '<li></li>'
             )
             .join('');
 
@@ -127,9 +109,49 @@ export function clearJobMoreMap() { // 切换对话清空
 
 export function parseMarkdown(content) {
     if (!content) {
-        return //处理特殊情况，比如网络异常导致的响应的 content 的值为空
+        return [] //处理特殊情况，比如网络异常导致的响应的 content 的值为空
     }
+    
+    // 过滤掉<think>标签及其内容，这些是AI内部思考过程，不应该显示给用户
+    // 1. 处理原始标签（支持多行）
+    content = content.replace(/<\s*think\s*>[\s\S]*?<\s*\/\s*think\s*>/gi, '')
+    // 2. 处理HTML编码的标签
+    content = content.replace(/&lt;\s*think\s*&gt;[\s\S]*?&lt;\s*\/\s*think\s*&gt;/gi, '')
+    // 3. 处理部分编码的标签
+    content = content.replace(/&lt;\s*think\s*>/gi, '')
+    content = content.replace(/<\s*\/\s*think\s*&gt;/gi, '')
+    
     codeDataList = []
     const unsafeHtml = md.render(content || '')
-    return unsafeHtml
+    
+    // 在markdown渲染后再次过滤，确保没有遗漏
+    let filteredHtml = unsafeHtml
+    // 1. 处理原始标签（支持多行）
+    filteredHtml = filteredHtml.replace(/<\s*think\s*>[\s\S]*?<\s*\/\s*think\s*>/gi, '')
+    // 2. 处理HTML编码的标签
+    filteredHtml = filteredHtml.replace(/&lt;\s*think\s*&gt;[\s\S]*?&lt;\s*\/\s*think\s*&gt;/gi, '')
+    // 3. 处理部分编码的标签
+    filteredHtml = filteredHtml.replace(/&lt;\s*think\s*>/gi, '')
+    filteredHtml = filteredHtml.replace(/<\s*\/\s*think\s*&gt;/gi, '')
+    // 4. 单独处理剩余的think标签对
+    filteredHtml = filteredHtml.replace(/&lt;think&gt;/gi, '')
+    filteredHtml = filteredHtml.replace(/&lt;\/think&gt;/gi, '')
+    filteredHtml = filteredHtml.replace(/<think>/gi, '')
+    filteredHtml = filteredHtml.replace(/<\/think>/gi, '')
+    
+    // 根据平台返回不同的内容格式
+    // 微信小程序：返回rich-text组件支持的nodes格式
+    // H5：直接返回HTML字符串，避免HTML解析错误
+    if (process.env.UNI_PLATFORM === 'mp-weixin') {
+        try {
+            return parseHtml(filteredHtml)
+        } catch (error) {
+            console.error('HTML解析失败:', error)
+            // 解析失败时返回空数组，避免页面崩溃
+            return []
+        }
+    } else {
+        // H5端直接返回HTML字符串
+        return filteredHtml
+    }
 }
\ No newline at end of file