解决冲突
parent
9c52c4c578
commit
2e3bf35c82
|
@ -7,36 +7,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="header-title">列表预览</div>
|
<div class="header-title">列表预览</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>
|
||||||
<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 class="expert-list-all section">
|
<div class="expert-list-all section">
|
||||||
<ul class="expert-list">
|
<ul class="expert-list">
|
||||||
<li>
|
<li>
|
||||||
|
@ -54,11 +25,7 @@
|
||||||
<span>好评度:{{ userData.comment_score }}</span>
|
<span>好评度:{{ userData.comment_score }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="honor">
|
<div class="honor">
|
||||||
<span
|
<span v-for="(itemk, indexk) in userData.keywords_list" :key="indexk">{{ itemk }}</span>
|
||||||
v-for="(itemk, indexk) in userData.keywords_list"
|
|
||||||
:key="indexk"
|
|
||||||
>{{ itemk }}</span
|
|
||||||
>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="slogan">{{ userData.summary }}</div>
|
<div class="slogan">{{ userData.summary }}</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -83,18 +50,24 @@ export default {
|
||||||
current: 0,
|
current: 0,
|
||||||
isConfirm: false,
|
isConfirm: false,
|
||||||
userData: {},
|
userData: {},
|
||||||
expertData: [
|
expertData: [{
|
||||||
{
|
|
||||||
name: "赵晓",
|
name: "赵晓",
|
||||||
title: "金牌咨询师",
|
title: "金牌咨询师",
|
||||||
imgsrc: "../../assets/images/home/index/expert.png",
|
imgsrc: "../../assets/images/home/index/expert.png",
|
||||||
integral: "985",
|
integral: "985",
|
||||||
score: "8.5",
|
score: "8.5",
|
||||||
honor: [
|
honor: [{
|
||||||
{ title: "中科院心理科" },
|
title: "中科院心理科"
|
||||||
{ title: "硕士" },
|
},
|
||||||
{ title: "从业5年" },
|
{
|
||||||
{ title: "熟悉高考" },
|
title: "硕士"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "从业5年"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "熟悉高考"
|
||||||
|
},
|
||||||
],
|
],
|
||||||
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
||||||
},
|
},
|
||||||
|
@ -104,11 +77,18 @@ userData:{},
|
||||||
imgsrc: "../../assets/images/home/index/expert.png",
|
imgsrc: "../../assets/images/home/index/expert.png",
|
||||||
integral: "985",
|
integral: "985",
|
||||||
score: "8.5",
|
score: "8.5",
|
||||||
honor: [
|
honor: [{
|
||||||
{ title: "中科院心理科" },
|
title: "中科院心理科"
|
||||||
{ title: "硕士" },
|
},
|
||||||
{ title: "从业5年" },
|
{
|
||||||
{ title: "熟悉高考" },
|
title: "硕士"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "从业5年"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "熟悉高考"
|
||||||
|
},
|
||||||
],
|
],
|
||||||
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
||||||
},
|
},
|
||||||
|
@ -118,11 +98,18 @@ userData:{},
|
||||||
imgsrc: "../../assets/images/home/index/expert.png",
|
imgsrc: "../../assets/images/home/index/expert.png",
|
||||||
integral: "985",
|
integral: "985",
|
||||||
score: "8.5",
|
score: "8.5",
|
||||||
honor: [
|
honor: [{
|
||||||
{ title: "中科院心理科" },
|
title: "中科院心理科"
|
||||||
{ title: "硕士" },
|
},
|
||||||
{ title: "从业5年" },
|
{
|
||||||
{ title: "熟悉高考" },
|
title: "硕士"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "从业5年"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "熟悉高考"
|
||||||
|
},
|
||||||
],
|
],
|
||||||
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
||||||
},
|
},
|
||||||
|
@ -132,11 +119,18 @@ userData:{},
|
||||||
imgsrc: "../../assets/images/home/index/expert.png",
|
imgsrc: "../../assets/images/home/index/expert.png",
|
||||||
integral: "985",
|
integral: "985",
|
||||||
score: "8.5",
|
score: "8.5",
|
||||||
honor: [
|
honor: [{
|
||||||
{ title: "中科院心理科" },
|
title: "中科院心理科"
|
||||||
{ title: "硕士" },
|
},
|
||||||
{ title: "从业5年" },
|
{
|
||||||
{ title: "熟悉高考" },
|
title: "硕士"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "从业5年"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "熟悉高考"
|
||||||
|
},
|
||||||
],
|
],
|
||||||
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
||||||
},
|
},
|
||||||
|
@ -146,11 +140,18 @@ userData:{},
|
||||||
imgsrc: "../../assets/images/home/index/expert.png",
|
imgsrc: "../../assets/images/home/index/expert.png",
|
||||||
integral: "985",
|
integral: "985",
|
||||||
score: "8.5",
|
score: "8.5",
|
||||||
honor: [
|
honor: [{
|
||||||
{ title: "中科院心理科" },
|
title: "中科院心理科"
|
||||||
{ title: "硕士" },
|
},
|
||||||
{ title: "从业5年" },
|
{
|
||||||
{ title: "熟悉高考" },
|
title: "硕士"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "从业5年"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "熟悉高考"
|
||||||
|
},
|
||||||
],
|
],
|
||||||
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
||||||
},
|
},
|
||||||
|
@ -160,11 +161,18 @@ userData:{},
|
||||||
imgsrc: "../../assets/images/home/index/expert.png",
|
imgsrc: "../../assets/images/home/index/expert.png",
|
||||||
integral: "985",
|
integral: "985",
|
||||||
score: "8.5",
|
score: "8.5",
|
||||||
honor: [
|
honor: [{
|
||||||
{ title: "中科院心理科" },
|
title: "中科院心理科"
|
||||||
{ title: "硕士" },
|
},
|
||||||
{ title: "从业5年" },
|
{
|
||||||
{ title: "熟悉高考" },
|
title: "硕士"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "从业5年"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "熟悉高考"
|
||||||
|
},
|
||||||
],
|
],
|
||||||
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
||||||
},
|
},
|
||||||
|
@ -174,11 +182,18 @@ userData:{},
|
||||||
imgsrc: "../../assets/images/home/index/expert.png",
|
imgsrc: "../../assets/images/home/index/expert.png",
|
||||||
integral: "985",
|
integral: "985",
|
||||||
score: "8.5",
|
score: "8.5",
|
||||||
honor: [
|
honor: [{
|
||||||
{ title: "中科院心理科" },
|
title: "中科院心理科"
|
||||||
{ title: "硕士" },
|
},
|
||||||
{ title: "从业5年" },
|
{
|
||||||
{ title: "熟悉高考" },
|
title: "硕士"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "从业5年"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: "熟悉高考"
|
||||||
|
},
|
||||||
],
|
],
|
||||||
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
slogan: "一所好的大学,是年轻人的家,是他 们度过人生最好时光的地方!",
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue