Commit a9579f69 authored by zhangyanni's avatar zhangyanni

Merge remote-tracking branch 'origin/master'

parents 36f83a2b 93cb6343
......@@ -827,8 +827,8 @@
});
},
eventtopiccontent(event){
if(event.toElement.dataset.id){
window.open(this.publicFun.getCurrentHrefEnv()+"/viewproject?projectId="+event.toElement.dataset.id+'&state=0' + this.publicFun.getTargetBlankFlag(2));
if(event.srcElement.dataset.id){
window.open(this.publicFun.getCurrentHrefEnv()+"/viewproject?projectId="+event.srcElement.dataset.id+'&state=0' + this.publicFun.getTargetBlankFlag(2));
}else if(event.target.innerText&&event.target.innerText.substr(0, 1) == '#'&&event.target.innerText.substr(event.target.innerText.length-1, 1) == '#'){
api.getTopicIdByTopicTitle(event.target.innerText.substring(1,event.target.innerText.length-1)+'').then((res) => {
if (res.code == 0) {
......
......@@ -1424,8 +1424,8 @@
});
},
eventtopiccontent(event){
if(event.toElement.dataset.id){
window.open(this.publicFun.getCurrentHrefEnv()+"/viewproject?projectId="+event.toElement.dataset.id+'&state=0' + this.publicFun.getTargetBlankFlag(2));
if(event.srcElement.dataset.id){
window.open(this.publicFun.getCurrentHrefEnv()+"/viewproject?projectId="+event.srcElement.dataset.id+'&state=0' + this.publicFun.getTargetBlankFlag(2));
}else if(event.target.innerText&&event.target.innerText.substr(0, 1) == '#'&&event.target.innerText.substr(event.target.innerText.length-1, 1) == '#'){
api.getTopicIdByTopicTitle(event.target.innerText.substring(1,event.target.innerText.length-1)+'').then((res) => {
if (res.code == 0) {
......
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 to comment