revert: 还原合并冲突文件

pages.json

@@ -1,61 +1,51 @@
 {
-    "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+    "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": "技能查询"
         }
       },
       {
@@ -63,68 +53,19 @@
         "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"
@@ -134,164 +75,132 @@
         "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/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",
+            "path": "pages/addWorkExperience/addWorkExperience",
-                "style" :
+            "style": {
-                {
+              "navigationBarTitleText": "添加工作经历"
-                    "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": "我的收藏",
-                    "navigationBarTitleTextSize": "30rpx",
+              "navigationBarBackgroundColor": "#FFFFFF"
-                    "navigationBarBackgroundColor": "#FFFFFF",
-                    "navigationStyle": "custom"
             }
           },
           {
             "path": "pages/browseJob/browseJob",
             "style": {
               "navigationBarTitleText": "我的浏览",
-                    "navigationBarTitleTextSize": "30rpx",
+              "navigationBarBackgroundColor": "#FFFFFF"
-                    "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/reservation/reservation",
+            "path": "pages/selectDate/reservation/reservation",
             "style": {
               "navigationBarTitleText": "我的预约",
-                    "navigationBarTitleTextSize": "30rpx",
               "navigationBarBackgroundColor": "#FFFFFF"
             }
           },
@@ -299,16 +208,13 @@
             "path": "pages/choicenessList/choicenessList",
             "style": {
               "navigationBarTitleText": "精选企业",
-                    "navigationBarTitleTextSize": "30rpx",
+              "navigationBarBackgroundColor": "#FFFFFF"
-                    "navigationBarBackgroundColor": "#FFFFFF",
-                    "navigationStyle": "custom"
             }
           },
           {
             "path": "pages/newJobPosition/newJobPosition",
             "style": {
               "navigationBarTitleText": "新职位推荐",
-                    "navigationBarTitleTextSize": "30rpx",
               "navigationBarBackgroundColor": "#FFFFFF"
             }
           },
@@ -316,7 +222,6 @@
             "path": "pages/systemNotification/systemNotification",
             "style": {
               "navigationBarTitleText": "系统通知",
-                    "navigationBarTitleTextSize": "30rpx",
               "navigationBarBackgroundColor": "#FFFFFF"
             }
           },
@@ -324,15 +229,13 @@
             "path": "pages/tiktok/tiktok",
             "style": {
               "navigationBarTitleText": "",
-                    "navigationBarBackgroundColor": "#FFFFFF",
+              "navigationBarBackgroundColor": "#FFFFFF"
-                    "navigationStyle": "custom"
             }
           },
           {
             "path": "pages/moreJobs/moreJobs",
             "style": {
               "navigationBarTitleText": "更多岗位",
-                    "navigationBarTitleTextSize": "30rpx",
               "navigationBarBackgroundColor": "#FFFFFF"
             }
           },
@@ -340,7 +243,6 @@
             "path": "pages/collection/compare",
             "style": {
               "navigationBarTitleText": " 岗位对比",
-                    "navigationBarTitleTextSize": "30rpx",
               "navigationBarBackgroundColor": "#FFFFFF"
             }
           },
@@ -348,7 +250,6 @@
             "path": "pages/myResume/corporateInformation",
             "style": {
               "navigationBarTitleText": " 企业详情",
-                    "navigationBarTitleTextSize": "30rpx",
               "navigationBarBackgroundColor": "#FFFFFF"
             }
           }
