Merge branch 'dev'

This commit is contained in:
daihh
2022-07-10 15:59:12 +08:00
10 changed files with 131 additions and 628 deletions

View File

@@ -95,7 +95,8 @@
<div class="keyword-text clearfix">
<div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain">{{ orgDomainTranslate(item.orgDomain) }}</div>
<div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain == '' && item.orgDomainParent">{{ orgDomainTranslate(item.orgDomainParent) }}</div>
<div style="color:#2974D6;font-weight: 450;" v-if="item.majorType">{{ majorTypeTranslate(item.majorType) }}</div>
<div style="color:#2974D6;font-weight: 450;" v-for="item,idx in item.majorType" :key="idx" >{{ majorTypeTranslate(item) }}</div>
<div v-if="item.keyword1">{{ item.keyword1 }}</div>
<div v-if="item.keyword2">{{ item.keyword2 }}</div>
<div v-if="item.keyword3">{{ item.keyword3 }}</div>
@@ -322,7 +323,6 @@ export default {
mounted() {
if(this.searchTags.length == 0){
console.log('gyigyu')
this.queryCondition.majorType = null;
this.queryCondition.orgDomain = null;
};
@@ -581,7 +581,9 @@ export default {
if (res.status == 200) {
if (res.result.list.length > 0) {
this.isSeach = false;
console.log(res.result.list)
res.result.list.forEach(item => {
item.majorType = item.majorType.split(",");
item.isAll = false;
item.authorInfo = {
aid: "",