浏览代码

修复bug

shmily1213 1 月之前
父节点
当前提交
be6e358ead

+ 2 - 2
src/api/modules/study.ts

@@ -25,8 +25,8 @@ export function saveStudyPlan(params: StudyPlan) {
  * @param params 
  * @returns 
  */
-export function getStudyPlanStats() {
-  return flyio.get('/front/student/plan/stats') as Promise<ApiResponse<any>>;
+export function getStudyPlanStats(params :any) {
+  return flyio.get('/front/student/plan/stats', params) as Promise<ApiResponse<any>>;
 }
 
 

+ 11 - 0
src/api/modules/university.ts

@@ -0,0 +1,11 @@
+import { ApiResponse } from "@/types";
+import flyio from "../flyio";
+
+/**
+ * 获取院校列表
+ * @param params 
+ * @returns 
+ */
+export function getUniversityList() {
+  return flyio.get('/front/student/university') as Promise<ApiResponse<any>>;
+}

+ 1 - 0
src/composables/useExamType.ts

@@ -35,6 +35,7 @@ export const useExamType = () => {
   watch(() => form.value.location, (val) => {
     form.value.examType = '';
     form.value.majorType = '';
+    form.value.endYear = undefined;
     if (val) {
       loadExamTypeData();
     }

+ 18 - 0
src/composables/useSchool.ts

@@ -0,0 +1,18 @@
+import { ClassItem, SchoolItem } from "@/types/user";
+import { getClassList, getSchoolList } from "@/api/modules/user";
+const useSchool = () => {
+  const form = ref({
+    schoolName: '',
+    schoolId: undefined,
+    className: '',
+    classId: undefined,
+  });
+  const schoolList = ref<SchoolItem[]>([]);
+  const classList = ref<ClassItem[]>([]);
+
+  return {
+    form,
+    schoolList,
+    classList,
+  };
+}

+ 10 - 8
src/pagesStudy/pages/index/compoentns/index-banner.vue

@@ -1,10 +1,8 @@
 <template>
   <view class="mx-30 mt-40">
-    <ie-image :is-oss="true" src="/banner/index-banner-3.png" :round="10" customClass="w-full h-264"
-      mode="widthFix" />
+    <ie-image :is-oss="true" src="/banner/index-banner-3.png" :round="10" customClass="w-full h-264" mode="widthFix" />
     <view class="mt-32 flex gap-x-30">
-      <view class="flex-1 rounded-12 bg-[#F0FFF2] py-40 pl-22 pr-8 flex items-center"
-        @click="handleOpenPlan">
+      <view class="flex-1 rounded-12 bg-[#F0FFF2] py-40 pl-22 pr-8 flex items-center" @click="handleOpenPlan">
         <!-- /pagesStudy/pages/study-plan-edit/study-plan-edit -->
         <view class="flex-1">
           <view class="text-30 text-fore-title font-bold flex items-center">
@@ -37,10 +35,14 @@ const navigateTo = (pageUrl: string) => {
 }
 
 const handleOpenPlan = async () => {
-  const data = await getStudyPlan()
-  const directedSchool = await getDirectedSchool()
-  console.log(data, directedSchool)
-  // transferTo('/pagesStudy/pages/study-plan-edit/study-plan-edit');
+  const { data } = await getStudyPlan()
+  // const directedSchool = await getDirectedSchool()
+  // console.log(data, directedSchool)
+  if (data) {
+    transferTo('/pagesStudy/pages/study-plan/study-plan');
+  } else {
+    transferTo('/pagesStudy/pages/study-plan-edit/study-plan-edit');
+  }
 }
 </script>
 <style lang="scss" scoped></style>

+ 0 - 7
src/pagesStudy/pages/study-plan/components/page-header copy 3.vue

@@ -1,7 +0,0 @@
-<template>
-  <view></view>
-</template>
-<script lang="ts" setup>
-
-</script>
-<style lang="scss" scoped></style>

+ 8 - 0
src/pagesStudy/pages/study-plan/study-plan.vue

@@ -15,7 +15,15 @@
 import PageHeader from './components/page-header.vue';
 import PageCalendar from './components/page-calendar.vue';
 import { useTransferPage } from '@/hooks/useTransferPage';
+import { getStudyPlanStats } from '@/api/modules/study';
 const { transferTo } = useTransferPage();
+const loadData = async () => {
+  const { data } = await getStudyPlanStats({
+    reportMonth: '2025-10-01'
+  });
+  console.log(data)
+}
+loadData();
 onPageScroll(() => { });
 
 const handleEditPlan = () => {

+ 2 - 2
src/pagesSystem/pages/card-verify/card-verify.vue

@@ -19,8 +19,8 @@ import { verifyCard } from '@/api/modules/user';
 import { useTransferPage } from '@/hooks/useTransferPage';
 const { transferTo } = useTransferPage();
 const form = ref({
-  cardNo: '20000001',
-  password: '669132'
+  cardNo: '',
+  password: ''
 });
 const handleSubmit = async () => {
   const { cardNo, password } = form.value;

+ 1 - 0
src/pagesSystem/pages/login/login.vue

@@ -212,6 +212,7 @@ const handleCardLogin = (params: MobileLoginRequestDTO) => {
       // 
       verifyCard(cardNo.value, cardPassword.value).then(res => {
         console.log(res)
+        uni.$ie.hideLoading();
         if (res.data) {
           transferTo('/pagesSystem/pages/phone-verify/phone-verify', {
             data: {

+ 1 - 1
src/pagesSystem/pages/phone-verify/phone-verify.vue

@@ -23,7 +23,7 @@ import { EnumSmsApiType } from '@/common/enum';
 import { validateSms } from '@/api/modules/system';
 const { prevData, transferTo } = useTransferPage();
 const form = ref({
-  phone: '17363958509',
+  phone: '',
   code: '',
   uuid: '',
 });

+ 6 - 6
src/pagesSystem/pages/user-profile/user-profile.vue

@@ -39,34 +39,34 @@
       </content-card>
       <content-card v-if="showCulture" title="文化素质">
         <uv-form-item label="语文" prop="form.scores.chinese" borderBottom :required="isImproveMode">
-          <uv-input v-model="scoresForm.chinese" border="none" type="number" placeholder="满分100分" font-size="30rpx"
+          <uv-input v-model="scoresForm.chinese" border="none" type="number" placeholder="请输入" font-size="30rpx"
             :custom-style="customStyle">
           </uv-input>
         </uv-form-item>
         <uv-form-item label="数学" prop="form.score.mathematics" borderBottom :required="isImproveMode">
-          <uv-input v-model="scoresForm.mathematics" border="none" type="number" placeholder="满分100分" font-size="30rpx"
+          <uv-input v-model="scoresForm.mathematics" border="none" type="number" placeholder="请输入" font-size="30rpx"
             :custom-style="customStyle">
           </uv-input>
         </uv-form-item>
         <uv-form-item label="外语" prop="form.scores.foreign" borderBottom :required="isImproveMode">
-          <uv-input v-model="scoresForm.foreign" border="none" type="number" placeholder="满分100分" font-size="30rpx"
+          <uv-input v-model="scoresForm.foreign" border="none" type="number" placeholder="请输入" font-size="30rpx"
             :custom-style="customStyle">
           </uv-input>
         </uv-form-item>
         <uv-form-item label="物理" prop="form.scores.physics" borderBottom :required="isImproveMode">
-          <uv-input v-model="scoresForm.physics" border="none" type="number" placeholder="满分100分" font-size="30rpx"
+          <uv-input v-model="scoresForm.physics" border="none" type="number" placeholder="请输入" font-size="30rpx"
             :custom-style="customStyle">
           </uv-input>
         </uv-form-item>
         <uv-form-item label="政治" prop="form.scores.political" :required="isImproveMode">
-          <uv-input v-model="scoresForm.political" border="none" type="number" placeholder="满分100分" font-size="30rpx"
+          <uv-input v-model="scoresForm.political" border="none" type="number" placeholder="请输入" font-size="30rpx"
             :custom-style="customStyle">
           </uv-input>
         </uv-form-item>
       </content-card>
       <content-card v-if="isImproveMode" title="学校信息">
         <uv-form-item label="学校名称" prop="form.name" borderBottom :required="isImproveMode">
-          <ie-picker ref="pickerRef" v-model="form.schoolName" :disabled="isSchoolDisabled" placeholder="请选择就读学校"
+          <ie-picker ref="pickerRef" v-model="form.schoolName" disabled placeholder="请选择就读学校"
             :custom-style="customStyle" :custom-label="form.schoolName" @click="handleSchoolSelect"
             :show-arrow="!isSchoolDisabled"></ie-picker>
         </uv-form-item>

+ 0 - 8
src/types/user.ts

@@ -32,14 +32,6 @@ export interface CultureScores {
   political?: number;
 }
 
-export interface SchoolInfo {
-  schoolName?: string;
-  schoolId?: number;
-  className?: string;
-  classId?: number;
-}
-
-
 export interface SchoolListQueryDTO {
   keyword?: string;
   pageNum: number;