mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-10 19:36:43 +08:00
Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal into online
This commit is contained in:
@@ -133,12 +133,18 @@ const user = {
|
|||||||
dfn = res.result.departFullName;
|
dfn = res.result.departFullName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (res.result.userNo != '') {
|
let nowTime = new Date() //当前时间
|
||||||
for(let key in caseUser){
|
let endTime = new Date('2022/07/01 10:00:00') //对比时间
|
||||||
if(res.result.userNo == key) {
|
if(nowTime.getTime() < endTime.getTime()){
|
||||||
commit('SET_caseShow',true);
|
if (res.result.userNo != '') {
|
||||||
}
|
for(let key in caseUser){
|
||||||
}
|
if(res.result.userNo == key) {
|
||||||
|
commit('SET_caseShow',true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
commit('SET_caseShow',true);
|
||||||
}
|
}
|
||||||
const user = {
|
const user = {
|
||||||
aid: res.result.aid,
|
aid: res.result.aid,
|
||||||
|
|||||||
@@ -70,7 +70,7 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-row class="order-div" style="border: 1px solid #EBEEF5;border-bottom:none">
|
<el-row class="order-div" style="border: 1px solid #EBEEF5;border-bottom:none">
|
||||||
<span class="quyer-tag">
|
<span class="quyer-tag">
|
||||||
<el-button type="text" class="order-class" @click="searchData('comments')" :class="{ actice: queryCondition.orderField == 'comments' }">最热</el-button>
|
<el-button type="text" class="order-class" @click="searchData('views')" :class="{ actice: queryCondition.orderField == 'views' }">最热</el-button>
|
||||||
<el-button type="text" class="order-class" @click="searchData('')" :class="{ actice: queryCondition.orderField == '' }">最新</el-button>
|
<el-button type="text" class="order-class" @click="searchData('')" :class="{ actice: queryCondition.orderField == '' }">最新</el-button>
|
||||||
<!-- <el-button type="text" class="order-class" @click="queryCondition.breCommend = queryCondition.breCommend == ture ? true : null" :class="{ actice: queryCondition.breCommend == true }">组织推荐</el-button> -->
|
<!-- <el-button type="text" class="order-class" @click="queryCondition.breCommend = queryCondition.breCommend == ture ? true : null" :class="{ actice: queryCondition.breCommend == true }">组织推荐</el-button> -->
|
||||||
</span>
|
</span>
|
||||||
@@ -301,7 +301,7 @@ export default {
|
|||||||
pageIndex: 1,
|
pageIndex: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
isTop: true,
|
isTop: true,
|
||||||
orderField: "comments",
|
orderField: "views",
|
||||||
// breCommend:null,
|
// breCommend:null,
|
||||||
keyWord: "",
|
keyWord: "",
|
||||||
majorType:null, //专业分类
|
majorType:null, //专业分类
|
||||||
|
|||||||
Reference in New Issue
Block a user