From 5f3d4748b4b9d0a837d78c2a7c2f365ffcbec264 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Thu, 20 Mar 2025 17:50:13 +0800
Subject: [PATCH] init

---
 common/http.api.js                            |   9 +
 .../pages/HistoryScore/HistoryScore.vue       |   2 +-
 .../IndependentDetail/IndependentDetail.vue   | 218 ++++++++++++++++++
 .../pages/IndependentList/IndependentList.vue | 167 ++++++++++++++
 .../IndependentRecruitment.vue                |   4 +-
 .../pages/RecommendForm/RecommendForm.vue     | 100 ++++++--
 package_sub/pages/SchoolList/SchoolList.vue   |  17 ++
 pages.json                                    |  14 ++
 pages/index/index.vue                         | 121 ++++++----
 pages/me/me.vue                               |   4 +-
 static/index/title.png                        | Bin 6381 -> 7912 bytes
 static/index/zizhuzhaosheng.png               | Bin 0 -> 1227 bytes
 12 files changed, 586 insertions(+), 70 deletions(-)
 create mode 100644 package_sub/pages/IndependentDetail/IndependentDetail.vue
 create mode 100644 package_sub/pages/IndependentList/IndependentList.vue
 create mode 100644 static/index/zizhuzhaosheng.png

diff --git a/common/http.api.js b/common/http.api.js
index a30ae4e..dcc7b13 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -1,5 +1,6 @@
 //api集合
 let apiApp = {
+	parameterShow: '/api/admin/parameter/show',
     schoolList: '/api/mobile/school/index',
 	schoolDetail: '/api/mobile/school/detail',
 	area: '/api/mobile/school/area',
@@ -7,6 +8,8 @@ let apiApp = {
 	middleSchoolIndicatorList: '/api/mobile/school/middle-school-indicator',
 	middleSchoolIndicatorDetail: '/api/mobile/school/middle-school-indicator-detail',
 	independentRecruitmentsSubmit: '/api/mobile/batch/independent-recruitments-submit',
+	independentRecruitmentsIndex: '/api/mobile/batch/independent-recruitment-index',
+	independentRecruitmentsDetail: '/api/mobile/batch/independent-recruitment-detail',
 	batchIndex: '/api/mobile/batch/index',
 	batchDetail: '/api/mobile/batch/detail',
 	batchSubmit: '/api/mobile/batch/user-submit',
@@ -39,6 +42,7 @@ const install = (Vue, vm) => {
 	const sendSms = (params = {}) => vm.$u.get(apiUser.sendSms, params)
 	//
 
+	const parameterShow = (params = {}) => vm.$u.get(apiApp.parameterShow, params)
 	const schoolList = (params = {}) => vm.$u.get(apiApp.schoolList, params)
 	const schoolDetail = (params = {}) => vm.$u.get(apiApp.schoolDetail, params)
 	const area = (params = {}) => vm.$u.get(apiApp.area, params)
@@ -46,6 +50,8 @@ const install = (Vue, vm) => {
 	const middleSchoolIndicatorList = (params = {}) => vm.$u.get(apiApp.middleSchoolIndicatorList, params)
 	const middleSchoolIndicatorDetail = (params = {}) => vm.$u.get(apiApp.middleSchoolIndicatorDetail, params)
 	const independentRecruitmentsSubmit = (params = {}) => vm.$u.post(apiApp.independentRecruitmentsSubmit, params)
+	const independentRecruitmentsIndex = (params = {}) => vm.$u.get(apiApp.independentRecruitmentsIndex, params)
+	const independentRecruitmentsDetail = (params = {}) => vm.$u.get(apiApp.independentRecruitmentsDetail, params)
 	const batchIndex = (params = {}) => vm.$u.get(apiApp.batchIndex, params)
 	const batchDetail = (params = {}) => vm.$u.get(apiApp.batchDetail, params)
 	const batchSubmit = (params = {}) => vm.$u.post(apiApp.batchSubmit, params)
@@ -65,6 +71,7 @@ const install = (Vue, vm) => {
 		bindMobile,
 		sendSms,
 		//
+		parameterShow,
 		schoolList,
 		schoolDetail,
 		area,
@@ -72,6 +79,8 @@ const install = (Vue, vm) => {
 		middleSchoolIndicatorList,
 		middleSchoolIndicatorDetail,
 		independentRecruitmentsSubmit,
+		independentRecruitmentsIndex,
+		independentRecruitmentsDetail,
 		batchIndex,
 		batchDetail,
 		batchSubmit,
diff --git a/package_sub/pages/HistoryScore/HistoryScore.vue b/package_sub/pages/HistoryScore/HistoryScore.vue
index b1ee75d..dbc3d2d 100644
--- a/package_sub/pages/HistoryScore/HistoryScore.vue
+++ b/package_sub/pages/HistoryScore/HistoryScore.vue
@@ -78,7 +78,7 @@ export default {
       defaultTime: '',
       select: {
         keyword: "",
-        year: new Date().getFullYear().toString(),
+        year: (new Date().getFullYear() - 1).toString(),
         area_id: "",
         school_name: ""
       },
diff --git a/package_sub/pages/IndependentDetail/IndependentDetail.vue b/package_sub/pages/IndependentDetail/IndependentDetail.vue
new file mode 100644
index 0000000..258e245
--- /dev/null
+++ b/package_sub/pages/IndependentDetail/IndependentDetail.vue
@@ -0,0 +1,218 @@
+<template>
+  <view class="container safe-area-inset-bottom">
+    <view class="wrap">
+      <view class="picked-data">
+        <view>{{ detail.year || '-' }}年</view>
+        <view>{{ detail.area ? detail.area.group : "-" }}</view>
+      </view>
+
+      <view class="card">
+        <view class="card__title">
+          基本信息
+        </view>
+
+        <view class="card__body">
+          <view class="info-row">
+            <view class="info-row__title">学生姓名</view>
+            <view class="info-row__value">{{ detail.name || ' ' }}</view>
+          </view>
+          <view class="info-row">
+            <view class="info-row__title">性别</view>
+            <view class="info-row__value">{{ detail.sex || ' ' }}</view>
+          </view>
+          <view class="info-row">
+            <view class="info-row__title">准考号</view>
+            <view class="info-row__value">{{ detail.number || ' ' }}</view>
+          </view>
+          <view class="info-row">
+            <view class="info-row__title">考生类别</view>
+            <view class="info-row__value">{{ detail.type || ' ' }}</view>
+          </view>
+          <view class="info-row">
+            <view class="info-row__title">民族</view>
+            <view class="info-row__value">{{ detail.nationality || ' ' }}</view>
+          </view>
+          <view class="info-row">
+            <view class="info-row__title">户籍地址</view>
+            <view class="info-row__value">{{ detail.address || ' ' }}</view>
+          </view>
+          <view class="info-row">
+            <view class="info-row__title">移动电话</view>
+            <view class="info-row__value">{{ detail.mobile || ' ' }}</view>
+          </view>
+          <view class="info-row">
+            <view class="info-row__title">毕业学校</view>
+            <view class="info-row__value">{{ detail.school || ' ' }}</view>
+          </view>
+        </view>
+      </view>
+
+      <view class="card">
+        <view class="card__title">
+          自主招生(含课程基地实验项目)
+        </view>
+
+        <view class="card__body">
+          <view class="info-row">
+            <view class="info-row__title">其他专业是否服从</view>
+            <view class="info-row__value">{{ detail.is_independent ? '是' : '否' }}</view>
+          </view>
+
+          <view class="sub-form2">
+            <view class="sub-form2__row sub-form2-title">
+              <view class="sub-form2__col1">
+                编号
+              </view>
+              <view class="sub-form2__col2">
+                代码
+              </view>
+              <view class="sub-form2__col3">
+                学校名称
+              </view>
+            </view>
+
+            <view class="sub-form2__row">
+              <view class="sub-form2__col1">
+                {{ detail.school_code || '-' }}
+              </view>
+              <view class="sub-form2__col2">
+                {{ detail.school_name || '-' }}
+              </view>
+              <view class="sub-form2__col3">
+                {{ spec.value || '-' }}
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      detail: {},
+    };
+  },
+  methods: {
+    async getDetail(id) {
+      try {
+        const { detail } = await this.$u.api.independentRecruitmentsDetail({
+          id,
+        });
+        console.log(detail);
+        this.detail = detail;
+      } catch (err) {
+        console.error(err);
+      }
+    },
+  },
+  onLoad(options) {
+    if (options.id) {
+      this.getDetail(options.id);
+    }
+  },
+};
+</script>
+
+<style lang="scss">
+.container {
+  min-height: 100vh;
+  background: #eaf8fe;
+
+  .wrap {
+    padding-top: 20rpx;
+
+    .picked-data {
+      display: flex;
+      align-items: center;
+      border-radius: 20rpx;
+      filter: drop-shadow(-2.179rpx 3.355rpx 2.5rpx rgba(208, 209, 209, 0.3));
+      background-color: rgba(255, 255, 255, 0.5);
+      margin: 0 24rpx;
+      padding: 26rpx 160rpx;
+
+      & > view {
+        flex: 1;
+        text-align: center;
+        font-size: 32rpx;
+        text-transform: uppercase;
+        color: #333333;
+        font-weight: bold;
+        white-space: nowrap;
+      }
+      & > view + view {
+        margin-left: 10rpx;
+      }
+    }
+
+    .card {
+      margin: 28rpx 24rpx 0;
+      border-radius: 20rpx;
+      filter: drop-shadow(-2.179rpx 3.355rpx 2.5rpx rgba(208,209,209,0.3));
+      background-color: #ffffff;
+
+      &__title {
+        background: #fbf1e8;
+        border-radius: 20rpx 20rpx 0 0;
+        text-align: center;
+        font-size: 28rpx;
+        text-transform: uppercase;
+        color: #e77817;
+        font-weight: 500;
+        padding: 30rpx 36rpx;
+      }
+      &__body {
+        padding: 34rpx 28rpx 52rpx 28rpx;
+      }
+    }
+    .card + .card {
+      margin-top: 22rpx;
+    }
+  }
+}
+
+.info-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 44rpx 0;
+  line-height: 1;
+  border-bottom: 1px solid rgba(152, 152, 152, 0.3);
+}
+.sub-form2 {
+  text-align: center;
+  margin-top: 34rpx;
+
+  &-title {
+    font-size: 24rpx;
+    padding: 20rpx 0;
+    text-transform: uppercase;
+    color: #333333;
+    font-weight: 500;
+    background-color: #f6f8f7;
+    text-align: center;
+    border-bottom: none !important;
+  }
+  &__row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1rpx solid #e0e0e0;
+    padding: 22rpx 0;
+  }
+  &__col1 {
+    flex-basis: 20%;
+    text-transform: uppercase;
+    color: #333333;
+  }
+  &__col2 {
+    flex-basis: 24.8%;
+  }
+  &__col3 {
+    flex-basis: 47.9%;
+  }
+}
+</style>
diff --git a/package_sub/pages/IndependentList/IndependentList.vue b/package_sub/pages/IndependentList/IndependentList.vue
new file mode 100644
index 0000000..acb99a8
--- /dev/null
+++ b/package_sub/pages/IndependentList/IndependentList.vue
@@ -0,0 +1,167 @@
+<template>
+  <view class="container">
+    <template v-if="vuex_user.mobile">
+      <view class="wrap">
+        <view class="list">
+          <view class="list-item" v-for="item in list" :key="item.id">
+            <view class="list-item__title">
+              <view class="list-item__title--time">
+                填报时间：{{ item.created_at }}
+              </view>
+              <view class="list-item__title--tag" v-if="false">
+                规划师已查看
+              </view>
+            </view>
+
+            <view class="list-item__body">
+              <view  class="list-item__body--row">
+                所属区域：{{ item.area ? item.area.name : '-' }}
+              </view>
+              <view  class="list-item__body--row">
+                填报年份：{{ item.year }}年
+              </view>
+            </view>
+
+            <view class="list-item__footer">
+              <u-button
+                  shape="circle"
+                  ripple
+                  :hair-line="false"
+                  :custom-style="{
+                  'background': '#1989f9',
+                  'color': '#f6f8f7',
+                  'width': '120rpx',
+                  'height': '44rpx',
+                  'line-height': '44rpx',
+                  'font-size': '24rpx'
+                }"
+                  @click="$u.route({
+                  url: '/package_sub/pages/IndependentDetail/IndependentDetail',
+                  params: {
+                    id: item.id
+                  }
+                })">查看</u-button>
+            </view>
+          </view>
+        </view>
+
+        <u-loadmore :status="status" :margin-top="40" />
+      </view>
+    </template>
+    <template v-else>
+      <view>请先登录</view>
+    </template>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      select: {
+        page: 1,
+        page_size: 10
+      },
+      total: 0,
+      list: [],
+      status: 'loadmore',
+    };
+  },
+  methods: {
+    async getList(refresh=false) {
+      try {
+        if (refresh) {
+          this.select.page = 1
+          this.list.length = 0
+          this.status = 'loadmore'
+        }
+        if (this.status === 'nomore') return
+        try {
+          this.status = 'loading'
+          const res = await this.$u.api.independentRecruitmentsIndex(this.select);
+          console.log(res);
+          this.list.push(...res.list)
+          this.total = res.list.length
+          if (this.list.length >= res.total) {
+            this.status = 'nomore'
+          } else {
+            this.select.page++;
+            this.status = 'loadmore'
+          }
+        } catch (err) {
+          console.error(err);
+          this.status = 'loadmore'
+        }
+      } catch (err) {
+        console.error(err)
+      } finally {
+        uni.stopPullDownRefresh()
+      }
+    }
+  },
+  onPullDownRefresh() {
+    this.getList(true)
+  },
+  created() {
+    this.getList(true)
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  background: #eaf8fe;
+  min-height: 100vh;
+}
+.wrap {
+  padding: 24rpx 24rpx;
+
+  .list {
+    &-item {
+      overflow: hidden;
+      filter: drop-shadow(-2.179px 3.355px 2.5px rgba(208,209,209,0.3));
+      border-radius: 20rpx;
+
+      &__title {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 22rpx 28rpx;
+        background-color: #f6f8f7;
+
+        &--time {
+          font-size: 28rpx;
+          color: #333333;
+        }
+        &--tag {
+          font-size: 24rpx;
+          color: #e77817;
+          border-radius: 40rpx;
+          background-color: rgba(236, 138, 51, 0.2);
+          padding: 10rpx 30rpx;
+        }
+      }
+      &__body {
+        background: #fff;
+        padding: 0 28rpx;
+
+        &--row {
+          font-size: 24rpx;
+          color: #333333;
+          padding: 20rpx 22rpx;
+          border-bottom: 1rpx solid rgba(152, 152, 152, 0.3);
+        }
+      }
+      &__footer {
+        background: #fff;
+        display: flex;
+        justify-content: flex-end;
+        padding: 26rpx 28rpx;
+      }
+    }
+    .list-item + .list-item {
+      margin-top: 24rpx;
+    }
+  }
+}
+</style>
diff --git a/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue b/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
index 7916e95..dd7400a 100644
--- a/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
+++ b/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="container">
+  <view class="container safe-area-inset-bottom">
     <image class="bkg" src="~@/static/me/wave.png" mode="widthFix"></image>
 
     <view class="wrap" v-if="step === 1">
