vhs - index - batch step init

src/pagesOther/pages/vhs/index/components/batch-step.vue

@@ -1,27 +1,27 @@
 <template>
     <view class="p-30 fx-col gap-30">
-        <view class="bg-gradient-to-r from-primary-deep to-primary-light px-20 py-30 rounded-lg">
+        <view class="bg-gradient-to-r from-primary to-primary-500 px-20 py-30 rounded-lg">
             <view class="text-white font-bold">我的成绩</view>
-            <view class="mt-20 fx-row fx-bet-cen text-white text-2xs">
-                <text>省份：{{ userSnapshot.provinceName }}</text>
+            <view class="mt-20 flex justify-between items-center text-white text-2xs">
+                <text>省份：{{ userSnapshot.location }}</text>
                 <text>专业类别：{{ userSnapshot.examMajorName }}</text>
                 <text>总分：{{ model.score }}</text>
             </view>
         </view>
         <view class="text-center mt-50">（二）选择填报批次</view>
-        <view class="fx-col gap-20 mt-20">
+        <view class="flex flex-col gap-20 mt-20">
             <view @click="handleBatchSelect(item)" v-for="item in batchList"
-                  class="bg-gradient-to-b from-sky-100 to-white px-30 py-50 fx-row fx-bet-cen mx-card">
-                <view class="flex-1 fx-col">
-                    <view class="fx-row items-center">
+                  class="bg-gradient-to-b from-sky-100 to-white px-30 py-50 flex justify-between items-center rounded-lg shadow-card">
+                <view class="flex-1 flex flex-col">
+                    <view class="flex items-center">
                         <text class="text-xl mr-10 batch-name">{{ item.name }}</text>
                         <uv-tags v-if="item.recommand" text="重点推荐" type="error" shape="circle" size="mini"/>
                     </view>
                     <view class="text-2xs mt-20">{{ item.tips }}</view>
                 </view>
-                <view class="fx-col ai-cen">
+                <view class="flex flex-col items-center">
                     <uv-button type="primary" shape="circle" class="pointer-events-none"
-                               color="linear-gradient(to right, var(--primary-deep-color),var(--primary-light-color))"
+                               color="linear-gradient(to right, var(--primary-color),var(--primary-color-500))"
                                custom-style="height: 32px; border: none;" text="智能填报"/>
                     <!--                    <text class="f-tips f10 mt5">可填{{ getCollegeLimit(item.batch) }}所院校</text>-->
                 </view>
@@ -31,15 +31,15 @@
 </template>
 
 <script setup>
-import {watch} from 'vue';
-import {useInjectVoluntaryForm} from "@/pagesOther/pages/voluntary/hooks/useVoluntaryFormInjection";
-import {useInjectUserSnapshot} from "@/pagesOther/pages/ie/hooks/useUserSnapshotInjection";
-import {useInjectVoluntaryAssistant} from "@/pagesOther/pages/voluntary/hooks/useVoluntaryAssistantInjection";
-import {useInjectVoluntaryStep} from "@/pagesOther/pages/voluntary/hooks/useVoluntaryStepInjection";
+
+import {useInjectVoluntaryStep} from "@/pagesOther/pages/vhs/hooks/useVoluntaryStepInjection";
+import {useInjectVoluntaryForm} from "@/pagesOther/pages/vhs/hooks/useVoluntaryFormInjection";
+import {useInjectUserSnapshot} from "@/pagesOther/hooks/useUserSnapshotInjection";
+import {useInjectVoluntaryAssistant} from "@/pagesOther/pages/vhs/hooks/useVoluntaryAssistantInjection";
 
 const {currentStep} = useInjectVoluntaryStep()
 const {model, batch, batchList, loadBatchList} = useInjectVoluntaryForm()
-const {userSnapshot} = useInjectUserSnapshot()
+const userSnapshot = useInjectUserSnapshot()
 const {handleForward} = useInjectVoluntaryAssistant()
 
 const handleBatchSelect = (item) => {

src/pagesOther/pages/vhs/index/components/score-form.vue

@@ -82,7 +82,6 @@ const validateForm = async function () {
     await validate(score)
     // seat validate
     let error = ''
-    debugger
     if (!seatInput) error = '请输入位次'
     else if (seatInput && !/^[1-9]\d*$/.test(seatInput)) error = '请输入合法的位次'
     else if (!isScoreUnlocked.value && (seatInput < rank.highestRank || seatInput > rank.lowestRank)) error = `位次必须在[${rank.highestRank}~${rank.lowestRank}]之间`

src/pagesOther/pages/vhs/index/index.vue

@@ -7,7 +7,7 @@
                     <score-step/>
                 </swiper-item>
                 <swiper-item>
-<!--                    <batch-step/>-->
+                    <batch-step/>
                 </swiper-item>
                 <swiper-item>
 <!--                    <cart-step/>-->
@@ -19,7 +19,7 @@
 
 <script setup>
 import ScoreStep from "@/pagesOther/pages/vhs/index/components/score-step.vue";
-// import BatchStep from "@/pagesOther/pages/vhs/index/components/batch-step.vue";
+import BatchStep from "@/pagesOther/pages/vhs/index/components/batch-step.vue";
 // import CartStep from "@/pagesOther/pages/vhs/index/components/cart-step.vue";
 import {useProvideVoluntaryStep} from "@/pagesOther/pages/vhs/hooks/useVoluntaryStepInjection";
 import {useProvideVoluntaryData} from "@/pagesOther/hooks/useVoluntaryDataInjection";