diff --git a/src/App.vue b/src/App.vue
index 13db56d..566ea6a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1695,7 +1695,7 @@ textarea::-webkit-input-placeholder{
 	color: #3844ce;
 }
 .report-list>li span{
-	width: 2.1rem;
+	width: 2.5rem;
 	font-size: .24rem;
 	text-align: right;
 	color: #999999;
@@ -1909,11 +1909,11 @@ textarea::-webkit-input-placeholder{
 	border-bottom: .02rem solid #333fc9;
 }
 .exponent-item-son{
-	margin-top: .15rem;
+	margin-top: .25rem;
 }
 .exponent-item-son span{
 	display: block;
-	font-size: .28rem;
+	font-size: .26rem;
 	line-height: 1.2;
 	margin: .15rem 0;
 	text-align: center;
diff --git a/src/views/consultant/index.vue b/src/views/consultant/index.vue
index 4eba282..7f783d7 100644
--- a/src/views/consultant/index.vue
+++ b/src/views/consultant/index.vue
@@ -8,22 +8,22 @@
 		<div class="consultant pull-content">
 			<div class="consultant-photo">
 				<div>
-					<span><img src="../../assets/images/user/photo.png"></span>
+					<span><img :src="host + experObj.avatar"></span>
 					<p>
-						<span><em>姓名：</em>李四</span>
-						<span><em>职称：</em>高级咨询师</span>
-						<span><em>电话：</em>18683958573</span>
+						<span><em>姓名：</em>{{experObj.name}}</span>
+						<span><em>职称：</em>{{experObj.tags_text}}</span>
+						<span><em>电话：</em>{{experObj.phone}}</span>
 					</p>
 				</div>
 				<p @click="editInformation()">修改基本资料</p>
 			</div>
 			<div class="consultant-info">
-				<p><span>重点服务区域：</span>北京、上海</p>
-				<p><span>区域1的服务价格：</span>3000-12000</p>
-				<p><span>区域2的服务价格：</span>3000-12000</p>
-				<p><span>区域3的服务价格：</span>3000-12000</p>
-				<p><span>其他区域的服务价格：</span>3000-12000</p>
-				<p><span>服务口号：</span>教会孩子规划人生旅程，重要的是帮助TA构建终身学习的生活态度。</p>
+				<p><span>重点服务区域：</span>{{experObj.service_area_text}}</p>
+				<p><span>区域1的服务价格：</span>{{experObj.price_area_a}}</p>
+				<p><span>区域2的服务价格：</span>{{experObj.price_area_b}}</p>
+				<p><span>区域3的服务价格：</span>{{experObj.price_area_c}}</p>
+				<p><span>其他区域的服务价格：</span>{{experObj.price_area_other}}</p>
+				<p><span>服务口号：</span>{{experObj.slogan}}</p>
 			</div>
 			<div class="case-administer">
 				<h3>案例管理</h3>
@@ -36,47 +36,14 @@
 					<span>主案例</span>
 					<span>操作</span>
 				</li>
-				<li>
-					<span><img src="../../assets/images/home/expert/detail.jpg" alt=""></span>
-					<span><p>完美的与湖北工业相遇完美的与湖北业相遇</p></span>
-					<span>是</span>
+				<li v-for="(item,index) in expertCase" :key="index">
+					<span><img :src="host + item.cover"></span>
+					<span><p>{{item.title}}</p></span>
+					<span>{{item.is_main==1?"是":"否"}}</span>
 					<span>
 						<ins>
-							<em @click="editCase()">编辑</em>
-							<em>删除</em>
-						</ins>
-					</span>
-				</li>
-				<li>
-					<span><img src="../../assets/images/home/expert/detail.jpg" alt=""></span>
-					<span><p>完美的与湖北工业相遇</p></span>
-					<span>是</span>
-					<span>
-						<ins>
-							<em>编辑</em>
-							<em>删除</em>
-						</ins>
-					</span>
-				</li>
-				<li>
-					<span><img src="../../assets/images/home/expert/detail.jpg" alt=""></span>
-					<span><p>完美的与湖北工业相遇</p></span>
-					<span>是</span>
-					<span>
-						<ins>
-							<em>编辑</em>
-							<em>删除</em>
-						</ins>
-					</span>
-				</li>
-				<li>
-					<span><img src="../../assets/images/home/expert/detail.jpg" alt=""></span>
-					<span><p>完美的与湖北工业相遇</p></span>
-					<span>是</span>
-					<span>
-						<ins>
-							<em>编辑</em>
-							<em>删除</em>
+							<em @click="editCase(index)">编辑</em>
+							<em @click="deleteCase(item.id)">删除</em>
 						</ins>
 					</span>
 				</li>
@@ -91,25 +58,98 @@
 		data(){
 		    return {
 				isScrollTop: false,
+				id: '',
+				page: 1,//页数
+				size: 10,//条数
+				is_main: -1,//主案件筛选
+				allowLoad:true,//是否允许加载 默认：允许
+				experObj: [],//咨询师详情
+				expertCase: [],//咨询师案例
 		    }
 		},
 		created() {
 			this.isScroll = true;
 			window.addEventListener("scroll", this.eventScrollTop);
 		},
+		mounted() {
+			this.checkExperInfo();
+		},
         methods:{
+			// 查询咨询师信息
+			  checkExperInfo(){
+			  	let that = this;
+			  	this.axios
+			  		.post(this.HOME + "/api/user/center-info", {
+			  		})
+			  		.then(function(res) {
+						console.log(res,123)
+						that.experObj = res.data.data.expert
+						// that.id = that.experObj.id;
+						// 查询咨询师案例
+						that.getExpertCase(that.id)
+			  		});
+			  },
+			
+			// 获取案例列表
+			getExpertCase(id){
+				let that = this;
+				let anId = id;
+				this.axios
+					.post(this.HOME + "/api/expert/get-expert-case-list", {
+						page: that.page,
+					  size: that.size,
+					  expert_id: anId,
+					  is_main: that.is_main
+					})
+					.then(function(res) {
+						let list = res.data.data.list;
+						let newArray = [];
+						that.expertCase = [];
+						list.forEach(item=>{
+						  let obj = {
+							id:item.id,
+							cover: item.cover,
+							title: item.title,
+							result_remarks: item.result_remarks,
+							location_remarks: item.location_remarks,
+							other_remarks: item.other_remarks,
+							account_remarks: item.account_remarks,
+							is_main:item.is_main,
+							student_name:item.student_name
+						  }
+						  newArray.push(obj);
+						})
+						that.expertCase = that.expertCase.concat(newArray);
+					});
+			},
+			
+			// 编辑案例
+			  editCase(index){
+			    let editIndex = index;
+				localStorage.anliObj = JSON.stringify(editIndex);
+			    this.$router.push('/case');
+			  },
+			  
+			  
+			  // 删除案例
+			  deleteCase(idk){
+			  	let that = this;
+				let anId = idk;
+			  	this.axios
+			  		.post(this.HOME + "/api/expert/get-expert-case-list", {
+						ids:anId
+			  		})
+			  		.then(function(res) {
+						console.log(res,2525)
+						alert('删除成功');
+			  			that.getExpertCase(that.id);
+			  		});
+			  },
+		
 			// 修改基本资料
 			editInformation(){
 				this.$router.push('/edit');
 			},
-			// 新增案例
-			addCase(){
-			    this.$router.push('/case');
-			},
-			// 编辑案例
-			editCase(){
-			    this.$router.push('/case');
-			},
 			// 页面跳转
 			goPage(path){
 			    this.$router.push(path);
diff --git a/src/views/user/feedback/index.vue b/src/views/user/feedback/index.vue
index 4af4240..2a63027 100644
--- a/src/views/user/feedback/index.vue
+++ b/src/views/user/feedback/index.vue
@@ -1,84 +1,85 @@
 <template>
-  <div class="content bind-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="info-bg pull-content">
-      <div class="feedback-msg">
-        <textarea v-model="content" rows="" cols="" placeholder="请输入您反馈的内容"></textarea>
-      </div>
-    </div>
-    <div @click="btnFeedback()" class="bind-btn">提交</div>
-  </div>
+	<div class="content bind-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="info-bg pull-content">
+			<div class="feedback-msg">
+				<textarea v-model="content" placeholder="请输入您反馈的内容"></textarea>
+			</div>
+		</div>
+		<div @click="btnFeedback()" class="bind-btn">提交</div>
+	</div>
 </template>
 
 <script>
-export default {
-  name: "feedback",
-  data() {
-    return {
-      isScrollTop: false,
-      content: "",
-    };
-  },
-  created() {
-    this.isScroll = true;
-    window.addEventListener("scroll", this.eventScrollTop);
-  },
-  mounted() {},
-  computed: {},
-  methods: {
-    btnFeedback() {
-      if (this.content == "") {
-        return;
-      }
-      this.axios
-        .post(
-          this.HOME + "/api/consumer/submit-feedback",
-          { content: this.content },
-        )
-        .then(function (res) {
-		  window.alert(res.data.msg)
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
-    },
-    // 滚动改变样式
-    eventScrollTop() {
-      let scrollTop =
-        document.body.scrollTop || document.documentElement.scrollTop;
-      if (scrollTop >= 5) {
-        if (this.isScroll) {
-          this.isScroll = false;
-          this.isScrollTop = true;
-        }
-      } else {
-        if (!this.isScroll) {
-          this.isScroll = true;
-          this.isScrollTop = false;
-        }
-      }
-    },
-  },
-  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);
-  },
-};
+	export default {
+		name: "feedback",
+		data() {
+			return {
+				isScrollTop: false,
+				content: "",
+			};
+		},
+		created() {
+			this.isScroll = true;
+			window.addEventListener("scroll", this.eventScrollTop);
+		},
+		mounted() {},
+		computed: {},
+		methods: {
+			btnFeedback() {
+				if (this.content == "") {
+					return;
+				}
+				this.axios
+					.post(
+						this.HOME + "/api/consumer/submit-feedback", {
+							content: this.content
+						},
+					)
+					.then(function(res) {
+						window.alert(res.data.msg)
+					})
+					.catch(function(error) {
+						console.log(error);
+					});
+			},
+			// 滚动改变样式
+			eventScrollTop() {
+				let scrollTop =
+					document.body.scrollTop || document.documentElement.scrollTop;
+				if (scrollTop >= 5) {
+					if (this.isScroll) {
+						this.isScroll = false;
+						this.isScrollTop = true;
+					}
+				} else {
+					if (!this.isScroll) {
+						this.isScroll = true;
+						this.isScrollTop = false;
+					}
+				}
+			},
+		},
+		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>
 
 <style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/user/info/index.vue b/src/views/user/info/index.vue
index 4b90d80..ffa81dd 100644
--- a/src/views/user/info/index.vue
+++ b/src/views/user/info/index.vue
@@ -1,96 +1,133 @@
 <template>
-  <div class="content bind-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="info-bg pull-content">
-      <ul class="phone-info">
-        <li>
-          <span>头像</span>
-          <p class="ps">
-            <input class="inputB" @change="imgIny($event)" type="file" />
-            <img src="../../../assets/images/user/photo.png" />
-          </p>
-        </li>
-        <li>
-          <span>昵称</span
-          ><input type="text" value="" placeholder="请输入昵称" />
-        </li>
-      </ul>
-    </div>
-    <div class="bind-btn">提交</div>
-  </div>
+	<div class="content bind-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="info-bg pull-content">
+			<ul class="phone-info">
+				<li>
+					<span>头像</span>
+					<p class="ps">
+						<input class="inputB" @change="imgIny($event)" type="file" />
+						<img v-if="myAvatar" :src="host + myAvatar">
+						<img v-else-if="userDataAll.avatar" :src="host + userDataAll.avatar">
+						<img v-else src="../../../assets/images/user/photo.png" />
+					</p>
+				</li>
+				<li>
+					<span>昵称</span><input type="text" v-model="nickName" value="" placeholder="请输入昵称" />
+				</li>
+			</ul>
+		</div>
+		<div class="bind-btn" @click="setInfo()">提交</div>
+	</div>
 </template>
 
 <script>
-export default {
-  name: "info",
-  data() {
-    return {
-      isScrollTop: false,
-    };
-  },
-  created() {
-    this.isScroll = true;
-    window.addEventListener("scroll", this.eventScrollTop);
-  },
-  mounted() {},
-  computed: {},
-  methods: {
-    imgIny(e) {
-      const files = e.target.files;
-      console.log(files[0]);
-      console.log({ image: files[0] });
-      var fromdata = new FormData();
-      fromdata.append("image", files[0]);
-      this.axios
-        .post(this.HOME + "/api/file/upload/image", fromdata, {
-          headers: {
-            "Content-Type": "multipart/form-data",
-          },
-        })
-        .then(function (res) {
-          console.log(res);
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
-    },
-    // 滚动改变样式
-    eventScrollTop() {
-      let scrollTop =
-        document.body.scrollTop || document.documentElement.scrollTop;
-      if (scrollTop >= 5) {
-        if (this.isScroll) {
-          this.isScroll = false;
-          this.isScrollTop = true;
-        }
-      } else {
-        if (!this.isScroll) {
-          this.isScroll = true;
-          this.isScrollTop = false;
-        }
-      }
-    },
-  },
-};
+	export default {
+		name: "info",
+		data() {
+			return {
+				isScrollTop: false,
+				myAvatar: '',
+				nickName:'',
+				userDataAll:[]
+			};
+		},
+		created() {
+			this.isScroll = true;
+			window.addEventListener("scroll", this.eventScrollTop);
+			this.userDataAll = (JSON.parse(localStorage.getItem("centerUserData")));
+			this.nickName = this.userDataAll.nick_name;
+		},
+		mounted() {},
+		computed: {},
+		methods: {
+			imgIny(e) {
+				let that = this;
+				const files = e.target.files;
+				console.log(files[0]);
+				console.log({
+					image: files[0]
+				});
+				var fromdata = new FormData();
+				fromdata.append("image", files[0]);
+				this.axios
+					.post(this.HOME + "/api/file/upload/image", fromdata, {
+						headers: {
+							"Content-Type": "multipart/form-data",
+						},
+					})
+					.then(function(res) {
+						that.myAvatar = res.data.data.src;
+						console.log(that.myAvatar, 123);
+					})
+					.catch(function(error) {
+						console.log(error);
+					});
+			},
+			
+			// 提交
+			setInfo(){
+				let that = this;
+				this.axios
+					.post(this.HOME + "/api/user/edit-base-info", {
+						nick_name: that.nickName,
+						avatar: that.myAvatar
+					})
+					.then(function(res) {
+						that.getUserData();
+						that.$router.push('/ucenter');
+						console.log(res)
+					});
+			},
+			
+			// 获取用户信息
+			getUserData() {
+			  let that = this;
+			  this.axios.post(this.HOME + "/api/user/center-info").then(function (res) {
+			    that.userData = res.data.data;
+				localStorage.centerUserData = JSON.stringify(res.data.data);
+			  });
+			},
+
+
+			// 滚动改变样式
+			eventScrollTop() {
+				let scrollTop =
+					document.body.scrollTop || document.documentElement.scrollTop;
+				if (scrollTop >= 5) {
+					if (this.isScroll) {
+						this.isScroll = false;
+						this.isScrollTop = true;
+					}
+				} else {
+					if (!this.isScroll) {
+						this.isScroll = true;
+						this.isScrollTop = false;
+					}
+				}
+			},
+		},
+	};
 </script>
 
 <style scoped>
-.inputB {
-  width: 1.1rem;
-  height: 1.1rem;
-  position: absolute;
-  left: 0px;
-  z-index: 5;
-  top: 0px;
-  opacity: 0;
-}
-.ps {
-  position: relative;
-}
-</style>
\ No newline at end of file
+	.inputB {
+		width: 1.1rem;
+		height: 1.1rem;
+		position: absolute;
+		left: 0px;
+		z-index: 5;
+		top: 0px;
+		opacity: 0;
+	}
+
+	.ps {
+		position: relative;
+	}
+</style>
diff --git a/src/views/user/report/index.vue b/src/views/user/report/index.vue
index 05c648b..dbc9874 100644
--- a/src/views/user/report/index.vue
+++ b/src/views/user/report/index.vue
@@ -1,680 +1,471 @@
 <template>
-  <div class="content my-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="report pull-content">
-      <ul class="report-nav">
-        <li :class="{ active: isShow }" @click="isShow = !isShow">
-          个性特质分析
-        </li>
-        <li :class="{ active: !isShow }" @click="isShow = !isShow">
-          专业类匹配度
-        </li>
-      </ul>
-      <div class="report-item-all">
-        <div class="report-item" v-show="isShow">
-          <div class="report-relation">
-            <span>{{ evaluationData.student.student_name }}</span>
-            <span>{{ evaluationData.student.student_native_str }}</span>
-            <span v-show="evaluationData.evaluation.role_type == 'student'"
-              >考生测评</span
-            >
-            <span v-show="evaluationData.evaluation.role_type == 'parents'"
-              >亲属测评</span
-            >
-            <span>{{ evaluationData.student.done_at }}</span>
-          </div>
-          <div class="report-box3 report-box">
-            <div class="report-title">
-              {{
-                evaluationData.evaluation.report.base.profession_concept.name
-              }}
-              <!-- 一、{{baseList1.summary}} -->
-            </div>
-            <span class="report-h2">
-              {{
-                evaluationData.evaluation.report.base.profession_concept
-                  .reportTextList.summary
-              }}
-              <!-- {{baseList1.reportspanList.summary}} -->
-            </span>
-            <span class="txt2">
-              {{
-                evaluationData.evaluation.report.base.profession_concept
-                  .reportTextList.keywords_text
-              }}
-              <!-- {{baseList1.reportspanList.keywords_span}} -->
-            </span>
-            <span class="report-h3">
-              {{
-                evaluationData.evaluation.report.base.profession_concept
-                  .reportTextList.description
-              }}
-              <!-- {{baseList1.reportspanList.description}} -->
-            </span>
-            <div id="intellect" ref="profession_concept"></div>
-          </div>
-          <div class="report-box1 report-box">
-            <div class="report-title">
-              {{ evaluationData.evaluation.report.base.intellect.name }}
-              <!-- 一、{{baseList1.summary}} -->
-            </div>
-            <span class="report-h2">
-              {{
-                evaluationData.evaluation.report.base.intellect.reportTextList
-                  .summary
-              }}
-              <!-- {{baseList1.reportspanList.summary}} -->
-            </span>
-            <span class="txt2">
-              {{
-                evaluationData.evaluation.report.base.intellect.reportTextList
-                  .keywords_text
-              }}
-              <!-- {{baseList1.reportspanList.keywords_span}} -->
-            </span>
-            <span class="report-h3">
-              {{
-                evaluationData.evaluation.report.base.intellect.reportTextList
-                  .description
-              }}
-              <!-- {{baseList1.reportspanList.description}} -->
-            </span>
+	<div class="content my-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="report pull-content">
+			<ul class="report-nav">
+				<li :class="{ active: isShow }" @click="isShow = !isShow">
+					个性特质分析
+				</li>
+				<li :class="{ active: !isShow }" @click="isShow = !isShow">
+					专业类匹配度
+				</li>
+			</ul>
+			<div class="report-item-all">
+				<div class="report-item" v-show="isShow">
+					<div class="report-relation">
+						<span>{{ evaluationData.student.student_name }}</span>
+						<span>{{ evaluationData.student.student_native_str }}</span>
+						<span v-show="evaluationData.evaluation.role_type == 'student'">考生测评</span>
+						<span v-show="evaluationData.evaluation.role_type == 'parents'">亲属测评</span>
+						<span>{{ evaluationData.student.done_at }}</span>
+					</div>
+					<div class="report-box3 report-box">
+						<div class="report-title">
+							一、{{evaluationData.evaluation.report.base.profession_concept.summary}}
+							<!-- 一、{{baseList1.summary}} -->
+						</div>
+						<span class="report-h2">
+							{{evaluationData.evaluation.report.base.profession_concept.reportTextList.summary}}
+							<!-- {{baseList1.reportspanList.summary}} -->
+						</span>
+						<span class="txt2">
+							{{evaluationData.evaluation.report.base.profession_concept.reportTextList.keywords_text}}
+							<!-- {{baseList1.reportspanList.keywords_text}} -->
+						</span>
+						<span class="report-h3">
+							{{evaluationData.evaluation.report.base.profession_concept.reportTextList.description}}
+							<!-- {{baseList1.reportspanList.description}} -->
+						</span>
+						<div id="intellect" ref="profession_concept"></div>
+					</div>
+					<div class="report-box1 report-box">
+						<div class="report-title">
+							二、{{evaluationData.evaluation.report.base.intellect.summary}}
+							<!-- 二、{{baseList1.summary}} -->
+						</div>
+						<span class="report-h2">
+							{{evaluationData.evaluation.report.base.intellect.reportTextList.summary}}
+							<!-- {{baseList1.reportspanList.summary}} -->
+						</span>
+						<span class="txt2">
+							{{evaluationData.evaluation.report.base.intellect.reportTextList.keywords_text}}
+							<!-- {{baseList1.reportspanList.keywords_text}} -->
+						</span>
+						<span class="report-h3">
+							{{evaluationData.evaluation.report.base.intellect.reportTextList.description}}
+							<!-- {{baseList1.reportspanList.description}} -->
+						</span>
 
-            <div id="intellect" ref="intellect"></div>
-          </div>
+						<div id="intellect" ref="intellect"></div>
+					</div>
 
-          <div class="report-box4 report-box">
-            <div class="report-title">
-              {{
-                evaluationData.evaluation.report.base.profession_interest.name
-              }}
-              <!-- 一、{{baseList1.summary}} -->
-            </div>
-            <span class="report-h2">
-              {{
-                evaluationData.evaluation.report.base.profession_interest
-                  .reportTextList.summary
-              }}
-              <!-- {{baseList1.reportspanList.summary}} -->
-            </span>
-            <span class="txt2">
-              {{
-                evaluationData.evaluation.report.base.profession_interest
-                  .reportTextList.keywords_text
-              }}
-              <!-- {{baseList1.reportspanList.keywords_span}} -->
-            </span>
-            <span class="report-h3">
-              {{
-                evaluationData.evaluation.report.base.profession_interest
-                  .reportTextList.description
-              }}
-              <!-- {{baseList1.reportspanList.description}} -->
-            </span>
-            <div id="intellect" ref="profession_interest"></div>
-          </div>
-          <div class="report-box2 report-box">
-            <div class="report-title">
-              {{ evaluationData.evaluation.report.base.mbti_character.name }}
-              <!-- 一、{{baseList1.summary}} -->
-            </div>
-            <span class="report-h2">
-              {{
-                evaluationData.evaluation.report.base.mbti_character
-                  .reportTextList.summary
-              }}
-              <!-- {{baseList1.reportspanList.summary}} -->
-            </span>
-            <span class="txt2">
-              {{
-                evaluationData.evaluation.report.base.mbti_character
-                  .reportTextList.keywords_text
-              }}
-              <!-- {{baseList1.reportspanList.keywords_span}} -->
-            </span>
-            <span class="report-h3">
-              {{
-                evaluationData.evaluation.report.base.mbti_character
-                  .reportTextList.description
-              }}
-              <!-- {{baseList1.reportspanList.description}} -->
-            </span>
-            <dir class="report-box4-ex">
-              <div v-for="item in arrData" :key="item">
-                <p>{{item.A.factor_name}}</p>
-                <div class="content-ex">
-                  <div>
-                    <p
-                      :style="{
-                        width: proportion(item.A.avg_score, (item.A.avg_score-0)+(item.B.avg_score-0)),
-                      }"
-					  v-if="(item.A.avg_score-0)>=(item.B.avg_score-0)"
-                    ></p>
-                  </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>
-              </div>
-            </dir>
-          </div>
+					<div class="report-box4 report-box">
+						<div class="report-title">
+							三、{{evaluationData.evaluation.report.base.profession_interest.name}}
+							<!-- 三、{{baseList1.summary}} -->
+						</div>
+						<span class="report-h2">
+							{{evaluationData.evaluation.report.base.profession_interest.reportTextList.eminent_person_text}}
+							<!-- {{baseList1.reportspanList.eminent_person_text}} -->
+						</span>
+						<span class="txt2">
+							{{evaluationData.evaluation.report.base.profession_interest.reportTextList.keywords_text}}
+							<!-- {{baseList1.reportspanList.keywords_text}} -->
+						</span>
+						<span class="report-h3">
+							{{evaluationData.evaluation.report.base.profession_interest.reportTextList.description}}
+							<!-- {{baseList1.reportspanList.description}} -->
+						</span>
+						<div id="intellect" ref="profession_interest"></div>
+					</div>
+					<div class="report-box2 report-box">
+						<div class="report-title">
+							四、{{ evaluationData.evaluation.report.base.mbti_character.name }}
+							<!-- 四、{{baseList1.summary}} -->
+						</div>
+						<span class="report-h2">
+							{{evaluationData.evaluation.report.base.mbti_character.reportTextList.eminent_person_text}}
+							<!-- {{baseList1.reportspanList.eminent_person_text}} -->
+						</span>
+						<span class="txt2">
+							{{evaluationData.evaluation.report.base.mbti_character.reportTextList.keywords_text}}
+							<!-- {{baseList1.reportspanList.keywords_text}} -->
+						</span>
+						<span class="report-h3">
+							{{evaluationData.evaluation.report.base.mbti_character.reportTextList.description}}
+							<!-- {{baseList1.reportspanList.description}} -->
+						</span>
+						<dir class="report-box4-ex">
+							<div v-for="item in arrData" :key="item">
+								<p>{{item.A.factor_name}}</p>
+								<div class="content-ex">
+									<div>
+										<p :style="{width: proportion(item.A.avg_score, (item.A.avg_score-0)+(item.B.avg_score-0)),}" v-if="(item.A.avg_score-0)>=(item.B.avg_score-0)"></p>
+									</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 class="report-box5 report-box">
-            <div class="report-title">
-              {{ evaluationData.evaluation.report.base.subjects.name }}
-              <!-- 一、{{baseList1.summary}} -->
-            </div>
-            <span class="report-h2">
-              {{
-                evaluationData.evaluation.report.base.subjects.reportTextList
-                  .summary
-              }}
-              <!-- {{baseList1.reportspanList.summary}} -->
-            </span>
-            <span class="txt2">
-              {{
-                evaluationData.evaluation.report.base.subjects.reportTextList
-                  .keywords_text
-              }}
-              <!-- {{baseList1.reportspanList.keywords_span}} -->
-            </span>
-            <span class="report-h3">
-              {{
-                evaluationData.evaluation.report.base.subjects.reportTextList
-                  .description
-              }}
-              <!-- {{baseList1.reportspanList.description}} -->
-            </span>
-            <div id="intellect" ref="subjects"></div>
-          </div>
-        </div>
-        <!-- 专业类匹配度 -->
-        <div class="report-item" v-show="!isShow">
-          <div class="report-exponent">
-            <div class="exponent-title">
-              <div class="exponent-star">
-                推荐指数：<span>★</span><span>★</span><span>★</span
-                ><span>★</span><span>★</span>
-                <!-- <span a:for="{{item.stars}}">★</span> -->
-              </div>
-              <div class="percentage">匹配度：>90%<!-- {{item.degree}} --></div>
-            </div>
-            <div class="exponent-list">
-              <div class="exponent-item">
-                <span>
-                  自然学科类<br />
-                  (10)
-                  <!-- {{item2.name}}
+									</div>
+								</div>
+								<p>{{item.B.factor_name}}</p>
+							</div>
+						</dir>
+					</div>
+
+					<div class="report-box5 report-box">
+						<div class="report-title">
+							五、{{ evaluationData.evaluation.report.base.subjects.summary }}
+							<!-- 五、{{baseList1.summary}} -->
+						</div>
+						<span class="report-h2">
+							{{evaluationData.evaluation.report.base.subjects.reportTextList.eminent_person_text}}
+							<!-- {{baseList1.reportspanList.eminent_person_text}} -->
+						</span>
+						<span class="txt2">
+							{{evaluationData.evaluation.report.base.subjects.reportTextList.keywords_text}}
+							<!-- {{baseList1.reportspanList.keywords_text}} -->
+						</span>
+						<span class="report-h3">
+							{{evaluationData.evaluation.report.base.subjects.reportTextList.description}}
+							<!-- {{baseList1.reportspanList.description}} -->
+						</span>
+						<div id="intellect" ref="subjects"></div>
+					</div>
+				</div>
+				<!-- 专业类匹配度 -->
+				<div class="report-item" v-show="!isShow">
+					<div class="report-exponent" v-for="(item,index) in majorList" :key="index">
+						<div class="exponent-title">
+							<div class="exponent-star">
+								推荐指数：<span v-for="(itemk,indexk) in item.stars" :key="indexk">★</span>
+								<!-- <span a:for="{{item.stars}}">★</span> -->
+							</div>
+							<div class="percentage">匹配度：{{item.degree}}
+								<!-- {{item.degree}} -->
+							</div>
+						</div>
+						<div class="exponent-list">
+							<div class="exponent-item" v-for="(item2,index2) in item.majors" :key="index2">
+								<span>
+									{{item2.name}}<br />
+									({{item2.childrenSize}})
+									<!-- {{item2.name}}<br />
 									({{item2.childrenSize}}) -->
-                </span>
-                <div class="exponent-item-son">
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                </div>
-              </div>
-              <div class="exponent-item">
-                <span>
-                  社会科学类<br />
-                  (10)
-                  <!-- {{item2.name}}
-									({{item2.childrenSize}}) -->
-                </span>
-                <div class="exponent-item-son">
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                </div>
-              </div>
-              <div class="exponent-item">
-                <span>
-                  人文科学类<br />
-                  (10)
-                  <!-- {{item2.name}}
-									({{item2.childrenSize}}) -->
-                </span>
-                <div class="exponent-item-son">
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="report-exponent">
-            <div class="exponent-title">
-              <div class="exponent-star">
-                推荐指数：<span>★</span><span>★</span><span>★</span
-                ><span>★</span><span>★</span>
-                <!-- <span a:for="{{item.stars}}">★</span> -->
-              </div>
-              <div class="percentage">匹配度：>90%<!-- {{item.degree}} --></div>
-            </div>
-            <div class="exponent-list">
-              <div class="exponent-item">
-                <span>
-                  自然学科类<br />
-                  (10)
-                  <!-- {{item2.name}}
-									({{item2.childrenSize}}) -->
-                </span>
-                <div class="exponent-item-son">
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                </div>
-              </div>
-              <div class="exponent-item">
-                <span>
-                  社会科学类<br />
-                  (10)
-                  <!-- {{item2.name}}
-									({{item2.childrenSize}}) -->
-                </span>
-                <div class="exponent-item-son">
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                </div>
-              </div>
-              <div class="exponent-item">
-                <span>
-                  人文科学类<br />
-                  (10)
-                  <!-- {{item2.name}}
-									({{item2.childrenSize}}) -->
-                </span>
-                <div class="exponent-item-son">
-                  <span>中西医结合</span>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="report-exponent">
-            <div class="exponent-title">
-              <div class="exponent-star">
-                推荐指数：<span>★</span><span>★</span><span>★</span
-                ><span>★</span><span>★</span>
-                <!-- <span a:for="{{item.stars}}">★</span> -->
-              </div>
-              <div class="percentage">匹配度：>90%<!-- {{item.degree}} --></div>
-            </div>
-            <div class="exponent-list">
-              <div class="exponent-item">
-                <span>
-                  自然学科类<br />
-                  (10)
-                  <!-- {{item2.name}}
-									({{item2.childrenSize}}) -->
-                </span>
-                <div class="exponent-item-son">
-                  <span>中西医结合</span>
-                  <span>自然保护与环境生态类</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                </div>
-              </div>
-              <div class="exponent-item">
-                <span>
-                  社会科学类<br />
-                  (10)
-                  <!-- {{item2.name}}
-									({{item2.childrenSize}}) -->
-                </span>
-                <div class="exponent-item-son">
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                  <span>中西医结合</span>
-                </div>
-              </div>
-              <div class="exponent-item">
-                <span>
-                  人文科学类<br />
-                  (10)
-                  <!-- {{item2.name}}
-									({{item2.childrenSize}}) -->
-                </span>
-                <div class="exponent-item-son"></div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+								</span>
+								<div class="exponent-item-son">
+									<span v-for="(item3,index3) in item2.children" :key="index3">{{item3.name}}</span>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
-import * as echarts from "echarts";
-export default {
-  name: "report",
-  data() {
-    return {
-      isScrollTop: false,
-      isShow: true, //切换报告
-      roleTType: "student", //报告人类型
-      evaluationData: {},
-	  arrData:"",
-    };
-  },
-  created() {
-    this.isScroll = true;
-    window.addEventListener("scroll", this.eventScrollTop);
-  },
-  mounted() {
-    this.getData();
-  },
-  methods: {
-    proportion(obj, max) {
-		console.log(obj ,max,"---")
-      return ((Math.abs(obj) - 0) / (max - 0)) * 100 + "%";
-    },
-    // 页面跳转
-    goPage(path) {
-      this.$router.push(path);
-    },
-    drawLine(dataNmae, dataNum, title) {
-      // 基于准备好的dom，初始化echarts实例
-      setTimeout(() => {
-        let myChart = echarts.init(this.$refs[title]);
-        // 绘制图表
-        let option = {
-          grid: {},
-          xAxis: {
-            data: dataNmae,
-            type: "category",
-            axisLabel: { interval: 0, rotate: 60 },
-          },
+	import * as echarts from "echarts";
+	export default {
+		name: "report",
+		data() {
+			return {
+				isScrollTop: false,
+				isShow: true, //切换报告
+				roleTType: "student", //报告人类型
+				evaluationData: {},
+				arrData: "",
+				majorList:[], //报告列表
+			};
+		},
+		created() {
+			this.isScroll = true;
+			window.addEventListener("scroll", this.eventScrollTop);
+		},
+		mounted() {
+			this.getData();
+		},
+		methods: {
+			proportion(obj, max) {
+				console.log(obj, max, "---")
+				return ((Math.abs(obj) - 0) / (max - 0)) * 100 + "%";
+			},
+			// 页面跳转
+			goPage(path) {
+				this.$router.push(path);
+			},
+			drawLine(dataNmae, dataNum, title) {
+				// 基于准备好的dom，初始化echarts实例
+				setTimeout(() => {
+					let myChart = echarts.init(this.$refs[title]);
+					// 绘制图表
+					let option = {
+						grid: {},
+						xAxis: {
+							data: dataNmae,
+							type: "category",
+							axisLabel: {
+								interval: 0,
+								rotate: 60
+							},
+						},
 
-          yAxis: {
-            type: "value",
-          },
+						yAxis: {
+							type: "value",
+						},
 
-          series: [
-            {
-              data: dataNum,
-              type: "bar",
-              itemStyle: {
-                normal: {
-                  label: {
-                    show: true, //开启显示
-                    position: "top", //在上方显示
-                    textStyle: {
-                      //数值样式
-                      color: "#666",
-                      fontSize: 12,
-                    },
-                  },
-                },
-              },
-            },
-          ],
-        };
-        myChart.setOption(option);
-      }, 10);
-    },
-    leidata(valueArr, indicator, title) {
-      console.log(valueArr, indicator);
-      setTimeout(() => {
-        let myChart = echarts.init(this.$refs[title]);
-        //   let valueArr = [];
-        //   let indicator = [];
-        //   let sum = 0;
-        let option = {
-          radar: {
-            // shape: 'circle',
-            indicator: indicator,
-            // [
-            //   { name: "Sales", max: 9 },
-            //   { name: "Administration", max: 9 },
-            //   { name: "Information Technology", max: 9 },
-            //   { name: "Customer Support", max: 9 },
-            //   { name: "Development", max: 9 },
-            //   { name: "Marketing", max: 9 },
-            // ],
-          },
-          series: [
-            {
-              name: "Budget vs spending",
-              type: "radar",
-              data: [
-                {
-                  //   value: [4200, 3000, 20000, 35000, 50000, 18000],
-                  value: valueArr,
-                  name: "Allocated Budget",
-                },
-              ],
-            },
-          ],
-        };
+						series: [{
+							data: dataNum,
+							type: "bar",
+							itemStyle: {
+								normal: {
+									label: {
+										show: true, //开启显示
+										position: "top", //在上方显示
+										textStyle: {
+											//数值样式
+											color: "#666",
+											fontSize: 12,
+										},
+									},
+								},
+							},
+						}, ],
+					};
+					myChart.setOption(option);
+				}, 10);
+			},
+			leidata(valueArr, indicator, title) {
+				console.log(valueArr, indicator);
+				setTimeout(() => {
+					let myChart = echarts.init(this.$refs[title]);
+					//   let valueArr = [];
+					//   let indicator = [];
+					//   let sum = 0;
+					let option = {
+						radar: {
+							// shape: 'circle',
+							indicator: indicator,
+							// [
+							//   { name: "Sales", max: 9 },
+							//   { name: "Administration", max: 9 },
+							//   { name: "Information Technology", max: 9 },
+							//   { name: "Customer Support", max: 9 },
+							//   { name: "Development", max: 9 },
+							//   { name: "Marketing", max: 9 },
+							// ],
+						},
+						series: [{
+							name: "Budget vs spending",
+							type: "radar",
+							data: [{
+								//   value: [4200, 3000, 20000, 35000, 50000, 18000],
+								value: valueArr,
+								name: "Allocated Budget",
+							}, ],
+						}, ],
+					};
 
-        myChart.setOption(option);
-      }, 1000);
-    },
-    getData() {
-      let that = this;
-      this.axios
-        .post(this.HOME + "/api/evaluation/evaluation-info", {
-          id: this.$route.query.id,
-        })
-        .then(function (res) {
-          console.log(res);
-          that.evaluationData = res.data.data;
-          let dataName = [];
-          let dataNun = [];
-          for (
-            let index = 0;
-            index <
-            that.evaluationData.evaluation.report.base.intellect.reportData
-              .length;
-            index++
-          ) {
-            dataNun.push(
-              that.evaluationData.evaluation.report.base.intellect.reportData[
-                index
-              ].avg_score
-            );
-            dataName.push(
-              that.evaluationData.evaluation.report.base.intellect.reportData[
-                index
-              ].factor_name
-            );
-          }
-          that.drawLine(dataName, dataNun, "intellect");
-          let dataNamea = [];
-          let dataNuna = [];
-          for (
-            let index = 0;
-            index <
-            that.evaluationData.evaluation.report.base.profession_concept
-              .reportData.length;
-            index++
-          ) {
-            dataNuna.push(
-              that.evaluationData.evaluation.report.base.profession_concept
-                .reportData[index].avg_score
-            );
-            dataNamea.push(
-              that.evaluationData.evaluation.report.base.profession_concept
-                .reportData[index].factor_name
-            );
-          }
-          that.drawLine(dataNamea, dataNuna, "profession_concept");
-          let dataNameb = [];
-          let dataNunb = [];
-          for (
-            let index = 0;
-            index <
-            that.evaluationData.evaluation.report.base.profession_interest
-              .reportData.length;
-            index++
-          ) {
-            dataNunb.push(
-              that.evaluationData.evaluation.report.base.profession_interest
-                .reportData[index].avg_score
-            );
-            dataNameb.push({
-              name: that.evaluationData.evaluation.report.base
-                .profession_interest.reportData[index].factor_name,
-              max: 9,
-            });
-          }
+					myChart.setOption(option);
+				}, 1000);
+			},
+			getData() {
+				let that = this;
+				this.axios
+					.post(this.HOME + "/api/evaluation/evaluation-info", {
+						id: this.$route.query.id,
+					})
+					.then(function(res) {
+						console.log(res,111111);
+						that.evaluationData = res.data.data;
+						that.majorList = that.evaluationData.evaluation.report.major;
+						console.log(that.majorList,123)
+						let dataName = [];
+						let dataNun = [];
+						for (
+							let index = 0; index <
+							that.evaluationData.evaluation.report.base.intellect.reportData
+							.length; index++
+						) {
+							dataNun.push(
+								that.evaluationData.evaluation.report.base.intellect.reportData[
+									index
+								].avg_score
+							);
+							dataName.push(
+								that.evaluationData.evaluation.report.base.intellect.reportData[
+									index
+								].factor_name
+							);
+						}
+						that.drawLine(dataName, dataNun, "intellect");
+						let dataNamea = [];
+						let dataNuna = [];
+						for (
+							let index = 0; index <
+							that.evaluationData.evaluation.report.base.profession_concept
+							.reportData.length; index++
+						) {
+							dataNuna.push(
+								that.evaluationData.evaluation.report.base.profession_concept
+								.reportData[index].avg_score
+							);
+							dataNamea.push(
+								that.evaluationData.evaluation.report.base.profession_concept
+								.reportData[index].factor_name
+							);
+						}
+						that.drawLine(dataNamea, dataNuna, "profession_concept");
+						let dataNameb = [];
+						let dataNunb = [];
+						for (
+							let index = 0; index <
+							that.evaluationData.evaluation.report.base.profession_interest
+							.reportData.length; index++
+						) {
+							dataNunb.push(
+								that.evaluationData.evaluation.report.base.profession_interest
+								.reportData[index].avg_score
+							);
+							dataNameb.push({
+								name: that.evaluationData.evaluation.report.base
+									.profession_interest.reportData[index].factor_name,
+								max: 9,
+							});
+						}
 
-          that.leidata(dataNunb, dataNameb, "profession_interest");
+						that.leidata(dataNunb, dataNameb, "profession_interest");
 
-          let dataNameC = [];
-          let dataNunC = [];
-          for (
-            let index = 0;
-            index <
-            that.evaluationData.evaluation.report.base.subjects.reportData
-              .length;
-            index++
-          ) {
-            dataNunC.push(
-              that.evaluationData.evaluation.report.base.subjects.reportData[
-                index
-              ].avg_score
-            );
-            dataNameC.push({
-              name: that.evaluationData.evaluation.report.base.subjects
-                .reportData[index].factor_name,
-              max: 9,
-            });
-          }
+						let dataNameC = [];
+						let dataNunC = [];
+						for (
+							let index = 0; index <
+							that.evaluationData.evaluation.report.base.subjects.reportData
+							.length; index++
+						) {
+							dataNunC.push(
+								that.evaluationData.evaluation.report.base.subjects.reportData[
+									index
+								].avg_score
+							);
+							dataNameC.push({
+								name: that.evaluationData.evaluation.report.base.subjects
+									.reportData[index].factor_name,
+								max: 9,
+							});
+						}
 
-          that.leidata(dataNunC, dataNameC, "subjects");
+						that.leidata(dataNunC, dataNameC, "subjects");
 
-          let arrData = [
-            {
-              A: "",
-              B: "",
-            },
-            {
-              A: "",
-              B: "",
-            },
-            {
-              A: "",
-              B: "",
-            },
-            {
-              A: "",
-              B: "",
-            },
-          ];
-  let arrAD=  that.evaluationData.evaluation.report.base.mbti_character.reportData
+						let arrData = [{
+								A: "",
+								B: "",
+							},
+							{
+								A: "",
+								B: "",
+							},
+							{
+								A: "",
+								B: "",
+							},
+							{
+								A: "",
+								B: "",
+							},
+						];
+						let arrAD = that.evaluationData.evaluation.report.base.mbti_character.reportData
 
-		  	// console.log((arrAD[0].factor_subgroup_id-0)-1);
-          for (
-            let index = 0;
-            index < arrAD.length; index++) {
-			if (arrData[(arrAD[index].factor_subgroup_id-0)-1].A) {
-			arrData[(arrAD[index].factor_subgroup_id-0)-1].B=	arrAD[index]
-			}else{
-			
-					arrData[(arrAD[index].factor_subgroup_id-0)-1].A=arrAD[index]
-			}
-         
-          }
-	 console.log(arrData)
-          that.arrData=arrData
-        });
-    },
-    // 滚动改变样式
-    eventScrollTop() {
-      let scrollTop =
-        document.body.scrollTop || document.documentElement.scrollTop;
-      if (scrollTop >= 5) {
-        if (this.isScroll) {
-          this.isScroll = false;
-          this.isScrollTop = true;
-        }
-      } else {
-        if (!this.isScroll) {
-          this.isScroll = true;
-          this.isScrollTop = false;
-        }
-      }
-    },
-  },
-  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);
-  },
-};
+		 			// console.log((arrAD[0].factor_subgroup_id-0)-1);
+						for (
+							let index = 0; index < arrAD.length; index++) {
+							if (arrData[(arrAD[index].factor_subgroup_id - 0) - 1].A) {
+								arrData[(arrAD[index].factor_subgroup_id - 0) - 1].B = arrAD[index]
+							} else {
+
+								arrData[(arrAD[index].factor_subgroup_id - 0) - 1].A = arrAD[index]
+							}
+
+						}
+						console.log(arrData)
+						that.arrData = arrData
+					});
+			},
+			// 滚动改变样式
+			eventScrollTop() {
+				let scrollTop =
+					document.body.scrollTop || document.documentElement.scrollTop;
+				if (scrollTop >= 5) {
+					if (this.isScroll) {
+						this.isScroll = false;
+						this.isScrollTop = true;
+					}
+				} else {
+					if (!this.isScroll) {
+						this.isScroll = true;
+						this.isScrollTop = false;
+					}
+				}
+			},
+		},
+		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>
 
 <style scoped>
-#intellect {
-  width: 100%;
-  height: 320px;
-}
-.report-box4-ex > div {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.content-ex {
-  width: 80%;
-  height: 0.5rem;
-  display: flex;
-}
-.content-ex > div {
-  width: 50%;
-  height: 100%;
-}
+	#intellect {
+		width: 100%;
+		height: 320px;
+	}
+	.report-box4-ex{
+		margin: .6rem 0;
+	}
+	.report-box4-ex>div {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin: .4rem 0;
+		color: #666666;
+		font-size: .28rem;
+	}
 
-.content-ex > div > p {
-  background-color: red;
-  width: 0px;
-  height: 100%;
-}
-.content-ex > :nth-child(1) {
-  display: flex;
-  justify-content: flex-end;
-}
+	.content-ex {
+		width: 80%;
+		height: 0.4rem;
+		display: flex;
+	}
+
+	.content-ex>div {
+		width: 50%;
+		height: 100%;
+	}
+
+	.content-ex>div>p {
+		background-color: #ffe3db;
+		border: .04rem solid #e0b280;
+		width: 0px;
+		height: 100%;
+	}
+
+	.content-ex> :nth-child(1) {
+		display: flex;
+		justify-content: flex-end;
+	}
 </style>
diff --git a/src/views/user/ucenter/index.vue b/src/views/user/ucenter/index.vue
index 51f7ea6..2dfd3f8 100644
--- a/src/views/user/ucenter/index.vue
+++ b/src/views/user/ucenter/index.vue
@@ -1,205 +1,206 @@
 <template>
-  <div class="content my-content main-content">
-    <!-- 头部 -->
-    <div :class="{ header: true, 'scroll white': isScrollTop }">
-      <div class="back"></div>
-      <div class="header-title">我的</div>
-    </div>
-    <!-- 轮播图 -->
-    <div class="banner my-banner">
-      <img src="../../../assets/images/user/banner.jpg" alt="" />
-      <div class="my-photo">
-        <span>
-          <img v-if="userData.avatar" :src="userData.avatar" />
-          <img v-else src="../../../assets/images/user/photo.png" />
-        </span>
-        <p v-if="userData.nick_name">{{ userData.nick_name }}</p>
-        <p v-else>未填写个人信息</p>
-      </div>
-    </div>
-    <!-- 免费咨询卡 -->
-    <div class="user-receive" @click="toPage()" v-if="isUse == 0">
-      <img src="../../../assets/images/user/card.png" alt="" />
-      <div class="receive-txt">
-        <span class="use-btn" v-if="isReceive == 1">立即使用</span>
-        <span class="receive-btn" v-if="isReceive == 0">立即领取</span>
-        <p>有效期：2022.2.1-2022.2.15</p>
-      </div>
-    </div>
-    <div class="line" v-if="isReceive == 1"></div>
-    <ul class="student-information">
-      <li v-if="userData.mobile">
-        <span
-          ><img src="../../../assets/images/user/icon-phone.png" alt=""
-        /></span>
-        <p>
-          手机号<em>{{ userData.mobile }}</em>
-        </p>
-      </li>
-      <li @click="goPage('/bind')" v-else>
-        <span
-          ><img src="../../../assets/images/user/icon-phone.png" alt=""
-        /></span>
-        <p>
-          手机号<em>{{ userData.mobile }}</em>
-        </p>
-        <img src="../../../assets/images/home/expert/arrow-right.png" alt="" />
-      </li>
-      <li @click="goPage('/info')">
-        <span
-          ><img src="../../../assets/images/user/icon-student.png" alt=""
-        /></span>
-        <p>考生信息</p>
-        <img src="../../../assets/images/home/expert/arrow-right.png" alt="" />
-      </li>
-    </ul>
-    <div class="feedback" @click="goPage('/feedback')">
-      <span
-        ><img src="../../../assets/images/user/icon-feedback.png" alt=""
-      /></span>
-      <p>意见和反馈</p>
-      <img src="../../../assets/images/home/expert/arrow-right.png" alt="" />
-    </div>
-    <div :class="{ 'my-report': true, open: isOpen }" @click="isOpen = !isOpen">
-      <span
-        ><img src="../../../assets/images/user/icon-report.png" alt=""
-      /></span>
-      <p>我的报告</p>
-      <img src="../../../assets/images/home/expert/arrow-right.png" alt="" />
-    </div>
-    <ul :class="{ 'report-list': true, open: isOpen }">
-      <li v-for="(item,index) in dataList" :key="index" @click="goPage(item.id)">
-        <p>{{item.title}}</p>
-        <span>{{item.done_at}}</span>
-      </li>
-   
-    </ul>
-    <div class="feedback-btn">退出登录</div>
-    <tabbar :current="4"></tabbar>
-  </div>
+	<div class="content my-content main-content">
+		<!-- 头部 -->
+		<div :class="{ header: true, 'scroll white': isScrollTop }">
+			<div class="back"></div>
+			<div class="header-title">我的</div>
+		</div>
+		<!-- 轮播图 -->
+		<div class="banner my-banner">
+			<img src="../../../assets/images/user/banner.jpg" alt="" />
+			<div class="my-photo">
+				<span>
+					<img v-if="userData.avatar" :src="host + userData.avatar" />
+					<img v-else src="../../../assets/images/user/photo.png" />
+				</span>
+				<p v-if="userData.nick_name">{{ userData.nick_name }}</p>
+				<p v-else>未填写个人信息</p>
+			</div>
+		</div>
+		<!-- 免费咨询卡 -->
+		<div class="user-receive" @click="toPage()" v-if="isUse == 0">
+			<img src="../../../assets/images/user/card.png" />
+			<div class="receive-txt">
+				<span class="use-btn" v-if="isReceive == 1">立即使用</span>
+				<span class="receive-btn" v-if="isReceive == 0">立即领取</span>
+				<p>有效期：2022.2.1-2022.2.15</p>
+			</div>
+		</div>
+		<div class="line" v-if="isReceive == 1"></div>
+		<ul class="student-information">
+			<li v-if="userData.mobile">
+				<span><img src="../../../assets/images/user/icon-phone.png" /></span>
+				<p>
+					手机号<em>{{ userData.mobile }}</em>
+				</p>
+			</li>
+			<li @click="goPage('/bind')" v-else>
+				<span><img src="../../../assets/images/user/icon-phone.png" /></span>
+				<p>
+					手机号<em></em>
+				</p>
+				<img src="../../../assets/images/home/expert/arrow-right.png" />
+			</li>
+			<li @click="goPage('/info')">
+				<span><img src="../../../assets/images/user/icon-student.png" /></span>
+				<p>考生信息</p>
+				<img src="../../../assets/images/home/expert/arrow-right.png" />
+			</li>
+		</ul>
+		<div class="feedback" @click="goPage('/feedback')">
+			<span><img src="../../../assets/images/user/icon-feedback.png" /></span>
+			<p>意见和反馈</p>
+			<img src="../../../assets/images/home/expert/arrow-right.png" />
+		</div>
+		<div :class="{ 'my-report': true, open: isOpen }" @click="isOpen = !isOpen">
+			<span><img src="../../../assets/images/user/icon-report.png" alt="" /></span>
+			<p>我的报告</p>
+			<img src="../../../assets/images/home/expert/arrow-right.png" alt="" />
+		</div>
+		<ul :class="{ 'report-list': true, open: isOpen }">
+			<li v-for="(item,index) in reportData" :key="index" @click="goReport(item.id)">
+				<p>{{item.title}}</p>
+				<span>{{item.done_at}}</span>
+			</li>
+
+		</ul>
+		<div class="feedback-btn">退出登录</div>
+		<tabbar :current="4"></tabbar>
+	</div>
 </template>
 
 <script>
-import tabbar from "../../../components/tabbar.vue";
-export default {
-  name: "expert",
-  components: {
-    tabbar,
-  },
-  data() {
-    return {
-      centerUserData: {
-        mobile: "",
-      },
-     dataList:[],
-      isScrollTop: false,
-      isReceive: 1, //是否领取咨询机会
-      isUse: 0, //是否使用
-      isOpen: false,
-      userData: {
-        avatar: "",
-        consult_amount: 0,
-        create_time: "",
-        ding_code: "",
-        expert_id: 0,
-        gender: 0,
-        id: 31,
-        im_uid: "",
-        lat: "",
-        lng: "",
-        login_time: "",
-        mobile: "",
-        nick_name: "",
-        open_id: "",
-        real_name: "",
-        tags: "",
-        tel: "",
-        type: 0,
-        unionid: "",
-        update_time: "",
-        user_code: "",
-      },
-    };
-  },
-  created() {
-    this.isScroll = true;
-    window.addEventListener("scroll", this.eventScrollTop);
-    this.getUserData();
-    this.getevaluationList()
-  },
-  methods: {
-    getevaluationList(){
-      let that=this
-          this.axios.post(this.HOME + "/api/evaluation/evaluation-list",{
-            page:"1",
-            size:"100",
-            status:""
-          }).then(function (res) {
-           that.dataList=res.data.data.list
-      });
-    },
-    // 判断跳转方式
-    toPage() {
-      if (this.isReceive == 1) {
-        this.$router.push("/expert");
-      } else if (this.isReceive == 0) {
-        this.$router.push("/information");
-      } else {
-        return false;
-      }
-    },
-    // 页面跳转
-    goPage(id) {
-      this.$router.push({
-        path: "/report",
-        query: {
-           id:id
-        },
-      });
-    },
-    // 获取用户信息
-    getUserData() {
-      let that = this;
-      this.axios.post(this.HOME + "/api/user/center-info").then(function (res) {
-        that.userData = res.data.data;
-		localStorage.centerUserData = JSON.stringify(res.data.data);
-      });
-    },
-    // 滚动改变样式
-    eventScrollTop() {
-      let scrollTop =
-        document.body.scrollTop || document.documentElement.scrollTop;
-      if (scrollTop >= 5) {
-        if (this.isScroll) {
-          this.isScroll = false;
-          this.isScrollTop = true;
-        }
-      } else {
-        if (!this.isScroll) {
-          this.isScroll = true;
-          this.isScrollTop = false;
-        }
-      }
-    },
-  },
-  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);
-  },
-};
+	import tabbar from "../../../components/tabbar.vue";
+	export default {
+		name: "expert",
+		components: {
+			tabbar,
+		},
+		data() {
+			return {
+				centerUserData: {
+					mobile: "",
+				},
+				reportData: [],
+				isScrollTop: false,
+				isReceive: 1, //是否领取咨询机会
+				isUse: 0, //是否使用
+				isOpen: false,
+				userData: {
+					avatar: "",
+					consult_amount: 0,
+					create_time: "",
+					ding_code: "",
+					expert_id: 0,
+					gender: 0,
+					id: 31,
+					im_uid: "",
+					lat: "",
+					lng: "",
+					login_time: "",
+					mobile: "",
+					nick_name: "",
+					open_id: "",
+					real_name: "",
+					tags: "",
+					tel: "",
+					type: 0,
+					unionid: "",
+					update_time: "",
+					user_code: "",
+				},
+			};
+		},
+		created() {
+			this.isScroll = true;
+			window.addEventListener("scroll", this.eventScrollTop);
+			this.getUserData();
+			this.getevaluationList()
+		},
+		methods: {
+			// 获取报告列表
+			getevaluationList() {
+				let that = this
+				this.axios.post(this.HOME + "/api/evaluation/evaluation-list", {
+					page: "1",
+					size: "100",
+					status: ""
+				}).then(function(res) {
+					that.reportData = res.data.data.list;
+					console.log(that.reportData,555)
+				});
+			},
+
+			// 判断跳转方式
+			toPage() {
+				if (this.isReceive == 1) {
+					this.$router.push("/expert");
+				} else if (this.isReceive == 0) {
+					this.$router.push("/information");
+				} else {
+					return false;
+				}
+			},
+
+			// 页面跳转
+			goPage(path) {
+				this.$router.push(path)
+			},
+
+			// 查看报告
+			goReport(id) {
+				this.$router.push({
+					path: "/report",
+					query: {
+						id: id
+					},
+				});
+			},
+
+			// 获取用户信息
+			getUserData() {
+				let that = this;
+				this.axios.post(this.HOME + "/api/user/center-info").then(function(res) {
+					that.userData = res.data.data;
+					localStorage.centerUserData = JSON.stringify(res.data.data);
+				});
+			},
+
+			// 滚动改变样式
+			eventScrollTop() {
+				let scrollTop =
+					document.body.scrollTop || document.documentElement.scrollTop;
+				if (scrollTop >= 5) {
+					if (this.isScroll) {
+						this.isScroll = false;
+						this.isScrollTop = true;
+					}
+				} else {
+					if (!this.isScroll) {
+						this.isScroll = true;
+						this.isScrollTop = false;
+					}
+				}
+			},
+		},
+		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>
 
 <style scoped>
-.banner,
-.banner img {
-  width: 100%;
-}
+	.banner,
+	.banner img {
+		width: 100%;
+	}
 </style>