Merge branch 'new-clean-branch' into refactor/clear
This commit is contained in:
commit
c26d749d77
@ -201,7 +201,7 @@ export default {
|
|||||||
{ label: '碳服务市场', path: '/tfwsc' },
|
{ label: '碳服务市场', path: '/tfwsc' },
|
||||||
{ label: '碳需求市场', path: '/txqsc' },
|
{ label: '碳需求市场', path: '/txqsc' },
|
||||||
{ label: '碳数据市场', path: '/tsjsc' },
|
{ label: '碳数据市场', path: '/tsjsc' },
|
||||||
{ label: '碳金融市场', path: '/tjrsc', disable: true },
|
{ label: '碳金融市场', path: '/tjrsc', url: 'https://www.unionecredit.com/greenfinance/#/home' },
|
||||||
],
|
],
|
||||||
// 筛选条件
|
// 筛选条件
|
||||||
filter: {
|
filter: {
|
||||||
@ -452,10 +452,14 @@ export default {
|
|||||||
isActiveTab(path) {
|
isActiveTab(path) {
|
||||||
return this.$route.path === path;
|
return this.$route.path === path;
|
||||||
},
|
},
|
||||||
goToTab({path, disable}) {
|
goToTab({path, disable, url}) {
|
||||||
|
if (url) {
|
||||||
|
window.open(url, '_blank', 'noopener,noreferrer');
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (disable) {
|
if (disable) {
|
||||||
this.showComingSoon();
|
this.showComingSoon();
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
this.$router.push(path);
|
this.$router.push(path);
|
||||||
},
|
},
|
||||||
|
|||||||
@ -189,7 +189,7 @@ export default {
|
|||||||
{ label: '碳服务市场', path: '/tfwsc' },
|
{ label: '碳服务市场', path: '/tfwsc' },
|
||||||
{ label: '碳需求市场', path: '/txqsc' },
|
{ label: '碳需求市场', path: '/txqsc' },
|
||||||
{ label: '碳数据市场', path: '/tsjsc' },
|
{ label: '碳数据市场', path: '/tsjsc' },
|
||||||
{ label: '碳金融市场', path: '/tjrsc', disable: true },
|
{ label: '碳金融市场', path: '/tjrsc', url: 'https://www.unionecredit.com/greenfinance/#/home' },
|
||||||
],
|
],
|
||||||
// 筛选条件
|
// 筛选条件
|
||||||
filter: {
|
filter: {
|
||||||
@ -389,7 +389,11 @@ export default {
|
|||||||
isActiveTab(path) {
|
isActiveTab(path) {
|
||||||
return this.$route.path === path;
|
return this.$route.path === path;
|
||||||
},
|
},
|
||||||
goToTab({ path, disable }) {
|
goToTab({ path, disable, url }) {
|
||||||
|
if (url) {
|
||||||
|
window.open(url, '_blank', 'noopener,noreferrer');
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (disable) {
|
if (disable) {
|
||||||
this.showComingSoon();
|
this.showComingSoon();
|
||||||
return;
|
return;
|
||||||
|
|||||||
@ -234,7 +234,7 @@ export default {
|
|||||||
{ label: '碳服务市场', path: '/tfwsc' },
|
{ label: '碳服务市场', path: '/tfwsc' },
|
||||||
{ label: '碳需求市场', path: '/txqsc' },
|
{ label: '碳需求市场', path: '/txqsc' },
|
||||||
{ label: '碳数据市场', path: '/tsjsc' },
|
{ label: '碳数据市场', path: '/tsjsc' },
|
||||||
{ label: '碳金融市场', path: '/tjrsc', disable: true },
|
{ label: '碳金融市场', path: '/tjrsc', url: 'https://www.unionecredit.com/greenfinance/#/home' },
|
||||||
],
|
],
|
||||||
// 筛选条件
|
// 筛选条件
|
||||||
filter: {
|
filter: {
|
||||||
@ -435,7 +435,11 @@ export default {
|
|||||||
isActiveTab(path) {
|
isActiveTab(path) {
|
||||||
return this.$route.path === path;
|
return this.$route.path === path;
|
||||||
},
|
},
|
||||||
goToTab({path, disable}) {
|
goToTab({path, disable, url}) {
|
||||||
|
if (url) {
|
||||||
|
window.open(url, '_blank', 'noopener,noreferrer');
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (disable) {
|
if (disable) {
|
||||||
this.showComingSoon();
|
this.showComingSoon();
|
||||||
return;
|
return;
|
||||||
|
|||||||
@ -499,7 +499,7 @@ export default {
|
|||||||
// 绿色服务
|
// 绿色服务
|
||||||
'服务市场': '/tfwsc',
|
'服务市场': '/tfwsc',
|
||||||
'需求市场': '/txqsc',
|
'需求市场': '/txqsc',
|
||||||
'金融市场': '',
|
'金融市场': 'https://www.unionecredit.com/greenfinance/#/home',
|
||||||
'数据市场': '/tsjsc',
|
'数据市场': '/tsjsc',
|
||||||
},
|
},
|
||||||
kxtfwzx: '',
|
kxtfwzx: '',
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user