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 @@
+
+
+
+
+ {{ detail.year || '-' }}年
+ {{ detail.area ? detail.area.group : "-" }}
+
+
+
+
+ 基本信息
+
+
+
+
+ 学生姓名
+ {{ detail.name || ' ' }}
+
+
+ 性别
+ {{ detail.sex || ' ' }}
+
+
+ 准考号
+ {{ detail.number || ' ' }}
+
+
+ 考生类别
+ {{ detail.type || ' ' }}
+
+
+ 民族
+ {{ detail.nationality || ' ' }}
+
+
+ 户籍地址
+ {{ detail.address || ' ' }}
+
+
+ 移动电话
+ {{ detail.mobile || ' ' }}
+
+
+ 毕业学校
+ {{ detail.school || ' ' }}
+
+
+
+
+
+
+ 自主招生(含课程基地实验项目)
+
+
+
+
+ 其他专业是否服从
+ {{ detail.is_independent ? '是' : '否' }}
+
+
+
+
+
+ 编号
+
+
+ 代码
+
+
+ 学校名称
+
+
+
+
+
+ {{ detail.school_code || '-' }}
+
+
+ {{ detail.school_name || '-' }}
+
+
+ {{ spec.value || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+ 填报时间：{{ item.created_at }}
+
+
+ 规划师已查看
+
+
+
+
+
+ 所属区域：{{ item.area ? item.area.name : '-' }}
+
+
+ 填报年份：{{ item.year }}年
+
+
+
+
+
+
+
+
+
+
+
+ 请先登录
+
+
+
+
+
+
+
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 @@
-
+
@@ -60,7 +60,7 @@
-
+
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 @@
- 估分成绩：
-
+ 考试裸分：
+
- 成绩稳定性：
+ 体育分数：
+
+
-
- 是
- 否
-
+
+ 口语听力：
+
- 是否为裸分：
+ 难度系数：
+
+
-
- 是
- 否
-
+
+
+ 您可以联系客服了解难度系数填写
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -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 @@
@@ -17,7 +13,12 @@
>
-
+
- 苏州中考志愿
模拟填报
+ 志愿填报
+
+ 自主招生
+
+ 历年录取
分数线
历年各初中
指标生
学校库
@@ -62,14 +74,21 @@
-
+
{{ i.name }}
- {{ i.sub_name }}
+ {{
+ i.sub_name
+ }}
@@ -83,20 +102,16 @@
-
- 系统提示
-
+ 系统提示
-
- 您需要联系我们的客服，获取授权
-
-
-
- 卓老师
-
-
- 电话：15006200900
-
+ 您需要联系我们的客服，获取授权
+
+ 卓老师
+ 电话：15006200900
@@ -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 @@
-
+
- 自主招生
+ 我的自主招生
diff --git a/static/index/title.png b/static/index/title.png
index a8faa61..4a98865 100644
Binary files a/static/index/title.png and b/static/index/title.png differ
diff --git a/static/index/zizhuzhaosheng.png b/static/index/zizhuzhaosheng.png
new file mode 100644
index 0000000..9e06ba7
Binary files /dev/null and b/static/index/zizhuzhaosheng.png differ