From f612399e9221541197a5c78526ff0c3a25c071fd Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Fri, 14 Mar 2025 15:36:43 +0800
Subject: [PATCH] init

---
 package_sub/pages/BatchDetail/BatchDetail.vue | 10 +--
 package_sub/pages/BatchForm/BatchForm.vue     | 76 ++++++++++++-------
 2 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/package_sub/pages/BatchDetail/BatchDetail.vue b/package_sub/pages/BatchDetail/BatchDetail.vue
index 36ccfd3..fb9a620 100644
--- a/package_sub/pages/BatchDetail/BatchDetail.vue
+++ b/package_sub/pages/BatchDetail/BatchDetail.vue
@@ -8,11 +8,9 @@
 
       <view class="card" v-for="batch in detail.data" :key="batch.batchId">
         <view class="card__title">
-          <scroll-view scroll-x="true" >
-            <view class="batch__title">
-              {{ batch.name || '-' }}
-            </view>
-          </scroll-view>
+          <view class="batch__title">
+            {{ batch.name || '-' }}
+          </view>
         </view>
 
         <view class="card__body">
@@ -245,8 +243,6 @@ export default {
   color: #e77817;
   font-weight: 500;
   padding: 30rpx 20rpx;
-  word-break: keep-all;
-  white-space: nowrap;
 }
 .batch-sub {
   &__title {
diff --git a/package_sub/pages/BatchForm/BatchForm.vue b/package_sub/pages/BatchForm/BatchForm.vue
index 1cac398..7af7235 100644
--- a/package_sub/pages/BatchForm/BatchForm.vue
+++ b/package_sub/pages/BatchForm/BatchForm.vue
@@ -1,8 +1,10 @@
 <template>
   <view class="container safe-area-inset-bottom">
     <image class="bkg" src="~@/static/me/wave.png" mode="widthFix"></image>
+    <u-notice-bar class="notice-bar" v-if="aspiration && aspiration.tip" :list="[aspiration.tip]"></u-notice-bar>
 
     <view class="wrap" v-if="step === 1">
+
       <view class="year-picker">
         <view class="year-picker__title">报考年份</view>
         <u-input class="year-picker__input"
@@ -16,7 +18,7 @@
                  }"
                  @click="isShowTime = true"></u-input>
       </view>
-      <view class="user-form" v-if="aspiration.need_sign">
+      <view class="user-form" v-if="false">
         <view class="user-form__input">
           <u-form :model="form" ref="uForm" :label-style="{ 'font-weight': '500' }" label-width="auto">
             <u-form-item label="学生姓名" required prop="name">
@@ -34,9 +36,9 @@
       <view class="area-pick">
         <view class="area-pick__title">所在区域</view>
         <view class="area-pick__panel">
-          <view v-for="(group, groupId) in groupArea" :key="groupId" class="area-item" @click="form.group = group.map(i => i.name).toString()">
-            {{ group.map(i => i.name).toString() }}
-            <u-icon class="area-item__tag" v-if="form.group === group.map(i => i.name).toString() " name="checkmark-circle-fill" color="#fff" :size="64" />
+          <view v-for="(group, groupId) in groupArea" :key="groupId" class="area-item" @click="form.group = groupId">
+            {{ groupId }}
+            <u-icon class="area-item__tag" v-if="form.group === groupId" name="checkmark-circle-fill" color="#fff" :size="64" />
           </view>
         </view>
       </view>
@@ -70,17 +72,15 @@
 
       <view class="card" v-for="item in currentBatchSub" :key="item.id">
         <view class="card__title">
-          <scroll-view scroll-x="true" >
-            <view class="batch-sub__title">
-              {{ item.name }}
-            </view>
-          </scroll-view>
+          <view class="batch-sub__title">
+            {{ item.name || '-' }}
+          </view>
         </view>
 
         <view class="card__body">
           <view class="batch-sub-school" v-for="school in item.batch_sub_schools" :key="school.id">
             <view class="batch-sub-school__name">
-              志愿序号 {{ school.number }}
+              志愿序号 {{ school.number || '-' }}
             </view>
             <view class="batch-sub-school__form sub-form1">
               <view class="sub-form1__row sub-form1-title">
@@ -128,7 +128,7 @@
 
               <view class="sub-form2__row" v-for="(spec, specIndex) in school.specialty" :key="spec.number">
                 <view class="sub-form2__col1">
-                  {{ spec.number }}
+                  {{ spec.number || '-' }}
                 </view>
                 <view class="sub-form2__col2">
                   <u-input
@@ -237,7 +237,8 @@
     <u-modal v-model="isShowWhite" content="您暂时没有填报权限" @confirm="$u.route({ type: 'back' })"></u-modal>
     <u-modal v-model="isShowModal" content="确认提交数据？" show-cancel-button @confirm="submit"></u-modal>
 
-    <u-select v-model="isShowSchoolSelect" mode="mutil-column-auto" :list="schoolList" @confirm="schoolListConfirm" @cancel="schoolListCancel"></u-select>
+<!--    <u-select v-model="isShowSchoolSelect" mode="mutil-column-auto" :list="schoolList" @confirm="schoolListConfirm" @cancel="schoolListCancel"></u-select>-->
+    <u-select v-model="isShowSchoolSelect" :list="schoolList" @confirm="schoolListConfirm" @cancel="schoolListCancel"></u-select>
     <u-select v-model="isShowSpecSelect" :list="specList" @confirm="specListConfirm" @cancel="specListCancel"></u-select>
   </view>
 </template>
@@ -314,8 +315,8 @@ export default {
     },
     schoolListConfirm(e) {
       console.log(e)
-      if (e[1]) {
-        const { label, value, extra } = e[1]
+      if (e[0]) {
+        const { label, value, extra } = e[0]
         if (this.forSchoolName.code) {
           this.flatForm[this.forSchoolName.code] = value
         }
@@ -344,18 +345,24 @@ export default {
       try {
         const { list } = await this.$u.api.schoolList({
           page: 1,
-          page_size: 9999
+          page_size: 9999,
+          group: this.aspiration.group
         })
-        this.schoolList = this.areaList.map(area => ({
-          id: area.id,
-          value: area.id,
-          label: area.name,
-          children: list.data.filter(school => school.area_id === area.id)?.map(i => ({
-            value: i.code,
-            label: i.name,
-            extra: i.id
-          }))
+        this.schoolList = list.data.map(school => ({
+          value: school.code,
+          label: school.name,
+          extra: school.id
         }))
+        // this.schoolList = this.areaList.map(area => ({
+        //   id: area.id,
+        //   value: area.id,
+        //   label: area.name,
+        //   children: list.data.filter(school => school.area_id === area.id)?.map(i => ({
+        //     value: i.code,
+        //     label: i.name,
+        //     extra: i.id
+        //   }))
+        // }))
       } catch (err) {
         console.error(err)
       }
@@ -453,6 +460,7 @@ export default {
           this.setTitle()
         } else {
           this.$u.toast("暂未获取到当年模版")
+          this.stepClick('prev')
         }
       } catch (err) {
         console.error(err)
@@ -462,12 +470,17 @@ export default {
       if (type === 'next') {
         if (this.step === 1 && !this.config) {
           await this.getConfig()
+          await this.getSchools()
         }
         if (this.step < (1 + this.batches.length)) {
           this.step = this.step + 1
         }
       } else if (type === 'prev') {
-        if (this.step > 1) {
+        if (this.step === 1) {
+          this.form.group = ''
+          this.config = null
+        }
+        else if (this.step > 1) {
           this.step = this.step - 1
         }
       }
@@ -477,7 +490,7 @@ export default {
     },
     setTitle() {
       uni.setNavigationBarTitle({
-        title: `志愿模拟填报 - Step ${this.step}${ this.step !== 1 ? ('/'+(this.batches.length)) : '' }`
+        title: `志愿模拟填报 - Step ${this.step}${ this.step !== 1 ? ('/'+(this.batches.length+1)) : '' }`
       })
     },
     async getArea() {
@@ -593,6 +606,14 @@ export default {
   width: 100vw;
   background: #eaf8fe;
 
+  .notice-bar {
+    position: sticky;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 5;
+  }
+
   .bkg {
     width: 100vw;
     position: fixed;
@@ -774,8 +795,6 @@ export default {
         color: #e77817;
         font-weight: 500;
         padding: 30rpx 20rpx;
-        word-break: keep-all;
-        white-space: nowrap;
       }
 
       &-is-obey {
@@ -855,6 +874,7 @@ export default {
       font-size: 28rpx;
       text-transform: uppercase;
       color: #333333;
+      text-align: center;
     }
     &__col2 {
       flex-basis: 29%;