@@ -60,7 +60,7 @@
             <u-input v-model="form.number" placeholder="请输入" input-align="right" />
           </u-form-item>
           <u-form-item label="考生类型" required prop="type">
-            <u-input v-model="form.type" placeholder="请选择" input-align="right" />
+            <u-input v-model="form.type" placeholder="请输入" input-align="right" />
           </u-form-item>
           <u-form-item label="民族" prop="nationality">
             <u-input v-model="form.nationality" placeholder="请输入" input-align="right" />
diff --git a/package_sub/pages/RecommendForm/RecommendForm.vue b/package_sub/pages/RecommendForm/RecommendForm.vue
index 5707dab..095dbe3 100644
--- a/package_sub/pages/RecommendForm/RecommendForm.vue
+++ b/package_sub/pages/RecommendForm/RecommendForm.vue
@@ -41,27 +41,47 @@
 
         <view class="score">
           <view class="score-row">
-            <view class="score-row__text">估分成绩：</view>
-            <u-input v-model="form.anticipate_score" style="width: 280rpx;" placeholder="输入估分成绩" input-align="center" border border-color="#e0e0e0" :height="50" :clearable="false"></u-input>
+            <view class="score-row__text">考试裸分：</view>
+            <u-input v-model="form.anticipate_score" style="width: 280rpx;" placeholder="输入考试裸分" input-align="center" border border-color="#e0e0e0" :height="50" :clearable="false"></u-input>
           </view>
 
           <view class="score-row">
