From e20ecf787ad8ea947e60d67df501f21cb5194851 Mon Sep 17 00:00:00 2001
From: xjs <xjs@ycymedu.com>
Date: Fri, 21 Mar 2025 14:09:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=A9=E7=BC=A9=E6=8B=9B=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/messageBox/MessageBox.vue      |  25 +-
 .../home/college/components/Situation.vue     | 114 +++++---
 src/pages-sub/home/expand/index.vue           | 252 ++++++++++--------
 .../static/images/ucenter/no-vip.png          | Bin 0 -> 1296 bytes
 .../static/images/ucenter/vip-flag.png        | Bin 0 -> 592 bytes
 src/pages-sub/ucenter/active/activePage.vue   | 189 +++++++++++++
 src/pages.json                                |   7 +
 src/pages/ucenter/index/index.vue             |   8 +-
 src/service/index/api.ts                      |  36 +++
 src/types/uni-pages.d.ts                      |   1 +
 10 files changed, 475 insertions(+), 157 deletions(-)
 create mode 100644 src/pages-sub/static/images/ucenter/no-vip.png
 create mode 100644 src/pages-sub/static/images/ucenter/vip-flag.png
 create mode 100644 src/pages-sub/ucenter/active/activePage.vue

diff --git a/src/pages-sub/components/messageBox/MessageBox.vue b/src/pages-sub/components/messageBox/MessageBox.vue
index ebbeef9..4950e26 100644
--- a/src/pages-sub/components/messageBox/MessageBox.vue
+++ b/src/pages-sub/components/messageBox/MessageBox.vue
@@ -1,7 +1,10 @@
 <template>
   <Overlay :show="show">
-    <view class="w-[90%] bg-white wrapper flex flex-col rounded-[16rpx]">
-      <view class="relative flex items-center w-full justify-center py-[26rpx] title">
+    <view class="bg-white wrapper flex flex-col rounded-[16rpx]" :style="{ width: defaultWidth }">
+      <view
+        class="relative flex items-center w-full justify-center py-[26rpx] title"
+        v-show="title"
+      >
         <text class="text-[36rpx] text-[#303030] font-bold text-center">
           {{ title }}
         </text>
@@ -9,9 +12,13 @@
         <view
           class="i-carbon-close absolute right-[40rpx] text-[40rpx]"
           @click="emits('update:show', false)"
+          v-if="showClose"
         ></view>
       </view>
-      <view class="min-h-[200rpx] h-max-content overflow-y-auto px-[32rpx]">
+      <view
+        class="min-h-[200rpx] h-max-content overflow-y-auto"
+        :class="{ 'px-[32rpx]': defaultPadding }"
+      >
         <slot></slot>
       </view>
     </view>
@@ -30,6 +37,18 @@ defineProps({
     type: String,
     default: '提示',
   },
+  showClose: {
+    type: Boolean,
+    default: true,
+  },
+  defaultPadding: {
+    type: Boolean,
+    default: true,
+  },
+  defaultWidth: {
+    type: String,
+    default: '90%',
+  },
 })
 
 const emits = defineEmits(['update:show'])
diff --git a/src/pages-sub/home/college/components/Situation.vue b/src/pages-sub/home/college/components/Situation.vue
index 24fa29d..c64061a 100644
--- a/src/pages-sub/home/college/components/Situation.vue
+++ b/src/pages-sub/home/college/components/Situation.vue
@@ -1,13 +1,6 @@
 <template>
   <view class="flex flex-col pt-[32rpx] px-[32rpx] bg-[#fff]">
     <view class="flex flex-wrap justify-between items-center">
-      <view
-        @click="handleShow(1)"
-        class="px-[24rpx] py-[8rpx] bg-[#f8f8f8] rounded-[8rpx] flex justify-between items-center text-[24rpx]"
-      >
-        {{ year }}
-        <view class="i-carbon-chevron-down"></view>
-      </view>
       <view
         @click="handleShow(2)"
         class="px-[24rpx] py-[8rpx] bg-[#f8f8f8] rounded-[8rpx] flex justify-between items-center text-[24rpx]"
@@ -18,14 +11,30 @@
     </view>
 
     <scroll-view class="mt-[38rpx] flex-1 pb-safe">
