package.json

@@ -83,6 +83,7 @@
     "sass-loader": "16.0.1",
     "tailwindcss": "^3.4.10",
     "tailwindcss-rem2px-preset": "^1.0.3",
+    "typescript": "^5.9.3",
     "unplugin-auto-import": "^19.3.0",
     "unplugin-vue-components": "^28.7.0",
     "vite": "5.2.8",

src/api/modules/study.ts

@@ -1,6 +1,6 @@
 import { ApiResponse, ApiResponseList } from "@/types";
 import flyio from "../flyio";
-import { Batch, ClassKnowledgeRecord, DirectedSchool, Examinee, ExamPaper, ExamPaperSubmit, GetExamPaperRequestDTO, Knowledge, KnowledgeListRequestDTO, KnowledgeRecord, OpenExamineeRequestDTO, PaperWork, PaperWorkRecord, PaperWorkRecordDetail, PaperWorkRecordQuery, PracticeHistory, PracticeRecord, SimulatedRecord, SimulationExamSubject, SimulationTestInfo, StudentExamRecord, StudentPlanStudyRecord, StudentVideoRecord, StudyPlan, Subject, SubjectListRequestDTO, TeachClass, VideoStudy } from "@/types/study";
+import { Batch, ClassKnowledgeRecord, DirectedSchool, Examinee, ExamPaper, ExamPaperSubmit, GetExamPaperRequestDTO, Knowledge, KnowledgeListRequestDTO, KnowledgeRecord, OpenExamineeRequestDTO, PaperWork, PaperWorkRecord, PaperWorkRecordDetail, PaperWorkRecordQuery, PracticeHistory, PracticeRecord, SimulatedRecord, SimulationExamSubject, SimulationTestInfo, StudentExamRecord, StudentPlanStudyRecord, StudentVideoRecord, StudyPlan, Subject, SubjectListRequestDTO, TeachClass, VHSPaperListRequestDTO, VideoStudy } from "@/types/study";
 import { EnumPaperWorkState } from "@/common/enum";
 
 /**
@@ -116,6 +116,14 @@ export function getExamineeResult(examineeId: number) {
   return flyio.get('/front/exam/loadExaminee', { examineeId }) as Promise<ApiResponse<Examinee>>;
 }
 
+/**
+ * 对口升学-获取真题&模拟试卷
+ * @param params 
+ * @returns 
+ */
+export function getVHSPaperList(params: VHSPaperListRequestDTO) {
+  return flyio.get('/front/paper/list', params) as Promise<ApiResponse<any[]>>;
+}
 
 /**
  * 获取模拟考试信息

src/components.d.ts

@@ -1,22 +0,0 @@
-/* eslint-disable */
-// @ts-nocheck
-// Generated by unplugin-vue-components
-// Read more: https://github.com/vuejs/core/pull/3399
-// biome-ignore lint: disable
-export {}
-
-/* prettier-ignore */
-declare module 'vue' {
-  export interface GlobalComponents {
-    RouterLink: typeof import('vue-router')['RouterLink']
-    RouterView: typeof import('vue-router')['RouterView']
-    // custom components
-    'dw-page': typeof import('./components/dw-page/dw-page.vue')['default']
-    'dw-navbar': typeof import('./components/dw-navbar/dw-navbar.vue')['default']
-    'dw-oss-image': typeof import('./components/dw-oss-image/dw-oss-image.vue')['default']
-    'dw-image': typeof import('./components/dw-image/dw-image.vue')['default']
-    'dw-picker': typeof import('./components/dw-picker/dw-picker.vue')['default']
-    'dw-input': typeof import('./components/dw-input/dw-input.vue')['default']
-    'dw-button': typeof import('./components/dw-button/dw-button.vue')['default']
-  }
-}

src/components/ie-page/ie-page.vue