-            <view class="score-row__text">成绩稳定性：</view>
+            <view class="score-row__text">体育分数：</view>
+            <u-input v-model="form.physical_score" style="width: 280rpx;" placeholder="输入体育分数" input-align="center" border border-color="#e0e0e0" :height="50" :clearable="false"></u-input>
+          </view>
 
-            <view class="my-radio-group">
-              <view class="my-radio" :class="form.is_stable ? 'my-radio--checked' : ''" @click="form.is_stable = 1">是</view>
-              <view class="my-radio" :class="!form.is_stable ? 'my-radio--checked' : ''" @click="form.is_stable = 0">否</view>
-            </view>
+          <view class="score-row">
+            <view class="score-row__text">口语听力：</view>
+            <u-input v-model="form.hearing_score" style="width: 280rpx;" placeholder="输入口语听力" input-align="center" border border-color="#e0e0e0" :height="50" :clearable="false"></u-input>
           </view>
 
           <view class="score-row">
-            <view class="score-row__text">是否为裸分：</view>
+            <view class="score-row__text">难度系数：</view>
+            <u-input v-model="form.difficulty" style="width: 280rpx;" placeholder="输入难度系数" input-align="center" border border-color="#e0e0e0" :height="50" :clearable="false"></u-input>
+          </view>
 
