From eb659896aec38732aef594890cc383eeab0edc55 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 11 Apr 2025 20:17:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package_sub/pages/BatchForm/BatchForm.vue     |  2 +-
 .../pages/HistoryScore/HistoryScore.vue       | 10 ++--
 .../IndependentRecruitment.vue                | 16 +++---
 .../pages/RecommendForm/RecommendForm.vue     |  6 ++-
 package_sub/pages/SchoolList/SchoolList.vue   | 17 +++++-
 package_sub/pages/StudentInfo/StudentInfo.vue | 53 ++++++++++++++++---
 package_sub/pages/TargetCount/TargetCount.vue |  2 +-
 7 files changed, 83 insertions(+), 23 deletions(-)

diff --git a/package_sub/pages/BatchForm/BatchForm.vue b/package_sub/pages/BatchForm/BatchForm.vue
index e525b26..0e563bd 100644
--- a/package_sub/pages/BatchForm/BatchForm.vue
+++ b/package_sub/pages/BatchForm/BatchForm.vue
@@ -414,7 +414,7 @@ export default {
           const { batchSubs } = await this.$u.api.batchDetail({ id: batchId })
           this.batchSub[batchId] = batchSubs
           batchSubs.forEach(batchSub => {
-            this.schoolMap.set(batchSub.id, batchSub.school)
+            this.schoolMap.set(batchSub.id, batchSub.school_details)
           })
 
           const formBatch = this.subForm.find(i => i.batchId === batchId)
diff --git a/package_sub/pages/HistoryScore/HistoryScore.vue b/package_sub/pages/HistoryScore/HistoryScore.vue
index dbc3d2d..975df55 100644
--- a/package_sub/pages/HistoryScore/HistoryScore.vue
+++ b/package_sub/pages/HistoryScore/HistoryScore.vue
@@ -50,16 +50,20 @@
         <view class="table__header">
           <text class="table__header-item">星级</text>
           <text class="table__header-item">学校</text>
+		  <text class="table__header-item">类型</text>
           <text class="table__header-item">分数</text>
+		   <text class="table__header-item">跨区总分</text>
         </view>
         <view
           class="table__row"
           v-for="(item, index) in list"
           :key="index"
         >
-          <text class="table__row-item">{{ item.school ? item.school.star : '' }}</text>
-          <text class="table__row-item">{{ item.school ? item.school.name : '' }}</text>
-          <text class="table__row-item">{{ item.total_score }}</text>
+          <text class="table__row-item">{{ item.school ? (item.school.star ?item.school.star: ''):'' }}</text>
+          <text class="table__row-item">{{ item.school ? (item.school.name ?item.school.name: ''):'' }}</text>
+		  <text class="table__row-item">{{ item.school ? (item.school.type_text ?item.school.type_text: '') : '' }}</text>
+          <text class="table__row-item">{{ item.total_score?item.total_score:'' }}</text>
+		  <text class="table__row-item">{{ item.area_total_score?item.area_total_score:'' }}</text>
         </view>
       </view>
     </view>
diff --git a/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue b/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
index 4600475..7b92310 100644
--- a/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
+++ b/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
@@ -67,9 +67,9 @@
           <!-- <u-form-item label="民族" prop="nationality">
             <u-input v-model="form.nationality" placeholder="请输入" input-align="right" />
           </u-form-item> -->
-          <u-form-item label="户籍地址" required prop="address">
+          <!-- <u-form-item label="户籍地址" required prop="address">
             <u-input v-model="form.address" placeholder="请输入" input-align="right" />
-          </u-form-item>
+          </u-form-item> -->
           <u-form-item label="移动电话" required prop="mobile">
             <u-input v-model="form.mobile" placeholder="请输入" input-align="right" />
           </u-form-item>
@@ -314,12 +314,12 @@ export default {
         //     message: '请输入考试类型'
         //   }
         // ],
-        address: [
-          {
-            required: true,
-            message: '请输入户籍地址'
-          }
-        ],
+        // address: [
+        //   {
+        //     required: true,
+        //     message: '请输入户籍地址'
+        //   }
+        // ],
         mobile: [
           {
             required: true,
diff --git a/package_sub/pages/RecommendForm/RecommendForm.vue b/package_sub/pages/RecommendForm/RecommendForm.vue
index 68ae6fc..75cd7f2 100644
--- a/package_sub/pages/RecommendForm/RecommendForm.vue
+++ b/package_sub/pages/RecommendForm/RecommendForm.vue
@@ -176,6 +176,7 @@
     <u-picker
       mode="time"
       v-model="isShowYear"
+	  :start-year="currentYear"
       :params="{
         year: true,
         month: false,
@@ -275,7 +276,7 @@
 						    i.nature === 1 ? "公办" : i.nature === 2 ? "民办" : "-"
 						  }}
 					  </view>
-					  <view>历年均分：{{i.avg_score?i.avg_score:'-'}}</view>
+					  <view>近三年均分：{{i.avg_score?i.avg_score:'-'}}</view>
                   </view>
                 </view>
               </view>
@@ -330,6 +331,7 @@ export default {
       isShowRegion: false,
       isShowYear: false,
       isShowSex: false,
+	  currentYear:'',
       sexList: [
         {
           value: "男",
@@ -577,6 +579,8 @@ export default {
     this.$refs.uForm.setRules(this.rules);
   },
   created() {
+	  let date = new Date()
+	this.currentYear = date.getFullYear()
     this.getArea().then((_) => this.getSchools());
   },
 };
diff --git a/package_sub/pages/SchoolList/SchoolList.vue b/package_sub/pages/SchoolList/SchoolList.vue
index ef0d26e..537cd2c 100644
--- a/package_sub/pages/SchoolList/SchoolList.vue
+++ b/package_sub/pages/SchoolList/SchoolList.vue
@@ -59,6 +59,11 @@
               <view class="list-item__tags--type" v-for="(tag, index1) in i.type" :key="index1">
                 {{ tag }}
               </view>
+			  <view class="list-item__tags--star" v-if="i.star">
+			    {{ i.star }}
+			  </view>
+			  
+			  
             </view>
             <view class="list-item__info">
               办学性质：{{ i.nature === 1 ? '公办' : (i.nature === 2 ? '民办' : '-') }}
@@ -82,11 +87,12 @@ export default {
       defaultTime: '',
       select: {
         name: "",
-        type: "",
+        type: "高中",
         nature: "",
         area_id: "",
         page: 1,
-        page_size: 10
+        page_size: 10,
+		from:1
       },
       scrollTop: 0,
       tableData: [
@@ -282,6 +288,13 @@ export default {
             background-color: rgba(233, 144, 50, 0.2);
             padding: 6rpx 18rpx;
           }
+		&--star{
+			color: #fff;
+			font-size: 24rpx;
+			border-radius: 20rpx;
+			background-color: #4186f2;
+			padding: 6rpx 18rpx;
+		  }
           & > view + view {
             margin-left: 10rpx;
           }
diff --git a/package_sub/pages/StudentInfo/StudentInfo.vue b/package_sub/pages/StudentInfo/StudentInfo.vue
index fa571d4..4bdf3bd 100644
--- a/package_sub/pages/StudentInfo/StudentInfo.vue
+++ b/package_sub/pages/StudentInfo/StudentInfo.vue
@@ -25,14 +25,14 @@
       </view>
       <view class="card">
         <u-form :model="form" ref="uForm" label-width="auto">
-          <u-form-item label="学生姓名" prop="name">
+          <u-form-item label="学生姓名" prop="name" required>
             <u-input v-model="form.name" placeholder="请输入" input-align="right" />
           </u-form-item>
           <u-form-item label="性别" prop="sex">
             <u-input type="select" v-model="form.sex" placeholder="请选择" input-align="right" @click="isShowSex = true"/>
           </u-form-item>
           <u-form-item label="年级" required prop="grade">
-            <u-input v-model="form.grade" placeholder="请输入" input-align="right" />
+            <u-input type="select" v-model="form.grade" placeholder="请选择" input-align="right" @click="isShowGrade = true"/>
           </u-form-item>
           <u-form-item label="中考年份" required prop="middle_exam_year">
             <u-input type="select" v-model="form.middle_exam_year" placeholder="请选择" input-align="right" @click="isShowYear = true" />
@@ -41,11 +41,15 @@
             <u-input v-model="form.nationality" placeholder="请输入" input-align="right" />
           </u-form-item> -->
           <u-form-item label="所在城市" required prop="city">
-            <u-input type="select" v-model="form.city" placeholder="请选择" input-align="right" @click="regionType = 'city',isShowRegion = true" />
-          </u-form-item>
+            <!-- <u-input type="select" v-model="form.city" placeholder="请输入" input-align="right" @click="regionType = 'city',isShowRegion = true" /> -->
+			<u-input disabled v-model="form.city" input-align="right" placeholder="请输入" />
+          
+		  </u-form-item>
           <u-form-item label="所在县区" required prop="area">
-            <u-input type="select" v-model="form.area" placeholder="请选择" input-align="right" @click="regionType = 'area',isShowRegion = true" />
-          </u-form-item>
+            <!-- <u-input type="select" v-model="form.area" placeholder="请选择" input-align="right" @click="regionType = 'area',isShowRegion = true" /> -->
+			<u-input type="select" v-model="form.area" placeholder="请选择" input-align="right" @click="isShowArea = true" />
+          
+		  </u-form-item>
           <u-form-item label="所在学校" required prop="school">
             <u-input v-model="form.school" placeholder="请输入" input-align="right" />
           </u-form-item>
@@ -95,6 +99,9 @@
     </view>
 
     <u-select v-model="isShowSex" :list="sexList" @confirm="e => form.sex = e[0].value"></u-select>
+	<u-select v-model="isShowGrade" :list="gradeList" @confirm="e => form.grade = e[0].value"></u-select>
+	<u-select v-model="isShowArea" :list="areaList" @confirm="e => form.area = e[0].value"></u-select>
+	
     <u-picker
         mode="time"
         v-model="isShowYear"
@@ -126,6 +133,9 @@ export default {
       isShowRegion: false,
       isShowYear: false,
       isShowSex: false,
+	  isShowGrade:false,
+	  isShowArea:false,
+	  areaList:[],
       sexList: [
         {
           value: '男',
@@ -140,13 +150,27 @@ export default {
           label: '保密'
         }
       ],
+	  gradeList: [
+	    {
+	      value: '初一',
+	      label: '初一'
+	    },
+	    {
+	      value: '初二',
+	      label: '初二'
+	    },
+	    {
+	      value: '初三',
+	      label: '初三'
+	    }
+	  ],
       form: {
         sex: '',
         nickname: '',
         mobile: '',
         country: '',
         province: '',
-        city: '',
+        city: '苏州市',
         headimgurl: '',
         grade: '',
         middle_exam_year: '',
@@ -178,6 +202,12 @@ export default {
         ]
       },
       rules: {
+	  name: [
+		{
+		  required: true,
+		  message: '请输入姓名'
+		}
+	  ],
         grade: [
           {
             required: true,
@@ -231,6 +261,14 @@ export default {
         console.error(err)
       }
     },
+	async getArea() {
+	  try {
+	    const res = await this.$u.api.area();
+	    this.areaList = res.list?.filter((i)=>i.group).map((i) => ({ label: i.name, value: i.name }));
+	  } catch (err) {
+	    console.error(err);
+	  }
+	},
     async onGetPhoneNumber(e) {
       try {
         if (e.detail.code) {
@@ -319,6 +357,7 @@ export default {
     }
   },
   onReady() {
+	  this.getArea()
     this.$refs.uForm.setRules(this.rules)
     this.getInfo()
   }
diff --git a/package_sub/pages/TargetCount/TargetCount.vue b/package_sub/pages/TargetCount/TargetCount.vue
index d605339..166839d 100644
--- a/package_sub/pages/TargetCount/TargetCount.vue
+++ b/package_sub/pages/TargetCount/TargetCount.vue
@@ -171,7 +171,7 @@ export default {
   background: #fff;
 }
 .container {
-  min-height: 100vh;
+  min-height: calc(100vh + 100rpx);
   background: #eaf8fe;
 }
 .search-bar {