tangyi
/
zycp-demo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

咨询师页面

master
tangyi 2022-03-05 22:20:31 +08:00
parent 01302f836f 31ac1df69a
commit b3a00f704e
10 changed files with 296 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/index.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title> <title>有谱志愿</title>
<style> <style>
.load { .load {
width: 0.6rem; width: 0.6rem;
@ -23,8 +23,7 @@
</head> </head>
<body> <body>
<noscript> <noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript <strong></strong>
enabled. Please enable it to continue.</strong>
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->

8
src/App.vue
View File

@ -182,6 +182,12 @@ textarea {
.login-mode{ .login-mode{
width: 100%; width: 100%;
margin-top: 2rem; margin-top: 2rem;
background-color: #FFFFFF;
position: fixed;
bottom: .4rem;
}
.login-mode.noPositin{
position: static;
} }
.mode-title{ .mode-title{
display: flex; display: flex;
@ -348,7 +354,7 @@ textarea {
.security-code-container { .security-code-container {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
width: 3.48rem; width: 5.32rem;
} }
.field-wrap { .field-wrap {
list-style: none; list-style: none;

4
src/views/consultant/case.vue
View File

@ -13,10 +13,10 @@
<img v-else-if="headImg" :src="host + headImg"> <img v-else-if="headImg" :src="host + headImg">
</div> </div>
<button class="cover-btn" @change="imgIny($event)"> <div class="cover-btn">
<input class="inputB" @change="imgIny($event)" type="file" /> <input class="inputB" @change="imgIny($event)" type="file" />
上传 上传
</button> </div>
</div> </div>
<ul class="case-msg"> <ul class="case-msg">
<li> <li>

43
src/views/consultant/list.vue
View File

@ -1,4 +1,5 @@
<template> <template>
<<<<<<< HEAD
<div class="content my-content"> <div class="content my-content">
<!-- 头部 --> <!-- 头部 -->
<div :class="{ header: true, 'scroll white': isScrollTop, white: true }"> <div :class="{ header: true, 'scroll white': isScrollTop, white: true }">
@ -6,6 +7,42 @@
<img src="../../assets/images/home/expert/back.png" alt="" /> <img src="../../assets/images/home/expert/back.png" alt="" />
</div> </div>
<div class="header-title">列表预览</div> <div class="header-title">列表预览</div>
=======
<div class="content">
<!-- 头部 -->
<div :class="{'header':true,'scroll white':isScrollTop,'white':true}">
<div class="back" @click="$router.go(-1)"><img src="../../assets/images/home/expert/back.png" alt=""></div>
<div class="header-title">列表预览</div>
</div>
<!-- 咨询师列表 -->
<div class="expert-list-all section">
<ul class="expert-list">
<li v-for="(item,index) in expertData" :key="index">
<div class="expert-list-con" @click="goPage('/expert/detail')">
<div class="expert-list-img"><img src="../../assets/images/home/index/expert.png" alt=""></div>
<div class="expert-list-txt">
<div class="title">
<h2>{{item.name}}</h2>
<span v-if="item.title">{{item.title}}</span>
</div>
<div class="integral">
<span>公益积分：{{item.integral}}</span>
<span>好评度：{{item.score}}</span>
</div>
<div class="honor">
<span v-for="(itemk,indexk) in item.honor" :key="indexk">{{itemk.title}}</span>
</div>
<div class="slogan">{{item.slogan}}</div>
</div>
</div>
<div class="expert-list-btns">
<div :class="{'btn':true}">向TA提问</div>
<div class="btn">查看详情</div>
</div>
</li>
</ul>
</div>
>>>>>>> 31ac1df69ae7462dac9a9171cb8e6856291e7c2a
</div> </div>
<!-- 咨询师列表 --> <!-- 咨询师列表 -->
<div class="expert-list-all section"> <div class="expert-list-all section">
@ -208,9 +245,15 @@ userData:{},
</script> </script>
<style scoped> <style scoped>
<<<<<<< HEAD
.expert-list>li{ .expert-list>li{
} }
.my-content{ .my-content{
padding-top: 1rem; padding-top: 1rem;
} }
=======
.expert-list{
margin-top: 1.2rem;
}
>>>>>>> 31ac1df69ae7462dac9a9171cb8e6856291e7c2a
</style> </style>

11
src/views/home/evaluation/index.vue
View File

@ -19,7 +19,7 @@
<span @click="toEntrance()">马上测试</span> <span @click="toEntrance()">马上测试</span>
</div> </div>
</div> </div>
<div class="evaluation-item"> <!-- <div class="evaluation-item">
<h2>MBTI职业性格测试（完整版）</h2> <h2>MBTI职业性格测试（完整版）</h2>
<div class="evaluation-txt"> <div class="evaluation-txt">
<span><img src="../../../assets/images/home/evaluation/evaluation-02.png" alt=""></span> <span><img src="../../../assets/images/home/evaluation/evaluation-02.png" alt=""></span>
@ -78,7 +78,7 @@
<span>测评人数：<em>134人</em></span> <span>测评人数：<em>134人</em></span>
<span @click="toEntrance()">马上测试</span> <span @click="toEntrance()">马上测试</span>
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>
<div class="addr-select-bg" v-show="isTips" @click="isTips=!isTips"></div> <div class="addr-select-bg" v-show="isTips" @click="isTips=!isTips"></div>
@ -112,6 +112,10 @@
created() { created() {
this.isScroll = true; this.isScroll = true;
window.addEventListener("scroll", this.eventScrollTop); window.addEventListener("scroll", this.eventScrollTop);
},
mounted() {
this.isFirst = (JSON.parse(localStorage.getItem("isFirst")));
}, },
methods:{ methods:{
toEntrance(){ toEntrance(){
@ -123,7 +127,8 @@
}, },
//下次不再提醒 //下次不再提醒
noTips(){ noTips(){
this.isFirst = !this.isFirst; this.isFirst = false;
localStorage.isFirst = JSON.stringify(this.isFirst);
this.$router.push('/evaluation/entrance'); this.$router.push('/evaluation/entrance');
}, },
// 页面跳转 // 页面跳转

13
src/views/home/expert/index.vue
View File

@ -10,12 +10,12 @@
<img :src="host + bannerSrc"> <img :src="host + bannerSrc">
</div> </div>
<!-- 领取咨询机会 --> <!-- 领取咨询机会 -->
<div class="expert-receive" @click="goPage('/information')" v-if="isReceive==0"> <div class="expert-receive" @click="goPage('/information')" v-if="consult_amount==0">
<img src="../../../assets/images/home/expert/notice-01.png"> <img src="../../../assets/images/home/expert/notice-01.png">
<p>完善信息，立即领取免费咨询卡(1小时)</p> <p>完善信息，立即领取免费咨询卡(1小时)</p>
<span></span> <span></span>
</div> </div>
<div class="expert-receive expert-receive-01" v-if="isReceive==1"> <div class="expert-receive expert-receive-01" v-if="consult_amount==1">
<img src="../../../assets/images/home/expert/notice-02.png"> <img src="../../../assets/images/home/expert/notice-02.png">
<p>您已领取一小时免费咨询权益，可向专家进行提问</p> <p>您已领取一小时免费咨询权益，可向专家进行提问</p>
</div> </div>
@ -52,7 +52,7 @@
</div> </div>
</div> </div>
<div class="expert-list-btns"> <div class="expert-list-btns">
<div :class="{'btn':true,'noservice':isReceive==0}" @click="toAsk(item.id)">向TA提问</div> <div :class="{'btn':true,'noservice':consult_amount==0}" @click="toAsk(item.id)">向TA提问</div>
<div class="btn" @click="toDetail(item.id)">查看详情</div> <div class="btn" @click="toDetail(item.id)">查看详情</div>
</div> </div>
</li> </li>
@ -103,7 +103,7 @@
data() { data() {
return { return {
isScrollTop: false, isScrollTop: false,
isReceive: 1, //是否领取咨询机会 consult_amount: 0, //是否领取咨询机会
current: 0, current: 0,
isConfirm: false, isConfirm: false,
bannerSrc: '', //banner图地址 bannerSrc: '', //banner图地址
@ -128,6 +128,7 @@
created() { created() {
this.isScroll = true; this.isScroll = true;
window.addEventListener("scroll", this.eventScrollTop); window.addEventListener("scroll", this.eventScrollTop);
this.consult_amount = (JSON.parse(localStorage.getItem("centerUserData"))).consult_amount;
}, },
mounted() { mounted() {
this.getBanner(); this.getBanner();
@ -242,7 +243,7 @@
// 向TA提问 // 向TA提问
toAsk(id) { toAsk(id) {
if (this.isReceive == 1) { if (this.consult_amount == 1) {
this.$router.push({ this.$router.push({
path: '/expert/ask', path: '/expert/ask',
name: 'expert-ask', name: 'expert-ask',
@ -250,7 +251,7 @@
id: id id: id
}, },
}); });
} else if (this.isReceive == 0) { } else if (this.consult_amount == 0) {
this.isConfirm = true; this.isConfirm = true;
} }
}, },

4
src/views/index/index.vue
View File

@ -120,7 +120,7 @@
data() { data() {
return { return {
isScrollTop: false, isScrollTop: false,
isReceive: 0, //是否完善资料 consult_amount: 0, //是否完善资料
bannerSrc: "", bannerSrc: "",
expertData: [], //专家列表 expertData: [], //专家列表
headlinesData: [{ headlinesData: [{
@ -149,7 +149,7 @@
created() { created() {
this.isScroll = true; this.isScroll = true;
window.addEventListener("scroll", this.eventScrollTop); window.addEventListener("scroll", this.eventScrollTop);
this.consult_amount = JSON.parse(localStorage.userData).consult_amount; this.consult_amount = (JSON.parse(localStorage.getItem("centerUserData"))).consult_amount;
}, },
mounted() { mounted() {
this.getBanner(); this.getBanner();

28
src/views/login.vue
View File

@ -13,7 +13,7 @@
<div class="company">有谱志愿</div> <div class="company">有谱志愿</div>
<div class="phone-number" v-if="mode == 1"> <div class="phone-number" v-if="mode == 1">
<span>手机号</span> <span>手机号</span>
<input type="text" v-model="phoneNumber" placeholder="请输入手机号" /> <input type="text" v-model="phoneNumber" placeholder="请输入手机号"/>
</div> </div>
<div class="agreement"> <div class="agreement">
<span :class="{ checked: isAgreement }" @click="isAgreement = !isAgreement"><img <span :class="{ checked: isAgreement }" @click="isAgreement = !isAgreement"><img
@ -23,12 +23,11 @@
</p> </p>
</div> </div>
<div class="login-btns"> <div class="login-btns">
<span @click="nailLogin()" v-if="mode == 0" class="nail-btn"><img <span @click="nailLogin()" v-if="mode == 0" class="nail-btn"><img src="../assets/images/login/nail.png" />钉钉授权登录</span>
src="../assets/images/login/nail.png" />钉钉授权登录</span>
<span @click="phoneLogin()" v-if="mode == 1">获取验证码</span> <span @click="phoneLogin()" v-if="mode == 1">获取验证码</span>
</div> </div>
</div> </div>
<div class="login-mode"> <div :class="{'login-mode':true,'noPositin':noPositin}" v-if="mode==0">
<div class="mode-title"><span></span>其他登录方式<span></span></div> <div class="mode-title"><span></span>其他登录方式<span></span></div>
<ul class="mode-item"> <ul class="mode-item">
<li> <li>
@ -92,13 +91,31 @@
openPhoneTips: false, //验证手机号弹出框 openPhoneTips: false, //验证手机号弹出框
phoneNumber: "", phoneNumber: "",
phone: "", phone: "",
noPositin: false,
defaultPhoneHeight : '0', //默认屏幕高度
nowPhoneHeight : '0', //实时屏幕高度
}; };
}, },
created() { created() {
this.isScroll = true; this.isScroll = true;
window.addEventListener("scroll", this.eventScrollTop); window.addEventListener("scroll", this.eventScrollTop);
}, },
mounted() {}, mounted(){
this.defaultPhoneHeight = window.innerHeight
window.onresize = ()=>{
this.nowPhoneHeight = window.innerHeight
}
},
watch: {
nowPhoneHeight:function(){
if(this.defaultPhoneHeight != this.nowPhoneHeight){
this.noPositin = true;
}else{
this.noPositin = false;
}
}
},
methods: { methods: {
// 钉钉授权登录 // 钉钉授权登录
nailLogin() { nailLogin() {
@ -170,6 +187,7 @@
}, },
destroyed() { destroyed() {
window.removeEventListener("scroll", this.eventScrollTop); window.removeEventListener("scroll", this.eventScrollTop);
window.onresize = null;
}, },
//keep-alive进入时触发 //keep-alive进入时触发
activated() { activated() {

32
src/views/login/verification.vue
View File

@ -55,6 +55,7 @@
show: false, //显示获取验证码 show: false, //显示获取验证码
count: "", //剩余时间 count: "", //剩余时间
timer: null, timer: null,
userType: 0,
}; };
}, },
beforeCreate() {}, beforeCreate() {},
@ -83,10 +84,12 @@
computed: {}, computed: {},
methods: { methods: {
getUserData() { getUserData() {
this.axios.post(this.HOME + "/api/user/center-info").then(function (res) { let that = this;
console.log(res.data.data) this.axios.post(this.HOME + "/api/user/center-info").then(function(res) {
localStorage.centerUserData = JSON.stringify(res.data.data); console.log(res.data.data,1234)
}); that.userType = res.data.data.type;
localStorage.centerUserData = JSON.stringify(res.data.data);
});
}, },
hideKeyboard() { hideKeyboard() {
// 输入完成隐藏键盘 // 输入完成隐藏键盘
@ -102,10 +105,8 @@
.then(function(res) { .then(function(res) {
localStorage.userData = JSON.stringify(res.data.data); localStorage.userData = JSON.stringify(res.data.data);
if (res.data.code == 0) { if (res.data.code == 0) {
that.getUserData() that.getUserData();
that.$router.push({ that.goPages();
path: "/index",
});
} else { } else {
window.alert(res.msg); window.alert(res.msg);
} }
@ -114,6 +115,21 @@
console.log(error); console.log(error);
}); });
}, },
// 跳转页面
goPages(){
console.log(this.userType,252525)
if(this.userType == 1){
this.$router.push({
path: "/consultant",
});
}else{
this.$router.push({
path: "/index",
});
}
},
handleSubmit() { handleSubmit() {
this.$emit("input", this.value); this.$emit("input", this.value);
}, },

311
src/views/user/information/index.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<div class="content"> <div class="content">
<!-- 头部 --> <!-- 头部 -->
<div :class="{'header':true,'scroll white':isScrollTop,'white':true}"> <div :class="{'header':true,'scroll white':isScrollTop,'white':true}">
<div class="back" @click="$router.go(-1)"><img src="../../../assets/images/home/expert/back.png" alt=""></div> <div class="back" @click="$router.go(-1)"><img src="../../../assets/images/home/expert/back.png" alt="">
</div>
<div class="header-title">完善考生信息</div> <div class="header-title">完善考生信息</div>
</div> </div>
<div class="information pull-content list-section"> <div class="information pull-content list-section">
@ -17,34 +18,36 @@
<span><em>*</em>考籍</span> <span><em>*</em>考籍</span>
<p> <p>
<input type="text" readonly="readonly" :value="addrArray[addrIndex]" placeholder="请选择考生所在省份"> <input type="text" readonly="readonly" :value="addrArray[addrIndex]" placeholder="请选择考生所在省份">
<img src="../../../assets/images/home/expert/arrow-right.png" > <img src="../../../assets/images/home/expert/arrow-right.png">
</p> </p>
</li> </li>
<li @click="openSex()"> <li @click="openSex()">
<span><em>*</em>性别</span> <span><em>*</em>性别</span>
<p> <p>
<input type="text" readonly="readonly" :value="sexData[sexIndex].title" placeholder="请选择性别"> <input type="text" readonly="readonly" :value="sexData[sexIndex].title" placeholder="请选择性别">
<img src="../../../assets/images/home/expert/arrow-right.png" > <img src="../../../assets/images/home/expert/arrow-right.png">
</p> </p>
</li> </li>
<li @click="openCategory()"> <li @click="openCategory()">
<span><em>*</em>考生类型</span> <span><em>*</em>考生类型</span>
<p> <p>
<input type="text" readonly="readonly" :value="categoryData[categoryIndex].title" placeholder="请选择考生类型"> <input type="text" readonly="readonly" :value="categoryData[categoryIndex].title"
<img src="../../../assets/images/home/expert/arrow-right.png" > placeholder="请选择考生类型">
<img src="../../../assets/images/home/expert/arrow-right.png">
</p> </p>
</li> </li>
<li @click="openDate()"> <li @click="openDate()">
<span><em>*</em>高考年份</span> <span><em>*</em>高考年份</span>
<p> <p>
<input type="text" readonly="readonly" :value="dateArray[dateIndex]" placeholder="请选择高考年份"> <input type="text" readonly="readonly" :value="dateArray[dateIndex]" placeholder="请选择高考年份">
<img src="../../../assets/images/home/expert/arrow-right.png" > <img src="../../../assets/images/home/expert/arrow-right.png">
</p> </p>
</li> </li>
<li> <li>
<span><em>*</em>选科组合</span> <span><em>*</em>选科组合</span>
<div class="course-list"> <div class="course-list">
<span :class="{'checked':item.isActive}" v-for="(item,index) in subjectArray" :key="index" @click="onChange(index,item.id)">{{item.name}}</span> <span :class="{'checked':item.isActive}" v-for="(item,index) in subjectArray" :key="index"
@click="onChange(index,item.id)">{{item.name}}</span>
</div> </div>
</li> </li>
<li> <li>
@ -70,7 +73,8 @@
<span @click="isAddr=!isAddr">取消</span> <span @click="isAddr=!isAddr">取消</span>
</div> </div>
<ul> <ul>
<li :class="{'checked':index == addrIndex}" @click="getAddrValue(index,item)" v-for="(item,index) in addrData" :key="index"> <li :class="{'checked':index == addrIndex}" @click="getAddrValue(index,item)"
v-for="(item,index) in addrData" :key="index">
{{item.name}} {{item.name}}
<img v-show="index == addrIndex" src="../../../assets/images/home/expert/yes.png"> <img v-show="index == addrIndex" src="../../../assets/images/home/expert/yes.png">
</li> </li>
@ -84,7 +88,9 @@
<span @click="isSex=!isSex">取消</span> <span @click="isSex=!isSex">取消</span>
</div> </div>
<ul> <ul>
<li :class="{'checked':index == sexIndex}" @click="getSexValue(index,item)" v-for="(item,index) in sexData" :key="index">{{item.title}}<img v-show="index==sexIndex" src="../../../assets/images/home/expert/yes.png"></li> <li :class="{'checked':index == sexIndex}" @click="getSexValue(index,item)"
v-for="(item,index) in sexData" :key="index">{{item.title}}<img v-show="index==sexIndex"
src="../../../assets/images/home/expert/yes.png"></li>
</ul> </ul>
</div> </div>
<!-- 日期弹出框 --> <!-- 日期弹出框 -->
@ -95,7 +101,9 @@
<span @click="isDate=!isDate">取消</span> <span @click="isDate=!isDate">取消</span>
</div> </div>
<ul> <ul>
<li :class="{'checked':index == dateIndex}" @click="getDateValue(index,item)" v-for="(item,index) in dateArray" :key="index">{{item}}<img v-show="index==dateIndex" src="../../../assets/images/home/expert/yes.png"></li> <li :class="{'checked':index == dateIndex}" @click="getDateValue(index,item)"
v-for="(item,index) in dateArray" :key="index">{{item}}<img v-show="index==dateIndex"
src="../../../assets/images/home/expert/yes.png"></li>
</ul> </ul>
</div> </div>
<!-- 考生类别弹出框 --> <!-- 考生类别弹出框 -->
@ -106,7 +114,9 @@
<span @click="isCategory=!isCategory">取消</span> <span @click="isCategory=!isCategory">取消</span>
</div> </div>
<ul> <ul>
<li :class="{'checked':index == categoryIndex}" @click="getCategoryValue(index,item)" v-for="(item,index) in categoryData" :key="index">{{item.title}}<img v-show="index==categoryIndex" src="../../../assets/images/home/expert/yes.png"></li> <li :class="{'checked':index == categoryIndex}" @click="getCategoryValue(index,item)"
v-for="(item,index) in categoryData" :key="index">{{item.title}}<img v-show="index==categoryIndex"
src="../../../assets/images/home/expert/yes.png"></li>
</ul> </ul>
</div> </div>
<!-- 咨询卡弹出框 --> <!-- 咨询卡弹出框 -->
@ -115,51 +125,59 @@
<img @click="goPage('/expert')" src="../../../assets/images/user/seekcard.png"> <img @click="goPage('/expert')" src="../../../assets/images/user/seekcard.png">
<img @click="isSeekCard=!isSeekCard" src="../../../assets/images/user/close.png"> <img @click="isSeekCard=!isSeekCard" src="../../../assets/images/user/close.png">
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: "information", name: "information",
data(){ data() {
return { return {
isScrollTop: false, isScrollTop: false,
addrArray:[], //城市名称列表 addrArray: [], //城市名称列表
addrData:[], //考籍列表 addrData: [], //考籍列表
addrIndex: 0, addrIndex: 0,
isAddr: false, //城市列表是否显示 isAddr: false, //城市列表是否显示
addrValue:'', //考籍城市编号 addrValue: '', //考籍城市编号
studentName: '', //考生姓名 studentName: '', //考生姓名
sexData:[ sexData: [{
{title:'男'}, title: '男'
{title:'女'} },
{
title: '女'
}
], ],
sexIndex: 0, sexIndex: 0,
isSex: false, //性别列表是否显示 isSex: false, //性别列表是否显示
sexValue:'', //选择性别 sexValue: '', //选择性别
dateArray:[], dateArray: [],
dateIndex: 0, dateIndex: 0,
isDate: false, //时间列表是否显示 isDate: false, //时间列表是否显示
dateValue:'', //选择时间 dateValue: '', //选择时间
categoryData:[ categoryData: [{
{title:'普通高考生'}, title: '普通高考生'
{title:'艺考生'}, },
{title:'体考生'} {
title: '艺考生'
},
{
title: '体考生'
}
], ],
categoryIndex: 0, categoryIndex: 0,
isCategory: false, //性别列表是否显示 isCategory: false, //性别列表是否显示
categoryValue:'', //选择性别 categoryValue: '', //选择性别
checkedIndex: -1, checkedIndex: -1,
isSeekCard: false, isSeekCard: false,
achievementExpect:'',//预估成绩 achievementExpect: '', //预估成绩
provinceRanking: '' ,//预估排名 provinceRanking: '', //预估排名
// 学科 // 学科
subjectArray: [], subjectArray: [],
@ -167,24 +185,24 @@
subjectIndex: 0, subjectIndex: 0,
numberArr: [], numberArr: [],
temporaryCode:[],//暂存编号 temporaryCode: [], //暂存编号
limitArr:[],//多选一数组 limitArr: [], //多选一数组
count:0, count: 0,
userObj:'', userObj: '',
lenNum:0,//最少最多 lenNum: 0, //最少最多
iscount:true, iscount: true,
ispopu:false ispopu: false
} }
}, },
created() { created() {
this.isScroll = true; this.isScroll = true;
window.addEventListener("scroll", this.eventScrollTop); window.addEventListener("scroll", this.eventScrollTop);
}, },
mounted() { mounted() {
this.getAddrData(); this.getAddrData();
this.getDate(); this.getDate();
}, },
methods:{ methods: {
// 获取城市列表 // 获取城市列表
getAddrData() { getAddrData() {
let that = this; let that = this;
@ -196,17 +214,17 @@
let list = res.data.data; let list = res.data.data;
let newArray = []; let newArray = [];
let newObj = []; let newObj = [];
list.forEach(item=>{ list.forEach(item => {
let obj = { let obj = {
code: item.code, code: item.code,
name: item.name, name: item.name,
subject_white: item.subject_white, subject_white: item.subject_white,
subject_radio_group: item.subject_radio_group, subject_radio_group: item.subject_radio_group,
subject_radio_group_list:item.subject_radio_group_list, subject_radio_group_list: item.subject_radio_group_list,
subject_max:item.subject_max subject_max: item.subject_max
} }
newArray.push(obj.name); newArray.push(obj.name);
newObj.push(obj); newObj.push(obj);
}) })
that.addrArray = newArray; that.addrArray = newArray;
that.addrData = newObj; that.addrData = newObj;
@ -214,22 +232,22 @@
}); });
}, },
// 获取考试时间 // 获取考试时间
getDate(){ getDate() {
const date = new Date(); const date = new Date();
let year = Math.trunc(date.getFullYear()); let year = Math.trunc(date.getFullYear());
let end = year + 10; let end = year + 10;
let newArray=[]; let newArray = [];
for(let i=year; i<= end; i++){ for (let i = year; i <= end; i++) {
newArray.push(i); newArray.push(i);
} }
this.dateArray = newArray; this.dateArray = newArray;
this.dateValue = this.dateArray[this.dateIndex]; this.dateValue = this.dateArray[this.dateIndex];
}, },
// 城市选择 // 城市选择
openAddr(){ openAddr() {
this.isAddr=!this.isAddr; this.isAddr = !this.isAddr;
}, },
getAddrValue(index,item){ getAddrValue(index, item) {
this.addrValue = item.code; this.addrValue = item.code;
this.addrIndex = index; this.addrIndex = index;
this.isAddr = false; this.isAddr = false;
@ -239,31 +257,31 @@
this.getSubjectArray(); this.getSubjectArray();
}, },
// 选择性别 // 选择性别
openSex(){ openSex() {
this.isSex=!this.isSex; this.isSex = !this.isSex;
}, },
getSexValue(index,item){ getSexValue(index, item) {
this.sexValue = item.title; this.sexValue = item.title;
this.sexIndex = index; this.sexIndex = index;
this.isSex=false; this.isSex = false;
}, },
// 选择时间 // 选择时间
openDate(){ openDate() {
this.isDate=!this.isDate; this.isDate = !this.isDate;
}, },
getDateValue(index,item){ getDateValue(index, item) {
this.dateValue = item; this.dateValue = item;
this.dateIndex = index; this.dateIndex = index;
this.isDate=false; this.isDate = false;
}, },
//选择考生类别 //选择考生类别
openCategory(){ openCategory() {
this.isCategory=!this.isCategory; this.isCategory = !this.isCategory;
}, },
getCategoryValue(index,item){ getCategoryValue(index, item) {
this.categoryValue = item.title; this.categoryValue = item.title;
this.categoryIndex = index; this.categoryIndex = index;
this.isCategory=false; this.isCategory = false;
}, },
// 获取选科组合列表 // 获取选科组合列表
getSubjectArray() { getSubjectArray() {
@ -276,58 +294,60 @@
let list = res.data.data; let list = res.data.data;
let newArray = []; let newArray = [];
let baiArr = that.addrData[that.addrIndex].subject_white.split(','); let baiArr = that.addrData[that.addrIndex].subject_white.split(',');
list.forEach(item=>{ list.forEach(item => {
baiArr.forEach(item1=>{ baiArr.forEach(item1 => {
if(item.id==item1){ if (item.id == item1) {
let obj = { let obj = {
id: item.id, id: item.id,
name: item.name, name: item.name,
isActive:false isActive: false
} }
newArray.push(obj); newArray.push(obj);
} }
}) })
}) })
that.subjectArray =newArray; that.subjectArray = newArray;
}); });
}, },
// 选科组合选择事件 // 选科组合选择事件
onChange(index,subId) { onChange(index, subId) {
let existSubid = this.temporaryCode.indexOf(subId); let existSubid = this.temporaryCode.indexOf(subId);
let existsubIndex = this.subjectArray.findIndex(item=>item.id==subId); let existsubIndex = this.subjectArray.findIndex(item => item.id == subId);
console.log(existSubid,existsubIndex,299); console.log(existSubid, existsubIndex, 299);
if(this.addrData[this.addrIndex].subject_max!=1){ if (this.addrData[this.addrIndex].subject_max != 1) {
// 多选 // 多选
if(this.temporaryCode.length < this.addrData[this.addrIndex].subject_max){ if (this.temporaryCode.length < this.addrData[this.addrIndex].subject_max) {
// 没有超过限制选择的科目数量 // 没有超过限制选择的科目数量
if(existSubid==-1){ if (existSubid == -1) {
if(this.addrData[this.addrIndex].subject_radio_group_list.length) { if (this.addrData[this.addrIndex].subject_radio_group_list.length) {
// 存在限制的科目id // 存在限制的科目id
let limitSubid = this.addrData[this.addrIndex].subject_radio_group_list[0].findIndex(item=>item==subId); let limitSubid = this.addrData[this.addrIndex].subject_radio_group_list[0].findIndex(
let date = this.temporaryCode.findIndex(item => this.addrData[this.addrIndex].subject_radio_group_list[0].indexOf(item) > -1) item => item == subId);
if(limitSubid!=-1 && date!=-1){ let date = this.temporaryCode.findIndex(item => this.addrData[this.addrIndex]
.subject_radio_group_list[0].indexOf(item) > -1)
if (limitSubid != -1 && date != -1) {
// 待提交科目数组id存在限制科目的id // 待提交科目数组id存在限制科目的id
console.log('选择科目冲突'); console.log('选择科目冲突');
} else { } else {
// 待提交科目数组id不存在限制科目的id // 待提交科目数组id不存在限制科目的id
this.subjectArray[index].isActive = !this.subjectArray[index].isActive; this.subjectArray[index].isActive = !this.subjectArray[index].isActive;
this.setSubList(index,subId); this.setSubList(index, subId);
} }
} else { } else {
// 不存在限制的科目的id // 不存在限制的科目的id
this.subjectArray[index].isActive = !this.subjectArray[index].isActive; this.subjectArray[index].isActive = !this.subjectArray[index].isActive;
this.setSubList(index,subId); this.setSubList(index, subId);
} }
} else { } else {
this.temporaryCode.splice(existSubid,1); this.temporaryCode.splice(existSubid, 1);
this.subjectArray[existsubIndex].isActive = false; this.subjectArray[existsubIndex].isActive = false;
} }
} else { } else {
// 超过了限制选择科目的数量 // 超过了限制选择科目的数量
if(existSubid!=-1){ if (existSubid != -1) {
// 如果选中的科目id在待提交的数组里存在，则删除当前选中的科目 // 如果选中的科目id在待提交的数组里存在，则删除当前选中的科目
this.temporaryCode.splice(existSubid,1); this.temporaryCode.splice(existSubid, 1);
this.subjectArray[existsubIndex].isActive = false; this.subjectArray[existsubIndex].isActive = false;
} else { } else {
console.log('提示框：xxxx'); console.log('提示框：xxxx');
@ -339,64 +359,61 @@
// 清空暂存编号 // 清空暂存编号
this.temporaryCode = []; this.temporaryCode = [];
// 取消所有选中项 // 取消所有选中项
this.subjectArray.forEach(item=>{item.isActive = false;}) this.subjectArray.forEach(item => {
item.isActive = false;
})
// 调用设置科目列表事件 // 调用设置科目列表事件
this.setSubList(index,subId); this.setSubList(index, subId);
} }
}, },
// 设置科目列表事件 // 设置科目列表事件
setSubList(index,id){ setSubList(index, id) {
// 设置选中项 // 设置选中项
this.subjectArray[index].isActive = true; this.subjectArray[index].isActive = true;
// 储存选中项的id到待提交数组里 // 储存选中项的id到待提交数组里
this.temporaryCode.push(id); this.temporaryCode.push(id);
console.log(this.temporaryCode,'数据'); console.log(this.temporaryCode, '数据');
}, },
// 获取考生信息 // 获取考生信息
setStudentInfo() { setStudentInfo() {
let that =this; let that = this;
if(that.temporaryCode.length != that.addrData[that.addrIndex].subject_max){ if (that.temporaryCode.length != that.addrData[that.addrIndex].subject_max) {
console.log('弹框提示，必须选择多少个科目'); console.log('弹框提示，必须选择多少个科目');
} else { } else {
let data = { let that = this;
student_name: that.studentName,//姓名 this.axios
student_gender: that.sexIndex==0 ? 1 : 2,//性别 .post(this.HOME + "/api/user/edit-student-info", {
student_native: that.addrData[that.addrIndex].code, //考籍（省级）编号 student_name: that.studentName, //姓名
student_native_str: that.addrData[that.addrIndex].name,//考籍（省级）名称 student_gender: that.sexIndex == 0 ? 1 : 2, //性别
student_subject: that.temporaryCode.join(','),//选科组合（选科ID，多个用英文逗号分割） student_native: that.addrData[that.addrIndex].code, //考籍（省级）编号
student_exam_year: that.dateValue,//高考年份 student_native_str: that.addrData[that.addrIndex].name, //考籍（省级）名称
is_art: that.dateIndex==1?1:0,//是否是艺考生 student_subject: that.temporaryCode.join(','), //选科组合（选科ID，多个用英文逗号分割）
is_PE:that.dateIndex==2?1:0,//是否是体考生 student_exam_year: that.dateValue, //高考年份
achievement_expect: that.achievementExpect,//预估或模考成绩 is_art: that.dateIndex == 1 ? 1 : 0, //是否是艺考生
province_ranking: that.provinceRanking,//预估/省内排名 is_PE: that.dateIndex == 2 ? 1 : 0, //是否是体考生
achievement_high: '',//高考成绩，-1表示未考（用户留空时默认传值为-1） achievement_expect: that.achievementExpect, //预估或模考成绩
} province_ranking: that.provinceRanking, //预估/省内排名
console.log(data,2525) achievement_high: '', //高考成绩，-1表示未考（用户留空时默认传值为-1）
})
.then(function(res) {
that.getUserData();
that.isSeekCard = true;
console.log(res, 123)
});
} }
// let that = this;
// this.axios },
// .post(this.HOME + "/api/area/index", { getUserData() {
// student_name: that.studentName,//姓名 this.axios.post(this.HOME + "/api/user/center-info").then(function(res) {
// student_gender: that.sexIndex==0 ? 1 : 2,//性别 console.log(res.data.data)
// student_native: that.addrData[that.addrIndex].code, //考籍（省级）编号 localStorage.centerUserData = JSON.stringify(res.data.data);
// student_native_str: that.addrData[that.addrIndex].name,//考籍（省级）名称 });
// student_subject: this.temporaryCode.join(','),//选科组合（选科ID，多个用英文逗号分割）
// student_exam_year: that.dateValue,//高考年份
// is_art: that.dateIndex==1?1:0,//是否是艺考生
// is_PE:that.dateIndex==2?1:0,//是否是体考生
// achievement_expect: that.achievementExpect,//预估或模考成绩
// province_ranking: that.provinceRanking,//预估/省内排名
// achievement_high: '',//高考成绩，-1表示未考（用户留空时默认传值为-1）
// })
// .then(function(res) {
// // that.isSeekCard = true;
// console.log(res,123)
// });
}, },
// 跳转 // 跳转
goPage(path){ goPage(path) {
this.$router.push(path); this.$router.push(path);
}, },
// 滚动改变样式 // 滚动改变样式
eventScrollTop() { eventScrollTop() {
@ -426,7 +443,7 @@
deactivated() { deactivated() {
window.removeEventListener("scroll", this.eventScrollTop); window.removeEventListener("scroll", this.eventScrollTop);
} }
} }
</script> </script>
<style scoped> <style scoped>