Commit e8b54a86 by 梁建民

Merge branch 'dev/ver/3.0.0' into 'master'

href

See merge request !5
parents 8eb279ef 73a60f18
Showing with 8 additions and 8 deletions
...@@ -225,19 +225,19 @@ ...@@ -225,19 +225,19 @@
<span style="margin-right: 4px;">{{ JSON.parse(scope.row.msg_data).title }}</span> <span style="margin-right: 4px;">{{ JSON.parse(scope.row.msg_data).title }}</span>
<template v-if="JSON.parse(scope.row.msg_data).cate_id == 6"> <template v-if="JSON.parse(scope.row.msg_data).cate_id == 6">
<a style="color: #409EFF" target="_blank" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a> <a style="color: #409EFF" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template> </template>
<template v-else-if="JSON.parse(scope.row.msg_data).cate_id == 7"> <template v-else-if="JSON.parse(scope.row.msg_data).cate_id == 7">
<a style="color: #1969F9" target="_blank" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a> <a style="color: #1969F9" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template> </template>
<template v-else-if="JSON.parse(scope.row.msg_data).cate_id == 8"> <template v-else-if="JSON.parse(scope.row.msg_data).cate_id == 8">
<a style="color: #FF870E" target="_blank" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a> <a style="color: #FF870E" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template> </template>
<template v-else-if="JSON.parse(scope.row.msg_data).cate_id == 9"> <template v-else-if="JSON.parse(scope.row.msg_data).cate_id == 9">
<a style="color: #FF0000" target="_blank" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a> <a style="color: #FF0000" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template> </template>
<template v-else> <template v-else>
<a style="color: #409EFF" target="_blank" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a> <a style="color: #409EFF" :href="JSON.parse(scope.row.msg_data).link">{{ JSON.parse(scope.row.msg_data).title_suffix }}</a>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
<div class="notice-content" v-html="noticeMsg.content"></div> <div class="notice-content" v-html="noticeMsg.content"></div>
<div class="enclosure row verCenter"> <div class="enclosure row verCenter">
<span>附件:</span> <span>附件:</span>
<a class="down" :href="noticeMsg.attachment_url " target="_blank">{{ noticeMsg.attachment_name || '暂无附件' }}</a> <a class="down" :href="noticeMsg.attachment_url ">{{ noticeMsg.attachment_name || '暂无附件' }}</a>
</div> </div>
<div class="notice-bottom row bothSide verCenter"> <div class="notice-bottom row bothSide verCenter">
<span>发件人:深圳市猎芯科技有限公司</span> <span>发件人:深圳市猎芯科技有限公司</span>
...@@ -461,9 +461,9 @@ export default { ...@@ -461,9 +461,9 @@ export default {
} }
} }
if (has_more) { if (has_more) {
html = '<P class="notify-text"><b>' + data.date + '</b><b>' + data.title + '</b><a style="' + colorStyle + '" target="_blank" href="' + data.link + '">' + data.title_suffix + '</a><a style="margin-left: 8px;" class="alink" target="_blank" href="' + data.has_more + '">更多>>></a></P>'; html = '<P class="notify-text"><b>' + data.date + '</b><b>' + data.title + '</b><a style="' + colorStyle + '" href="' + data.link + '">' + data.title_suffix + '</a><a style="margin-left: 8px;" class="alink" href="' + data.has_more + '">更多>>></a></P>';
} else { } else {
html = '<P class="notify-text"><b>' + data.date + '</b><b>' + data.title + '</b><a style="' + colorStyle + '" target="_blank" href="' + data.link + '">' + data.title_suffix + '</a></P>'; html = '<P class="notify-text"><b>' + data.date + '</b><b>' + data.title + '</b><a style="' + colorStyle + '" href="' + data.link + '">' + data.title_suffix + '</a></P>';
} }
if (data.content.length > 0) { if (data.content.length > 0) {
htmlArr.push(html + htmlArr.push(html +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment