jialong.yu
/
FE_IASF_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

修复bug

Browse Source
master
wangchenguang 2 years ago
parent 892d84e124
commit 7f35bb8fc6
2 changed files with 123 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 121
      src/pages/column/index.vue
  2. 4
      src/pages/news/index.vue

121
src/pages/column/index.vue
Unescape View File

@ -139,7 +139,112 @@
</div> </div>
</div> </div>
</template> </template>
<template v-else-if="info.listStyleId === 11 || info.listStyleId === 15 || info.listStyleId === 10">
<div class="article-wrap">
<ul class="articles">
<li v-for="(item, i) in articles" :key="i" :class="{'news-notice': info.listStyleId === 55}" class="otherData" @click="toArtice(item)">
<template v-if="info.listStyleId === 55">
<div class="releaseTime">
<p class="d">{{ item.date }}</p>
<p class="m">{{ item.month }}</p>
</div>
<div class="news-title">{{ item.title }}</div>
</template>
<template v-else> <template v-else>
<div class="texts leftBox">
<p v-if="(item.listStyleId === 10 || item.listStyleId === 15|| item.listStyleId === 11) && item.classificationName"
class="type">
{{ item.classificationName }}
</p>
<h6 class="titleDes">{{ item.title }}</h6>
<template v-if="item.listStyleId === 11 || item.listStyleId == 12">
<span class="meta">{{ item.releaseTime }}
<template v-if="item.labelName != ''">
| {{ item.labelName }}
</template>
</span>
</template>
<span v-if="item.listStyleId === 10 " class="meta">{{ item.releaseTime }} {{ item.labelName && ' | ' +
item.labelName }}</span>
<template v-if="item.listStyleId === 15 || item.listStyleId === 16">
<div v-if="item.keynoteSpeaker" class="meta m-b-10">
<img class="icon" src="@/assets/images/mine.png" alt="" /> {{ item.keynoteSpeaker }}
</div>
<div v-if="item.activityStartTime" class="meta m-b-10">
<img class="icon" src="@/assets/images/time.png" alt="" />
{{ item.activityStartTime + ' ~ ' + item.activityEndTime }}
</div>
<div v-if="item.offlineLocation" class="meta m-b-10">
<img class="icon" src="@/assets/images/location.png" alt="" /> {{ item.offlineLocation }}
</div>
<div v-if="item.onlineLocation" class="meta">
<img class="icon" src="@/assets/images/online.png" alt="" /> {{ item.onlineLocation }}
</div>
</template>
</div>
<img class="pic" :src="item.titleImg" alt="" onerror="javascript:this.src='./images/1.png';" />
</template>
</li>
</ul>
<div v-if="articles.length" class="pagination">
<el-pagination background @current-change="currentChange" :current-page="page"
layout="total, prev, pager, next" :total="total"></el-pagination>
</div>
</div>
</template>
<template v-else>
<div class="article-wrap">
<ul class="articles">
<li v-for="(item, i) in articles" :key="i" :class="{'news-notice': info.listStyleId === 55}" class="overDetail" @click="toArtice(item)">
<template v-if="info.listStyleId === 55">
<div class="releaseTime">
<p class="d">{{ item.date }}</p>
<p class="m">{{ item.month }}</p>
</div>
<div class="news-title">{{ item.title }}</div>
</template>
<template v-else>
<img class="pic" :src="item.titleImg" alt="" onerror="javascript:this.src='./images/1.png';" />
<div class="texts">
<p v-if="(item.listStyleId === 10 || item.listStyleId === 15) && item.classificationName"
class="type">
{{ item.classificationName }}
</p>
<h6 class="titleDes">{{ item.title }}</h6>
<template v-if="item.listStyleId === 11 || item.listStyleId == 12">
<span class="meta">{{ item.releaseTime }}</span>
<div class="des" v-html="item.mainBody"></div>
</template>
<span v-if="item.listStyleId === 10 " class="meta">{{ item.releaseTime }} {{ item.labelName && ' | ' +
item.labelName }}</span>
<template v-if="item.listStyleId === 15 || item.listStyleId === 16">
<div v-if="item.keynoteSpeaker" class="meta m-b-10">
<img class="icon" src="@/assets/images/mine.png" alt="" /> {{ item.keynoteSpeaker }}
</div>
<div v-if="item.activityStartTime" class="meta m-b-10">
<img class="icon" src="@/assets/images/time.png" alt="" />
{{ item.activityStartTime + ' ~ ' + item.activityEndTime }}
</div>
<div v-if="item.offlineLocation" class="meta m-b-10">
<img class="icon" src="@/assets/images/location.png" alt="" /> {{ item.offlineLocation }}
</div>
<div v-if="item.onlineLocation" class="meta">
<img class="icon" src="@/assets/images/online.png" alt="" /> {{ item.onlineLocation }}
</div>
</template>
<el-button type="primary" class="readDetailBtn">{{ $t('column.readDetail') }}</el-button>
</div>
</template>
</li>
</ul>
<div v-if="articles.length" class="pagination">
<el-pagination background @current-change="currentChange" :current-page="page"
layout="total, prev, pager, next" :total="total"></el-pagination>
</div>
</div>
</template> </template>
</div> </div>
</div> </div>
@ -771,15 +876,29 @@ export default {
.readDetail { .readDetail {
justify-content: flex-start; justify-content: flex-start;
align-items: flex-start; align-items: flex-start;
.leftBox {
p {
margin-top: 1.25rem;
}
}
.texts {
.titleDes {
margin-bottom: 1.56rem;
}
.des {
margin-top: 1.7rem;
}
}
.titleDes { .titleDes {
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
margin-top: 1rem;
} }
.readDetailBtn { .readDetailBtn {
margin-top: 4rem; margin-top: 2rem;
} }
.texts { .texts {
flex-grow: 1; flex-grow: 1;

4
src/pages/news/index.vue
Unescape View File

@ -394,9 +394,11 @@ export default {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 2.5rem; margin-top: 2.5rem;
width: 100%;
li { li {
width: calc((100% - 3.5rem) / 3); width: calc((100% - 3.5rem) / 3);
margin-right: 28px; margin-right: 1rem;
box-shadow: 0px 0px 20px 0px rgba(176,176,176,0.21); box-shadow: 0px 0px 20px 0px rgba(176,176,176,0.21);
border-radius: 6px; border-radius: 6px;
transition: .3s; transition: .3s;

Write Preview
Loading…
Cancel
Save