-      <WXXTable :data="tableData">
-        <WXXTableCol prop="years" label="年份" width="10%"></WXXTableCol>
-        <WXXTableCol prop="batchName" label="院校/批次" width="19%"></WXXTableCol>
-        <WXXTableCol prop="selectsubject" label="选考要求" width="16%"></WXXTableCol>
-        <WXXTableCol prop="plancount" label="录取数" width="13%"></WXXTableCol>
-        <WXXTableCol prop="lowscore" label="分数" width="24%"></WXXTableCol>
-        <WXXTableCol prop="lowscorerank" label="最低位次" width="18%"></WXXTableCol>
-      </WXXTable>
+      <view
+        class="bg-[#F7F7F7] flex items-center justify-between text-[20rpx] text-[#333] sticky top-0 th-border"
+      >
+        <view class="px-[20rpx] w-[40rpx] td">代码</view>
+        <view class="flex-auto px-[25rpx] td">院校/专业名称</view>
+        <view class="w-[88rpx] text-center px-[22rpx] td">{{ year }}招生</view>
+        <view class="w-[88rpx] text-center px-[22rpx] td">{{ +year - 1 }}招生</view>
+      </view>
+
+      <view
+        class="item-wrapper flex items-center justify-between tbody-custom"
+        :key="index"
+        v-for="(item, index) in tableData"
+      >
+        <view class="px-[20rpx] w-[40rpx] td">{{ item.majorCode }}</view>
+        <view class="flex-1 p-[24rpx] td max-w-[400rpx]">
+          <view class="text-[22rpx] font-bold text-[#333]">{{ item.majorName }}</view>
+          <view class="text-[20rpx] text-[#636363]">
+            定向生录取分数要求按我校招生章程执行,可在统招线下20分内优录取:{{ item.selectsubject }}
+          </view>
+        </view>
+        <view class="w-[88rpx] text-center px-[22rpx] td">{{ item.newPlan }}</view>
+        <view class="w-[88rpx] text-center px-[22rpx] td">{{ item.oldPlan }}</view>
+      </view>
     </scroll-view>
 
     <ActionSheet v-model:show="show" title="">
@@ -38,7 +47,7 @@
           v-show="pickType === 2"
           @change="handleRegionChange"
           @change-name="handleRegionChangeName"
-          :defaultValue="[provinceCode]"
+          :defaultValue="provinceCode"
           :max="1"
         />
       </view>
@@ -51,9 +60,7 @@
 </template>
 
 <script lang="ts" setup>
-import WXXTable from '@/pages-sub/components/table/Table.vue'
-import WXXTableCol from '@/pages-sub/components/table/TableCol.vue'
-import { getPlanProList } from '@/service/index/api'
+import { getAdmissionTrendsByCollege } from '@/service/index/api'
 import { useUserStore } from '@/store'
 import Region from '@/pages-sub/home/components/Region.vue'
 import CustomPickerView from '@/pages-sub/components/CustomPickerView.vue'
