mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-11 03:46:44 +08:00
Merge branch 'dev' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into dev
This commit is contained in:
@@ -320,7 +320,6 @@
|
||||
this.loadData();
|
||||
},
|
||||
inputValue(val,oldVal) {
|
||||
console.log("333333");
|
||||
let fu = val.substr(-1);
|
||||
if(fu == '@'&&!oldVal) {
|
||||
this.toUserId = '';
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
</div>
|
||||
<div style="display: flex;justify-content: flex-end;align-items: center;">
|
||||
<div v-if="goSearch !=10">
|
||||
<el-input v-show="!hideSearch" placeholder="请输入关键词搜索" style="width: 260px;" @keyup.enter.native="searchJump()" clearable maxlength="20" v-model="keyword" class="input-with-select">
|
||||
<el-input v-show="!hideSearch" placeholder="请输入标题搜索" style="width: 260px;" @keyup.enter.native="searchJump()" clearable maxlength="20" v-model="keyword" class="input-with-select">
|
||||
<el-select v-if="current == 'index'" v-model="findType" style="width: 75px;" slot="prepend" placeholder="请选择">
|
||||
<el-option label="课程" value="1"></el-option>
|
||||
<el-option label="案例" value="2"></el-option>
|
||||
|
||||
@@ -65,13 +65,8 @@
|
||||
</el-button>
|
||||
</div>
|
||||
</el-row>
|
||||
|
||||
|
||||
|
||||
<el-row style="height:10px;background-color:#f6f7fc;" >
|
||||
|
||||
</el-row>
|
||||
|
||||
<el-row class="order-div" style="border: 1px solid #EBEEF5;border-bottom:none">
|
||||
<span class="quyer-tag">
|
||||
<el-button type="text" class="order-class" @click="searchData('comments')" :class="{ actice: queryCondition.orderField == 'comments' }">最热</el-button>
|
||||
@@ -82,7 +77,7 @@
|
||||
<el-row class="data-content" style="border: 1px solid #EBEEF5;border-top:none;border-bottom:none">
|
||||
<el-col :span="24" v-for="item in caseList.list" :key="item.id" class="case-list">
|
||||
<div class="case-info">
|
||||
<div class="case-info">
|
||||
<div class="case-info-cont">
|
||||
<div class="case-info-title">
|
||||
<router-link :to="'/case/detail?id='+item.id">
|
||||
<!-- <span v-if="i % 2 == 0" style="color:red;margin-right:5px">[组织推荐]</span> -->
|
||||
@@ -112,13 +107,13 @@
|
||||
<router-link :to="'/case/detail?id='+item.id">
|
||||
{{displayAll(item)}}
|
||||
</router-link>
|
||||
<span style="color:#588afc" v-if="item.summary.length>190" @click.stop="changeIsAll(item)">
|
||||
<span style="color:#588afc" v-if="item.summary.length>180" @click.stop="changeIsAll(item)">
|
||||
{{item.isAll?'收起':'展开'}}
|
||||
</span>
|
||||
</div>
|
||||
<div style="display: flex;justify-content: space-between;">
|
||||
<div style="margin:8px 0;">
|
||||
<interactBar :type="0" :shares="false" :data="item" :readonly="false"></interactBar> </div>
|
||||
<interactBar :type="0" :shares="false" :data="item" :readonly="true"></interactBar> </div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -134,7 +129,7 @@
|
||||
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
@@ -368,8 +363,8 @@ export default {
|
||||
},
|
||||
//展示全部
|
||||
displayAll(item) {
|
||||
if (!item.isAll && item.summary && item.summary.length > 190) {
|
||||
return item.summary.slice(0, 190) + "...";
|
||||
if (!item.isAll && item.summary && item.summary.length > 180) {
|
||||
return item.summary.slice(0, 180) + "...";
|
||||
}
|
||||
return item.summary;
|
||||
},
|
||||
@@ -816,10 +811,11 @@ export default {
|
||||
}
|
||||
|
||||
.case-list {
|
||||
margin: 8px 0;
|
||||
border-bottom: 1px solid #dfdfdf;
|
||||
margin: 8px 0px;
|
||||
padding-bottom: 15px;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
}
|
||||
.case-image {
|
||||
width: 230px;
|
||||
@@ -827,10 +823,11 @@ export default {
|
||||
float: left;
|
||||
border: 1px solid #eee;
|
||||
}
|
||||
|
||||
.case-info {
|
||||
|
||||
.case-info {
|
||||
border-bottom: 1px solid #dfdfdf;
|
||||
|
||||
.case-info-cont {
|
||||
|
||||
.case-info-title {
|
||||
font-size: 15px;
|
||||
color: #333;
|
||||
@@ -878,6 +875,7 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
.search-div {
|
||||
|
||||
Reference in New Issue
Block a user