merge: 合并 CareerMap 分支到 main（职业图谱功能）

packageRc/components/ImageUpload.vue

@@ -117,7 +117,6 @@ import { getToken } from "@/utilsRc/auth";
 											name: 'file',
 											formData: {},
 											header: {
-												// 'Authorization': 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJzeXNfdXNlcjoxIiwicm5TdHIiOiJQSlUyVlJCc1E1aXRMMWgxdjNkcVh2eER1c2VVc0hvRiIsInVzZXJJZCI6MX0.z4Z2XqgXyU0GQU-i7Bsa5T-zCKApTxj1YQ73rk7bAVo'
 												'Authorization': 'Bearer ' + getToken(),
 											},
 											success: (res) => {

packageRc/pages/daiban/addbangfu.vue

@@ -338,7 +338,6 @@ export default {
                     name: 'file',
                     formData: {},
                     header: {
-                      // 'Authorization': 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJzeXNfdXNlcjoxIiwicm5TdHIiOiJQSlUyVlJCc1E1aXRMMWgxdjNkcVh2eER1c2VVc0hvRiIsInVzZXJJZCI6MX0.z4Z2XqgXyU0GQU-i7Bsa5T-zCKApTxj1YQ73rk7bAVo'
                       'Authorization': 'Bearer ' + getToken(),
                     },
                     success: (res) => {

pages.json

@@ -1,51 +1,68 @@
 {
-    "pages": [
+    "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
         {
             "path": "pages/index/index",
             "style": {
-          "navigationBarTitleText": "喀什智慧就业平台"
+                "navigationBarTitleText": "喀什智慧就业平台",
+                "navigationBarTitleTextSize": "30rpx",
+                // #ifdef H5
+                "navigationStyle": "custom"
+                // #endif
             }
         },
         {
             "path": "pages/mine/mine",
             "style": {
-          "navigationBarTitleText": "我的"
+                "navigationBarTitleText": "我的",
+                "navigationBarTitleTextSize": "30rpx",
+                "navigationStyle": "custom"
             }
         },
         {
             "path": "pages/msglog/msglog",
             "style": {
-          "navigationBarTitleText": "消息"
+                "navigationBarTitleText": "消息",
+                "navigationBarTitleTextSize": "30rpx"
+                // "navigationStyle": "custom",
+                // "enablePullDownRefresh": false
             }
         },
         {
             "path": "pages/careerfair/careerfair",
             "style": {
-          "navigationBarTitleText": "招聘会"
+                "navigationBarTitleText": "招聘会",
+                "navigationBarTitleTextSize": "30rpx"
+                // "navigationStyle": "custom"
             }
         },
         {
             "path": "pages/complete-info/complete-info",
             "style": {
-          "navigationBarTitleText": "补全信息"
+                "navigationBarTitleText": "补全信息",
+                "navigationBarTitleTextSize": "30rpx"
+                // "navigationStyle": "custom"
             }
         },
         {
             "path": "pages/complete-info/company-info",
             "style": {
-          "navigationBarTitleText": "企业信息"
+                "navigationBarTitleText": "企业信息",
+                "navigationBarTitleTextSize": "30rpx"
+                // "navigationStyle": "custom"
             }
         },
         {
             "path": "pages/complete-info/components/map-location-picker",
             "style": {
-          "navigationBarTitleText": "选择地址"
+                "navigationBarTitleText": "选择地址",
+                "navigationStyle": "custom"
             }
         },
         {
             "path": "pages/complete-info/skill-search",
             "style": {
-          "navigationBarTitleText": "技能查询"
+                "navigationBarTitleText": "技能查询",
+                "navigationBarTitleTextSize": "30rpx"
             }
         },
         {
@@ -53,19 +70,68 @@
             "style": {
                 "navigationBarTitleText": "附近",
                 "navigationBarBackgroundColor": "#4778EC",
-          "navigationBarTextStyle": "white"
+                "navigationBarTextStyle": "white",
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/test/userTypeTest",
+            "style": {
+                "navigationBarTitleText": "用户类型测试",
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/test/tabbar-test",
+            "style": {
+                "navigationBarTitleText": "TabBar测试",
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/test/homepage-test",
+            "style": {
+                "navigationBarTitleText": "首页内容测试",
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/test/tabbar-user-type-test",
+            "style": {
+                "navigationBarTitleText": "TabBar用户类型测试",
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/test/company-search-test",
+            "style": {
+                "navigationBarTitleText": "企业搜索功能测试",
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/test/company-mine-test",
+            "style": {
+                "navigationBarTitleText": "企业我的页面测试",
+                "navigationStyle": "custom"
             }
         },
         {
             "path": "pages/job/publishJob",
             "style": {
                 "navigationBarTitleText": "发布岗位"
+                // "navigationStyle": "custom",
+                // "disableScroll": false,
+                // "enablePullDownRefresh": false,
+                // "onReachBottomDistance": 50,
+                // "backgroundColor": "#f5f5f5"
             }
         },
         {
             "path": "pages/job/companySearch",
             "style": {
                 "navigationBarTitleText": "选择企业",
+                "navigationStyle": "custom",
                 "disableScroll": false,
                 "enablePullDownRefresh": false,
                 "backgroundColor": "#f5f5f5"
@@ -75,132 +141,178 @@
             "path": "pages/chat/chat",
             "style": {
                 "navigationBarTitleText": "AI+",
+                "navigationBarTitleTextSize": "30rpx",
                 "navigationBarBackgroundColor": "#4778EC",
                 "navigationBarTextStyle": "white",
                 "enablePullDownRefresh": false
+                // #ifdef H5
+                // "navigationStyle": "custom"
+                //#endif
             }
         },
         {
             "path": "pages/search/search",
             "style": {
                 "navigationBarTitleText": ""
+                // "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/service/career-planning",
+            "style": {
+                "navigationBarTitleText": "职业规划推荐",
+                "navigationBarTitleTextSize": "30rpx",
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/service/serviceDetail",
+            "style": {
+                "navigationBarTitleText": "服务",
+                "navigationBarTitleTextSize": "30rpx"
+            }
+        },
+        {
+            "path": "pages/service/serviceTraceability",
+            "style": {
+                "navigationBarTitleText": "服务追溯",
+                "navigationBarTitleTextSize": "30rpx"
             }
         },
         {
             "path": "pages/mine/company-mine",
             "style": {
-          "navigationBarTitleText": "我的"
+                "navigationBarTitleText": "我的",
+                "navigationBarTitleTextSize": "30rpx"
+                // "navigationStyle": "custom"
             }
         },
         {
             "path": "pages/mine/company-info",
             "style": {
-          "navigationBarTitleText": "企业信息"
+                "navigationBarTitleText": "企业信息",
+                "navigationBarTitleTextSize": "30rpx"
             }
         },
         {
             "path": "pages/mine/edit-company-contacts",
             "style": {
-          "navigationBarTitleText": "编辑联系人"
+                "navigationBarTitleText": "编辑联系人",
+                "navigationBarTitleTextSize": "30rpx"
             }
         }
+
     ],
-    "subpackages": [
-      {
+    "subpackages": [{
         "root": "packageA",
         "pages": [
             {
                 "path" : "pages/addWorkExperience/addWorkExperience",
-            "style": {
-              "navigationBarTitleText": "添加工作经历"
-            }
-          },
+                "style" :
                 {
+                    "navigationBarTitleText" : "添加工作经历",
+                    "navigationBarTitleTextSize": "30rpx"
+                    // "navigationStyle": "custom"
+                }
+            },{
                 "path": "pages/choiceness/choiceness",
                 "style": {
                     "navigationBarTitleText": "精选",
                     "navigationBarBackgroundColor": "#4778EC",
-              "navigationBarTextStyle": "white"
+                    "navigationBarTextStyle": "white",
+                    "navigationStyle": "custom"
                 }
-          },
-          {
+            }, {
                 "path": "pages/post/post",
                 "style": {
                     "navigationBarTitleText": "职位详情",
                     "navigationBarBackgroundColor": "#4778EC",
                     "navigationBarTextStyle": "white"
                 }
-          },
-          {
+            }, {
                 "path": "pages/UnitDetails/UnitDetails",
                 "style": {
                     "navigationBarTitleText": "单位详情"
+                    // "navigationBarBackgroundColor": "#4778EC",
+                    // "navigationBarTextStyle": "white"
+                    // "navigationStyle": "custom"
                 }
-          },
-          {
+            }, {
                 "path": "pages/exhibitors/exhibitors",
                 "style": {
                     "navigationBarTitleText": "参展单位",
                     "navigationBarBackgroundColor": "#FFFFFF",
                     "navigationBarTextStyle": "black"
+                    // "navigationStyle": "custom"
                 }
-          },
-          {
+            },             {
                 "path": "pages/myResume/myResume",
                 "style": {
                     "navigationBarTitleText": "我的简历",
+                    "navigationBarTitleTextSize": "30rpx",
                     "navigationBarBackgroundColor": "#FFFFFF"
                 }
-          },
-          {
+            },             {
                 "path": "pages/Intendedposition/Intendedposition",
                 "style": {
                     "navigationBarTitleText": "投递记录",
+                    "navigationBarTitleTextSize": "30rpx",
                     "navigationBarBackgroundColor": "#FFFFFF"
                 }
-          },
-          {
+            },             {
                 "path": "pages/collection/collection",
                 "style": {
                     "navigationBarTitleText": "我的收藏",
-              "navigationBarBackgroundColor": "#FFFFFF"
+                    "navigationBarTitleTextSize": "30rpx",
+                    "navigationBarBackgroundColor": "#FFFFFF",
+                    "navigationStyle": "custom"
                 }
             },
             {
                 "path": "pages/browseJob/browseJob",
                 "style": {
                     "navigationBarTitleText": "我的浏览",
-              "navigationBarBackgroundColor": "#FFFFFF"
+                    "navigationBarTitleTextSize": "30rpx",
+                    "navigationBarBackgroundColor": "#FFFFFF",
+                    "navigationStyle": "custom"
                 }
             },
             {
                 "path": "pages/addPosition/addPosition",
                 "style": {
-              "navigationBarTitleText": "添加岗位"
+                    "navigationBarTitleText": "添加岗位",
+                    "navigationBarTitleTextSize": "30rpx",
+                    "navigationStyle": "custom"
                 }
             },
             {
                 "path": "pages/selectDate/selectDate",
                 "style": {
-              "navigationBarTitleText": ""
+                    "navigationBarTitleText": "",
+                    "navigationStyle": "custom"
                 }
             },
             {
                 "path": "pages/personalInfo/personalInfo",
                 "style": {
-              "navigationBarTitleText": "个人信息"
+                    "navigationBarTitleText": "个人信息",
+                    "navigationBarTitleTextSize": "30rpx",
+                    "navigationStyle": "custom"
                 }
             },
             {
                 "path": "pages/jobExpect/jobExpect",
                 "style": {
-              "navigationBarTitleText": "求职期望"
+                    "navigationBarTitleText": "求职期望",
+                    "navigationBarTitleTextSize": "30rpx"
+                    // "navigationStyle": "custom"
                 }
             },
             {
-            "path": "pages/selectDate/reservation/reservation",
+                "path": "pages/reservation/reservation",
                 "style": {
                     "navigationBarTitleText": "我的预约",
+                    "navigationBarTitleTextSize": "30rpx",
                     "navigationBarBackgroundColor": "#FFFFFF"
                 }
             },
@@ -208,13 +320,16 @@
                 "path": "pages/choicenessList/choicenessList",
                 "style": {
                     "navigationBarTitleText": "精选企业",
-              "navigationBarBackgroundColor": "#FFFFFF"
+                    "navigationBarTitleTextSize": "30rpx",
+                    "navigationBarBackgroundColor": "#FFFFFF",
+                    "navigationStyle": "custom"
                 }
             },
             {
                 "path": "pages/newJobPosition/newJobPosition",
                 "style": {
                     "navigationBarTitleText": "新职位推荐",
+                    "navigationBarTitleTextSize": "30rpx",
                     "navigationBarBackgroundColor": "#FFFFFF"
                 }
             },
@@ -222,6 +337,7 @@
                 "path": "pages/systemNotification/systemNotification",
                 "style": {
                     "navigationBarTitleText": "系统通知",
+                    "navigationBarTitleTextSize": "30rpx",
                     "navigationBarBackgroundColor": "#FFFFFF"
                 }
             },
@@ -229,13 +345,15 @@
                 "path": "pages/tiktok/tiktok",
                 "style": {
                     "navigationBarTitleText": "",
-              "navigationBarBackgroundColor": "#FFFFFF"
+                    "navigationBarBackgroundColor": "#FFFFFF",
+                    "navigationStyle": "custom"
                 }
             },
             {
                 "path": "pages/moreJobs/moreJobs",
                 "style": {
                     "navigationBarTitleText": "更多岗位",
+                    "navigationBarTitleTextSize": "30rpx",
                     "navigationBarBackgroundColor": "#FFFFFF"
                 }
             },
@@ -243,6 +361,7 @@
                 "path": "pages/collection/compare",
                 "style": {
                     "navigationBarTitleText": " 岗位对比",
+                    "navigationBarTitleTextSize": "30rpx",
                     "navigationBarBackgroundColor": "#FFFFFF"
                 }
             },
@@ -250,6 +369,7 @@
                 "path": "pages/myResume/corporateInformation",
                 "style": {
                     "navigationBarTitleText": " 企业详情",
+                    "navigationBarTitleTextSize": "30rpx",
                     "navigationBarBackgroundColor": "#FFFFFF"
                 }
             }
@@ -259,99 +379,66 @@
 	    "root": "packageB",
 	    "pages": [
 	        {
-            "path": "jobFair/detailCom",
-            "style": {
-              "navigationBarTitleText": "招聘会详情"
-            }
-          },
+	            "path" : "jobFair/detail",
+	            "style" :
 	            {
-            "path": "jobFair/detailPerson",
-            "style": {
-              "navigationBarTitleText": "招聘会详情"
+	                "navigationBarTitleText" : "招聘会详情",
+	                "navigationBarTitleTextSize": "30rpx"
+	                // "navigationStyle": "custom"
 	            }
 	        },
 	        {
 	            "path" : "login",
-            "style": {
-              "navigationBarTitleText": "登录"
+	            "style" :
+	            {
+	                "navigationBarTitleText" : "登录",
+	                "navigationBarTitleTextSize": "30rpx"
+	                // "navigationStyle": "custom"
 	            }
 	        },
 			{
 			    "path" : "train/index",
-            "style": {
-              "navigationBarTitleText": "技能评价"
+			    "style" :
+			    {
+			        "navigationBarTitleText" : "技能评价",
+			        "navigationBarTitleTextSize": "30rpx"
+			        // "navigationStyle": "custom"
 			    }
 			},
 			{
 			    "path" : "train/practice/startPracticing",
-            "style": {
-              "navigationBarTitleText": "专项训练"
+			    "style" :
+			    {
+			        "navigationBarTitleText" : "专项训练",
+			        "navigationBarTitleTextSize": "30rpx"
+			        // "navigationStyle": "custom"
 			    }
 			},
 			{
 			    "path" : "train/video/videoList",
-            "style": {
-              "navigationBarTitleText": "视频学习"
+			    "style" :
+			    {
+			        "navigationBarTitleText" : "视频学习",
+			        "navigationBarTitleTextSize": "30rpx"
+			        // "navigationStyle": "custom"
 			    }
 			},
 			{
 			    "path" : "train/video/videoDetail",
-            "style": {
-              "navigationBarTitleText": "视频详情"
+			    "style" :
+			    {
+			        "navigationBarTitleText" : "视频详情",
+			        "navigationBarTitleTextSize": "30rpx"
+			        // "navigationStyle": "custom"
 			    }
 			},
 			{
 			    "path" : "train/mockExam/examList",
-            "style": {
-              "navigationBarTitleText": "考试列表"
-            }
-          },
+			    "style" :
 			    {
-            "path": "train/mockExam/startExam",
-            "style": {
-              "navigationBarTitleText": "模拟考试"
-            }
-          },
-          {
-            "path": "train/mockExam/viewGrades",
-            "style": {
-              "navigationBarTitleText": "查看成绩"
-            }
-          },
-		  {
-		    "path": "train/mockExam/paperDetails",
-		    "style": {
-		      "navigationBarTitleText": "考试详情"
-		    }
-		  },
-          {
-            "path": "priority/helpFilter",
-            "style": {
-              "navigationBarTitleText": "筛选和帮扶"
-            }
-          },
-          {
-            "path": "priority/helpFollow",
-            "style": {
-              "navigationBarTitleText": "跟进"
-            }
-          },
-		  {
-		    "path": "train/wrongAnswer/mistakeNotebook",
-		    "style": {
-		      "navigationBarTitleText": "错题本"
-		    }
-		  },
-		  {
-		    "path": "train/wrongAnswer/questionPractice",
-		    "style": {
-		      "navigationBarTitleText": "错题练习"
-		    }
-		  },
-		  {
-		    "path": "train/wrongAnswer/wrongDetail",
-		    "style": {
-		      "navigationBarTitleText": "错题详情"
+			        "navigationBarTitleText" : "模拟考试",
+			        "navigationBarTitleTextSize": "30rpx"
+			        // "navigationStyle": "custom"
 			    }
 			}
 	    ]
@@ -361,309 +448,105 @@
         "pages": [
             {
                 "path" : "pages/index/index",
-            "style": {
+                "style" : 
+                {
                     "navigationBarTitleText" : "高校毕业生智慧就业"
                 }
-          },
-          {
+            }  , {
                 "path": "pages/personalList/personalList",
                 "style": {
-              "navigationBarTitleText": "毕业生追踪"
+                    "navigationBarTitleText": "添加帮扶"
                 }
-          },
-          {
-            "path": "pages/jobList/jobList",
-            "style": {
-              "navigationBarTitleText": "岗位列表"
-            }
-          },
-          {
+            },{
                 "path": "pages/daiban/daiban",
                 "style": {
                     "navigationBarTitleText": "待办任务"
+                    // "navigationBarBackgroundColor": "#4778EC",
+                    // "navigationBarTextStyle": "white"
                 }
             },
             {
                 "path": "pages/daiban/daibandetail",
                 "style": {
-              "navigationBarTitleText": "待办详情"
+                    "navigationBarTitleText": "待办详情",
+                    "navigationBarBackgroundColor": "#4778EC",
+                    "navigationBarTextStyle": "white"
                 }
             },
+             
               {
                 "path": "pages/demand/demandail",
                 "style": {
-              "navigationBarTitleText": "新增需求"
+                    "navigationBarTitleText": "新增需求",
+                    "navigationBarBackgroundColor": "#4778EC",
+                    "navigationBarTextStyle": "white"
                 }
-          },
-          {
+            }  , {
                 "path": "pages/daiban/addbangfu",
                 "style": {
-              "navigationBarTitleText": "添加帮扶"
-            }
-          },
-          {
-            "path": "pages/service/serviceDetail",
-            "style": {
-              "navigationBarTitleText": "服务"
-            }
-          },
-          {
-            "path": "pages/service/serviceTraceability",
-            "style": {
-              "navigationBarTitleText": "服务追溯"
-            }
-          },
-          {
-            "path": "pages/needs/needDetail",
-            "style": {
-              "navigationBarTitleText": "需求信息"
-            }
-          },
-          {
-            "path": "pages/daiban/bangfuList",
-            "style": {
-              "navigationBarTitleText": "服务记录"
-            }
-          },
-          {
-            "path": "pages/needs/personNeeds",
-            "style": {
-              "navigationBarTitleText": "需求上报"
-            }
-          },
-          {
-            "path": "pages/needs/needsList",
-            "style": {
-              "navigationBarTitleText": "需求"
-            }
-          },
-          {
-            "path": "pages/policy/policyList",
-            "style": {
-              "navigationBarTitleText": "政策专区"
-            }
-          },
-          {
-            "path": "pages/policy/policyDetail",
-            "style": {
-              "navigationBarTitleText": "政策详解"
+                    "navigationBarTitleText": "添加帮扶",
+                    "navigationBarBackgroundColor": "#4778EC",
+                    "navigationBarTextStyle": "white"
                 }
             }
         ]
-      },
-      {
-        "root": "packageCa",
-        "pages": [
-          {
-            "path": "search/search",
-            "style": {
-              "navigationBarTitleText": "生涯规划",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "search/AIAudition",
-            "style": {
-              "navigationBarTitleText": "AI智能面试"
-            }
-          },
-          {
-            "path": "job/index",
-            "style": {
-              "navigationBarTitleText": "职业库"
-            }
-          },
-          {
-            "path": "job/midList",
-            "style": {
-              "navigationBarTitleText": "职业库-中类"
-            }
-          },
-          {
-            "path": "job/smallList",
-            "style": {
-              "navigationBarTitleText": "职业库-小类"
-            }
-          },
-          {
-            "path": "job/details",
-            "style": {
-              "navigationBarTitleText": "职业详情"
-            }
-          },
-          {
-            "path": "userCenter/professionPath",
-            "style": {
-              "navigationBarTitleText": "职业路径",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "userCenter/personDocument",
-            "style": {
-              "navigationBarTitleText": "生涯档案",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "userCenter/careerCompass",
-            "style": {
-              "navigationBarTitleText": "生涯罗盘",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "userCenter/learningPlan",
-            "style": {
-              "navigationBarTitleText": "学业规划",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "userCenter/smartTarget",
-            "style": {
-              "navigationBarTitleText": "学业规划",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "userCenter/fillInInformation",
-            "style": {
-              "navigationBarTitleText": "完善个人信息"
-            }
-          },
-          {
-            "path": "pagesTest/testList",
-            "style": {
-              "navigationBarTitleText": "生涯测评",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "pagesTest/customTestTitle",
-            "style": {
-              "navigationBarTitleText": "自定义测评",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "pagesTest/interestTestTitle",
-            "style": {
-              "navigationBarTitleText": "职业兴趣测评",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "pagesTest/workValuesTestTitle",
-            "style": {
-              "navigationBarTitleText": "工作价值观测评",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "pagesTest/personalTestTitle",
-            "style": {
-              "navigationBarTitleText": "人格测评",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "testReport/workValuesTestReport",
-            "style": {
-              "navigationBarTitleText": "工作价值观测评报告",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "testReport/multipleAbilityTestReport",
-            "style": {
-              "navigationBarTitleText": "多元能力测评报告",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "testReport/generalCareerTestReport",
-            "style": {
-              "navigationBarTitleText": "通用职业能力测评报告",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "testReport/personalTestReport",
-            "style": {
-              "navigationBarTitleText": "人格测评报告",
-              "navigationStyle": "custom"
-            }
-          },
-          {
-            "path": "testReport/interestTestReport",
-            "style": {
-              "navigationBarTitleText": "职业兴趣测评报告",
-              "navigationStyle": "custom"
-            }
-          }
-        ]
-      }
-    ],
+    }],
+    // "tabBar": {
+    //     "custom": true,
+    //     "color": "#5E5F60",
+    //     "selectedColor": "#256BFA",
+    //     "borderStyle": "black",
+    //     "backgroundColor": "#ffffff",
+    //     "list": [{
+    //             "pagePath": "pages/index/index",
+    //             "iconPath": "static/tabbar/calendar.png",
+    //             "selectedIconPath": "static/tabbar/calendared.png",
+    //             "text": "职1"
+    //         },
+    //         {
+    //             "pagePath": "pages/careerfair/careerfair",
+    //             "iconPath": "static/tabbar/post.png",
+    //             "selectedIconPath": "static/tabbar/posted.png",
+    //             "text": "招聘会"
+    //         },
+    //         {
+    //             "pagePath": "pages/chat/chat",
+    //             "iconPath": "static/tabbar/logo3.png",
+    //             "selectedIconPath": "static/tabbar/logo3.png",
+    //             "text": "AI+"
+    //         },
+    //         {
+    //             "pagePath": "pages/msglog/msglog",
+    //             "iconPath": "static/tabbar/chat4.png",
+    //             "selectedIconPath": "static/tabbar/chat4ed.png",
+    //             "text": "消息"
+    //         },
+    //         {
+    //             "pagePath": "pages/mine/mine",
+    //             "iconPath": "static/tabbar/mine.png",
+    //             "selectedIconPath": "static/tabbar/mined.png",
+    //             "text": "我的"
+    //         }
+    //     ]
+    // },
     "globalStyle": {
         "navigationBarTextStyle": "black",
         "navigationBarTitleText": "uni-app",
         "navigationBarBackgroundColor": "#F8F8F8",
-      "backgroundColor": "#F8F8F8"
+        "backgroundColor": "#F8F8F8",
+        "navigationBarTitleTextSize": "18px"
+        // "enablePullDownRefresh": false,
+        // "navigationStyle": "custom"
     },
     "easycom": {
         "autoscan": true,
         "custom": {
             "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue",
-        "^time-picker$": "@dcloudio/uni-ui/lib/uni-datetime-picker/time-picker.vue",
-        "^TimePicker$": "@dcloudio/uni-ui/lib/uni-datetime-picker/time-picker.vue",
-        "^Calendar$": "@dcloudio/uni-ui/lib/uni-datetime-picker/calendar.vue",
-        "^calendar-item$": "@dcloudio/uni-ui/lib/uni-datetime-picker/calendar-item.vue",
-        "^CalendarItem$": "@dcloudio/uni-ui/lib/uni-datetime-picker/calendar-item.vue",
-        "^table-checkbox$": "@dcloudio/uni-ui/lib/uni-tr/table-checkbox.vue",
-        "^TableCheckbox$": "@dcloudio/uni-ui/lib/uni-tr/table-checkbox.vue",
-        "^filter-dropdown$": "@dcloudio/uni-ui/lib/uni-th/filter-dropdown.vue",
-        "^FilterDropdown$": "@dcloudio/uni-ui/lib/uni-th/filter-dropdown.vue",
-        "^uni-status-bar$": "@dcloudio/uni-ui/lib/uni-nav-bar/uni-status-bar.vue",
-        "^upload-image$": "@dcloudio/uni-ui/lib/uni-file-picker/upload-image.vue",
-        "^UploadImage$": "@dcloudio/uni-ui/lib/uni-file-picker/upload-image.vue",
-        "^upload-file$": "@dcloudio/uni-ui/lib/uni-file-picker/upload-file.vue",
-        "^UploadFile$": "@dcloudio/uni-ui/lib/uni-file-picker/upload-file.vue",
             "^IconfontIcon$": "@/components/IconfontIcon/IconfontIcon.vue",
-        "^WxAuthLogin$": "@/components/wxAuthLogin/WxAuthLogin.vue",
+            "^WxAuthLogin$": "@/components/WxAuthLogin/WxAuthLogin.vue",
             "^AppLayout$": "@/components/AppLayout/AppLayout.vue",
-        "^CustomTabBar$": "@/components/CustomTabBar/CustomTabBar.vue",
-        "^UserTypeSwitcher$": "@/components/UserTypeSwitcher/UserTypeSwitcher.vue",
-        "^CollapseTransition$": "@/components/CollapseTransition/CollapseTransition.vue",
-        "^NoBouncePage$": "@/components/NoBouncePage/NoBouncePage.vue",
-        "^TikTok$": "@/components/TikTok/TikTok.vue",
-        "^MsgTips$": "@/components/MsgTips/MsgTips.vue",
-        "^exitPopup$": "@/packageRc/components/exitPopup.vue",
-        "^ImageUpload$": "@/packageRc/components/ImageUpload.vue",
-        "^placePicker$": "@/packageRc/components/placePicker.vue",
-        "^PlacePicker$": "@/packageRc/components/placePicker.vue",
-        "^PopupLists$": "@/packageRc/components/PopupLists.vue",
-        "^PopupList$": "@/packageRc/components/PopupLists.vue",
-        "^popupList$": "@/packageRc/components/PopupLists.vue",
-        "^DealDone$": "@/packageRc/pages/needs/dealDone.vue",
-        "^ChoosePerson$": "@/packageRc/pages/needs/components/choosePerson.vue",
-        "^choosePerson$": "@/packageRc/pages/needs/components/choosePerson.vue",
-        "^choose-person$": "@/packageRc/pages/needs/components/choosePerson.vue",
-        "^contrastBox$": "@/packageCa/testReport/components/contrastBox.vue",
-        "^testHead$": "@/packageCa/testReport/components/testHead.vue",
-        "^jobService$": "@/packageRc/pages/needs/components/jobService.vue",
-        "^entrepreneurshipService$": "@/packageRc/pages/needs/components/entrepreneurshipService.vue",
-        "^trainService$": "@/packageRc/pages/needs/components/trainService.vue",
-        "^otherService$": "@/packageRc/pages/needs/components/otherService.vue",
-        "^investigate$": "@/packageRc/pages/service/components/investigate.vue",
-        "^policyConsultation$": "@/packageRc/pages/service/components/policyConsultation.vue",
-        "^jobRecommend$": "@/packageRc/pages/service/components/jobRecommend.vue",
-        "^skillTrain$": "@/packageRc/pages/service/components/skillTrain.vue",
-        "^jobTrack$": "@/packageRc/pages/service/components/jobTrack.vue",
-        "^positionChooser$": "@/packageRc/pages/service/components/positionChooser.vue",
-        "^(?!u-|uni-|el-|req-comp|template|transition|enterprise-list-pop|handler-data|time-picker|TimePicker|Calendar|calendar-item|CalendarItem|table-checkbox|TableCheckbox|filter-dropdown|FilterDropdown|uni-status-bar|upload-image|UploadImage|upload-file|UploadFile|view|text|image|button|input|textarea|picker|scroll-view|swiper|map|canvas|video|audio|cover-view|cover-image|navigator|rich-text|progress|checkbox|radio|switch|slider|form|label|picker-view|movable-view|movable-area|web-view|ad|official-account|open-data|editor|live-player|live-pusher|functional-page-navigator|match-media|page-meta|navigation-bar|keyboard-accessory|page-container|uni-app|block|component|slot|keep-alive|router-view|router-link)([a-zA-Z][a-zA-Z0-9-]*)$": "@/components/$1/$1.vue"
+            "^CustomTabBar$": "@/components/CustomTabBar/CustomTabBar.vue"
         }
     },
     "uniIdRouter": {}
 }
-  

pages/index/components/index-one.vue

@@ -106,17 +106,17 @@
                     </view>
                     <view class="service-title">题库和考试</view>
                 </view>
-                <view class="service-item press-button"  @click="goCa()">
+                <view class="service-item press-button" @click="handleServiceClick('quality-assessment')">
                     <view class="service-icon service-icon-8">
                         <IconfontIcon name="suzhicepingtiku" :size="48" color="#FFFFFF" />
                     </view>
                     <view class="service-title">素质测评</view>
                 </view>
-                <view class="service-item press-button" @click="goAiAu()">
+                <view class="service-item press-button" @click="handleServiceClick('ai-interview')">
                     <view class="service-icon service-icon-9">
                         <IconfontIcon name="ai" :size="68" color="#FFFFFF" />
                     </view>
-                    <view class="service-title">虚拟面试</view>
+                    <view class="service-title">AI智能面试</view>
                 </view>
                 <view class="service-item press-button" style="justify-content:normal" @click="goRc()">
                     <view class="service-icon service-icon-9">
@@ -124,11 +124,17 @@
                     </view>
                     <view class="service-title" style="overflow:unset">高校毕业生<br/>智慧就业服务</view>
                 </view>
-                <view class="service-item press-button" @click="navToPage">
+                <view class="service-item press-button" @click="handleServiceClick('career-planning')">
+                    <view class="service-icon service-icon-11">
+                        <image class="service-icon-img" src="/static/icon/antOutline.png" mode="aspectFit"></image>
+                    </view>
+                    <view class="service-title">职业规划推荐</view>
+                </view>
+                <view class="service-item press-button" @click="navToTestPage">
                     <view class="service-icon service-icon-10">
                         <uni-icons type="gear-filled" size="32" color="#FFFFFF"></uni-icons>
                     </view>
-                    <view class="service-title">帮扶</view>
+                    <view class="service-title">测试页面</view>
                 </view>
             </view>
         </view>
@@ -593,6 +599,8 @@ const { columnCount, columnSpace } = useColumnCount(() => {
 const getCompanyInfo = () => {
     try {
         const cachedUserInfo = uni.getStorageSync('userInfo') || {};
+        console.log('缓存中的userInfo:', cachedUserInfo);
+        
         // 重置企业信息
         companyInfo.name = '';
         companyInfo.avatar = '';
@@ -699,49 +707,15 @@ const handleServiceClick = (serviceType) => {
     }
 };
 
-// 处理直播按钮点击 - 跳转微信视频号
+// 处理直播按钮点击
 const handleLiveClick = () => {
-    // #ifdef MP-WEIXIN
-    const feedId = 'sphKH1AEeLfTJJE';
-    
-    // 使用微信原生 API 打开视频号直播
-    if (typeof wx !== 'undefined' && wx.openChannelsUserProfile) {
-        wx.openChannelsUserProfile({
-            // feedId: feedId,
-            finderUserName: feedId, // 视频号 finderUserName，如果feedId足够可以留空
-            success: (res) => {
-                console.log('打开视频号成功', res);
-            },
-            fail: (err) => {
-                console.error('打开视频号失败', err);
-                $api.msg(err.errMsg || '无法打开直播，请稍后重试');
-            }
-        });
-    } else {
-        // 如果 API 不存在，尝试使用 uni API
-        uni.openChannelsLive({
-            feedId: feedId,
-            success: (res) => {
-                console.log('打开视频号成功', res);
-            },
-            fail: (err) => {
-                console.error('打开视频号失败', err);
-                $api.msg('无法打开直播，请检查微信版本或稍后重试');
-            }
-        });
-    }
-    // #endif
-    
-    // #ifndef MP-WEIXIN
-    // 非微信小程序环境提示
-    $api.msg('该功能仅在微信小程序中可用');
-    // #endif
+    $api.msg('该功能正在开发中');
 };
 
-const navToPage = () =>{
-	// navTo('/packageB/login?flag=nw');
-	navTo('/packageB/priority/helpFilter');
-}
+// 跳转到测试页面
+const navToTestPage = () => {
+    navTo('/pages/test/homepage-test');
+};
 
 async function loadData() {
     try {
@@ -1034,49 +1008,17 @@ function dataToImg(data) {
 
 // import { loginRc } from '@/apiRc/login/login.js';
 import storeRc from '@/utilsRc/store/index.js';
-import { getToken } from '@/utilsRc/auth.js';
 // 跳转到高校毕业页面
 function goRc(){
     if (checkLogin()) {
-        let token = getToken();
-        console.log(token,'t123312')
-        if(!token){
-            console.log(111)
         let userInfo = uni.getStorageSync('userInfo')
+        console.log(uni.getStorageSync('userInfo'), "uni.getStorageSync('userInfo')");
         storeRc.dispatch('LoginByUserInfo', userInfo).then(res => {
             // console.log(res, "'res");
-                storeRc.dispatch('GetInfo').then(res => {
-                    if(res.data.user.userType == 'person'){
             navTo('/packageRc/pages/index/index');
-                    }else{
-                        navTo('/packageRc/pages/daiban/daiban');
-                    }
         });
-            });
-        }else{
-            if(storeRc.state.user.type == 'person'){
-                navTo('/packageRc/pages/index/index');
-            }else{
-                navTo('/packageRc/pages/daiban/daiban');
     }
 }
-    }
-}
-// 跳转素质测评页面（在线测评，职业库，职业生涯规划）
-function goCa(){
-    if (checkLogin()) {
-        const userInfo = uni.getStorageSync('userInfo')
-		navTo(`/packageCa/search/search?userId=${userInfo.userId}&name=${userInfo.name}`);
-    }
-}
-// 跳转AI智能面试
-function goAiAu(){
-    if (checkLogin()) {
-        const userInfo = uni.getStorageSync('userInfo')
-		navTo(`/packageCa/search/AIAudition?userId=${userInfo.userId}&name=${userInfo.name}`);
-    }
-}
-
 
 
 defineExpose({ loadData });
@@ -1383,15 +1325,17 @@ defineExpose({ loadData });
             align-items: center
             justify-content: center
         .service-icon-11
-            background: linear-gradient(135deg, #FF9800 0%, #FFB74D 100%)
+            background-color: #72A4FC
             position: relative
-            &::before
-                content: '📈'
-                position: absolute
-                top: 50%
-                left: 50%
-                transform: translate(-50%, -50%)
-                font-size: 32rpx
+            display: flex
+            align-items: center
+            justify-content: center
+            .service-icon-img
+                width: 42rpx
+                height: 42rpx
+                position: relative
+                z-index: 1
+                filter: brightness(1.8) contrast(1.4)
         .service-icon-12
             background: linear-gradient(135deg, #4CAF50 0%, #81C784 100%)
             position: relative

utilsRc/config.js

@@ -2,12 +2,33 @@
  * @Descripttion:
  * @Author: lip
  * @Date: 2022-12-28 13:59:09
- * @LastEditors: lip
+ * @LastEditors: shirlwang
  */
 // 应用全局配置
+import config from '@/config.js'
+
 let exports = {
+	// ========== baseUrl 配置方式选择 ==========
+	// 方式1：硬编码baseUrl（main分支使用，合并到main时不会影响现有功能）
 	baseUrl: 'http://222.80.110.161:11111/sdrc-api', // 正式环境在济南人才上部署（不要轻易连接）
+	
+	// 方式2：引用根目录config.js的baseUrl（CareerMap分支可选方式，如需使用请注释掉方式1，取消注释此方式）
+	// baseUrl: config.baseUrl, // 引用根目录config.js的baseUrl，避免重复配置
+	
+	// ========== 其他baseUrl配置（备用） ==========
 	// baseUrl: 'http://172.20.0.177:8903', // 正式环境在济南人才上部署（不要轻易连接）
+	// baseUrl: 'http://127.0.0.1:8903', // 本地开发
+	// baseUrl: 'http://172.20.0.104:8903', // xubaiqi 地址
+	// baseUrl: 'http://172.20.1.76:8903', // 演示环境内网
+	// baseUrl: 'http://36.140.162.216:8904/prod-api', // 演示环境外网
+	// baseUrl: 'http://10.160.0.5:8903', // 演示环境外网
+	// baseUrl: 'http://111.34.80.140:8081/prod-api', // 正式环境（不要轻易连接）
+	// baseUrl: 'http://ks.zhaopinzao8dian.com/api/ks', // 已从根目录config.js引用，不再重复配置
+	
+	// ========== 职业图谱专用baseUrl ==========
+	zytpBaseUrl: 'http://ks.zhaopinzao8dian.com/api/ks_zytp/admin-api/zytp',
+
+
 
 	// 应用信息
 	appInfo: {

utilsRc/request.js

@@ -2,7 +2,7 @@
  * @Descripttion:
  * @Author: lip
  * @Date: 2023-05-12 08:44:49
- * @LastEditors: lip
+ * @LastEditors: shirlwang
  */
 import store from './store/index.js'
 import configRc from './config.js'
@@ -12,30 +12,59 @@ import { toast, showConfirm, tansParams } from '@/utilsRc/common'
 
 let timeout = 10000
 const baseUrl = configRc.baseUrl
+const zytpBaseUrl = configRc.zytpBaseUrl || ''
 
 const request = config => {
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   config.header = config.header || {}
-  if (getToken() && !isToken) {
-    config.header['Authorization'] = 'Bearer ' + getToken()
+  // 从存储中获取微信登录的 token
+  const token = getToken()
+  if (token && !isToken) {
+    config.header['Authorization'] = 'Bearer ' + token
   }
-  // config.header['Authorization'] = 'Bearer ' + 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJzeXNfdXNlcjoxIiwicm5TdHIiOiJGUVl3YmRUalAzQ1BMNGFVc0RxeGJmdjAyT3JMZllDVSIsInVzZXJJZCI6MX0.kSOXY2QJQPbfjE0Yx2R3S8yQciA33OZBS9xJtr7cQ1A'
   // get请求映射params参数
+  const baseType = config.baseUrlType
+  const requestBaseUrl = baseType === 'zytp' && zytpBaseUrl ? zytpBaseUrl : baseUrl
+  let requestUrl = config.fullUrl ? config.fullUrl : (requestBaseUrl + (config.url || ''))
+
   if (config.params) {
-    let url = config.url + '?' + tansParams(config.params)
+    let url = tansParams(config.params)
     url = url.slice(0, -1)
-    config.url = url
+    if (url) {
+      requestUrl += (requestUrl.includes('?') ? '&' : '?') + url
     }
+  }
+  
+  // 如果是 getJobPathById 接口，打印完整 URL（调试用，生产环境可注释）
+  // if (config.url && config.url.includes('getJobPathById')) {
+  //   console.log('[请求URL] getJobPathById 完整请求URL:', requestUrl);
+  //   console.log('[请求URL] baseUrl:', requestBaseUrl);
+  //   console.log('[请求URL] 接口路径:', config.url);
+  //   console.log('[请求URL] 请求参数:', config.params);
+  // }
+  
+  // 如果是 recommendJob 接口，打印详细信息（调试用，生产环境可注释）
+  // if (config.url && config.url.includes('recommendJob')) {
+  //   console.log('[请求URL] recommendJob 完整请求URL:', requestUrl);
+  //   console.log('[请求URL] baseUrl:', requestBaseUrl);
+  //   console.log('[请求URL] 接口路径:', config.url);
+  //   console.log('[请求URL] 请求方法:', config.method);
+  //   console.log('[请求URL] 请求参数 (params):', config.params);
+  //   console.log('[请求URL] 请求数据 (data):', config.data);
+  //   console.log('[请求URL] Content-Type:', config.header?.['content-type']);
+  // }
+  
   return new Promise((resolve, reject) => {
     uni.request({
       method: config.method || 'get',
       timeout: config.timeout ||  timeout,
-      url: baseUrl + config.url,
+      url: requestUrl,
       // url: 'https://gccrcdh.sd-talent.cn:80/zhq' + config.url,
       data: config.data,
       header: config.header,
-      dataType: 'json'
+      dataType: 'json',
+      responseType: config.responseType || 'text'
     }).then(response => {
       let res = response.data
       let error = response.errMsg!='request:ok'
@@ -44,10 +73,12 @@ const request = config => {
           reject('网络出小差，请稍后再试')
           return
         }
-        const code = res.code || 200
+        // 处理 code，0 和 200 都表示成功
+        const code = res.code !== undefined && res.code !== null ? res.code : 200
+        // console.log(code, 'const code = res.code || 200') // 调试用，生产环境可注释
         const msg = errorCode[code] || res.msg || errorCode['default']
 		const isShowModel = getApp().globalData.isShowModel
-		if (code == 200) {
+		if (code === 200 || code === 0) {
       resolve(res)
     }else if (code === 401) {
 			if(isShowModel === false) {
@@ -80,14 +111,18 @@ const request = config => {
 		else if (code === 500) {
           toast(msg)
           reject('500')
-        } else if (code !== 200 && code !== 9999) {
+        } else if (code !== 200 && code !== 0 && code !== 9999) {
           // 9999是正常的业务状态码，不应该被当作错误处理
+          // 0 和 200 都表示成功
           toast(msg)
           reject(code)
         }
-        resolve(res.data)
+        // 如果 code 是 0 或 200，返回完整响应对象，而不是 res.data
+        // 因为有些接口的 data 在 res.data 中，有些在 res 中
+        resolve(res)
       })
       .catch(error => {
+        console.log(error, 'error')
         let message = error.errMsg
         if (message === 'Network Error') {
           message = '网络出小差，请稍后再试'