修改禅道已知bug
This commit is contained in:
+5
-2
@@ -298,10 +298,13 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
viewClick() {
|
viewClick(row) {
|
||||||
let newUrl = this.$router.resolve({
|
let newUrl = this.$router.resolve({
|
||||||
path: '/countryCardView',
|
path: '/countryCardView',
|
||||||
query: {}
|
query: {
|
||||||
|
applyMarket: row.applyMarket,
|
||||||
|
id: row.id
|
||||||
|
}
|
||||||
})
|
})
|
||||||
window.open(newUrl.href, '_blank')
|
window.open(newUrl.href, '_blank')
|
||||||
},
|
},
|
||||||
|
|||||||
+18
-3
@@ -26,7 +26,7 @@
|
|||||||
<div style="width: 100%" v-for="(item1,index) in contentList" class="content-box-top">
|
<div style="width: 100%" v-for="(item1,index) in contentList" class="content-box-top">
|
||||||
<div v-for="(item2,index2) in item1.list" style="width: 340px;display: inline-block"
|
<div v-for="(item2,index2) in item1.list" style="width: 340px;display: inline-block"
|
||||||
class="content-box-left">
|
class="content-box-left">
|
||||||
<div class="content-box-box-top" v-if="index == 0">
|
<div class="content-box-box-top" style="cursor: default" v-if="index == 0">
|
||||||
<img class="content-box-box-img" style="display: inline-block;width: auto" v-if="index2 == 0">
|
<img class="content-box-box-img" style="display: inline-block;width: auto" v-if="index2 == 0">
|
||||||
<img :src="item2.img" v-else class="content-box-box-img" alt="">
|
<img :src="item2.img" v-else class="content-box-box-img" alt="">
|
||||||
<span v-if="index2 == 0" class="content-box-box-text"></span>
|
<span v-if="index2 == 0" class="content-box-box-text"></span>
|
||||||
@@ -36,15 +36,28 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="content-box-box" v-else>
|
<div class="content-box-box" v-else>
|
||||||
|
<a v-if="index2 == 0 && item2.relevantUrl"
|
||||||
|
style="color: rgb(33, 201, 204)"
|
||||||
|
:class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}"
|
||||||
|
class="content-box-box-text content-box-box-text-index"
|
||||||
|
:href="item2.relevantUrl" target="_blank">{{item2.lableName}}</a>
|
||||||
<span style="color: #21c9cc"
|
<span style="color: #21c9cc"
|
||||||
:class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}"
|
:class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}"
|
||||||
class="content-box-box-text content-box-box-text-index"
|
class="content-box-box-text content-box-box-text-index"
|
||||||
@click="viewFileClick(item2.lableName)"
|
@click="viewFileClick(item2.lableName)"
|
||||||
v-if="item2.lableType == 7 && item2.lableName && index2 != 0">
|
v-else-if="item2.lableType == 7 && item2.lableName && index2 != 0">
|
||||||
{{$t('viewFile')}}
|
{{$t('viewFile')}}
|
||||||
</span>
|
</span>
|
||||||
|
<span class="content-box-box-text content-box-box-text-index"
|
||||||
|
v-else-if="item2.lableType != 7 && !item2.lableName && index2 != 0"
|
||||||
|
style="cursor: default"
|
||||||
|
:title="item2.lableName"
|
||||||
|
:class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}">
|
||||||
|
{{item2.lableName}}
|
||||||
|
</span>
|
||||||
<span class="content-box-box-text content-box-box-text-index"
|
<span class="content-box-box-text content-box-box-text-index"
|
||||||
v-else
|
v-else
|
||||||
|
style="cursor: default"
|
||||||
:title="item2.lableName"
|
:title="item2.lableName"
|
||||||
:class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}">
|
:class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}">
|
||||||
{{item2.lableName}}
|
{{item2.lableName}}
|
||||||
@@ -169,12 +182,14 @@
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
if (content && content.length > 0) {
|
if (content && content.length > 0) {
|
||||||
|
console.log(content)
|
||||||
content.forEach((res, index) => {
|
content.forEach((res, index) => {
|
||||||
this.contentList[index + 1] = { name: res.lableName }
|
this.contentList[index + 1] = { name: res.lableName }
|
||||||
this.contentList[index + 1].list = []
|
this.contentList[index + 1].list = []
|
||||||
this.contentList[index + 1].list.push({
|
this.contentList[index + 1].list.push({
|
||||||
lableName: res.lableName,
|
lableName: res.lableName,
|
||||||
lableType: res.lableType
|
lableType: res.lableType,
|
||||||
|
relevantUrl: res.relevantUrl
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user