@@ -68,11 +68,9 @@ defineExpose({
   closeVipPopup
 });
 const addListener = () => {
-  console.log('监听')
   uni.$on(EnumEvent.OPEN_VIP_POPUP, showVipPopup);
 }
 const removeListener = () => {
-  console.log('取消监听')
   uni.$off(EnumEvent.OPEN_VIP_POPUP);
 }
 onMounted(() => {

src/components/ie-picker/ie-picker.vue

@@ -1,13 +1,13 @@
 <template>
   <view class="w-full" @click="handleClick">
-    <view class="flex items-center gap-x-6 justify-end" :style="customStyle">
-      <view v-if="matchValue || customLabel" class="text-fore-title flex-1 min-w-1 ellipsis-1" :style="getValueStyle"
+    <view class="flex items-center gap-x-6 justify-start" :style="customStyle">
+      <view v-if="matchValue || customLabel" class="text-[15px] h-[24px] leading-[26px] text-fore-title flex-1 min-w-1 ellipsis-1" :style="getValueStyle"
         :class="{ 'text-[#dce4f6]': disabled || readonly }">
         <slot :label="label">
           {{ label }}
         </slot>
       </view>
-      <view v-else class=" text-[#c0c4cc]" :style="getPlaceholderStyle">{{ placeholder }}</view>
+      <view v-else class="text-[15px] h-[24px] leading-[26px] text-[#c0c4cc] flex-1 min-w-1 ellipsis-1" :style="getPlaceholderStyle">{{ placeholder }}</view>
       <slot name="right">
         <view v-if="!readonly && showArrow" class="transition-all duration-300">
           <uv-icon :name="icon" size="15" color="#B3B3B3" />
@@ -92,7 +92,7 @@ const props = defineProps({
   },
   fontSize: {
     type: Number,
-    default: 30,
+    default: 15,
   },
   showArrow: {
     type: Boolean,
@@ -109,12 +109,12 @@ const columns = computed(() => {
 const getPlaceholderStyle = computed(() => {
   return {
     ...props.placeholderStyle,
-    fontSize: props.fontSize + 'rpx'
+    fontSize: props.fontSize + 'px'
   }
 });
 const getValueStyle = computed(() => {
   return {
-    fontSize: props.fontSize + 'rpx'
+    fontSize: props.fontSize + 'px'
   }
 });
 const init = () => {

src/composables/useExamType.ts

@@ -1,4 +1,4 @@
-import { EnumDictName } from "@/common/enum";
+import { EnumDictName, EnumExamType } from "@/common/enum";
 import { useDictStore } from "@/store/dictStore";
 import { useAppStore } from "@/store/appStore";
 import { DictItem, System } from "@/types";
@@ -8,7 +8,7 @@ const dictStore = useDictStore();
 const appStore = useAppStore();
 
 export const useExamType = () => {
-  const form = ref<Partial<Pick<StudentExamInfo, 'location' | 'examType' | 'endYear' | 'majorType'>>>({})
+  const form = ref<Partial<Pick<StudentExamInfo, 'location' | 'examType' | 'endYear' | 'examMajor'>>>({})
   const provinceList = ref<System.ProvinceItem[]>([]);
   const examTypeList = ref<DictItem[]>([]);
   const examMajorList = ref<DictItem[]>([]);
@@ -26,13 +26,14 @@ export const useExamType = () => {
     }
 
   }
-  const loadExamMajorData = async () => {
-    if (form.value.location && form.value.examType) {
-      const { data } = await getExamMajors(form.value.location, form.value.examType);
+  const loadExamMajorData = async (location: string, examType: EnumExamType) => {
+    if (location && examType) {
+      const { data } = await getExamMajors(location, examType);
       examMajorList.value = data;
     } else {
       examMajorList.value = [];
     }
+    return examMajorList.value;
   }
   const loadGraduateYearData = async () => {
     if (form.value.location && form.value.examType) {
@@ -43,12 +44,11 @@ export const useExamType = () => {
     }
   }
   watch(() => form.value.location, (val) => {
-    console.log('监听到省份数据', val)
     if (examTypeList.value.length) {
       form.value.examType = undefined;
     }
     if (examMajorList.value.length) {
-      form.value.majorType = '';
+      form.value.examMajor = '';
     }
     if (endYearList.value.length) {
      form.value.endYear = undefined; 
@@ -56,13 +56,18 @@ export const useExamType = () => {
     if (val) {
       loadExamTypeData();
     }
+    if (val && form.value.examType) {
+      loadExamMajorData(val, form.value.examType);
+    }
     loadGraduateYearData();
   });
   watch(() => form.value.examType, (val) => {
     if (val) {
-      loadExamMajorData();
       loadGraduateYearData();
     }
+    if (val && form.value.location) {
+      loadExamMajorData(form.value.location, val);
+    }
   })
   loadProvinceData();
 
@@ -71,6 +76,7 @@ export const useExamType = () => {
     provinceList,
     examTypeList,
     examMajorList,
-    endYearList
+    endYearList,
+    loadExamMajorData
   }
 }

src/main.ts

@@ -121,8 +121,6 @@ export function createApp() {
     }
   }
 
-  console.log(uni.$zp)
-
   const pinia = Pinia.createPinia();
   app.use(pinia);
   pinia.use(piniaPluginPersistedstate);

src/pagesMain/pages/index/components/index-popup.vue

@@ -1,45 +1,33 @@
 <template>
-  <!-- #ifdef H5 -->
-  <teleport to="body">
-    <!-- #endif -->
-    <!-- #ifdef MP-WEIXIN -->
-    <root-portal externalClass="theme-ie">
-      <!-- #endif -->
-      <uv-popup ref="popupRef" mode="bottom" :round="16" :closeOnClickOverlay="false">
-        <view class="popup-content relative">
-          <ie-image :is-oss="true" src="/study-bg15.png" custom-class="absolute top-0 left-0 w-full h-392 z-0"
-            mode="aspectFill" />
-          <view class="relative z-1">
-            <view class="px-88 pt-60 pb-60">
-              <view class="text-40 text-fore-title font-bold">请确认信息</view>
-              <view class="mt-16 text-32 text-fore-light">让我们开始体验升学备考之旅吧！</view>
-            </view>
-            <view class="mx-46 pb-50">
-              <view class="flex items-center px-42 bg-back rounded-15 h-104 box-border">
-                <view class="flex-shrink-0">所在省份</view>
-                <ie-picker ref="pickerRef" v-model="form.location" :list="provinceList" :customStyle="customStyle"
-                  placeholder="请选择" key-label="areaName" key-value="shortName">
-                </ie-picker>
-              </view>
-              <view class="mt-30 flex items-center px-42 bg-back rounded-15 h-104 box-border">
-                <view class="flex-shrink-0">考生类别</view>
-                <ie-picker ref="pickerRef" v-model="form.examType" :list="examTypeList" :disabled="!form.location"
-                  :customStyle="customStyle" placeholder="请选择" key-label="dictLabel" key-value="dictValue">
-                </ie-picker>
-              </view>
-              <view class="mt-140">
-                <ie-button type="primary" @click="handleConfirm">立即体验</ie-button>
-              </view>
-            </view>
+  <ie-popup title="" mode="bottom" ref="popupRef" :showToolbar="false">
+    <view class="popup-content relative">
+      <ie-image :is-oss="true" src="/study-bg15.png" custom-class="absolute top-0 left-0 w-full h-392 z-0"
+        mode="aspectFill" />
+      <view class="relative z-1">
+        <view class="px-88 pt-60 pb-60">
+          <view class="text-40 text-fore-title font-bold">请确认信息</view>
+          <view class="mt-16 text-32 text-fore-light">让我们开始体验升学备考之旅吧！</view>
+        </view>
+        <view class="mx-46 pb-50">
+          <view class="flex items-center px-42 bg-back rounded-15 h-104 box-border">
+            <view class="flex-shrink-0">所在省份</view>
+            <ie-picker ref="pickerRef" v-model="form.location" :list="provinceList" :customStyle="customStyle"
+              placeholder="请选择" key-label="areaName" key-value="shortName">
+            </ie-picker>
+          </view>
+          <view class="mt-30 flex items-center px-42 bg-back rounded-15 h-104 box-border">
+            <view class="flex-shrink-0">考生类别</view>
+            <ie-picker ref="pickerRef" v-model="form.examType" :list="examTypeList" :disabled="!form.location"
+              :customStyle="customStyle" placeholder="请选择" key-label="dictLabel" key-value="dictValue">
+            </ie-picker>
+          </view>
+          <view class="mt-140">
+            <ie-button type="primary" @click="handleConfirm">立即体验</ie-button>
           </view>
         </view>
-      </uv-popup>
-      <!-- #ifdef MP-WEIXIN -->
-    </root-portal>
-    <!-- #endif -->
-    <!-- #ifdef H5 -->
-  </teleport>
-  <!-- #endif -->
+      </view>
+    </view>
+  </ie-popup>
 </template>
 <script lang="ts" setup>
 import { useExamType } from '@/composables/useExamType';

src/pagesMain/pages/index/index.vue

@@ -6,10 +6,15 @@
           <view class="text-36 text-fore-title font-bold">{{ orgName }}</view>
           <view class="w-6 h-6 rounded-2 bg-black mx-12"></view>
           <view>升学备考好帮手</view>
-          <view v-if="userStore.getLocation" class="ml-10 flex items-center gap-x-4" @click="handleChangeLocation">
-            <ie-image src="/static/image/icon-location.png" custom-class="w-20 h-24" mode="aspectFill" />
-            <text class="text-26 text-primary">{{ userStore.getLocation }}</text>
-          </view>
+        </view>
+      </template>
+      <template #headerRight="{ isTransparent }">
+        <view v-if="userStore.getLocation" class="ml-10 flex items-center gap-x-4" @click="handleChangeLocation">
+          <uv-icon name="map" size="14" :color="isTransparent ? '#333' : 'var(--primary-color)'" />
+          <text class="text-26 transition-colors duration-300"
+            :class="[isTransparent ? 'text-fore-title' : 'text-primary']">
+            {{ userStore.getLocation }}
+          </text>
         </view>
       </template>
     </ie-navbar>

src/pagesStudy/pages/exam-start/components/exam-subtitle.vue

@@ -17,11 +17,25 @@ const examData = inject(EXAM_DATA) || {} as ReturnType<typeof useExam>;
 const { virtualCurrentIndex, virtualTotalCount } = examData;
 
 const pageSubtitle = computed(() => {
-  if (examPageOptions) {
-    const { name } = examPageOptions;
-    return name;
+  if (!examPageOptions || !examPageOptions.practiceInfo) {
+    return '知识点练习';
   }
-  return '';
+  const { practiceInfo: { isVHS, directed, questionType, name } } = examPageOptions;
+  let titlePrefix = '';
+  if (isVHS) {
+    if (questionType === 0) {
+      titlePrefix = '知识点练习';
+    } else if (questionType === 2) {
+      titlePrefix = '必刷题';
+    }
+  } else {
+    if (directed) {
+      titlePrefix = '定向刷题';
+    } else {
+      titlePrefix = '全量刷题';
+    }
+  }
+  return titlePrefix + '-' + name;
 });
 </script>
 <style lang="scss" scoped></style>

src/pagesStudy/pages/exam-start/exam-start.vue

@@ -222,7 +222,8 @@ const handleSubmit = (tempSave: boolean = false) => {
               paperType: prevData.value.paperType,
               examineeId: examineeId.value,
               name: prevData.value.practiceInfo?.name,
-              directed: prevData.value.practiceInfo?.directed
+              directed: prevData.value.practiceInfo?.directed,
+              questionType: prevData.value.practiceInfo?.questionType
             } as Transfer.PracticeResultPageOptions,
             type: 'redirectTo'
           });
@@ -276,11 +277,17 @@ const loadPracticeData = async () => {
       data = res.data;
     }
   } else {
-    const res = await getOpenExaminee({
+    const params = {
       paperType: paperType,
       relateId: practiceInfo?.relateId,
-      directed: practiceInfo?.directed || false
-    });
+    } as Study.OpenExamineeRequestDTO;
+    if (userStore.isVHS) {
+      params.questionType = practiceInfo?.questionType;
+    } else {
+      params.directed = practiceInfo?.directed || false;
+      params.questionType = practiceInfo?.questionType || 0;
+    }
+    const res = await getOpenExaminee(params);
     data = res.data || {};
   }
 

src/pagesStudy/pages/index/compoentns/henan-exam.vue

@@ -21,6 +21,8 @@
 <script lang="ts" setup>
 import HenanExamItem from '@/pagesStudy/components/henan-exam-item.vue';
 import { useNavbar } from '@/hooks/useNavbar';
+import { getVHSPaperList } from '@/api/modules/study';
+import { Study } from '@/types';
 
 const { baseStickyTop } = useNavbar();
 const list = [1, 1, 1, 1, 1, 1, 1, 1]
@@ -28,6 +30,16 @@ const current = ref(0);
 const handleChange = (index: number) => {
   current.value = index;
 }
+const loadData = async () => {
+  const { data } = await getVHSPaperList({
+    subjectId: current.value
+  });
+  console.log(data)
+  // list.value = data;
+}
+onLoad(() => {
+  loadData();
+});
 </script>
 <style lang="scss" scoped>
 .is-active {

src/pagesStudy/pages/index/compoentns/index-practice-entry.vue

@@ -0,0 +1,146 @@
+<template>
+  <view>
+    <view v-if="!isVHS" class="mx-30 mt-20 flex items-center bg-[#E3F4FA] rounded-8 py-16 px-16 gap-x-40">
+      <view class="text-24 text-[#34B0D7] flex-1">
+        <text v-if="!hasDirectedSchool">你还未开启定向学习，快来设置吧！</text>
+        <view v-else class="flex items-center">
+          <text class="flex-shrink-0">定向：</text>
+          <text class="min-w-1 ellipsis-1">{{ firstDirectedSchool.universityName }}</text>
+          <uv-icon name="arrow-right" size="14" color="#0DACF5"></uv-icon>
+          <text class="flex-shrink-0">{{ firstDirectedSchool.majorName }}</text>
+        </view>
+      </view>
+      <view class="text-24 text-white bg-gradient-to-r from-[#26C5F7] to-[#0DACF5] rounded-full px-18 py-6"
+        @click="handleSetting">{{ hasDirectedSchool ? '已开启' : '去开启' }}</view>
+    </view>
+    <view class="mx-30 mt-20">
+      <view class="flex items-center gap-x-28">
+        <template v-if="isVHS">
+          <view class="bg-gradient-to-r from-[#0088FE] to-[#31A0FC] flex-1 rounded-15 relative overflow-hidden">
+            <view class="mt-30 p-30 z-1 relative">
+              <view class="text-30 text-white font-bold">知识点练习</view>
+              <view class="mt-8 text-24 text-white">考点专攻，精准提分</view>
+              <view class="mt-32 w-200 h-56 flex items-center justify-center rounded-full text-26 text-primary bg-white"
+                @click="handlePracticeKnowledge">
+                开始练习
+              </view>
+            </view>
+            <ie-image :is-oss="true" src="/study-bg13.png" custom-class="absolute bottom-0 left-0 w-full h-full z-0"
+              mode="aspectFill" />
+          </view>
+          <view class="bg-gradient-to-r from-[#32B5FD] to-[#79DCFD] flex-1 rounded-15 relative overflow-hidden">
+            <view class="mt-30 p-30 z-1 relative">
+              <view class="text-30 text-white font-bold">必刷题</view>
+              <view class="mt-8 text-24 text-white">高频考题，一网打尽</view>
+              <view class="mt-32 w-200 h-56 flex items-center justify-center rounded-full text-26 text-primary bg-white"
+                @click="handlePracticeMustDo">
+                开始练习
+              </view>
+            </view>
+            <ie-image :is-oss="true" src="/study-bg13.png" custom-class="absolute bottom-0 left-0 w-full h-full z-0"
+              mode="aspectFill" />
+          </view>
+        </template>
+        <template v-else>
+          <view class="bg-gradient-to-r from-[#0088FE] to-[#31A0FC] flex-1 rounded-15 relative overflow-hidden">
+            <view class="mt-30 p-30 z-1 relative">
+              <view class="text-30 text-white font-bold">全量刷题</view>
+              <view class="mt-8 text-24 text-white">全面刷题，高效备考</view>
+              <view class="mt-32 w-200 h-56 flex items-center justify-center rounded-full text-26 text-primary bg-white"
+                @click="handlePracticeAll">
+                开始练习
+              </view>
+            </view>
+            <ie-image :is-oss="true" src="/study-bg13.png" custom-class="absolute bottom-0 left-0 w-full h-full z-0"
+              mode="aspectFill" />
+          </view>
+          <view class="bg-gradient-to-r from-[#32B5FD] to-[#79DCFD] flex-1 rounded-15 relative overflow-hidden">
+            <view class="mt-30 p-30 z-1 relative">
+              <view class="text-30 text-white font-bold">定向刷题</view>
+              <view class="mt-8 text-24 text-white">紧扣考纲，精准练习</view>
+              <view class="mt-32 w-200 h-56 flex items-center justify-center rounded-full text-26 text-primary bg-white"
+                @click="handlePracticeDirected">
+                开始练习
+              </view>
+            </view>
+            <ie-image :is-oss="true" src="/study-bg13.png" custom-class="absolute bottom-0 left-0 w-full h-full z-0"
+              mode="aspectFill" />
+          </view>
+        </template>
+      </view>
+    </view>
+  </view>
+</template>
+<script lang="ts" setup>
+import { useTransferPage } from '@/hooks/useTransferPage';
+import { useUserStore } from '@/store/userStore';
+const { transferTo } = useTransferPage();
+const userStore = useUserStore();
+
+const { hasDirectedSchool, directedSchoolList, getExamType, isVHS } = storeToRefs(userStore);
+const firstDirectedSchool = computed(() => directedSchoolList.value[0] || {});
+
+const handlePracticeDirected = async () => {
+  if (!hasDirectedSchool.value) {
+    addTarget();
+    return;
+  }
+  const notice = firstDirectedSchool.value.notice;
+  if (notice) {
+    await uni.$ie.showModal({
+      title: '提示',
+      content: notice,
+      showCancel: false,
+      confirmText: '知道了'
+    });
+  } else {
+    transferTo('/pagesStudy/pages/knowledge-practice/knowledge-practice', {
+      data: {
+        isVHS: false,
+        directed: true
+      }
+    });
+  }
+}
+
+const handlePracticeAll = () => {
+  transferTo('/pagesStudy/pages/knowledge-practice/knowledge-practice', {
+    data: {
+      isVHS: false,
+      directed: false
+    }
+  });
+}
+
+const handlePracticeKnowledge = () => {
+  transferTo('/pagesStudy/pages/knowledge-practice/knowledge-practice', {
+    data: {
+      isVHS: true,
+      directed: false,
+      questionType: 0
+    }
+  });
+}
+
+const handlePracticeMustDo = () => {
+  transferTo('/pagesStudy/pages/knowledge-practice/knowledge-practice', {
+    data: {
+      isVHS: true,
+      directed: false,
+      questionType: 2
+    }
+  });
+}
+
+const handleSetting = async () => {
+  if (hasDirectedSchool.value) {
+    transferTo('/pagesStudy/pages/targeted-setting/targeted-setting');
+  } else {
+    addTarget();
+  }
+}
+const addTarget = () => {
+  transferTo('/pagesStudy/pages/targeted-add/targeted-add');
+}
+</script>
+<style lang="scss" scoped></style>

src/pagesStudy/pages/index/index.vue

@@ -12,51 +12,11 @@
         </view>
       </template>
     </ie-navbar>
-    <view class="mx-30 mt-20 flex items-center bg-[#E3F4FA] rounded-8 py-16 px-16 gap-x-40">
-      <view class="text-24 text-[#34B0D7] flex-1">
-        <text v-if="!hasDirectedSchool">你还未开启定向学习，快来设置吧！</text>
-        <view v-else class="flex items-center">
-          <text class="flex-shrink-0">定向：</text>
-          <text class="min-w-1 ellipsis-1">{{ firstDirectedSchool.universityName }}</text>
-          <uv-icon name="arrow-right" size="14" color="#0DACF5"></uv-icon>
-          <text class="flex-shrink-0">{{ firstDirectedSchool.majorName }}</text>
-        </view>
-      </view>
-      <view class="text-24 text-white bg-gradient-to-r from-[#26C5F7] to-[#0DACF5] rounded-full px-18 py-6"
-        @click="handleSetting">{{ hasDirectedSchool ? '已开启' : '去开启' }}</view>
-    </view>
-    <view class="mx-30 mt-20">
-      <view class="flex items-center gap-x-28">
-        <view class="bg-gradient-to-r from-[#0088FE] to-[#31A0FC] flex-1 rounded-15 relative overflow-hidden">
-          <view class="mt-30 p-30 z-1 relative">
-            <view class="text-30 text-white font-bold">全量刷题</view>
-            <view class="mt-8 text-24 text-white">全面刷题，高效备考</view>
-            <view class="mt-32 w-200 h-56 flex items-center justify-center rounded-full text-26 text-primary bg-white"
-              @click="handlePracticeAll">
-              开始练习
-            </view>
-          </view>
-          <ie-image :is-oss="true" src="/study-bg13.png" custom-class="absolute bottom-0 left-0 w-full h-full z-0"
-            mode="aspectFill" />
-        </view>
-        <view class="bg-gradient-to-r from-[#32B5FD] to-[#79DCFD] flex-1 rounded-15 relative overflow-hidden">
-          <view class="mt-30 p-30 z-1 relative">
-            <view class="text-30 text-white font-bold">定向刷题</view>
-            <view class="mt-8 text-24 text-white">紧扣考纲，精准练习</view>
-            <view class="mt-32 w-200 h-56 flex items-center justify-center rounded-full text-26 text-primary bg-white"
-              @click="handlePracticeDirected">
-              开始练习
-            </view>
-          </view>
-          <ie-image :is-oss="true" src="/study-bg13.png" custom-class="absolute bottom-0 left-0 w-full h-full z-0"
-            mode="aspectFill" />
-        </view>
-      </view>
-    </view>
+    <index-practice-entry />
     <index-menu />
     <index-banner />
-    <henan-exam v-if="getLocation === '河南'" :directed-school="firstDirectedSchool" />
-    <hunan-exam v-else-if="getLocation === '湖南'" :directed-school="firstDirectedSchool" />
+    <henan-exam v-if="isVHS" :directed-school="firstDirectedSchool" />
+    <hunan-exam v-else :directed-school="firstDirectedSchool" />
   </ie-page>
 </template>
 
@@ -65,6 +25,7 @@ import IndexMenu from './compoentns/index-menu.vue';
 import IndexBanner from './compoentns/index-banner.vue';
 import HunanExam from './compoentns/hunan-exam.vue';
 import HenanExam from './compoentns/henan-exam.vue';
+import IndexPracticeEntry from './compoentns/index-practice-entry.vue';
 import { EnumDictName, EnumExamType, EnumUserRole } from '@/common/enum';
 import { useUserStore } from '@/store/userStore';
 import { useTransferPage } from '@/hooks/useTransferPage';
@@ -76,47 +37,9 @@ const userStore = useUserStore();
 const { hasPermission } = useAuth();
 // 通过 ref 获取 ie-page 组件实例
 const iePageRef = ref<InstanceType<typeof IePage>>();
-const { hasDirectedSchool, directedSchoolList, getExamType, getLocation } = storeToRefs(userStore);
+const { hasDirectedSchool, directedSchoolList, getExamType, isVHS } = storeToRefs(userStore);
 const firstDirectedSchool = computed(() => directedSchoolList.value[0] || {});
 
-const handlePracticeAll = () => {
-  transferTo('/pagesStudy/pages/knowledge-practice/knowledge-practice', {
-    data: {
-      directed: false
-    }
-  });
-}
-const handlePracticeDirected = async () => {
-  if (!hasDirectedSchool.value) {
-    addTarget();
-    return;
-  }
-  const notice = firstDirectedSchool.value.notice;
-  if (notice) {
-    await uni.$ie.showModal({
-      title: '提示',
-      content: notice,
-      showCancel: false,
-      confirmText: '知道了'
-    });
-  } else {
-    transferTo('/pagesStudy/pages/knowledge-practice/knowledge-practice', {
-      data: {
-        directed: true
-      }
-    });
-  }
-}
-const handleSetting = async () => {
-  if (hasDirectedSchool.value) {
-    transferTo('/pagesStudy/pages/targeted-setting/targeted-setting');
-  } else {
-    addTarget();
-  }
-}
-const addTarget = () => {
-  transferTo('/pagesStudy/pages/targeted-add/targeted-add');
-}
 const loadData = async () => {
   await userStore.getDirectedSchoolList();
 }

src/pagesStudy/pages/knowledge-practice-detail/knowledge-practice-detail.vue

@@ -106,9 +106,12 @@ const handleStartPractice = () => {
       practiceInfo: {
         name: prevData.value.name,
         relateId: knowledgeId,
-        directed: prevData.value.directed
+        directed: prevData.value.directed,
+        // 对口升学
+        isVHS: prevData.value.isVHS,
+        questionType: prevData.value.questionType
       },
-    }
+    } as Transfer.ExamAnalysisPageOptions
   });
 }
 const handleViewAnalysis = () => {
@@ -117,16 +120,17 @@ const handleViewAnalysis = () => {
   }
   transferTo('/pagesStudy/pages/exam-start/exam-start', {
     data: {
-      name: paperName.value,
       paperType: EnumPaperType.PRACTICE,
       readonly: true,
       practiceInfo: {
         name: prevData.value.name,
         relateId: examineeData.value.knowledgeId,
         directed: prevData.value.directed,
-        examineeId: examineeData.value.examineeId
+        examineeId: examineeData.value.examineeId,
+        // 对口升学
+        questionType: prevData.value.questionType
       },
-    }
+    } as Transfer.ExamAnalysisPageOptions
   });
 }
 const loadData = async () => {
@@ -139,6 +143,7 @@ const loadData = async () => {
   }
 }
 onLoad(() => {
+  console.log(prevData.value)
   loadData();
 });
 </script>

src/pagesStudy/pages/knowledge-practice-history/knowledge-practice-history.vue

@@ -27,22 +27,26 @@
   </ie-page>
 </template>
 <script lang="ts" setup>
+import { useUserStore } from '@/store/userStore';
 import { useNavbar } from '@/hooks/useNavbar';
 import { useTransferPage } from '@/hooks/useTransferPage';
 import { getPracticeHistory } from '@/api/modules/study';
 import { Study } from '@/types';
 import { Transfer } from '@/types';
 import { EnumPaperType } from '@/common/enum';
+
 const { prevData, transferTo } = useTransferPage<{}, Transfer.PracticeResultPageOptions>();
 const { baseStickyTop } = useNavbar();
+const userStore = useUserStore();
 const historyList = ref<Study.PracticeHistory[]>([]);
-const handleViewHistory = (value: Study.PracticeHistory) => {
+const handleViewHistory = (item: Study.PracticeHistory) => {
   transferTo('/pagesStudy/pages/knowledge-practice-detail/knowledge-practice-detail', {
     data: {
       paperType: EnumPaperType.PRACTICE,
-      examineeId: value.examineeId,
-      name: value.paperName,
-      directed: value.directed === 1
+      examineeId: item.examineeId,
+      name: item.paperName,
+      directed: item.directed === 1,
+      questionType: item.questionType
     }
   });
 }

src/pagesStudy/pages/knowledge-practice/knowledge-practice.vue

@@ -3,14 +3,16 @@
     <z-paging ref="pagingRef" v-model="treeData" :loading-more-enabled="false" :auto="false" @query="loadKnowledgeList">
       <template #top>
         <ie-navbar :title="pageTitle" />
-        <uv-tabs :list="subjectList" key-name="subjectName" @click="handleChangeTab" :scrollable="true"></uv-tabs>
-        <view class="px-30 py-16 bg-back">
-          <view class="flex items-center justify-end gap-x-4" @click="handleViewHistory">
-            <uv-icon name="clock" size="16" color="#31A0FC"></uv-icon>
-            <text class="text-28 text-primary">查看记录</text>
-            <uv-icon name="arrow-right" size="16" color="#31A0FC"></uv-icon>
+        <template v-if="subjectList.length">
+          <uv-tabs :list="subjectList" key-name="subjectName" @click="handleChangeTab" :scrollable="true"></uv-tabs>
+          <view class="px-30 py-16 bg-back">
+            <view class="flex items-center justify-end gap-x-4" @click="handleViewHistory">
+              <uv-icon name="clock" size="16" color="#31A0FC"></uv-icon>
+              <text class="text-28 text-primary">查看记录</text>
+              <uv-icon name="arrow-right" size="16" color="#31A0FC"></uv-icon>
+            </view>
           </view>
-        </view>
+        </template>
       </template>
       <view class="px-40">
         <knowledgeTree :tree-data="treeData" @start-practice="handleStartPractice" />
@@ -24,7 +26,7 @@ import IePage from '@/components/ie-page/ie-page.vue';
 import { useTransferPage } from '@/hooks/useTransferPage';
 import { getSubjectList, getKnowledgeList } from '@/api/modules/study';
 import knowledgeTree from '@/pagesStudy/components/knowledge-tree.vue';
-import * as Study from '@/types/study';
+import { Study, Transfer } from '@/types';
 import { EnumPaperType, EnumUserRole } from '@/common/enum';
 import { useUserStore } from '@/store/userStore';
 import { useAuth } from '@/hooks/useAuth';
@@ -32,14 +34,24 @@ import { useAuth } from '@/hooks/useAuth';
 const { prevData, transferTo } = useTransferPage();
 const currentSubjectIndex = ref<number>(-1);
 const userStore = useUserStore();
-const pagingRef = ref();
+const pagingRef = ref<ZPagingInstance>();
 
 const { hasPermission } = useAuth();
 const pageTitle = computed(() => {
-  if (prevData.value.directed) {
-    return '定向刷题';
+  const { isVHS, directed, questionType } = prevData.value;
+  if (isVHS) {
+    if (questionType === 0) {
+      return '知识点练习';
+    } else if (questionType === 2) {
+      return '必刷题';
+    }
+  } else {
+    if (directed) {
+      return '定向刷题';
+    } else {
+      return '全量刷题';
+    }
   }
-  return '全量刷题';
 });
 const currentSubjectId = computed(() => {
   if (subjectList.value.length > 0 && currentSubjectIndex.value >= 0) {
@@ -70,10 +82,10 @@ const loadKnowledgeList = async () => {
       directed: prevData.value.directed
     });
     treeData.value = data as Study.KnowledgeNode[];
-    pagingRef.value.complete(data);
+    pagingRef.value?.complete(data);
   } catch (error) {
     console.log(error);
-    pagingRef.value.complete(false);
+    pagingRef.value?.complete(false);
   } finally {
     uni.$ie.hideLoading();
   }
@@ -84,29 +96,35 @@ const handleStartPractice = async (node: Study.KnowledgeNode) => {
   if (hasAuth) {
     transferTo('/pagesStudy/pages/exam-start/exam-start', {
       data: {
-        name: '知识点练习-' + node.name,
         paperType: EnumPaperType.PRACTICE,
         practiceInfo: {
           name: node.name,
           relateId: node.id,
-          directed: prevData.value.directed
-        },
-      }
+          directed: prevData.value.directed,
+          // 对口升学
+          questionType: prevData.value.questionType
+        }
+      } as Transfer.ExamAnalysisPageOptions
     });
   }
 }
 
 watch(() => currentSubjectIndex.value, () => {
-  pagingRef.value.reload();
+  pagingRef.value?.reload();
 }, {
   immediate: false
 });
 
 const loadData = async () => {
+  const { isVHS, directed, subjectType } = prevData.value;
   try {
-    const { data } = await getSubjectList({
-      directed: !!prevData.value.directed
-    });
+    const params = {} as Study.SubjectListRequestDTO;
+    if (isVHS) {
+      params.subjectType = subjectType;
+    } else {
+      params.directed = !!directed;
+    }
+    const { data } = await getSubjectList(params);
     subjectList.value = data.map(item => ({ subjectId: item.subjectId, subjectName: item.subjectName }));
     currentSubjectIndex.value = 0;
   } catch (error) { }
@@ -117,7 +135,7 @@ onLoad(() => {
 onShow(() => {
   nextTick(() => {
     if (subjectList.value.length > 0) {
-      pagingRef.value.refresh();
+      pagingRef.value?.refresh();
     }
   });
 });

src/pagesSystem/pages/bind-profile/bind-profile copy.vue

@@ -1,457 +0,0 @@
-<template>
-  <ie-page bg-color="#F6F8FA" :safeAreaInsetBottom="false">
-    <ie-navbar title="完善信息"></ie-navbar>
-    <uv-form labelPosition="left" :model="form" labelWidth="70px" ref="formRef">
-      <content-card title="个人信息">
-        <uv-form-item label="姓名" prop="name" borderBottom required>
-          <uv-input v-model="form.nickName" border="none" placeholder="请输入姓名" placeholderClass="text-30"
-            font-size="30rpx" :custom-style="customStyle">
-          </uv-input>
-        </uv-form-item>
-        <uv-form-item label="所在省份" prop="location" borderBottom required>
-          <ie-picker ref="pickerRef" v-model="examTypeForm.location" :list="provinceList"
-            :placeholder="pickerPlaceholder" :custom-style="customStyle" key-label="dictLabel" key-value="dictValue"
-            :disabled="isProvinceDisabled">
-            <template v-if="isProvinceDisabled" #right>
-              <ie-image src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
-            </template>
-          </ie-picker>
-        </uv-form-item>
-        <uv-form-item label="考生类别" prop="examType" borderBottom required>
-          <ie-picker ref="pickerRef" v-model="examTypeForm.examType" :list="examTypeList" :disabled="isExamTypeDisabled"
-            :placeholder="pickerPlaceholder" :custom-style="customStyle" key-label="dictLabel" key-value="dictValue">
-            <template v-if="isExamTypeDisabled" #right>
-              <ie-image src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
-            </template>
-          </ie-picker>
-        </uv-form-item>
-        <uv-form-item v-if="examTypeForm.examType === 'VHS'" label="专业类别" prop="majorType" borderBottom required>
-          <ie-picker ref="pickerRef" v-model="examTypeForm.majorType" :list="examMajorList"
-            :disabled="!examTypeForm.examType" :placeholder="pickerPlaceholder" :custom-style="customStyle"
-            key-label="dictLabel" key-value="dictValue"></ie-picker>
-        </uv-form-item>
-        <uv-form-item label="单招年份" prop="year" required>
-          <ie-picker ref="pickerRef" v-model="examTypeForm.endYear" :list="endYearList"
-            :disabled="!examTypeForm.examType" :placeholder="pickerPlaceholder" :custom-style="customStyle"
-            key-label="dictLabel" key-value="dictValue"></ie-picker>
-        </uv-form-item>
-
-      </content-card>
-      <content-card title="邀请信息">
-        <uv-form-item label="邀请码" prop="form.inviteCode">
-          <uv-input v-model="form.inviteCode" border="none" placeholder="请输入邀请码（非必填）" font-size="30rpx"
-            :custom-style="customStyle">
-          </uv-input>
-        </uv-form-item>
-      </content-card>
-      <content-card v-if="showCulture" title="文化素质">
-        <uv-form-item label="语文" prop="form.scores.chinese" borderBottom :required="isBindMode">
-          <uv-input v-model.number="scoresForm.chinese" border="none" type="number" :placeholder="inputPlaceholder"
-            font-size="30rpx" :custom-style="customStyle">
-          </uv-input>
-        </uv-form-item>
-        <uv-form-item label="数学" prop="form.score.mathematics" borderBottom :required="isBindMode">
-          <uv-input v-model.number="scoresForm.mathematics" border="none" type="number" :placeholder="inputPlaceholder"
-            font-size="30rpx" :custom-style="customStyle">
-          </uv-input>
-        </uv-form-item>
-        <uv-form-item label="外语" prop="form.scores.foreign" borderBottom :required="isBindMode">
-          <uv-input v-model.number="scoresForm.foreign" border="none" type="number" :placeholder="inputPlaceholder"
-            font-size="30rpx" :custom-style="customStyle">
-          </uv-input>
-        </uv-form-item>
-        <uv-form-item label="物理" prop="form.scores.physics" borderBottom :required="isBindMode">
-          <uv-input v-model.number="scoresForm.physics" border="none" type="number" :placeholder="inputPlaceholder"
-            font-size="30rpx" :custom-style="customStyle">
-          </uv-input>
-        </uv-form-item>
-        <uv-form-item label="政治" prop="form.scores.political" :required="isBindMode">
-          <uv-input v-model.number="scoresForm.political" border="none" type="number" :placeholder="inputPlaceholder"
-            font-size="30rpx" :custom-style="customStyle">
-          </uv-input>
-        </uv-form-item>
-      </content-card>
-      <content-card v-if="isBindMode" title="学校信息">
-        <template #right>
-          <view class="text-26 text-primary underline" @click="handleNoSchool">没有我的学校班级?</view>
-        </template>
-        <uv-form-item label="学校名称" prop="form.name" borderBottom :required="isBindMode">
-          <ie-picker ref="pickerRef" v-model="form.schoolName" disabled :placeholder="pickerPlaceholder"
-            :custom-style="customStyle" :custom-label="form.schoolName" @click="handleSchoolSelect">
-            <template v-if="isSchoolDisabled" #right>
-              <ie-image src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
-            </template>
-          </ie-picker>
-        </uv-form-item>
-        <uv-form-item label="所在班级" prop="form.name" :required="isBindMode">
-          <ie-picker ref="pickerRef" v-model="form.classId" :list="classList" :disabled="!form.schoolId" title="选择班级"
-            placeholder="请选择" :custom-style="customStyle" key-label="name" key-value="classId"></ie-picker>
-        </uv-form-item>
-      </content-card>
-    </uv-form>
-    <ie-safe-toolbar :height="84" :shadow="false">
-      <view class="px-46 pt-24">
-        <ie-button @click="handleSubmit">确认提交</ie-button>
-      </view>
-    </ie-safe-toolbar>
-  </ie-page>
-</template>
-
-<script lang="ts" setup>
-import ContentCard from '../../components/content-card.vue';
-import { useUserStore } from '@/store/userStore';
-import { registry, improve, improveWithToken } from '@/api/modules/login';
-import { useTransferPage } from '@/hooks/useTransferPage';
-import { useExamType } from '@/composables/useExamType';
-import { useAppStore } from '@/store/appStore';
-import { BindCardInfo, CardInfo, ClassItem, LoginInfo, RegisterInfo, SchoolItem, Scores, UserInfo } from '@/types/user';
-
-import { getClassList } from '@/api/modules/user';
-import { EnumBindScene, EnumExamRecordType, EnumExamType } from '@/common/enum';
-type PrevDataInfo = {
-  cardInfo: CardInfo;
-  userInfo: UserInfo;
-  registerInfo: RegisterInfo;
-  scene: EnumBindScene;
-  token: string; // 绑定已有账号时需要 token
-}
-
-const { form: examTypeForm, examTypeList, examMajorList, provinceList, endYearList } = useExamType();
-const userStore = useUserStore();
-const { prevData, transferTo, transferBack } = useTransferPage();
-
-const form = ref<Partial<BindCardInfo>>({});
-const scoresForm = ref<Scores>({})
-const formRef = ref();
-const customStyle = {
-  paddingLeft: '26px'
-};
-
-const isBindMode = computed(() => [EnumBindScene.LOGIN_BIND, EnumBindScene.REGISTER_BIND].includes(prevData.value.scene));
-const isSchoolDisabled = computed(() => isBindMode.value && prevData.value.cardInfo.assignSchoolId);
-const isProvinceDisabled = computed(() => isBindMode.value && prevData.value.cardInfo.assignLocation);
-const isExamTypeDisabled = computed(() => (isBindMode.value && prevData.value.cardInfo.assignExamType) || !examTypeForm.value.location);
-const contactPhone = computed(() => userStore.orgInfo.contactPhone);
-const inputPlaceholder = computed(() => {
-  return isBindMode.value ? '请输入(提交后不可修改)' : '请输入';
-});
-const pickerPlaceholder = computed(() => {
-  return isBindMode.value ? '请选择(提交后不可修改)' : '请选择';
-});
-
-const classList = ref<ClassItem[]>([]);
-const showCulture = computed(() => {
-  return examTypeForm.value.examType === EnumExamType.OHS;
-});
-const handleNoSchool = () => {
-  if (!contactPhone.value) {
-    uni.$ie.showToast('请联系客服处理');
-    return;
-  }
-  uni.showActionSheet({
-    title: '联系客服处理',
-    itemList: [`拨打电话：${contactPhone.value}`],
-    success: (res) => {
-      uni.makePhoneCall({
-        phoneNumber: contactPhone.value
-      });
-    }
-  });
-}
-const handleSchoolSelect = () => {
-  // if (isSchoolDisabled.value || !examTypeForm.value.examType) {
-  //   return;
-  // }
-  transferTo('/pagesSystem/pages/school-select/school-select', {
-    data: {
-      examType: examTypeForm.value.examType,
-    }
-  }).then(res => {
-    if (res) {
-      const school = res as SchoolItem;
-      form.value.schoolId = school.id;
-      form.value.schoolName = school.name;
-      console.log(form.value)
-      form.value.classId = undefined;
-      classList.value = [];
-      handleGetClassList();
-    }
-  });
-}
-const handleGetClassList = () => {
-  if (!form.value.schoolId) {
-    return;
-  }
-  getClassList({ schoolId: form.value.schoolId }).then(res => {
-    classList.value = res.data;
-    console.log(classList.value)
-  });
-}
-
-
-const loginValidate = () => {
-  form.value = {
-    ...form.value,
-    ...examTypeForm.value,
-  }
-  const { nickName, location, examType, endYear } = form.value;
-  if (!nickName || nickName.trim() === '') {
-    uni.$ie.showToast('请输入姓名');
-    return false;
-  }
-  if (!location || location.trim() === '') {
-    uni.$ie.showToast('请选择省份');
-    return false;
-  }
-  if (!examType || examType.trim() === '') {
-    uni.$ie.showToast('请选择考生类别');
-    return false;
-  }
-  if (examType === 'VHS') {
-    if (!form.value.majorType) {
-      uni.$ie.showToast('请选择专业类别');
-      return false;
-    }
-  }
-  if (!endYear) {
-    uni.$ie.showToast('请选择毕业年份');
-    return false;
-  }
-  if (showCulture.value) {
-    if (isBindMode.value) {
-      if (!scoresForm.value.chinese || scoresForm.value.chinese < 0 || scoresForm.value.chinese > 100) {
-        uni.$ie.showToast('请输入正确的语文成绩');
-        return false;
-      }
-    }
-    if (isBindMode.value) {
-      if (!scoresForm.value.mathematics || scoresForm.value.mathematics < 0 || scoresForm.value.mathematics > 100) {
-        uni.$ie.showToast('请输入正确的数学成绩');
-        return false;
-      }
-    }
-    if (isBindMode.value) {
-      if (!scoresForm.value.foreign || scoresForm.value.foreign < 0 || scoresForm.value.foreign > 100) {
-        uni.$ie.showToast('请输入正确的外语成绩');
-        return false;
-      }
-    }
-    if (isBindMode.value) {
-      if (!scoresForm.value.physics || scoresForm.value.physics < 0 || scoresForm.value.physics > 100) {
-        uni.$ie.showToast('请输入正确的物理成绩');
-        return false;
-      }
-    }
-    if (isBindMode.value) {
-      if (!scoresForm.value.political || scoresForm.value.political < 0 || scoresForm.value.political > 100) {
-        uni.$ie.showToast('请输入正确的政治成绩');
-        return false;
-      }
-    }
-  }
-  if (isBindMode.value) {
-    if (!form.value.schoolId) {
-      uni.$ie.showToast('请选择学校');
-      return false;
-    }
-  }
-  if (isBindMode.value) {
-    if (!form.value.classId) {
-      uni.$ie.showToast('请选择班级');
-      return false;
-    }
-  }
-  return true;
-}
-const handleSubmit = async () => {
-  const valid = loginValidate();
-  if (valid) {
-    let params = {
-      ...form.value,
-      ...examTypeForm.value,
-      scores: scoresForm.value,
-    };
-
-    // 接下来补充注册登录信息
-    try {
-      if (prevData.value.scene === EnumBindScene.REGISTER) {
-        startRegister(params as BindCardInfo);
-      } else {
-        // startRegisterBind(params as BindCardInfo);
-        // params = {
-        //   ...params,
-        //   username: prevData.value.registerInfo.username,
-        //   password: prevData.value.registerInfo.password,
-        // };
-        console.log('初步提交信息:', params);
-        if (prevData.value.scene === EnumBindScene.LOGIN_BIND) {
-          startLoginBind(params as BindCardInfo);
-        } else {
-          startRegister(params as BindCardInfo);
-        }
-      }
-      // if (isBindMode.value) {
-      //   const { cardNo, password } = prevData.value;
-      //   params = {
-      //     ...params,
-      //     username: cardNo,
-      //     password,
-      //   }
-      //   console.log('params', params)
-      //   if (prevData.value.scene === 'card_improve') {
-      //     startRegister(params as BindCardInfo);
-      //   } else {
-      //     startRegisterBind(params as BindCardInfo)
-      //   }
-      // } else {
-      //   const { mobile, password, code, uuid } = prevData.value;
-      //   params = {
-      //     ...params,
-      //     mobile,
-      //     password,
-      //     code,
-      //     uuid,
-      //   }
-      //   startRegister(params as BindCardInfo);
-      // }
-    } catch (error) {
-      console.error(error)
-    }
-  }
-}
-
-const startLoginBind = async (params: BindCardInfo) => {
-  uni.$ie.showLoading();
-  const token = prevData.value.token;
-  await improveWithToken(params, token);
-  uni.$ie.hideLoading();
-  uni.$ie.showSuccess('绑定成功');
-  const userStore = useUserStore();
-  userStore.setToken(token);
-  setTimeout(() => {
-    userStore.getUserInfo();
-    goHome();
-  }, 50);
-}
-
-// const startRegisterBind = async (params: BindCardInfo) => {
-//   uni.$ie.showLoading();
-//   await improve(params);
-//   uni.$ie.hideLoading();
-//   uni.$ie.showSuccess('绑定成功');
-//   userStore.getUserInfo();
-//   goHome();
-// }
-
-const startRegister = async (params: BindCardInfo) => {
-  uni.$ie.showLoading();
-  const { token } = await registry(params);
-  if (token) {
-    const { success } = await userStore.login(token);
-    uni.$ie.hideLoading();
-    uni.$ie.showSuccess('登录成功');
-    if (success) {
-      goHome();
-    }
-  }
-}
-
-const goHome = () => {
-  setTimeout(() => {
-    transferTo('/pagesMain/pages/index/index', {
-      type: 'reLaunch'
-    });
-  }, 800);
-}
-
-const gatherInfo = () => {
-  console.log('数据预览：', prevData.value)
-  // const { scene, card, phone, code, uuid } = prevData.value;
-  let { cardInfo = {} as CardInfo, userInfo = {} as UserInfo, registerInfo = {} as RegisterInfo, scene, token } = prevData.value as PrevDataInfo;
-  form.value = {
-    code: registerInfo.code,
-    uuid: registerInfo.uuid,
-    mobile: registerInfo.mobile,
-    username: registerInfo.username,
-    password: registerInfo.password,
-  }
-  // 注册时，如果以游客身份使用过，则从临时信息中获取省份和考试类型
-  if (scene === EnumBindScene.REGISTER) {
-    console.log('自动填写临时信息：', userStore.tempInfo)
-    examTypeForm.value.location = userStore.tempInfo?.location;
-    setTimeout(() => {
-      examTypeForm.value.examType = userStore.tempInfo!.examType;
-    }, 0);
-  } else if ([EnumBindScene.LOGIN_BIND, EnumBindScene.REGISTER_BIND].includes(scene)) {
-    // 已有卡信息，补充信息
-    if (scene === EnumBindScene.LOGIN_BIND) {
-      form.value = {
-        ...form.value,
-        ...userInfo,
-      };
-    }
-    form.value = {
-      ...form.value,
-      schoolName: cardInfo.assignSchoolName,
-      schoolId: cardInfo.assignSchoolId,
-      classId: cardInfo.classId,
-      //
-      // code: registerInfo.code,
-      // uuid: registerInfo.uuid,
-      // mobile: registerInfo.mobile,
-      // username: registerInfo.username,
-      // password: registerInfo.password,
-    };
-    // 考生相关信息
-    examTypeForm.value.location = cardInfo.assignLocation || userInfo.location || '';
-    setTimeout(() => {
-      examTypeForm.value.examType = cardInfo.assignExamType || userInfo.examType || '';
-      examTypeForm.value.endYear = cardInfo.endYear || userInfo.endYear;
-    }, 0);
-    examTypeForm.value.majorType = userInfo.majorType || '';
-    // 
-    scoresForm.value = userInfo.scores || {};
-    handleGetClassList();
-  }
-  console.log('初始化整理的信息:')
-  console.log('form.value:', form.value)
-  console.log('examTypeForm.value:', examTypeForm.value)
-  console.log('scoresForm.value:', scoresForm.value)
-  // if (scene === EnumBindScene.LOGIN_BIND) {
-  // 未登录用户卡注册登录
-  // form.value = {
-  // nickName,
-  // scores,
-  // 下面 3 个属性卡的优先级更高
-  // location: assignLocation || location,
-  // examType: assignExamType || examType,
-  // endYear: cardEndYear || userEndYear,
-  // majorType: majorType || userMajorType,
-  // schoolId: assignSchoolId,
-  // schoolName: assignSchoolName,
-  // classId: classId,
-  // mobile: phone
-  // code
-  // };
-  // handleGetClassList();
-  // } else if (scene === 'phone_improve') {
-  // 已登录用户绑卡
-  // const { nickName, location, examType, endYear, scores } = userStore.userInfo;
-  // const { nickName, location, examType, endYear, scores } = prevData.value.userInfo;
-  // form.value = {
-  //   nickName,
-  //   location,
-  //   examType,
-  //   // endYear,
-  //   scores
-  // };
-  // scoresForm.value = scores;
-  // }
-}
-
-onLoad(() => {
-  gatherInfo();
-});
-</script>
-
-<style lang="scss" scoped></style>

src/pagesSystem/pages/bind-profile/bind-profile.vue

@@ -4,7 +4,7 @@
     <uv-form labelPosition="left" :model="form" labelWidth="70px" ref="formRef">
       <content-card title="个人信息">
         <uv-form-item label="姓名" prop="name" borderBottom required>
-          <uv-input v-model="form.nickName" border="none" placeholder="请输入姓名" placeholderClass="text-30"
+          <uv-input v-model="form.nickName" border="none" placeholder="请输入姓名" placeholderClass="text-[15px]"
             font-size="30rpx" :custom-style="customStyle">
           </uv-input>
         </uv-form-item>
@@ -26,8 +26,8 @@
             </template>
           </ie-picker>
         </uv-form-item>
-        <uv-form-item v-if="examTypeForm.examType === 'VHS'" label="专业类别" prop="majorType" borderBottom required>
-          <ie-picker ref="pickerRef" v-model="examTypeForm.majorType" :list="examMajorList"
+        <uv-form-item v-if="examTypeForm.examType === 'VHS'" label="专业类别" prop="examMajor" borderBottom required>
+          <ie-picker ref="pickerRef" v-model="examTypeForm.examMajor" :list="examMajorList"
             :disabled="!examTypeForm.examType" :placeholder="pickerPlaceholder" :custom-style="customStyle"
             key-label="dictLabel" key-value="dictValue"></ie-picker>
         </uv-form-item>
@@ -264,7 +264,7 @@ const loginValidate = () => {
     return false;
   }
   if (examType === 'VHS') {
-    if (!form.value.majorType) {
+    if (!form.value.examMajor) {
       uni.$ie.showToast('请选择专业类别');
       return false;
     }
@@ -453,7 +453,7 @@ const gatherInfo = () => {
       examTypeForm.value.examType = cardInfo.assignExamType || userInfo.examType || undefined;
       examTypeForm.value.endYear = cardInfo.endYear || userInfo.endYear;
     }, 0);
-    examTypeForm.value.majorType = userInfo.majorType || '';
+    examTypeForm.value.examMajor = userInfo.examMajor || '';
     // 
     scoresForm.value = userInfo.scores || {};
     handleGetClassList();

src/pagesSystem/pages/bind-teacher-profile/bind-teacher-profile.vue

@@ -25,8 +25,8 @@
             </template>
           </ie-picker>
         </uv-form-item>
-        <uv-form-item v-if="examTypeForm.examType === 'VHS'" label="专业类别" prop="majorType" borderBottom required>
-          <ie-picker ref="pickerRef" v-model="examTypeForm.majorType" :list="examMajorList"
+        <uv-form-item v-if="examTypeForm.examType === 'VHS'" label="专业类别" prop="examMajor" borderBottom required>
+          <ie-picker ref="pickerRef" v-model="examTypeForm.examMajor" :list="examMajorList"
             :disabled="!examTypeForm.examType || disabledEdit" :placeholder="pickerPlaceholder"
             :custom-style="customStyle" key-label="dictLabel" key-value="dictValue">
             <template v-if="disabledEdit" #right>
@@ -134,7 +134,7 @@ const scoresForm = ref<Scores>({})
 examTypeForm.value.location = form.value.location;
 examTypeForm.value.examType = form.value.examType;
 examTypeForm.value.endYear = form.value.endYear;
-examTypeForm.value.majorType = form.value.majorType;
+examTypeForm.value.examMajor = form.value.examMajor;
 scoresForm.value = form.value.scores || {}
 
 const disabledEdit = computed(() => {
@@ -182,7 +182,7 @@ const loginValidate = () => {
     return false;
   }
   if (examType === 'VHS') {
-    if (!form.value.majorType) {
+    if (!form.value.examMajor) {
       uni.$ie.showToast('请选择专业类别');
       return false;
     }

src/pagesSystem/pages/edit-profile/edit-profile.vue

@@ -6,29 +6,35 @@
         <content-card title="个人信息">
           <uv-form-item label="姓名" prop="name" borderBottom>
             <uv-input v-model="form.nickName" border="none" :readonly="!userStore.isStudent" placeholder="请输入姓名"
-              placeholderClass="text-30" font-size="30rpx" :custom-style="customStyle">
+              placeholderClass="text-[15px]" font-size="15px" :custom-style="customStyle">
             </uv-input>
           </uv-form-item>
           <uv-form-item v-if="userStore.isStudent" label="手机号码" prop="name" borderBottom>
             <uv-input v-model="form.phonenumber" border="none" placeholder="请输入手机号码" maxlength="11" type="number"
-              placeholderClass="text-30" font-size="30rpx" :custom-style="customStyle" readonly>
+              placeholderClass="text-[15px]" font-size="15px" :custom-style="customStyle" readonly>
             </uv-input>
-            <text slot="right" class="text-30 text-primary" @click="handleBindPhone">换绑</text>
+            <text slot="right" class="text-[15px] text-primary" @click="handleBindPhone">换绑</text>
           </uv-form-item>
           <uv-form-item label="所在省份" prop="name" borderBottom>
-            <uv-input v-model="form.location" border="none" placeholder="" placeholderClass="text-30" font-size="30rpx"
+            <uv-input v-model="form.location" border="none" placeholder="" placeholderClass="text-[15px]" font-size="15px"
               :custom-style="customStyle" readonly>
             </uv-input>
             <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
           </uv-form-item>
           <uv-form-item label="考试类别" prop="name" borderBottom>
-            <view class="flex-1 pl-[26px] text-30">
+            <view class="flex-1 pl-[26px] text-[15px] leading-[24px]">
               <ie-dict :dictName="EnumDictName.EXAM_TYPE" :dictValue="form.examType" />
             </view>
             <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
           </uv-form-item>
+          <uv-form-item v-if="form.examType === 'VHS'" label="专业类别" prop="examMajor" borderBottom>
+            <view class="flex-1 pl-[26px] text-[15px] h-[24px] leading-[24px]">
+              <text>{{ examMajorName }}</text>
+            </view>
+            <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
+          </uv-form-item>
           <uv-form-item label="单招年份" prop="name">
-            <uv-input v-model="form.endYear" border="none" placeholder="" placeholderClass="text-30" font-size="30rpx"
+            <uv-input v-model="form.endYear" border="none" placeholder="" placeholderClass="text-[15px]" font-size="15px"
               :custom-style="customStyle" readonly>
             </uv-input>
             <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
@@ -38,16 +44,16 @@
         <content-card title="文化素质">
           <uv-form-item label="语文" prop="name" borderBottom>
             <uv-input v-model="scores.chinese" border="none"
-              :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-30"
-              font-size="30rpx" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
+              :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-[15px]"
+              font-size="15px" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
             </uv-input>
             <ie-image v-if="form.examType === EnumExamType.OHS" slot="right" src="/static/image/icon-lock.png"
               custom-class="w-24 h-30" mode="aspectFill" />
           </uv-form-item>
           <uv-form-item label="数学" prop="name" borderBottom>
             <uv-input v-model="scores.mathematics" border="none"
-              :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-30"
-              font-size="30rpx" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
+              :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-[15px]"
+              font-size="15px" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
             </uv-input>
             <ie-image v-if="form.examType === EnumExamType.OHS" slot="right" src="/static/image/icon-lock.png"
               custom-class="w-24 h-30" mode="aspectFill" />
@@ -55,8 +61,8 @@
           <uv-form-item label="外语" prop="name"
             :borderBottom="form.examType === EnumExamType.OHS || form.examType === EnumExamType.SVS">
             <uv-input v-model="scores.foreign" border="none"
-              :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-30"
-              font-size="30rpx" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
+              :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-[15px]"
+              font-size="15px" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
             </uv-input>
             <ie-image v-if="form.examType === EnumExamType.OHS" slot="right" src="/static/image/icon-lock.png"
               custom-class="w-24 h-30" mode="aspectFill" />
@@ -64,16 +70,16 @@
           <block v-if="[EnumExamType.OHS, EnumExamType.SVS].includes(form.examType)">
             <uv-form-item label="物理" prop="name" borderBottom>
               <uv-input v-model="scores.physics" border="none"
-                :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-30"
-                font-size="30rpx" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
+                :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-[15px]"
+                font-size="15px" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
               </uv-input>
               <ie-image v-if="form.examType === EnumExamType.OHS" slot="right" src="/static/image/icon-lock.png"
                 custom-class="w-24 h-30" mode="aspectFill" />
             </uv-form-item>
             <uv-form-item label="政治" prop="name">
               <uv-input v-model="scores.political" border="none"
-                :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-30"
-                font-size="30rpx" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
+                :placeholder="form.examType === EnumExamType.OHS ? '' : '请输入'" placeholderClass="text-[15px]"
+                font-size="15px" :custom-style="customStyle" :readonly="form.examType === EnumExamType.OHS">
               </uv-input>
               <ie-image v-if="form.examType === EnumExamType.OHS" slot="right" src="/static/image/icon-lock.png"
                 custom-class="w-24 h-30" mode="aspectFill" />
@@ -83,8 +89,8 @@
 
         <content-card v-if="([EnumExamType.OHS, EnumExamType.SVS].includes(form.examType))" title="职业技能成绩">
           <uv-form-item label="职业技能" prop="name">
-            <uv-input v-model.number="scores.skill" border="none" placeholder="请输入" placeholderClass="text-30"
-              font-size="30rpx" :custom-style="customStyle">
+            <uv-input v-model.number="scores.skill" border="none" placeholder="请输入" placeholderClass="text-[15px]"
+              font-size="15px" :custom-style="customStyle">
             </uv-input>
           </uv-form-item>
         </content-card>
@@ -92,8 +98,8 @@
         <template v-if="userStore.isStudent">
           <content-card v-if="userStore.isVip" title="学校信息">
             <uv-form-item label="学校名称" prop="form.name" borderBottom>
-              <uv-input v-model="form.schoolName" border="none" placeholder="" placeholderClass="text-30"
-                font-size="30rpx" :custom-style="customStyle" readonly>
+              <uv-input v-model="form.schoolName" border="none" placeholder="" placeholderClass="text-[15px]"
+                font-size="15px" :custom-style="customStyle" readonly>
               </uv-input>
               <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
             </uv-form-item>
@@ -110,14 +116,14 @@
         </template>
         <content-card v-else-if="userStore.isTeacher" title="学校信息">
           <uv-form-item label="学校名称" prop="form.campusName" borderBottom>
-            <uv-input v-model="form.campusName" border="none" placeholder="" placeholderClass="text-30"
-              font-size="30rpx" :custom-style="customStyle" readonly>
+            <uv-input v-model="form.campusName" border="none" placeholder="" placeholderClass="text-[15px]"
+              font-size="15px" :custom-style="customStyle" readonly>
             </uv-input>
             <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
           </uv-form-item>
           <uv-form-item label="所在班级" prop="form.campusClassName">
-            <uv-input v-model="form.campusClassName" border="none" placeholder="" placeholderClass="text-30"
-              font-size="30rpx" :custom-style="customStyle" readonly>
+            <uv-input v-model="form.campusClassName" border="none" placeholder="" placeholderClass="text-[15px]"
+              font-size="15px" :custom-style="customStyle" readonly>
             </uv-input>
             <ie-image slot="right" src="/static/image/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
           </uv-form-item>
@@ -154,10 +160,15 @@ import { BindCardInfo, UserInfo } from '@/types/user';
 import { EnumDictName, EnumSmsApiType, EnumExamType } from '@/common/enum';
 import { validatePhone } from '@/hooks/useValidation';
 import { validateSms } from '@/api/modules/system';
+import { useExamType } from '@/composables/useExamType';
+import { DictItem } from '@/types';
+const { loadExamMajorData } = useExamType();
+
 const userStore = useUserStore();
 const userInfo = computed(() => userStore.userInfo);
 const cardInfo = computed(() => userStore.card);
 const { classList, loadClassData } = useSchool();
+const examMajorList = ref<DictItem[]>([]);
 
 const form = ref<UserInfo>({
   ...userInfo.value
@@ -184,6 +195,12 @@ const schoolClassDisabled = computed(() => {
   const { schoolId } = form.value;
   return schoolId === undefined || schoolId === null || pickerDisabled.value;
 });
+const examMajorName = computed(() => {
+  if (!form.value.examMajor) {
+    return '';
+  }
+  return examMajorList.value.find(item => item.dictValue === form.value.examMajor)?.dictLabel;
+});
 
 const handleSubmit = async () => {
   uni.$ie.showLoading();
@@ -243,8 +260,20 @@ const handleChangePhone = async () => {
   form.value.phonenumber = phoneForm.value.phone;
   popupRef.value.close();
 }
-onLoad(() => {
+const initData = () => {
   loadClassData(cardInfo.value?.schoolId);
+  // 对口升学加载专业类别数据
+  if (form.value.examType === EnumExamType.VHS) {
+    uni.$ie.showLoading();
+    loadExamMajorData(form.value.location, form.value.examType).then(res => {
+      examMajorList.value = res || [];
+    }).finally(() => {
+      uni.$ie.hideLoading();
+    });
+  }
+}
+onLoad(() => {
+  initData();
 });
 </script>
 

src/store/userStore.ts

@@ -11,7 +11,7 @@ import defaultAvatar from '@/static/personal/avatar_default.png'
 
 // @ts-ignore
 import { useUserStore as useOldUserStore } from '@/hooks/useUserStore';
-import { CardType, EnumReviewMode, EnumUserType } from '@/common/enum';
+import { CardType, EnumExamType, EnumReviewMode, EnumUserType } from '@/common/enum';
 import { OPEN_VIP_POPUP } from '@/types/injectionSymbols';
 import { getDirectedSchool, saveDirectedSchool } from '@/api/modules/study';
 const oldUserStore = useOldUserStore()
@@ -121,6 +121,9 @@ export const useUserStore = defineStore('ie-user', {
         return this.user?.examType || '';
       }
       return this.tempInfo?.examType || '';
+    },
+    isVHS(): boolean {
+      return this.getExamType === EnumExamType.VHS;
     }
   },
   actions: {

src/types/study.ts

@@ -299,7 +299,9 @@ export interface Question extends QuestionState {
 }
 
 export interface SubjectListRequestDTO {
-  directed: boolean;
+  directed?: boolean;
+  questionType?: number;
+  subjectType?: number;
 }
 
 export interface KnowledgeListRequestDTO {
@@ -312,7 +314,8 @@ export interface OpenExamineeRequestDTO {
   relateId?: number,
   directed: boolean,
   subjectId?: number,
-  testType?: string
+  testType?: string;
+  questionType?: number;
 }
 
 export interface GetExamPaperRequestDTO {
@@ -430,6 +433,7 @@ export interface PracticeHistory {
   endTime: string;
   examineeId: number;
   paperName: string;
+  questionType?: number;
 }
 
 /**
@@ -454,4 +458,8 @@ export interface PaperWork {
   endTime: string;
   duration: number;
   batchName: string;
+}
+
+export interface VHSPaperListRequestDTO {
+  subjectId: number;
 }

src/types/transfer.ts

@@ -10,6 +10,8 @@ export interface PracticeResultPageOptions {
   name: string;
   directed: boolean;
   paperType: EnumPaperType;
+  isVHS?: boolean; // 是否是对口升学
+  questionType?: number; // 对口升学用来区分是知识点还是必刷题
 }
 
 /**
@@ -31,6 +33,7 @@ export interface ExamAnalysisPageOptions {
     relateId: number;
     directed: boolean; // 知识点 id
     examineeId?: number;
+    questionType?: number; // 对口升学用来区分是知识点还是必刷题
   };
 }
 

src/types/user.ts

@@ -12,7 +12,7 @@ export interface StudentExamInfo {
   location: string;
   endYear: number;
   examType?: EnumExamType;
-  majorType?: string;
+  examMajor?: string;
 }
 
 export interface InviteInfo {
@@ -76,7 +76,7 @@ export interface RegisterInfo {
   examType: string;
   inviteCode?: string;
   location: string;
-  majorType?: string;
+  examMajor?: string;
   nickName: string;
   schoolId?: number;
   schoolName?: string;
@@ -141,7 +141,7 @@ export interface UserInfo {
   code: string;
   endYear: number;
   examType: EnumExamType;
-  majorType?: string;
+  examMajor?: string;
   inviteCode?: string;
   location: string;
   nickName: string;

src/uni_modules/uv-form/components/uv-form-item/uv-form-item.vue

@@ -189,8 +189,8 @@ export default {
                     left: -9px;
                     color: $uv-error;
                     line-height: 20px;
-                    font-size: 20px;
-                    top: 3px;
+                    font-size: 14px;
+                    top: 0px;
                 }
 
                 &__label {