-            <view class="my-radio-group">
-              <view class="my-radio" :class="form.is_bare ? 'my-radio--checked' : ''" @click="form.is_bare = 1">是</view>
-              <view class="my-radio" :class="!form.is_bare ? 'my-radio--checked' : ''" @click="form.is_bare = 0">否</view>
-            </view>
+          <view style="line-height: 2.5;">
+            <u-icon name="question-circle-fill"></u-icon>
+            <text>您可以联系客服了解难度系数填写</text>
           </view>
+
+<!--          <view class="score-row">-->
+<!--            <view class="score-row__text">成绩稳定性：</view>-->
+
+<!--            <view class="my-radio-group">-->
+<!--              <view class="my-radio" :class="form.is_stable ? 'my-radio&#45;&#45;checked' : ''" @click="form.is_stable = 1">是</view>-->
+<!--              <view class="my-radio" :class="!form.is_stable ? 'my-radio&#45;&#45;checked' : ''" @click="form.is_stable = 0">否</view>-->
+<!--            </view>-->
+<!--          </view>-->
+
+<!--          <view class="score-row">-->
+<!--            <view class="score-row__text">是否为裸分：</view>-->
+
+<!--            <view class="my-radio-group">-->
+<!--              <view class="my-radio" :class="form.is_bare ? 'my-radio&#45;&#45;checked' : ''" @click="form.is_bare = 1">是</view>-->
+<!--              <view class="my-radio" :class="!form.is_bare ? 'my-radio&#45;&#45;checked' : ''" @click="form.is_bare = 0">否</view>-->
+<!--            </view>-->
+<!--          </view>-->
         </view>
       </view>
 
