Skip to content

T
techbook
Commit 75a9816e authored by zhangyanni's avatar zhangyanni
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents ef2df666 ddbada32
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 9 deletions
public/css/pc.scss
View file @ 75a9816e
......@@ -899,11 +899,13 @@
.boxShadowTip{
width: 400px;
font-size: 14px;
&.el-tooltip__popper.is-light{
border: unset;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.15);
}
.el-tooltip__popper .popper__arrow{
border-width: 0;
}
}
.boxShadowTip .popper__arrow{
display: none!important;
}
\ No newline at end of file
src/views/topicpage/topictype.vue
View file @ 75a9816e
......@@ -38,7 +38,7 @@
<i class="iconfont icon-xiala-copy icon_toptopic"></i>
<el-row :gutter="30">
<el-col :span="12" v-for="(itemchild,index) in item.secondList" :key="index">
<div @click="todetail(item)" class="gendisplay" style="margin-top: 20px;padding-bottom: 10px;cursor: pointer;">
<div @click="todetail(itemchild)" class="gendisplay" style="margin-top: 20px;padding-bottom: 10px;cursor: pointer;">
<p class="imgInfo"
style="height: 70px;width: 100px;border-radius: 3px;"
:style="{backgroundImage:'url('+(itemchild.topicCover?itemchild.topicCover:require('../../assets/img/index/prodefaultLogo.png'))+')'}">
......@@ -64,7 +64,7 @@
</div>
<div v-if="item.secondList&&item.secondList.length==1" style="padding: 20px;background: #F8F8F8;border-top: 1px solid #e8e8e8;position: relative">
<i class="iconfont icon-xiala-copy icon_toptopic"></i>
<div @click="todetail(item)" v-for="(itemchild,index) in item.secondList" :key="index" class="gendisplay">
<div @click="todetail(itemchild)" v-for="(itemchild,index) in item.secondList" :key="index" class="gendisplay">
<p class="imgInfo" style="width: 100px;height: 70px;margin-right: 15px;border-radius: 3px;" :style="{backgroundImage:'url('+(itemchild.topicCover?itemchild.topicCover:require('../../assets/img/topicbackground.jpg'))+')'}">
&nbsp;
</p>
......@@ -111,9 +111,9 @@
<img v-else src="../../assets/img/defaultlogo.png" style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
<img src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 3px;top: 45px;width: 15px;">
</div>
<div style="margin: 10px 0 0 15px;">
<div style="margin: 10px 0 0 15px;font-size: 14px;">
<p style="color:#1A1A1E;">{{item.empName}}</p>
<p class="ellipsisFont1" style="margin-top: 10px;color: #AAAAAA;height: 20px;width: 100%;line-height: 20px;overflow: hidden;">{{item.professorIntroduction}}</p>
<p class="ellipsisFont1" style="margin-top: 10px;color: #AAAAAA;height: 20px;width: 100%;line-height: 24px;overflow: hidden;">{{item.professorIntroduction}}</p>
</div>
</div>
......@@ -124,9 +124,9 @@
<img v-else src="../../assets/img/defaultlogo.png" style="border-radius: 50%; border:1px solid #DCDFF1; width: 60px;height: 60px;">
<img src="../../assets/img/proFeedBack/vip.png" alt="" style="position: absolute;right: 3px;top: 45px;width: 15px;">
</div>
<div style="margin: 10px 0 0 15px;">
<div style="margin: 10px 0 0 15px;font-size: 14px;">
<p style="color:#1A1A1E;">{{item.empName}}</p>
<p style="margin-top: 10px;color: #AAAAAA">{{item.professorIntroduction}}</p>
<p style="margin-top: 10px;color: #AAAAAA;line-height: 24px;">{{item.professorIntroduction}}</p>
</div>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment