wangyifang
/
xinfeiyue-wx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更改

Browse Source
master
lion 1 year ago
parent c4cff213a4
commit eb659896ae
7 changed files with 83 additions and 23 deletions
Show Stats Download Patch File Download Diff File

2
package_sub/pages/BatchForm/BatchForm.vue
Unescape View File

@ -414,7 +414,7 @@ export default {
const { batchSubs } = await this.$u.api.batchDetail({ id: batchId })
this.batchSub[batchId] = batchSubs
batchSubs.forEach(batchSub => {
this.schoolMap.set(batchSub.id, batchSub.school)
this.schoolMap.set(batchSub.id, batchSub.school_details)
})
const formBatch = this.subForm.find(i => i.batchId === batchId)

10
package_sub/pages/HistoryScore/HistoryScore.vue
Unescape View File

@ -50,16 +50,20 @@
<view class="table__header">
<text class="table__header-item">星级</text>
<text class="table__header-item">学校</text>
<text class="table__header-item">类型</text>
<text class="table__header-item">分数</text>
<text class="table__header-item">跨区总分</text>
</view>
<view
class="table__row"
v-for="(item, index) in list"
:key="index"
>
<text class="table__row-item">{{ item.school ? item.school.star : '' }}</text>
<text class="table__row-item">{{ item.school ? item.school.name : '' }}</text>
<text class="table__row-item">{{ item.total_score }}</text>
<text class="table__row-item">{{ item.school ? (item.school.star ?item.school.star: ''):'' }}</text>
<text class="table__row-item">{{ item.school ? (item.school.name ?item.school.name: ''):'' }}</text>
<text class="table__row-item">{{ item.school ? (item.school.type_text ?item.school.type_text: '') : '' }}</text>
<text class="table__row-item">{{ item.total_score?item.total_score:'' }}</text>
<text class="table__row-item">{{ item.area_total_score?item.area_total_score:'' }}</text>
</view>
</view>
</view>

16
package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
Unescape View File

@ -67,9 +67,9 @@
<!-- <u-form-item label="民族" prop="nationality">
<u-input v-model="form.nationality" placeholder="请输入" input-align="right" />
</u-form-item> -->
<u-form-item label="户籍地址" required prop="address">
<!-- <u-form-item label="户籍地址" required prop="address">
<u-input v-model="form.address" placeholder="请输入" input-align="right" />
</u-form-item>
</u-form-item> -->
<u-form-item label="移动电话" required prop="mobile">
<u-input v-model="form.mobile" placeholder="请输入" input-align="right" />
</u-form-item>
@ -314,12 +314,12 @@ export default {
// message: '请输入考试类型'
// }
// ],
address: [
{
required: true,
message: '请输入户籍地址'
}
],
// address: [
// {
// required: true,
// message: '请输入户籍地址'
// }
// ],
mobile: [
{
required: true,

6
package_sub/pages/RecommendForm/RecommendForm.vue
Unescape View File

@ -176,6 +176,7 @@
<u-picker
mode="time"
v-model="isShowYear"
:start-year="currentYear"
:params="{
year: true,
month: false,
@ -275,7 +276,7 @@
i.nature === 1 ? "公办" : i.nature === 2 ? "民办" : "-"
}}
</view>
<view>历年均分：{{i.avg_score?i.avg_score:'-'}}</view>
<view>近三年均分：{{i.avg_score?i.avg_score:'-'}}</view>
</view>
</view>
</view>
@ -330,6 +331,7 @@ export default {
isShowRegion: false,
isShowYear: false,
isShowSex: false,
currentYear:'',
sexList: [
{
value: "男",
@ -577,6 +579,8 @@ export default {
this.$refs.uForm.setRules(this.rules);
},
created() {
let date = new Date()
this.currentYear = date.getFullYear()
this.getArea().then((_) => this.getSchools());
},
};

17
package_sub/pages/SchoolList/SchoolList.vue
Unescape View File

@ -59,6 +59,11 @@
<view class="list-item__tags--type" v-for="(tag, index1) in i.type" :key="index1">
{{ tag }}
</view>
<view class="list-item__tags--star" v-if="i.star">
{{ i.star }}
</view>
</view>
<view class="list-item__info">
办学性质：{{ i.nature === 1 ? '公办' : (i.nature === 2 ? '民办' : '-') }}
@ -82,11 +87,12 @@ export default {
defaultTime: '',
select: {
name: "",
type: "",
type: "高中",
nature: "",
area_id: "",
page: 1,
page_size: 10
page_size: 10,
from:1
},
scrollTop: 0,
tableData: [
@ -282,6 +288,13 @@ export default {
background-color: rgba(233, 144, 50, 0.2);
padding: 6rpx 18rpx;
}
&--star{
color: #fff;
font-size: 24rpx;
border-radius: 20rpx;
background-color: #4186f2;
padding: 6rpx 18rpx;
}
& > view + view {
margin-left: 10rpx;
}

53
package_sub/pages/StudentInfo/StudentInfo.vue
Unescape View File

@ -25,14 +25,14 @@
</view>
<view class="card">
<u-form :model="form" ref="uForm" label-width="auto">
<u-form-item label="学生姓名" prop="name">
<u-form-item label="学生姓名" prop="name" required>
<u-input v-model="form.name" placeholder="请输入" input-align="right" />
</u-form-item>
<u-form-item label="性别" prop="sex">
<u-input type="select" v-model="form.sex" placeholder="请选择" input-align="right" @click="isShowSex = true"/>
</u-form-item>
<u-form-item label="年级" required prop="grade">
<u-input v-model="form.grade" placeholder="请输入" input-align="right" />
<u-input type="select" v-model="form.grade" placeholder="请选择" input-align="right" @click="isShowGrade = true"/>
</u-form-item>
<u-form-item label="中考年份" required prop="middle_exam_year">
<u-input type="select" v-model="form.middle_exam_year" placeholder="请选择" input-align="right" @click="isShowYear = true" />
@ -41,11 +41,15 @@
<u-input v-model="form.nationality" placeholder="请输入" input-align="right" />
</u-form-item> -->
<u-form-item label="所在城市" required prop="city">
<u-input type="select" v-model="form.city" placeholder="请选择" input-align="right" @click="regionType = 'city',isShowRegion = true" />
</u-form-item>
<!-- <u-input type="select" v-model="form.city" placeholder="请输入" input-align="right" @click="regionType = 'city',isShowRegion = true" /> -->
<u-input disabled v-model="form.city" input-align="right" placeholder="请输入" />
</u-form-item>
<u-form-item label="所在县区" required prop="area">
<u-input type="select" v-model="form.area" placeholder="请选择" input-align="right" @click="regionType = 'area',isShowRegion = true" />
</u-form-item>
<!-- <u-input type="select" v-model="form.area" placeholder="请选择" input-align="right" @click="regionType = 'area',isShowRegion = true" /> -->
<u-input type="select" v-model="form.area" placeholder="请选择" input-align="right" @click="isShowArea = true" />
</u-form-item>
<u-form-item label="所在学校" required prop="school">
<u-input v-model="form.school" placeholder="请输入" input-align="right" />
</u-form-item>
@ -95,6 +99,9 @@
</view>
<u-select v-model="isShowSex" :list="sexList" @confirm="e => form.sex = e[0].value"></u-select>
<u-select v-model="isShowGrade" :list="gradeList" @confirm="e => form.grade = e[0].value"></u-select>
<u-select v-model="isShowArea" :list="areaList" @confirm="e => form.area = e[0].value"></u-select>
<u-picker
mode="time"
v-model="isShowYear"
@ -126,6 +133,9 @@ export default {
isShowRegion: false,
isShowYear: false,
isShowSex: false,
isShowGrade:false,
isShowArea:false,
areaList:[],
sexList: [
{
value: '男',
@ -140,13 +150,27 @@ export default {
label: '保密'
}
],
gradeList: [
{
value: '初一',
label: '初一'
},
{
value: '初二',
label: '初二'
},
{
value: '初三',
label: '初三'
}
],
form: {
sex: '',
nickname: '',
mobile: '',
country: '',
province: '',
city: '',
city: '苏州市',
headimgurl: '',
grade: '',
middle_exam_year: '',
@ -178,6 +202,12 @@ export default {
]
},
rules: {
name: [
{
required: true,
message: '请输入姓名'
}
],
grade: [
{
required: true,
@ -231,6 +261,14 @@ export default {
console.error(err)
}
},
async getArea() {
try {
const res = await this.$u.api.area();
this.areaList = res.list?.filter((i)=>i.group).map((i) => ({ label: i.name, value: i.name }));
} catch (err) {
console.error(err);
}
},
async onGetPhoneNumber(e) {
try {
if (e.detail.code) {
@ -319,6 +357,7 @@ export default {
}
},
onReady() {
this.getArea()
this.$refs.uForm.setRules(this.rules)
this.getInfo()
}

2
package_sub/pages/TargetCount/TargetCount.vue
Unescape View File

@ -171,7 +171,7 @@ export default {
background: #fff;
}
.container {
min-height: 100vh;
min-height: calc(100vh + 100rpx);
background: #eaf8fe;
}
.search-bar {

Write Preview
Loading…
Cancel
Save