@@ -69,10 +76,9 @@ const props = defineProps({
 const userStore = useUserStore()
 
 const provinceName = ref(userStore.userInfo.city.provincename)
-const provinceCode = userStore.userInfo.city.code
+const provinceCode = ref([userStore.userInfo.city.code])
 
-const year = ref('')
-const yearList = ref([])
+const year = ref(0)
 
 const pickList = ref([])
 const pickValue = ref('')
@@ -80,7 +86,6 @@ let pickType = 1
 
 const tableData = ref([])
 
-let isFirst = true
 watch(
   () => props.id,
   (newVal) => {
@@ -93,42 +98,34 @@ const handleShow = (type: number) => {
   show.value = true
   pickType = type
 
-  if (type === 1) {
-    pickList.value = yearList.value
-    pickValue.value = year.value
-  } else if (type === 2) {
+  if (type === 2) {
     pickList.value = []
   }
 }
 
 const getPlanProListData = async (newVal) => {
-  getPlanProList({
-    years: year.value === '全部年份' ? '' : year.value,
-    _uid: newVal,
-    batchName: '',
-    locationCode: userStore.userInfo.estimatedAchievement.provinceCode,
+  getAdmissionTrendsByCollege({
+    year: year.value,
+    uid: newVal,
+    locationCode: provinceCode.value[0],
   }).then((resp) => {
     if (resp.code === 200) {
       const _res = resp.result as {
-        batches: { batchName: string }[]
-        yearsDtos: string[]
-        plans: any[]
+        items: { batchName: string }[]
+        year: number
       }
-      yearList.value = ['全部年份', ..._res.yearsDtos]
 
-      // tableData.value = _res.plans
-
-      if (isFirst) {
-        year.value = yearList.value[0]
+      tableData.value = _res.items
+      if (_res.year !== year.value) {
+        year.value = _res.year
+        // getPlanProListData(props.id)
       }
-      isFirst = false
     }
   })
 }
 
 const handleConfirm = () => {
   if (pickType === 1) {
-    year.value = pickValue.value
   } else if (pickType === 2) {
   }
   show.value = false
@@ -136,14 +133,43 @@ const handleConfirm = () => {
 }
 
 const handleRegionChange = (val) => {
-  console.log(val)
+  provinceCode.value = val
+  getPlanProListData(props.id)
 }
 
 const handleRegionChangeName = (val) => {
-  console.log(val)
   provinceName.value = val.join(',')
 }
 </script>
 <style lang="scss" scoped>
 @import '@/pages-sub/home/styles/picker-view-btn.scss';
+
+.th-border {
+  border: 2rpx solid #eeeeee;
+
+  .td:not(:last-child) {
+    border-right: 2rpx solid #eeeeee;
+  }
+
+  .td {
+    padding-top: 16rpx;
+    padding-bottom: 16rpx;
+  }
+}
+
+.tbody-custom {
+  border-left: 2rpx solid #eee;
+  border-right: 2rpx solid #eee;
+  border-bottom: 2rpx solid #eee;
+  align-items: stretch;
+  .td:not(:last-child) {
+    border-right: 2rpx solid #eeeeee;
+  }
+  .td {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+}
 </style>
diff --git a/src/pages-sub/home/expand/index.vue b/src/pages-sub/home/expand/index.vue
index 239d3f5..68555a9 100644
--- a/src/pages-sub/home/expand/index.vue
+++ b/src/pages-sub/home/expand/index.vue
@@ -7,70 +7,116 @@
 </route>
 
 <template>
-  <view class="flex flex-col h-screen">
-    <view class="relative">
-      <Navbar
-        safeAreaInsetTop
-        bg-color="transparent"
-        :bordered="false"
-        left-arrow
-        title="查扩缩招"
-        @click-left="navigatorBack"
-      />
-      <view class="custom-background h-[200rpx] w-full absolute top-0 left-0 z-[-1]"></view>
-    </view>
-    <drop-menu>
-      <drop-menu-item
-        :key="1"
-        :title="searchParams.locationName || '省份'"
-        custom-class="flex items-center"
-      >
-        <view class="pl-[32rpx] pb-[32rpx]">
-          <Region
-            :defaultValue="searchParams.locationCode ? [searchParams.locationCode] : []"
-            :max="1"
-            @changeName="handleRegionChange"
-            @change="handleRegionChangeCode"
-          />
-        </view>
-      </drop-menu-item>
-      <drop-menu-item
-        :key="2"
-        :title="searchParams.searchNature || '层次'"
-        custom-class="flex items-center"
-      >
-        <view class="pl-[32rpx] pb-[32rpx]">
-          <Nature @changeName="handleNatureChange" />
-        </view>
-      </drop-menu-item>
-      <drop-menu-item :key="3" title="类别" custom-class="flex items-center">
-        <view class="pl-[32rpx] pb-[32rpx]">
-          <UniType
-            @change="handleUniTypeChange"
-            :max="1"
-            :default-value="searchParams.type ? [searchParams.type] : []"
-          />
-        </view>
-      </drop-menu-item>
-    </drop-menu>
-
-    <view class="px-32rpx">
-      <view class="flex items-center justify-between input-wrapper-class">
-        <input
-          v-model="searchParams.Score"
-          type="number"
-          placeholder="请输入你的高考分数"
-          confirm-type="done"
-          input-mode="numeric"
-          class="flex-auto"
+  <z-paging
+    ref="paging"
+    use-virtual-list
+    :force-close-inner-list="true"
+    cell-height-mode="dynamic"
+    @virtualListChange="virtualListChange"
+    @query="queryList"
+    :auto-show-system-loading="true"
+  >
+    <template #top>
+      <view class="relative">
+        <Navbar
+          safeAreaInsetTop
+          bg-color="transparent"
+          :bordered="false"
+          left-arrow
+          title="查扩缩招"
+          @click-left="navigatorBack"
         />
-        <view class="text-[#1580FF] text-[24rpx] search-text" @click="handleConfirm">查询</view>
+        <view class="custom-background h-[200rpx] w-full absolute top-0 left-0 z-[-1]"></view>
       </view>
-      <view class="text-[#636363] text-[20rpx] mt-[24rpx]">分数范围：{{ betweenScores }}</view>
-    </view>
+      <drop-menu>
+        <drop-menu-item :key="1" :title="'省份'" custom-class="flex items-center">
+          <view class="pl-[32rpx] pb-[32rpx]">
+            <Region
+              :defaultValue="searchParams.locationCode"
+              @changeName="handleRegionChange"
+              @change="handleRegionChangeCode"
+            />
+          </view>
+        </drop-menu-item>
+        <drop-menu-item :key="2" :title="'层次'" custom-class="flex items-center">
+          <view class="pl-[32rpx] pb-[32rpx]">
+            <Nature @changeName="handleNatureChange" />
+          </view>
+        </drop-menu-item>
+        <drop-menu-item :key="3" title="类别" custom-class="flex items-center">
+          <view class="pl-[32rpx] pb-[32rpx]">
+            <UniType @change-name="handleUniTypeChange" />
+          </view>
+        </drop-menu-item>
+      </drop-menu>
 
-    <view class="bg-[#F8F8F8] h-[16rpx] mt-[40rpx]"></view>
-  </view>
+      <view class="px-32rpx">
+        <view class="flex items-center justify-between input-wrapper-class">
+          <input
+            v-model="searchParams.collegeName"
+            placeholder="请输入院校名称"
+            confirm-type="done"
+            input-mode="numeric"
+            class="flex-auto"
+          />
+          <view class="text-[#1580FF] text-[24rpx] search-text" @click="handleConfirm">查询</view>
+        </view>
+      </view>
+      <view class="bg-[#F8F8F8] h-[16rpx] mt-[40rpx]"></view>
+    </template>
+    <view class="px-[32rpx] pt-[32rpx]">
+      <view
+        class="bg-[#F7F7F7] flex items-center justify-between text-[20rpx] text-[#333] px-[28rpx] py-[16rpx] sticky top-0"
+      >
+        <view class="flex-auto">院校</view>
+        <view class="w-[80rpx] text-center px-[25rpx]">招生专业</view>
+        <view class="w-[86rpx] text-center px-[25rpx]">{{ tModel.year }}计划</view>
+        <view class="w-[66rpx] text-center pl-[25rpx]">较{{ tModel.year - 1 }}</view>
+      </view>
+
+      <view
+        class="item-wrapper"
+        :id="`zp-id-${item.zp_index}`"
+        :key="item.zp_index"
+        v-for="(item, index) in lineList"
+      >
+        <view class="flex items-center justify-between text-[20rpx] text-[#333] py-[16rpx]">
+          <view class="flex-1 flex items-center">
+            <image :src="item.logo" mode="scaleToFill" class="w-[72rpx] h-[72rpx] mr-[6rpx]" />
+            <view class="ml-[6rpx]">
+              <view class="text-[32rpx] font-semibold">
+                {{ item.name }}
+              </view>
+              <view class="mt-[6rpx] text-[22rpx]">
+                <text class="mr-[16rpx]">{{ item.provinceName }}</text>
+                <text>排名：{{ item.rank }}</text>
+              </view>
+            </view>
+          </view>
+          <view class="w-[80rpx] text-center px-[25rpx]">{{ item.planCount }}</view>
+          <view class="w-[86rpx] text-center px-[25rpx]">{{ item.newPlan }}人</view>
+          <view class="w-[66rpx] text-center pl-[25rpx] pr-[28rpx]">
+            <text v-if="item.newPlan - item.oldPlan === 0">相同</text>
+            <view v-else class="flex items-center justify-center gap-[10rpx]">
+              <text>{{ item.newPlan - item.oldPlan }}</text>
+              <image
+                v-if="item.newPlan - item.oldPlan < 0"
+                src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAATCAYAAACORR0GAAAAAXNSR0IArs4c6QAAARRJREFUSEu91EFOhDAYhuH370TXHGGOwMaEuNJM4jnKCYwnEE4yeAoTE0LcsZwb6BE8wFC1OBBGO6UmZboikPTJ9/Uvkj3rtbqkMUqK9nb7xEJLrmv9Bqzt/kaJXgqTrNZawXYIshQmFjgH1kPnwEboP9jVi05XkLZ3VRU6O0dQCGaRixUNkBgo2k1VhmB/IB82RcbhCcSckBMzlEpxb5MckI/hOSTZSciFTVLkXcduqLC/gzPJvJAzGeTt5mcIflfpw2ah6YYGHgZkSBeKBUFzU+XDslo/YniNAp2q0b5XUNCRR4Nc2NiEoYwKebAqOmTPpK/reMU7o8NVcCH203vURDeNTvZ7UhGS7pMUIUFI5ftv8gVvqo+bwdfwaAAAAABJRU5ErkJggg=="
+                mode="scaleToFill"
+                class="w-[16rpx] h-[16rpx]"
+              />
+              <image
+                v-if="item.newPlan - item.oldPlan > 0"
+                src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAATCAYAAACORR0GAAAAAXNSR0IArs4c6QAAATlJREFUSEu11eFNwzAQBeB3gQEyAIV2g67QDewJgBGYgHYCRmhH8AbABHSDRhSJvxmA5sEFtTKuk7jIza9EivP57l0SQcZjY8z0ApgSGAtwI0ApInpdSkYH78bcicjy6JnkOiukQAwj8Jod+rD29qd1K78qkqusUAxRsCEX2aAQIXmviGam58mQTtTEuXVseGLItXNt+zSzAkgbhq0xjxCZg5yPnFv4WB/i3zdY0QHZr/KwAKlB2pFzL7Gqe6EjxMNEpPKmqxZydtXR2jarrhc2QGoNtBB50rc+WDOIdEIhst/tpzHjncizhyUhUagL2VfhYeVQuzqHYQj5gwFlXyZhJIeMUpH/foRb6NxIm5GPEKgK0p7SktQKZWvtG35/VtWOnE2cq1IXn3KfbIwpL4ti+dU0D+dCdEPf+I3M1u2H9e8AAAAASUVORK5CYII="
+                mode="scaleToFill"
+                class="w-[16rpx] h-[16rpx]"
+              />
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </z-paging>
 </template>
 
 <script lang="ts" setup>
@@ -82,81 +128,69 @@ import Region from '@/pages-sub/home/components/Region.vue'
 import UniType from '@/pages-sub/home/components/UniType.vue'
 import Nature from '@/pages-sub/home/components/Nature.vue'
 
-import { getBatchList } from '@/service/index/api'
+import { getAdmissionTrends } from '@/service/index/api'
 
 const userStore = useUserStore()
 
 const searchParams = ref({
-  locationCode: userStore.userInfo.estimatedAchievement.provinceCode || '370000',
-  locationName: userStore.userInfo.estimatedAchievement.provinceName || '山东省',
-  type: '',
-  searchNature: '',
-  Score: '',
+  locationCode: [userStore.userInfo.estimatedAchievement.provinceCode || '370000'],
+  locationName: [userStore.userInfo.estimatedAchievement.provinceName || '山东省'],
+  type: [],
+  searchNature: [],
+  collegeName: '',
 })
 
 const handleConfirm = () => {
-  getBatchListData()
+  paging.value.reload()
 }
 
-const betweenScores = ref('')
-
-const checkYearList = ref([])
-
 const navigatorBack = () => {
   uni.navigateBack()
 }
 
 const handleRegionChange = (val) => {
-  searchParams.value.locationName = val.join(',')
+  searchParams.value.locationName = val
 }
 const handleRegionChangeCode = (val) => {
-  searchParams.value.locationCode = val[0]
-  getBatchListData()
+  searchParams.value.locationCode = val
+  paging.value.reload()
 }
 
 const handleUniTypeChange = (val) => {
-  searchParams.value.type = val[0]
-  getBatchListData()
+  searchParams.value.type = val
+  paging.value.reload()
 }
 
-const handleNatureChange = (val) => {}
-
-type LineItem = {
-  batch_id: number
-  batch_name: string
-  province_code: number
-  province_name: string
-  score: string
-  subject_id: number
-  subject_name: string
-  year: number
+const handleNatureChange = (val) => {
+  searchParams.value.searchNature = val
+  paging.value.reload()
 }
 
-const lineList = ref<LineItem[]>([])
+const lineList = ref([])
+const tModel = ref({ year: 0 })
 
-const getBatchListData = () => {
-  getBatchList({
-    locationCode: searchParams.value.locationCode,
-    year: '',
-    type: searchParams.value.type,
-  }).then((resp) => {
-    if (resp.code === 200 && resp.result !== '暂无数据') {
-      const _result = resp.result as {
-        configList: { yearList: { year: string; check: boolean }[] }
-        list: LineItem[]
-      }
-      checkYearList.value = _result.configList.yearList
-
-      lineList.value = _result.list
-    } else if (resp.code === 200 && resp.result === '暂无数据') {
-      lineList.value = []
+const paging = ref(null)
+const queryList = (page: number, pageSize: number) => {
+  getAdmissionTrends({
+    pageIndex: page,
+    pageSize,
+    locationCode: userStore.userInfo.estimatedAchievement.provinceCode,
+    provinceName: searchParams.value.locationName,
+    utype: searchParams.value.type,
+    nature: searchParams.value.searchNature,
+    keyword: searchParams.value.collegeName,
+  }).then((res) => {
+    if (res.code === 200) {
+      paging.value.complete((res.result as { rows: any[] }).rows)
+      tModel.value.year = (res.result as { tModel: { year: number } }).tModel.year
+    } else {
+      paging.value.complete([])
     }
   })
 }
-
-onBeforeMount(() => {
-  getBatchListData()
-})
+const virtualListChange = (_vList) => {
+  lineList.value = _vList
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages-sub/static/images/ucenter/no-vip.png b/src/pages-sub/static/images/ucenter/no-vip.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2ad81758f5daf023fb42d614cc021b55be5dd45
GIT binary patch
literal 1296
zcmeAS@N?(olHy`uVBq!ia0vp^HbBhB!3-o_CiFi8QjEnx?oJHr&dI!FU|<pm@Ck7R
z3If4@Fj%!}6_DP)fB%^?XMpT0SFS+VK*o_HM{eA>apJ@YpcGK>@ZrOkE?qiy?AXbZ
zCxIg8&Yin>@gh+6^5x4w?u82%PMtahR0EMZe*F09)2D%gKoTedlmaq<8iBeX?6YUj
z0vSL66agv#%0fhd3<v;<0~tUmpg52LB!SxDYT)7!H4rP{D&cy8=0o&Clz}Zg1+fl7
zLbL#7fl@#btN@}HNJ0Qm3tSmc1jq#fAOk1}AtAEJih&9sf^Y^_^*}Xf3Lv`R1|l;c
zCcxDLrO<4L>xH-k&c$RrnV#<pOc3i!g8YIR7#W$EnORub*f_X&czOBw1q20!ghfQf
z#Kk40W##1L6_nJ}H4F?*OiaxztnBO^UEDo9z5M+A0|G<BqoQMC;}et8GcvQXb8>PE
zib_gL%gQS%E30ej>swme+b2z(HhtFYIrHW(UbcMs>h&8oZrrqW>-HTxckSM@XYby9
z`wtvGa^eIqd7V3d;ljmBm#<#Ce(UbNhmRgVfAR9=tJiPdzI*@i)8{W=zkUDy<L9s6
zfBybko?+MxOyZwCT^vI+&QG26GTMhx<XC;zv9RK$Q&cvkXkQmvClIcDEKi5?;#QSY
zvrN5jdU<Z2v}j5Y+tEG$7x9;CJ&u0Ay?EZ|>T{L%p9@S3;oGn&zDvYdQ}^wJIfiBy
z_vVRmu%t0hm};vipLuhoireay54_IR=S)hJc>Bxvz5!3o;#mPw%dZ^aTrcs}_2G@Z
z_m3^Fo|zfy^;|c5`;)xJ);?qP{mY&`n5Ve+P;+te4VK&6{JqX@%Z)xDoXPpb>$<|y
zjT;SLH(vP^xT=>qyvk7EvHAT?YlL2IOpOc^I@WQI*?Ot*h8N9j#a~`-`<1uy?(H=a
zWxw|8J#W=o`fSstP0KIsO{!SgmMfKWIbim?{(}<}cAcL;@ge(+ZLzz872m$U+W++9
z-2F?=$HvCmFP(S#gKMaw?VgqCSGD>NO;kv{{PUh|k;sEdTlPhrS~=aQ^L=1F(}yUp
z_LP@*j=l(Nx3Lgv+3+$X;0oswp4FvZ-AbL|OG=-3PGzW-VhHng-FoYf$L@Ro;+S{L
zyT9S(m7C_T8V+CDw<EE%IEJer>=vVnH?PCOFV9{z?m6V(xIjU)VDFkk%PtrGbuufs
zp6hjL%B!0XcDYw9zqs>&)=I7wm#<IUsI#4EZQQxU%PVJ8++tlg;i+r=t`hwNn=W1I
tH8^Y{E}iY`Uzaf1{9nz{jY4WG_uu^gT`y$8GjmW`=IQF^vd$@?2>|A+77YLZ

literal 0
HcmV?d00001

diff --git a/src/pages-sub/static/images/ucenter/vip-flag.png b/src/pages-sub/static/images/ucenter/vip-flag.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b35d37c48f5ca842339a1881dcaa7ca89808519
GIT binary patch
literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq002Ay000gM1^@s6b54KM00001b5ch_0Itp)
z=>Px%3Q0skR7gwR*1<~@VHn5p?{8);g$%Nbr(jDeqpZVrFz8SuE=wR%;L;@wI#@E`
zB@bSL>?9S1<Pu$iE=fT`MHWaM3f4nlLK}h9DWZdcMT^AF6Ekbh?)n$Jy{DOZ=kR`b
zp653s`+O?|M6#xo4ldN(V@uaFc&Qh_wzcO5-bJN{r)uAG;aawIZ8zcSb5J@yu)=~m
z#)keK-ad|J@cnwMyg(hJlP&-o&lp$MN@FEpZ@g&~wC`#Rw#7>sQcaDO4b*wXNo-ut
zDr}?#Rs~}P9k@AUi^Ca+u$Hv3DNxr9XR!(R-T9=#P{97&Lru@>X4X@nLwB6UCgAxq
zH7#vLq)uS#dO$@pd-%Td*aZBxueQQ<0SyXt<ne!jO~9{Dl+apeC0qjn{NK}TUj4!M
zR10leTH@{HUuETrEAFQBTz6xIji`-}y_vMR?lO?Y$Ro}I5wr~|V>&)R;TpP{(z9K)
zU?U2so`txLZMLh7EK8_7s9D*CL3?@d9HCuS@B1BYf}iXxAw{1hLw=y#r}de&r@P9i
zlEwTyX8R$$i`0*K+jVm3sGH!K_Nc;pzzfv(wJxA+roD{TS{i!6D<YPugcIuj_Qg%`
zqt*|YZtL{QhBUT^t!2EZrM*0|W}W&u=o+&2yww?g;O8_@iGDOTESvUU;Z;Vccs;--
e4TR$^gZ~0o(zp-ljG(Uo0000<MNUMnLSTa0avH_}

literal 0
HcmV?d00001

diff --git a/src/pages-sub/ucenter/active/activePage.vue b/src/pages-sub/ucenter/active/activePage.vue
new file mode 100644
index 0000000..cd3e643
--- /dev/null
+++ b/src/pages-sub/ucenter/active/activePage.vue
@@ -0,0 +1,189 @@
+<route lang="json5" type="page">
+{
+  style: {
+    navigationStyle: 'custom',
+  },
+}
+</route>
+
+<template>
+  <view class="h-screen flex flex-col">
+    <view class="relative">
+      <Navbar
+        safeAreaInsetTop
+        bg-color="transparent"
+        :bordered="false"
+        left-arrow
+        title="卡密兑换"
+        @click-left="navigatorBack"
+        content-class="justify-between"
+      ></Navbar>
+      <view class="bg-[#fff] rounded-[8rpx] px-[46rpx] pt-[40rpx] pb-[60rpx] mx-[30rpx] mt-[40rpx]">
+        <view class="flex items-center gap-[12rpx]">
+          <image
+            :src="userStore.userInfo?.avatar"
+            mode="scaleToFill"
+            class="w-[60rpx] h-[60rpx] rounded-full"
+          />
+          <text class="text-[#000] text-[36rpx] font-bold">{{ userStore.userInfo?.nickname }}</text>
+          <image
+            src="@/pages-sub/static/images/ucenter/vip-flag.png"
+            mode="scaleToFill"
+            v-if="userStore.userInfo?.estimatedAchievement.isVIP"
+          />
+          <image
+            v-else
+            src="@/pages-sub/static/images/ucenter/no-vip.png"
+            mode="scaleToFill"
+            class="w-[120rpx] h-[28rpx]"
+          />
+        </view>
+
+        <view class="mt-[40rpx]">
+          <view
+            class="flex items-center gap-[10rpx] px-[30rpx] py-[25rpx] rounded-[20rpx] bg-[#f5f5f5] mb-[40rpx]"
+          >
+            <view class="i-carbon-account text-[#999999]"></view>
+            <input
+              v-model="cardNumber"
+              type="number"
+              placeholder="请输入卡号"
+              confirm-type="done"
+              class="text-start flex-auto"
+            />
+          </view>
+
+          <view
+            class="flex items-center gap-[10rpx] px-[30rpx] py-[25rpx] rounded-[20rpx] bg-[#f5f5f5]"
+          >
+            <view class="i-carbon-locked text-[#999999]"></view>
+            <input
+              v-model="cardPassword"
+              type="number"
+              placeholder="请输入卡密"
+              confirm-type="done"
+              class="text-start flex-auto"
+            />
+          </view>
+        </view>
+
+        <button class="submit-button" @click="handleActive">立即兑换</button>
+        <view
+          class="text-[#999] text-[24rpx] text-center mt-[20rpx] mb-[30rpx] text-center"
+          v-show="userStore.userInfo.estimatedAchievement.isVIP"
+        >
+          到期时间:2025-08-31
+        </view>
+      </view>
+      <view class="custom-background h-[780rpx] w-full absolute top-0 left-0 z-[-1]"></view>
+    </view>
+
+    <view class="flex flex-col items-start justify-center text-[#999] text-[28rpx] px-[46rpx]">
+      <text class="text-[#333] text-[30rpx] font-semibold mb-[20rpx]">兑换规则</text>
+      <text class="mb-[20rpx]">
+        1.适用对象：普通类文理科考生、新高考选科类考生 （提前批次及艺术体育类考生暂不适用)
+      </text>
+      <text class="mb-[20rpx]">2.使用时效：有效期截止到用户自行选择高考年的8月31日为止。</text>
+      <text>3.这里是兑换规则介绍详情。</text>
+    </view>
+  </view>
+
+  <MessageBox
+    :show="showMessageBox"
+    title=""
+    :show-close="false"
+    :defaultPadding="false"
+    default-width="472rpx"
+  >
+    <template>
+      <view class="mt-[60rpx] flex flex-col items-center">
+        <image
+          src="data:image/png;base64,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"
+          mode="aspectFit"
+          class="h-[112rpx]"
+        />
+        <text class="text-[40rpx] font-semibold my-[10rpx]">兑换成功</text>
+        <text class="text-[28rpx] text-[#666] text-center px-[39rpx]">
+          您已成功兑换六纬高级会员，快去体验吧！
+        </text>
+        <view class="h-[2rpx] bg-[#E5E5E5] w-full mt-[20rpx]"></view>
+        <view
+          class="w-full text-[#9D5800] py-[26rpx] text-center text-[36rpx] font-bold"
+          @click="handleStart"
+        >
+          开启六纬之旅
+        </view>
+      </view>
+    </template>
+  </MessageBox>
+</template>
+
+<script setup lang="ts">
+import Navbar from '@/pages-sub/components/navbar/Navbar.vue'
+import MessageBox from '@/pages-sub/components/messageBox/MessageBox.vue'
+import { activeCard } from '@/service/index/api'
+
+import { useUserStore } from '@/store/user'
+
+const userStore = useUserStore()
+
+const cardNumber = ref('')
+const cardPassword = ref('')
+
+const navigatorBack = () => {
+  uni.navigateBack()
+}
+
+const showMessageBox = ref(false)
+
+const handleStart = () => {
+  showMessageBox.value = false
+}
+
+const handleActive = () => {
+  activeCard({
+    cardCode: cardNumber.value,
+    cardPwd: cardPassword.value,
+  }).then((res) => {
+    if (res.code === 200) {
+      showMessageBox.value = true
+    } else {
+      uni.showToast({
+        title: res.message,
+        icon: 'none',
+      })
+    }
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+.custom-background {
+  background: linear-gradient(180deg, #fbddbf 0%, rgba(251, 221, 191, 0) 100%);
+  background-position: 50% 50%;
+  background-origin: padding-box;
+  background-clip: border-box;
+  background-size: auto auto;
+}
+
+.submit-button {
+  background: linear-gradient(270deg, #f9e1b5 0%, #e4be80 100%);
+  border-radius: 16rpx 16rpx 16rpx 16rpx;
+  color: #9d5800;
+  font-weight: 500;
+  font-size: 32rpx;
+  border-radius: 16rpx;
+  margin-top: 60rpx;
+}
+
+.check-style {
+  width: 112rpx;
+  height: 112rpx;
+  background: linear-gradient(270deg, #f9e1b5 0%, #e4be80 100%);
+  box-shadow: 0rpx 12rpx 24rpx 0rpx rgba(228, 190, 128, 0.2);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
diff --git a/src/pages.json b/src/pages.json
index e6d54e1..9795fc0 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -256,6 +256,13 @@
             "navigationBarTitleText": "当前志愿表"
           }
         },
+        {
+          "path": "ucenter/active/activePage",
+          "type": "page",
+          "style": {
+            "navigationStyle": "custom"
+          }
+        },
         {
           "path": "ucenter/appointment/appointment",
           "type": "page",
diff --git a/src/pages/ucenter/index/index.vue b/src/pages/ucenter/index/index.vue
index e137c61..2e3f1c7 100644
--- a/src/pages/ucenter/index/index.vue
+++ b/src/pages/ucenter/index/index.vue
@@ -85,7 +85,7 @@
         <text>我的预约</text>
         <view class="i-carbon-chevron-down rotate-270 text-[#BFBFBF]"></view>
       </view>
-      <view class="flex items-center justify-between mx-[32rpx] py-[28rpx]">
+      <view class="flex items-center justify-between mx-[32rpx] py-[28rpx]" @click="goActive">
         <text>激活记录</text>
         <view class="i-carbon-chevron-down rotate-270 text-[#BFBFBF]"></view>
       </view>
@@ -155,6 +155,12 @@ const goAppointment = () => {
     url: '/pages-sub/ucenter/appointment/appointment',
   })
 }
+
+const goActive = () => {
+  uni.navigateTo({
+    url: '/pages-sub/ucenter/active/activePage',
+  })
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/service/index/api.ts b/src/service/index/api.ts
index 02cb243..32b26b4 100644
--- a/src/service/index/api.ts
+++ b/src/service/index/api.ts
@@ -326,3 +326,39 @@ export const getWishList = () => {
 export const deleteWishList = (params: { id: number }) => {
   return http.post('/api/volunTb/delete', params)
 }
+
+export const activeCard = (params: { cardCode: string; cardPwd: string }) => {
+  return http.post('/api/Zyvip/bind', params)
+}
+
+export const getAdmissionTrends = (params: {
+  ascription?: string[] | null
+  /**
+   * 985、211
+   */
+  feature?: string[] | null
+  keyword?: null | string
+  /**
+   * 本科0专科1
+   */
+  level?: number | null
+  /**
+   * 用户所在省份编码
+   */
+  locationCode?: null | string
+  nature?: string[] | null
+  pageIndex?: number
+  pageSize?: number
+  provinceName?: string[] | null
+  utype?: string[] | null
+}) => {
+  return http.post('/api/admissionstreds/university', params)
+}
+
+export const getAdmissionTrendsByCollege = (params: {
+  uid: number
+  year: number
+  locationCode: string
+}) => {
+  return http.get('/api/admissionstreds/major', params)
+}
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index d69f16f..ed1ac88 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -29,6 +29,7 @@ interface NavigateToOptions {
        "/pages-sub/home/schoolRank/index" |
        "/pages-sub/home/wishesList/index" |
        "/pages-sub/home/wishesList/wishesList" |
+       "/pages-sub/ucenter/active/activePage" |
        "/pages-sub/ucenter/appointment/appointment" |
        "/pages-sub/ucenter/evaluate/evaluateList" |
        "/pages-sub/ucenter/star/myStar" |