From 55b64892e0807342eda8ba5b3e09de604c6fffcc Mon Sep 17 00:00:00 2001
From: Lee-1203 <342694918@qq.com>
Date: Fri, 11 Mar 2022 18:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E4=BF=AE=E6=94=B9=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                            |   4 +-
 src/assets/images/home/home.png        | Bin 0 -> 1209 bytes
 src/views/home/evaluation/entrance.vue |   3 +-
 src/views/home/evaluation/index.vue    |  21 +---------
 src/views/home/expert/ask.vue          |  18 +++++----
 src/views/login/verification.vue       |   3 +-
 src/views/user/information/index.vue   |  51 ++++++++++++++++++++++++-
 src/views/user/report/index.vue        |  23 ++++++++++-
 src/views/user/ucenter/index.vue       |   7 ++--
 9 files changed, 93 insertions(+), 37 deletions(-)
 create mode 100644 src/assets/images/home/home.png

diff --git a/src/App.vue b/src/App.vue
index d37b098..f28d971 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -596,10 +596,12 @@ textarea {
 	text-align: center;
 }
 /* 专业测评 */
+.evaluation{
+	margin-top: 0;
+}
 .index-evaluation-list{
 	display: flex;
 	justify-content: space-between;
-	margin-top: .2rem;
 }
 .index-evaluation-list>li{
 	width: 48.875%;
diff --git a/src/assets/images/home/home.png b/src/assets/images/home/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..462c6088520b421479754113609ffb007cb8016e
GIT binary patch
literal 1209
zcmV;q1V;ObP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px(b4f%&RA@u(nOle(WfaH%XR=#cAEej^K?Ma7M8R&|NoE3SCM~6i);<*k>4Uc2
zZo8IUbro;m7L<xw+^xH)?Fyw;#0ykZ`XalTYMY&8Cb6_4rHYC^h%Z$rsBCt=BiU?{
z$#rIu>5_%yDNN4g|2yaVzL_~8tnd%5aQ)~4)azhGOFbk&0{}-rWP_2Bz(>-$@>S3s
z54Zzkk{o|v9E|-9gicy|WEdb36i8qI{aW%4388TYwlo(<Uxz|sBsHV{5ClXZ0P_8F
z53@uQ1iG~-iiwZ*NEpxAz4Ju&v&6i+B$)A=1dOClD<|89Xd57`8KVq(!zqNpqZwU2
z<h&-wQqO?!y7L-=o;UT#YwbX^3=oYb*UYb$CWxtAS;EhPF`R9%S>?E~4U7qZZYgyN
zbPQLdp-e{prxlQv03z|!dYkb!0r!=c1)o}AjGX&M{jr&l{9YmS90qu^!){Ix@6RUG
zj9&=f0R6Glb|Sn3U|lI0;VmnnJmn{Of6SO7qJ54Smx+1U)YT9C#PJ0nYpE9jyi%25
z(9)In{3I>fhBafDLE}}vuUfkDlGk{i0Q$7=*7hPd$>2xJf$1V(@3r)(?loCGJ2_@-
zW}+zqZg>3t+3JNg182_M{g+#8R{(jV8G#V_3ilO*5pYu2p`pyT@*i#qy!^g?WAdh6
z5z6Oy&{3cZBw^5;jU=1JXbK?5j2)0@8jMw?Q-k<mCZWFIMVMcku$F$4!B0E<asc*P
zy7GRbSPcQfTKXV^pQ{MQywf_Zp71NokG&i>9tYFA0D8+Er$eS58Lbzm20+<l++f>u
z6u{P!1LM3z*qPQ9%a52=ZST<xRRT=|xXW=$o#KViuIgo50U&Fp28g`lZH~40@in>m
z-Dl6<d!<!Dt@tU5ah<r9rkSzb;s1+}uq!*O%sTdC;cGaa-p9;SmC3{bOOKAVA|NOq
zS(_UJq?aq>@e`J=E^1xufUM1FfRw0B+Nl751Z>T}UlaiHrw!5ZMIyqd<+gP$01@vo
z6Y7!D9?0L?0lG*e)|Fe<X#nCtp~#`jW+HO9w1k{Xr*h489zgY;tT{%z06`r;OL5!^
z+U-EV1+NL$?Lez{Vr7$Yr)^V|K>tyQ&Gd|Nsg-Umdj}j-x$?u{qH_AOmFe8F0z|hY
zug}f*TmbWp^{UOluQpa~IHzy;+iN$L6+qU^M*#7W;}Q4-1pN!*f#Nj*@mN-m9_vs5
z=aXakF78&vW-xBPf!+riC36$e1qkY4uG@h+Ysqc-b@zam<>yw#KsWKy@b;6XpeajN
z)OOG8wgBR(<6!J4Xy7L;U9Fg<*3N}A<7ON5ds#I91n`GmA)K$Hl|IGELgBU0`^Pbn
zAZeSG2!G-9tvi{MHFF3MlirhDeM<r|rmo1<nHr83Wz84?C_j%`d-dhHX84nV!Hlka
z?inC&7}nB#HtaqLDE)conkrxeCg~DOJ>O?%`p?%3?K)l$SWn>Lx&VQf)MvmI-+})D
XefghH&X-lJ00000NkvXXu0mjf6q`(~

literal 0
HcmV?d00001

diff --git a/src/views/home/evaluation/entrance.vue b/src/views/home/evaluation/entrance.vue
index 39dce66..32a88e8 100644
--- a/src/views/home/evaluation/entrance.vue
+++ b/src/views/home/evaluation/entrance.vue
@@ -38,7 +38,8 @@ export default {
   created() {
     this.isScroll = true;
     window.addEventListener("scroll", this.eventScrollTop);
-	if(this.$route.query.source !== ''){
+	
+	if(this.$route.query.source){
 		localStorage.source = JSON.stringify(this.$route.query.source);
 	}
   },
diff --git a/src/views/home/evaluation/index.vue b/src/views/home/evaluation/index.vue
index 8913fac..9673d40 100644
--- a/src/views/home/evaluation/index.vue
+++ b/src/views/home/evaluation/index.vue
@@ -1,10 +1,5 @@
 <template>
     <div class="content main-content">
-		<!-- 头部 -->
-		<div :class="{'header':true,'scroll white':isScrollTop,'white':true}">
-			<div class="back"></div>
-			<div class="header-title">测评</div>
-		</div>
 		<div class="evaluation pull-content">
 			<div class="evaluation-list">
 				<div class="evaluation-item" v-for="(item,index) in evaluationList" :key="index">
@@ -63,8 +58,6 @@
 		    }
 		},
 		created() {
-			this.isScroll = true;
-			window.addEventListener("scroll", this.eventScrollTop);
 			
 		},
 		mounted() {
@@ -136,19 +129,7 @@
 					}
 				}
 			}
-        },
-		destroyed() {
-			window.removeEventListener("scroll", this.eventScrollTop);
-		},
-		//keep-alive进入时触发
-		activated() {
-			this.isScroll = true;
-			window.addEventListener("scroll", this.eventScrollTop)
-		},
-		//keep-alive离开时触发
-		deactivated() {
-			window.removeEventListener("scroll", this.eventScrollTop);
-		}
+        }
     }
 </script>
 
diff --git a/src/views/home/expert/ask.vue b/src/views/home/expert/ask.vue
index c9057d0..892a51e 100644
--- a/src/views/home/expert/ask.vue
+++ b/src/views/home/expert/ask.vue
@@ -15,7 +15,7 @@
 				<span :class="{'active':!isActive}" @click="isActive=!isActive">专属公益服务群链接</span>
 			</div>
 			<div class="ask-mode-list">
-				<div class="ask-mode-txt" v-show="isActive">
+				<div class="ask-mode-txt" v-show="isActive&&expertDetail.im_group_qr">
 					<p>下载二维码并用钉钉扫一扫进入专属群</p>
 					<img :src="host + expertDetail.im_group_qr">
 					<span @click="downImg()">点击下载二维码</span>
@@ -45,9 +45,10 @@
 			this.isScroll = true;
 			window.addEventListener("scroll", this.eventScrollTop);
 			this.id = this.$route.query.id;
+			this.getDetailData();
 		},
 		mounted() {
-			this.getDetailData();
+			
 		},
 		computed: {
 			
@@ -89,23 +90,24 @@
 				}
 			},
 			
-			
-			//下载二维码的事件
+			// 下载二维码事件
 			downImg() {
 			    var oQrcode = document.querySelectorAll('.ask-mode-txt img')
 			    var url = oQrcode[0].src
-			    var a = document.createElement('a')
+			    var link = document.createElement('a')
 			    var event = new MouseEvent('click')
 			    // 自定义下载后图片的名称
 				if(url!=''){
-					a.download = '钉钉专属群二维码'
-					a.href = url
-					a.dispatchEvent(event)
+					link.download = '钉钉专属群二维码'
+					link.href = url
+					link.dispatchEvent(event)
 				}else{
 					return false;
 				}
 			},
 			
+			
+			
 			// 滚动改变样式
 			eventScrollTop() {
 				let scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
diff --git a/src/views/login/verification.vue b/src/views/login/verification.vue
index a0d7afd..104b7b2 100644
--- a/src/views/login/verification.vue
+++ b/src/views/login/verification.vue
@@ -117,7 +117,8 @@
 							if(res.data.data.userType == 1){
 								that.$router.push('/consultant');
 							}else{
-								if(that.source !== null){
+								if(that.source){
+									window.localStorage.removeItem('source');
 									that.$router.push('/evaluation/entrance');
 								}else{
 									that.$router.push('/index');
diff --git a/src/views/user/information/index.vue b/src/views/user/information/index.vue
index ea118ff..8a3030b 100644
--- a/src/views/user/information/index.vue
+++ b/src/views/user/information/index.vue
@@ -206,6 +206,25 @@
 		created() {
 			this.isScroll = true;
 			window.addEventListener("scroll", this.eventScrollTop);
+			this.userObj = JSON.parse(localStorage.getItem("centerUserData")).student;
+			console.log(this.userObj,'用户信息')
+			if(this.userObj){
+				let list = this.userObj;
+				this.studentName = list.student_name;//姓名
+				this.addrValue = list.student_native;//考籍
+				this.sexIndex = list.student_gender-1;//性别
+				this.temporaryCode = list.student_subject;//选科组合
+				//考生类型
+				if(list.is_art==1){
+					this.categoryIndex = 1;
+				}else if(list.is_is_PE==1){
+					this.categoryIndex = 2;
+				}else{
+					this.categoryIndex = 0;
+				}
+				this.achievementExpect = list.achievement_expect; //预估成绩
+				this.provinceRanking = list.province_ranking //排名
+			}
 		},
 		mounted() {
 			this.getAddrData();
@@ -217,6 +236,8 @@
 				this.isSeekCard=false;
 				this.$router.push('/index');
 			},
+			
+			
 			// 获取城市列表
 			getAddrData() {
 				let that = this;
@@ -242,6 +263,11 @@
 						})
 						that.addrArray = newArray;
 						that.addrData = newObj;
+						if(that.userObj){
+							// 赋值考籍省份
+							let addrIndex = that.addrArray.indexOf(that.userObj.student_native_str);
+							that.addrIndex = addrIndex;
+						}
 						that.getSubjectArray();
 					});
 			},
@@ -256,6 +282,11 @@
 				}
 				this.dateArray = newArray;
 				this.dateValue = this.dateArray[this.dateIndex];
+				if(this.userObj){
+					// 赋值时间
+					let yearIndex = this.dateArray.indexOf(this.userObj.student_exam_year);
+					this.dateIndex = yearIndex;
+				}
 			},
 			// 城市选择
 			openAddr() {
@@ -322,6 +353,24 @@
 
 						})
 						that.subjectArray = newArray;
+						
+						// 修改信息时，默认选中项
+						if(that.userObj){
+						  if(that.iscount){
+							that.iscount = false;
+							let stuJect = that.userObj.student_subject.split(',');
+							let arrList = [];
+							stuJect.forEach(item=>{
+							  that.subjectArray.forEach(item1=>{
+								if(item==item1.id){
+								  item1.isActive = true;
+								}
+							  })
+							  arrList.push(item*1);
+							})
+							that.temporaryCode = arrList;
+						  }
+						}
 					});
 			},
 			// 选科组合选择事件
@@ -396,7 +445,7 @@
 				console.log(this.temporaryCode, '数据');
 			},
 
-			// 获取考生信息
+			// 编辑考生信息
 			setStudentInfo() {
 				let that = this;
 				if(that.studentName == ''){
diff --git a/src/views/user/report/index.vue b/src/views/user/report/index.vue
index dbc9874..28ba92b 100644
--- a/src/views/user/report/index.vue
+++ b/src/views/user/report/index.vue
@@ -6,6 +6,9 @@
 				<img src="../../../assets/images/home/expert/back.png" alt="" />
 			</div>
 			<div class="header-title">我的报告</div>
+			<div class="home" @click="goPage('/index')">
+				<img src="../../../assets/images/home/home.png" alt="" />
+			</div>
 		</div>
 		<div class="report pull-content">
 			<ul class="report-nav">
@@ -110,7 +113,6 @@
 									</div>
 									<div>
 										<p v-if="(item.A.avg_score-0)<=(item.B.avg_score-0)" :style="{width: proportion(item.B.avg_score, (item.A.avg_score-0)+(item.B.avg_score-0))}"></p>
-
 									</div>
 								</div>
 								<p>{{item.B.factor_name}}</p>
@@ -434,6 +436,15 @@
 		width: 100%;
 		height: 320px;
 	}
+	.home,
+	.home img{
+		width: .4rem;
+		height: .4rem;
+	}
+	.home{
+		width: .32rem;
+		height: .32rem;
+	}
 	.report-box4-ex{
 		margin: .6rem 0;
 	}
@@ -460,9 +471,17 @@
 	.content-ex>div>p {
 		background-color: #ffe3db;
 		border: .04rem solid #e0b280;
-		width: 0px;
+		width: 0;
 		height: 100%;
 	}
+	.content-ex>div:nth-of-type(1)>p{
+		border-right: 0;
+	}
+	.content-ex>div:nth-of-type(2)>p{
+		background-color: #b7e46a;
+		border: .04rem solid #80b02e;
+		border-left: 0;
+	}
 
 	.content-ex> :nth-child(1) {
 		display: flex;
diff --git a/src/views/user/ucenter/index.vue b/src/views/user/ucenter/index.vue
index df3a1a7..d385734 100644
--- a/src/views/user/ucenter/index.vue
+++ b/src/views/user/ucenter/index.vue
@@ -3,7 +3,7 @@
 		<!-- 轮播图 -->
 		<div class="banner my-banner">
 			<img src="../../../assets/images/user/banner.jpg" alt="" />
-			<div class="my-photo">
+			<div class="my-photo" @click="goPage('/info')">
 				<span>
 					<img v-if="userData.avatar" :src="host + userData.avatar" />
 					<img v-else src="../../../assets/images/user/photo.png" />
@@ -29,7 +29,7 @@
 					手机号<em>{{ userData.mobile }}</em>
 				</p>
 			</li>
-			<li @click="goPage('/info')">
+			<li @click="goPage('/information')">
 				<span><img src="../../../assets/images/user/icon-student.png" /></span>
 				<p>考生信息</p>
 				<img src="../../../assets/images/home/expert/arrow-right.png" />
@@ -103,11 +103,12 @@
 		},
 		created() {
 			this.getUserData();
+			this.getDate();
 			this.getevaluationList()
 			this.consult_amount = (JSON.parse(localStorage.getItem("centerUserData"))).consult_amount;
 		},
 		mounted() {
-			this.getDate();
+			
 		},
 		methods: {
 			// 获取报告列表