@@ -199,6 +219,9 @@ export default {
         school_id: "",
         school_name: "",
         anticipate_score: "",
+        physical_score: "",
+        hearing_score: "",
+        difficulty: "",
         is_stable: 1,
         is_bare: 1
       },
@@ -209,6 +232,36 @@ export default {
             message: '请选择县区'
           }
         ],
+        anticipate_score: [
+          {
+            required: true,
+            message: '请填写'
+          },
+          {
+            type: 'number',
+            message: '请填写数字'
+          }
+        ],
+        physical_score: [
+          {
+            required: true,
+            message: '请填写'
+          },
+          {
+            type: 'number',
+            message: '请填写数字'
+          }
+        ],
+        hearing_score: [
+          {
+            required: true,
+            message: '请填写'
+          },
+          {
+            type: 'number',
+            message: '请填写数字'
+          }
+        ]
       },
 
       isShowAreaSelect: false,
@@ -293,18 +346,20 @@ export default {
       try {
         const { list } = await this.$u.api.schoolList({
           page: 1,
-          page_size: 9999
+          page_size: 9999,
+          type: '初中'
         })
         this.schoolList = this.areaList.map(area => ({
           id: area.value,
           value: area.value,
           label: area.label,
-          children: list.data.filter(school => school.area_id === area.value)?.map(i => ({
+          children: list.data?.filter(school => school.area_id === area.value)?.map(i => ({
             value: i.code,
             label: i.name,
-            extra: i.id
+            extra: i.id,
           }))
         }))
+        console.log(this.schoolList)
       } catch (err) {
         console.error(err)
       }
@@ -323,8 +378,21 @@ export default {
     },
 
     submit () {
+      const myValid = () => {
+        const isPositiveNumber = (input) => {
+          const regex = /^(?:0|[1-9]\d*)(?:\.\d+)?$/;
+          return regex.test(input);
+        }
+        if (isPositiveNumber(this.form.anticipate_score) && isPositiveNumber(this.form.hearing_score) && isPositiveNumber(this.form.physical_score)) {
+          return true
+        } else {
+          this.$u.toast("分数请填写数字")
+          return false
+        }
+      }
       this.$refs['uForm'].validate(valid => {
-        if (valid) {
+        const valid1 = myValid()
+        if (valid && valid1) {
           try {
             this.$u.api.recommendForm(this.form).then(async res => {
               console.log(res)
diff --git a/package_sub/pages/SchoolList/SchoolList.vue b/package_sub/pages/SchoolList/SchoolList.vue
index 1f3351c..ef0d26e 100644
--- a/package_sub/pages/SchoolList/SchoolList.vue
+++ b/package_sub/pages/SchoolList/SchoolList.vue
@@ -115,6 +115,22 @@ export default {
     };
   },
   methods: {
+    async getType() {
+      try {
+        const { detail } = await this.$u.api.parameterShow({
+          number: 'school_type'
+        })
+        this.typeList = [{
+          label: '全部',
+          value: ''
+        },...detail?.map(i => ({
+          label: i.value,
+          value: i.value
+        }))]
+      } catch (err) {
+        console.error(err)
+      }
+    },
     async getArea() {
       try {
         const res = await this.$u.api.area()
@@ -173,6 +189,7 @@ export default {
     this.scrollTop = e.scrollTop;
   },
   created() {
+    this.getType()
     this.getArea()
     this.getList(true)
   },
diff --git a/pages.json b/pages.json
index 2c8f036..750f079 100644
--- a/pages.json
+++ b/pages.json
@@ -120,6 +120,20 @@
           "style": {
             "navigationBarTitleText": " "
           }
+        },
+        {
+          "path": "pages/IndependentList/IndependentList",
+          "style": {
+            "navigationBarTitleText": "我的自主招生",
+            "enablePullDownRefresh": true
+          }
+        },
+        {
+          "path": "pages/IndependentDetail/IndependentDetail",
+          "style": {
+            "navigationBarTitleText": "自主填报详情",
+            "enablePullDownRefresh": true
+          }
         }
       ]
     }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c351b2b..be58f0f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,10 +1,6 @@
 <template>
   <page-meta
-      :page-style="`overflow:${
-      isShowQrcode
-        ? 'hidden'
-        : 'visible'
-    };`"
+    :page-style="`overflow:${isShowQrcode ? 'hidden' : 'visible'};`"
   ></page-meta>
   <view class="content" :style="{ 'padding-top': paddingTop + 'px' }">
     <image class="bkg" src="~@/static/index/bkg.png" mode="aspectFill"></image>
@@ -17,7 +13,12 @@
       ></image>
 
       <view class="grid">
-        <view class="grid1 grid-item" @click="$u.route({ url: '/package_sub/pages/RecommendForm/RecommendForm' })">
+        <view
+          class="grid1 grid-item"
+          @click="
+            $u.route({ url: '/package_sub/pages/RecommendForm/RecommendForm' })
+          "
+        >
           <image
             class="grid-item__icon"
             src="~@/static/index/zhinengtuijian.png"
@@ -35,10 +36,21 @@
             src="~@/static/index/monitianbao.png"
             mode="aspectFit"
           ></image>
-          <view class="grid-item__name">苏州中考志愿<br />模拟填报</view>
+          <view class="grid-item__name">志愿填报</view>
         </view>
         <view
           class="grid3 grid-item"
+          @click="$u.route({ url: '/package_sub/pages/IndependentRecruitment/IndependentRecruitment' })"
+        >
+          <image
+            class="grid-item__icon"
+            src="~@/static/index/zizhuzhaosheng.png"
+            mode="aspectFit"
+          ></image>
+          <view class="grid-item__name">自主招生</view>
+        </view>
+        <view
+          class="grid4 grid-item"
           @click="
             $u.route({ url: '/package_sub/pages/HistoryScore/HistoryScore' })
           "
@@ -46,7 +58,7 @@
           <view class="grid-item__name"> 历年录取<br />分数线 </view>
         </view>
         <view
-          class="grid4 grid-item"
+          class="grid5 grid-item"
           @click="
             $u.route({ url: '/package_sub/pages/TargetCount/TargetCount' })
           "
@@ -54,7 +66,7 @@
           <view class="grid-item__name"> 历年各初中<br />指标生 </view>
         </view>
         <view
-          class="grid5 grid-item"
+          class="grid6 grid-item"
           @click="$u.route({ url: '/package_sub/pages/SchoolList/SchoolList' })"
         >
           <view class="grid-item__name">学校库</view>
@@ -62,14 +74,21 @@
       </view>
 
       <view class="list">
-        <view class="list-item" v-for="i in banners" :key="i.id" @click="bannerJump2(i)">
+        <view
+          class="list-item"
+          v-for="i in banners"
+          :key="i.id"
+          @click="bannerJump2(i)"
+        >
           <image
             class="list-item__img"
             mode="aspectFill"
             :src="i.image ? i.image.url : '/static/index/template1.png'"
           ></image>
           <view class="list-item__name">{{ i.name }}</view>
-          <view v-if="i.sub_name" class="list-item__subname">{{ i.sub_name }}</view>
+          <view v-if="i.sub_name" class="list-item__subname">{{
+            i.sub_name
+          }}</view>
         </view>
       </view>
     </view>
@@ -83,20 +102,16 @@
 
     <u-popup mode="center" v-model="isShowQrcode" border-radius="14">
       <view class="customer-service">
-        <view class="customer-service__title">
-          系统提示
-        </view>
+        <view class="customer-service__title"> 系统提示 </view>
         <view class="customer-service__body">
-          <view>
-            您需要联系我们的客服，获取授权
-          </view>
-          <image mode="aspectFit" show-menu-by-longpress src="~@/static/qrcode.png"></image>
-          <view>
-            卓老师
-          </view>
-          <view>
-            电话：15006200900
-          </view>
+          <view> 您需要联系我们的客服，获取授权 </view>
+          <image
+            mode="aspectFit"
+            show-menu-by-longpress
+            src="~@/static/qrcode.png"
+          ></image>
+          <view> 卓老师 </view>
+          <view> 电话：15006200900 </view>
         </view>
       </view>
     </u-popup>
@@ -113,7 +128,6 @@ export default {
   },
   onLoad() {},
   methods: {
-
     async getBanners() {
       try {
         const { list } = await this.$u.api.banners();
@@ -123,30 +137,30 @@ export default {
       }
     },
     bannerJump2(i) {
-      console.log(i)
-      if (i.jump_url === '#') {
-        return
+      console.log(i);
+      if (i.jump_url === "#") {
+        return;
       }
       if (i.jump_type === 1) {
         uni.navigateToMiniProgram({
-          appId: i.jump_url
-        })
+          appId: i.jump_url,
+        });
       } else if (i.jump_type === 2) {
         this.$u.route({
-          url: '/package_sub/pages/webview/webview',
+          url: "/package_sub/pages/webview/webview",
           params: {
-            src: i.jump_url
-          }
-        })
+            src: i.jump_url,
+          },
+        });
       } else if (i.jump_type === 3) {
         this.$u.route({
-          url: '/package_sub/pages/LoadImage/LoadImage',
+          url: "/package_sub/pages/LoadImage/LoadImage",
           params: {
-            src: i.jump_url
-          }
-        })
+            src: i.jump_url,
+          },
+        });
       }
-    }
+    },
   },
   computed: {
     paddingTop() {
@@ -175,12 +189,12 @@ export default {
     height: 100vh;
   }
   .wrap {
-    padding-top: 71rpx;
+    padding-top: 72rpx;
     position: relative;
     z-index: 2;
 
     .title {
-      width: 407rpx;
+      width: 495rpx;
       height: 52rpx;
       display: block;
       margin: 0 auto;
@@ -192,10 +206,11 @@ export default {
       display: grid;
       grid-gap: 26rpx;
       grid-template-columns: repeat(6, 1fr);
-      grid-template-rows: 323rpx 176rpx;
+      grid-template-rows: 197rpx 108rpx 176rpx;
       grid-template-areas:
         "grid1 grid1 grid1 grid2 grid2 grid2"
-        "grid3 grid3 grid4 grid4 grid5 grid5";
+        "grid1 grid1 grid1 grid3 grid3 grid3"
+        "grid4 grid4 grid5 grid5 grid6 grid6";
 
       $grid-colors: linear-gradient(
           0deg,
@@ -205,10 +220,11 @@ export default {
           #fcfcfe 100%
         ),
         linear-gradient(0deg, #f5ddc5 0%, #f5ddc5 1%, #fcfcfe 74%, #fcfcfe 100%),
+        linear-gradient(0deg, #c6e1d4 0%, #fdfdfe 100%),
         linear-gradient(-37deg, #ee6734 0%, #f7915b 100%),
         linear-gradient(-37deg, #8773e9 0%, #c39df5 100%),
         linear-gradient(-37deg, #4f83f9 0%, #a3b9fd 100%);
-      $font-colors: #1989fa, #ea9332, #fff, #fff, #fff;
+      $font-colors: #1989fa, #ea9332, #3cb877, #fff, #fff, #fff;
       @for $i from 1 through length($grid-colors) {
         .grid#{$i} {
           grid-area: grid#{$i};
@@ -246,13 +262,20 @@ export default {
           color: rgba(0, 0, 0, 0.7);
         }
       }
-      .grid2 {
+      .grid2, .grid3 {
+        display: flex;
+        flex-direction: row;
+
         .grid-item__name {
-          padding: 46rpx 0 0;
+          padding-left: 20rpx;
+          // padding: 46rpx 0 0;
         }
-        .grid-item__subname {
-          font-size: 24rpx;
-          color: rgba(0, 0, 0, 0.7);
+      }
+      .grid3 {
+
+        .grid-item__icon {
+          width: 69rpx;
+          height: 69rpx;
         }
       }
     }
diff --git a/pages/me/me.vue b/pages/me/me.vue
index 7ac8884..c69f4c2 100644
--- a/pages/me/me.vue
+++ b/pages/me/me.vue
@@ -19,9 +19,9 @@
             <u-icon name="arrow-right" :size="38" color="#a7a7a7"></u-icon>
           </view>
         </view>
-        <view class="row" v-if="vuex_user.mobile" @click="$u.route({ url: '/package_sub/pages/IndependentRecruitment/IndependentRecruitment' })">
+        <view class="row" v-if="vuex_user.mobile" @click="$u.route({ url: '/package_sub/pages/IndependentList/IndependentList' })">
           <image class="row__icon" src="~@/static/me/ico2.png" mode="aspectFit"></image>
-          <view class="row__text">自主招生</view>
+          <view class="row__text">我的自主招生</view>
           <view class="row__arrow">
             <u-icon name="arrow-right" :size="38" color="#a7a7a7"></u-icon>
           </view>
diff --git a/static/index/title.png b/static/index/title.png
index a8faa613c0b86545e4858d92403a34d7d24bc411..4a988653c606c2558190b5201ddf860d6007bb88 100644
GIT binary patch
delta 7903
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
JPDHLkV1i6Q&prSE

delta 6360
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
aYX1VE4qqJkNWLZj0000<MNUMnLSTYY;c&|U

diff --git a/static/index/zizhuzhaosheng.png b/static/index/zizhuzhaosheng.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e06ba7cee295b931863c01b090d541c687aceb4
GIT binary patch
literal 1227
zcmeAS@N?(olHy`uVBq!ia0vp^t{}|83?#LKZ%YFy#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND0n!)C&abr%48rDNLug7wB4KSc%aa3UykLjRQr8-4*T=Xb|e{YiM86D
z?sBNi^++{P83dVZOMtUo4_Ct3m<*?b#h8M`i#YDj3p!dEdAi->Se@I^+R)>*Mq6V&
z4ito(sB=G940MLuk(!{+)xkhNIF<zY1)pI!_#X*acgy|X6l(UrY*|dU_k#VkF8>V<
zx2`_Eb+)Ql(JsD89MjU6q=XVbK6~=x|Kqo(&%XTnF3SAH7X}9A5KkA!kcv5LXS@!3
zWFXMczNn#Tn`n$ifMBE2f|!tNw|Bk!ZGUy!%q35ZGEdE$TR-<pjjz#nr=x1t`*&v^
zzqd-<<@>eiI~rW&zuhjFaQ4A`joJ$-7Iw3QzLj`r>AMI0v1Vctka3lq-1DZaZ-LH>
zxha=){bxogGMEKRiX67;vYE2jM%?MaGMUs!pT_4#Q)1sNa7oqJ$INuuXo|Er>mi{j
zO2&&P91GLrH&#!5x$KU$Vu{JhDcR<!@0MBkPEnin-$`@hbRqRwJ2V&04mxyc>Jiq+
zw_X8E;!kHay_nL+?8Ls<Pt#9-qrY>{pP-T@$6HyG0^WqZ>doO%dLLDEcu#|4z%{v2
zv0El(To3m<vp28l-L+NqwOvg4ue<MzK5gxBzxuL~=_SY4;`CyR+<a*(4bk{lu`YMk
z{H}V+d+g|xQwrzjB&jQF9h&Ak<)F>~H7A&3n<n1<J-OFt(kqAAuhmRcdOIg9vC&jC
zFjJKO{p#fT!;iBZ1K3W9+RZxtbH&_{=u*zhW|~oJj|Xd?te79P>g%*6J1=TRIXn)#
zR>W+OZQvDaZFWP^X1!)^;290wR-;gjU5Y|?x`Ij`Z*FsBj9(;i?MPfeuht|Zn}9Pt
z-7gE*1!u9bIyoA?{v-RE<*VMKH3xmxYAHKrHtW6EUb$`N+D9Qmejhir->DE*kY)AP
zmi_Ye{L}vK?%TJ6{Z`JOA0KOKU;i<DqSMni4x2u|e!A3WWs%qB&KWEn+D~pz+4G-Q
zQ@rVt&=mh|GR9n%_6f~Bst;`!r_8prwGGzr-S)<i%apH>EAGba-;I|ZO!?gN>Fl)d
z1?|y#7RUEI*n48iESH~Wr&TBH6ul_l|KZ_RUd^2ojZR%PKQG|uRjH(S=k*s?zrd-{
z8_pX^T*{J{ojk=bAg^0!W~XDos;*6Q-4>Vn%n|1E3|cfLN&Z}c*sT>JB@&V5(aS|{
zInCTN<6_-$S+{Gsmt(>W94fLkId=R>;|rc_68Wb2Yt#qrT{HLHIO;K#WmCLlz>Ux(
z<?RzzAGp46<NpcsBF!15arGQ>Z!bu#WxmVU^*hDxtbUHM%zN*Kp6AUU>}9PtWzOlk
zZ~frapQAGG_`izg&pyxcV2+6JMc-bL|F2yyHSl$Y>tqTG_FO2``abuhLE`>Z+p=!|
a6hGQ)zkXl5O)@aEGI+ZBxvX<aXaWFhxkq&X

literal 0
HcmV?d00001