@@ -358,66 +259,99 @@
         "root": "packageB",
         "pages": [
           {
-	            "path" : "jobFair/detail",
+            "path": "jobFair/detailCom",
-	            "style" :
+            "style": {
-	            {
+              "navigationBarTitleText": "招聘会详情"
-	                "navigationBarTitleText" : "招聘会详情",
-	                "navigationBarTitleTextSize": "30rpx"
-	                // "navigationStyle": "custom"
             }
           },
           {
-	            "path" : "login",
+            "path": "jobFair/detailPerson",
-	            "style" :
+            "style": {
-	            {
+              "navigationBarTitleText": "招聘会详情"
-	                "navigationBarTitleText" : "登录",
-	                "navigationBarTitleTextSize": "30rpx"
-	                // "navigationStyle": "custom"
             }
           },
           {
-			    "path" : "train/index",
+            "path": "login",
-			    "style" :
+            "style": {
-			    {
+              "navigationBarTitleText": "登录"
-			        "navigationBarTitleText" : "技能评价",
-			        "navigationBarTitleTextSize": "30rpx"
-			        // "navigationStyle": "custom"
             }
           },
           {
-			    "path" : "train/practice/startPracticing",
+            "path": "train/index",
-			    "style" :
+            "style": {
-			    {
+              "navigationBarTitleText": "技能评价"
-			        "navigationBarTitleText" : "专项训练",
-			        "navigationBarTitleTextSize": "30rpx"
-			        // "navigationStyle": "custom"
             }
           },
           {
-			    "path" : "train/video/videoList",
+            "path": "train/practice/startPracticing",
-			    "style" :
+            "style": {
-			    {
+              "navigationBarTitleText": "专项训练"
-			        "navigationBarTitleText" : "视频学习",
-			        "navigationBarTitleTextSize": "30rpx"
-			        // "navigationStyle": "custom"
             }
           },
           {
-			    "path" : "train/video/videoDetail",
+            "path": "train/video/videoList",
-			    "style" :
+            "style": {
-			    {
+              "navigationBarTitleText": "视频学习"
-			        "navigationBarTitleText" : "视频详情",
-			        "navigationBarTitleTextSize": "30rpx"
-			        // "navigationStyle": "custom"
             }
           },
           {
-			    "path" : "train/mockExam/examList",
+            "path": "train/video/videoDetail",
-			    "style" :
+            "style": {
+              "navigationBarTitleText": "视频详情"
+            }
+          },
           {
-			        "navigationBarTitleText" : "模拟考试",
+            "path": "train/mockExam/examList",
-			        "navigationBarTitleTextSize": "30rpx"
+            "style": {
-			        // "navigationStyle": "custom"
+              "navigationBarTitleText": "考试列表"
+            }
+          },
+          {
+            "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": "错题详情"
 		    }
 		  }
         ]
@@ -426,106 +360,310 @@
         "root": "packageRc",
         "pages": [
           {
-                "path" : "pages/index/index",
+            "path": "pages/index/index",
-                "style" : 
+            "style": {
-                {
+              "navigationBarTitleText": "高校毕业生智慧就业"
-                    "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": "添加帮扶",
+              "navigationBarTitleText": "添加帮扶"
-                    "navigationBarBackgroundColor": "#4778EC",
+            }
-                    "navigationBarTextStyle": "white"
+          },
+          {
+            "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": "政策详解"
             }
           }
         ]
-    }],
+      },
-    // "tabBar": {
+      {
-    //     "custom": true,
+        "root": "packageCa",
-    //     "color": "#5E5F60",
+        "pages": [
-    //     "selectedColor": "#256BFA",
+          {
-    //     "borderStyle": "black",
+            "path": "search/search",
-    //     "backgroundColor": "#ffffff",
+            "style": {
-    //     "list": [{
+              "navigationBarTitleText": "生涯规划",
-    //             "pagePath": "pages/index/index",
+              "navigationStyle": "custom"
-    //             "iconPath": "static/tabbar/calendar.png",
+            }
-    //             "selectedIconPath": "static/tabbar/calendared.png",
+          },
-    //             "text": "职1"
+          {
-    //         },
+            "path": "search/AIAudition",
-    //         {
+            "style": {
-    //             "pagePath": "pages/careerfair/careerfair",
+              "navigationBarTitleText": "AI智能面试"
-    //             "iconPath": "static/tabbar/post.png",
+            }
-    //             "selectedIconPath": "static/tabbar/posted.png",
+          },
-    //             "text": "招聘会"
+          {
-    //         },
+            "path": "job/index",
-    //         {
+            "style": {
-    //             "pagePath": "pages/chat/chat",
+              "navigationBarTitleText": "职业库"
-    //             "iconPath": "static/tabbar/logo3.png",
+            }
-    //             "selectedIconPath": "static/tabbar/logo3.png",
+          },
-    //             "text": "AI+"
+          {
-    //         },
+            "path": "job/midList",
-    //         {
+            "style": {
-    //             "pagePath": "pages/msglog/msglog",
+              "navigationBarTitleText": "职业库-中类"
-    //             "iconPath": "static/tabbar/chat4.png",
+            }
-    //             "selectedIconPath": "static/tabbar/chat4ed.png",
+          },
-    //             "text": "消息"
+          {
-    //         },
+            "path": "job/smallList",
-    //         {
+            "style": {
-    //             "pagePath": "pages/mine/mine",
+              "navigationBarTitleText": "职业库-小类"
-    //             "iconPath": "static/tabbar/mine.png",
+            }
-    //             "selectedIconPath": "static/tabbar/mined.png",
+          },
-    //             "text": "我的"
+          {
-    //         }
+            "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"
+            }
+          }
+        ]
+      }
+    ],
     "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"
+        "^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"
       }
     },
     "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="handleServiceClick('quality-assessment')">
+                <view class="service-item press-button"  @click="goCa()">
                     <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="handleServiceClick('ai-interview')">
+                <view class="service-item press-button" @click="goAiAu()">
                     <view class="service-icon service-icon-9">
                         <IconfontIcon name="ai" :size="68" color="#FFFFFF" />
                     </view>
-                    <view class="service-title">AI智能面试</view>
+                    <view class="service-title">虚拟面试</view>
                 </view>
                 <view class="service-item press-button" style="justify-content:normal" @click="goRc()">
                     <view class="service-icon service-icon-9">
@@ -124,17 +124,11 @@
                     </view>
                     <view class="service-title" style="overflow:unset">高校毕业生<br/>智慧就业服务</view>
                 </view>
-                <view class="service-item press-button" @click="handleServiceClick('career-planning')">
+                <view class="service-item press-button" @click="navToPage">
-                    <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>
@@ -599,8 +593,6 @@ const { columnCount, columnSpace } = useColumnCount(() => {
 const getCompanyInfo = () => {
     try {
         const cachedUserInfo = uni.getStorageSync('userInfo') || {};
-        console.log('缓存中的userInfo:', cachedUserInfo);
-        
         // 重置企业信息
         companyInfo.name = '';
         companyInfo.avatar = '';
@@ -707,15 +699,49 @@ const handleServiceClick = (serviceType) => {
     }
 };
 
-// 处理直播按钮点击
+// 处理直播按钮点击 - 跳转微信视频号
 const handleLiveClick = () => {
-    $api.msg('该功能正在开发中');
+    // #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
 };
 
-// 跳转到测试页面
+const navToPage = () =>{
-const navToTestPage = () => {
+	// navTo('/packageB/login?flag=nw');
-    navTo('/pages/test/homepage-test');
+	navTo('/packageB/priority/helpFilter');
-};
+}
 
 async function loadData() {
     try {
@@ -1008,17 +1034,49 @@ 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 });
@@ -1325,17 +1383,15 @@ defineExpose({ loadData });
             align-items: center
             justify-content: center
         .service-icon-11
-            background-color: #72A4FC
+            background: linear-gradient(135deg, #FF9800 0%, #FFB74D 100%)
             position: relative
-            display: flex
+            &::before
-            align-items: center
+                content: '📈'
-            justify-content: center
+                position: absolute
-            .service-icon-img
+                top: 50%
-                width: 42rpx
+                left: 50%
-                height: 42rpx
+                transform: translate(-50%, -50%)
-                position: relative
+                font-size: 32rpx
-                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

@@ -5,25 +5,9 @@
  * @LastEditors: lip
  */
 // 应用全局配置
-import config from '@/config.js'
-
 let exports = {
-	// 引用根目录config.js的baseUrl，避免重复配置
+	 baseUrl: 'http://222.80.110.161:11111/sdrc-api', // 正式环境在济南人才上部署（不要轻易连接）
-	baseUrl: config.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引用，不再重复配置
-	zytpBaseUrl: 'http://ks.zhaopinzao8dian.com/api/ks_zytp/admin-api/zytp',
 
 	// 应用信息
 	appInfo: {

utilsRc/request.js

@@ -12,59 +12,30 @@ 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 || {}
-  // 从存储中获取微信登录的 token
+  if (getToken() && !isToken) {
-  const token = getToken()
+    config.header['Authorization'] = 'Bearer ' + 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 = tansParams(config.params)
+    let url = config.url + '?' + tansParams(config.params)
     url = url.slice(0, -1)
-    if (url) {
+    config.url = 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: requestUrl,
+      url: baseUrl + config.url,
       // 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'
@@ -73,11 +44,10 @@ const request = config => {
           reject('网络出小差，请稍后再试')
           return
         }
-        // 处理 code，0 和 200 都表示成功
+        const code = res.code || 200
-        const code = res.code !== undefined && res.code !== null ? res.code : 200
         const msg = errorCode[code] || res.msg || errorCode['default']
 		const isShowModel = getApp().globalData.isShowModel
-		if (code === 200 || code === 0) {
+		if (code == 200) {
       resolve(res)
     }else if (code === 401) {
 			if(isShowModel === false) {
@@ -110,15 +80,12 @@ const request = config => {
 		else if (code === 500) {
           toast(msg)
           reject('500')
-        } else if (code !== 200 && code !== 0 && code !== 9999) {
+        } else if (code !== 200 && code !== 9999) {
           // 9999是正常的业务状态码，不应该被当作错误处理
-          // 0 和 200 都表示成功
           toast(msg)
           reject(code)
         }
-        // 如果 code 是 0 或 200，返回完整响应对象，而不是 res.data
+        resolve(res.data)
-        // 因为有些接口的 data 在 res.data 中，有些在 res 中
-        resolve(res)
       })
       .catch(error => {
         let message = error.errMsg