Skip to content

T
techbook
Commit 47dc7f45 authored by zhangyanni's avatar zhangyanni
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 8ec1f842 6ddbce59
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 43 deletions
src/views/findeventpage/eventdetail.vue
View file @ 47dc7f45
......@@ -134,7 +134,7 @@
methods:{
successlogin(){
this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
// this.getActivityDetails();
this.getActivityDetails();
},
getresourcesdata(){
// this.getActivityDetails();
......@@ -146,7 +146,7 @@
if(row.baseLive.liveState != 0){
if(this.userInfo&&this.userInfo.empId==row.createdBy){
if(row.baseLive.liveState == 1||row.baseLive.liveBack == 0){
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive");
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive?url="+liveUrl);
}
}else{
if(row.baseLive.liveState == 2&&row.baseLive.liveBack == 0){
......@@ -154,7 +154,7 @@
this.$refs.login.isexpertVisible();
return
}
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive");
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive?url="+liveUrl);
}else{
if(row.baseLive.livePowers == 0&&row.activityState == 2&&!row.isApply){
if(!this.publicFun.getUserInfoCookieType()){
......@@ -172,7 +172,7 @@
this.$refs.login.isexpertVisible();
return
}
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive");
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive?url="+liveUrl);
}
}
}
......@@ -293,7 +293,8 @@
}
else {
if(data.baseLive&&data.baseLive.liveState == 1){
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive");
var liveUrl = this.Base64.encode(data.baseLive.liveUrl);
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive?url="+liveUrl);
console.log(data)
}else{
this.$router.replace({path:"/eventsuccess",query:{id:this.$route.query.id?this.$route.query.id:this.eventdata.channelId,type:this.eventdata.channelType,ismyevent:0}})
......
src/views/findeventpage/eventlive.vue
View file @ 47dc7f45
<template>
<div style="padding-top: 60px;">
<div>
<iframe name = "child" id = "child" src="live.html" frameborder="0" scrolling="no" style="position:related;top: 2.8px;left: 0px;width: 100%;height: 100vh;border: medium none;"></iframe>
</div>
</template>
......
src/views/findeventpage/eventpage.vue
View file @ 47dc7f45
......@@ -136,7 +136,7 @@
if(row.baseLive.liveState != 0){
if(this.userInfo&&this.userInfo.empId==row.createdBy){
if(row.baseLive.liveState == 1||row.baseLive.liveBack == 0){
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive");
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive?url="+liveUrl);
}
}else{
if(row.baseLive.liveState == 2&&row.baseLive.liveBack == 0){
......@@ -144,7 +144,7 @@
this.$refs.login.isexpertVisible();
return
}
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive");
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive?url="+liveUrl);
}else{
if(row.baseLive.livePowers == 0&&row.activityState == 2&&row.isJoin == 2){
if(!this.publicFun.getUserInfoCookieType()){
......@@ -162,7 +162,7 @@
this.$refs.login.isexpertVisible();
return
}
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive");
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive?url="+liveUrl);
}
}
}
......@@ -284,7 +284,8 @@
}
else {
if(data.baseLive&&data.baseLive.liveState == 1){
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive");
var liveUrl = this.Base64.encode(data.baseLive.liveUrl);
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive?url="+liveUrl);
this.resourcesdata();
}else{
this.$router.replace({path:"/eventsuccess",query:{id:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,type:this.detailInfo.channelType,ismyevent:0}})
......
src/views/findeventpage/signupbar.vue
View file @ 47dc7f45
......@@ -1189,8 +1189,9 @@
}
else {
if(this.detailInfo.baseLive&&this.detailInfo.baseLive.liveState == 1){
var liveUrl = this.Base64.encode(this.detailInfo.baseLive.liveUrl);
this.expertVisible = false;
this.$router.push({path:'/eventlive',query:{}});
this.$router.push({path:'/eventlive',query:{url:liveUrl}});
}else{
this.$router.replace({path:"/eventsuccess",query:{id:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,type:this.detailInfo.channelType,ismyevent:0}})
}
......@@ -1368,8 +1369,9 @@
api.applyForProjectAxios(resultObj).then((res)=>{
if(res.code==0){
if(this.detailInfo.baseLive&&this.detailInfo.baseLive.liveState == 1){
var liveUrl = this.Base64.encode(this.detailInfo.baseLive.liveUrl);
this.expertVisible = false;
this.$router.push({path:'/eventlive',query:{}});
this.$router.push({path:'/eventlive',query:{url:liveUrl}});
this.$emit("getresourcesdata")
}else{
this.$router.replace({path:"/eventsuccess",query:{id:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,type:this.detailInfo.channelType,ismyevent:0}})
......
src/views/index/pages/index.vue
View file @ 47dc7f45
......@@ -299,11 +299,11 @@
<ul>
<li @click="handleMore('detail','/articleDetail',item)" class="article_li" v-for="(item,index) in articleList" :key="item.contentId">
<div class="gendisplay" v-if="index == 0">
<p @click="todetail(item,2)" class="imgInfo" :style="{backgroundImage:'url('+(item.contentCoverUrl?item.contentCoverUrl:item.contentUrl?item.contentUrl.split(',')[0]:'')+')'}">
<p class="imgInfo" :style="{backgroundImage:'url('+(item.contentCoverUrl?item.contentCoverUrl:item.contentUrl?item.contentUrl.split(',')[0]:'')+')'}">
&nbsp;
</p>
<div>
<p @click="todetail(item,2)" class="ellipsisFont2" style="color:#1A1A1E;height: 50px;font-weight: bold;">{{item.contentTitle}}</p>
<p class="ellipsisFont2" style="color:#1A1A1E;height: 50px;font-weight: bold;">{{item.contentTitle}}</p>
<p style="color: #AAAAAA;font-size: 12px;">
<span>{{item.contentBrowseStr}} 阅读</span>
<span style="margin: 0 15px;">{{item.publishTimeStr}}</span>
......@@ -311,7 +311,7 @@
</p>
</div>
</div>
<p v-else class="gendisplay" style="margin-bottom: 12px;line-height: 20px;" @click="todetail(item,2)">
<p v-else class="gendisplay" style="margin-bottom: 12px;line-height: 20px;">
<i style="color:#5D78FF;padding-left: 10px;">&bull;&nbsp;&nbsp;</i>
<span class="ellipsisFont1" style="color:#1A1A1E;width: 350px;height: 20px;line-height: 22px;">{{item.contentTitle}}</span>
<span style="width:calc(100% - 340px);text-align: right;color: #AAAAAA;">{{item.publishTimeStr}}</span>
......@@ -1034,6 +1034,7 @@
if(path == '/eventdetail')open_url = '#/eventdetail?id='+(hotstate?val.contentDetail.channelId:val.channelId)+'&type='+(hotstate?val.contentDetail.channelType:val.channelType);
if(path == '/topicDetails')open_url ='#/topicDetails?id='+(hotstate?val.contentDetail.topicId:val.topicId);
if(path == '/viewproject')open_url ='#/viewproject?projectId='+val.projectId;
if(path == '/articleDetail')open_url ='#/articleDetail?id='+val.contentId+'&newnpen=true';
if(path == '/bigBusiness/detail')open_url ='#/bigBusiness/detail?id='+val.businessId
if(path == '/casedetails')open_url ='#/casedetails?entid='+val.id;
window.open(this.publicFun.getCurrentHrefEnv() +open_url)
......@@ -1199,23 +1200,6 @@
this.$message.error(err);
})
},
//进入详情
todetail(row,state){
if(state == 1){
// globalMsg.$emit('topisInit', false);
// globalMsg.$emit('sendIndex', 5);
window.open(this.publicFun.getCurrentHrefEnv()+"#/topicDetails?id="+row.topicId+'&newnpen=true');
globalMsg.$emit('maidianfunc',({type:'report-topic-index-recommend',topicId:row.topicId}));
// this.$router.push({path:"/topicdetail",query:{id:row.topicId}});
}else if(state == 2){
globalMsg.$emit('maidianfunc',({type:'report-article-index',articleId:row.contentId}));
window.open(this.publicFun.getCurrentHrefEnv()+"#/articleDetail?id="+row.contentId+'&newnpen=true');
}else if(state == 3){
this.$router.push({path:'/eventdetail',query:{id:row.channelId,ismyevent:0}})
globalMsg.$emit('maidianfunc',({type:'report-channel-index-recommend',channelId:row.channelId}));
}
},
//行业报告
getIndexBaseReport(){
api.getIndexBaseReport(this.$i18n.locale=='zh-CN'?5:3).then((res) => {
......@@ -1281,7 +1265,7 @@
if(row.baseLive.liveState != 0){
if(this.userInfo&&this.userInfo.empId==row.createdBy){
if(row.baseLive.liveState == 1||row.baseLive.liveBack == 0){
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive");
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive?url="+liveUrl);
}
}else{
if(row.baseLive.liveState == 2&&row.baseLive.liveBack == 0){
......@@ -1289,7 +1273,7 @@
this.$refs.login.isexpertVisible();
return
}
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive");
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive?url="+liveUrl);
}else{
if(row.baseLive.livePowers == 0&&row.activityState == 2&&row.isJoin == 2){
if(!this.publicFun.getUserInfoCookieType()){
......@@ -1307,7 +1291,7 @@
this.$refs.login.isexpertVisible();
return
}
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive");
window.open(this.publicFun.getCurrentHrefEnv()+"#/eventlive?url="+liveUrl);
}
}
}
......@@ -1392,8 +1376,9 @@
}
else {
if(data.baseLive&&data.baseLive.liveState == 1){
var liveUrl = this.Base64.encode(data.baseLive.liveUrl);
this.applyVisible = false;
this.$router.push({path:'/eventlive',query:{}});
this.$router.push({path:'/eventlive',query:{url:liveUrl}});
}else{
this.$router.replace({path:"/eventsuccess",query:{id:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,type:this.detailInfo.channelType,ismyevent:0}})
}
......@@ -1720,11 +1705,11 @@
.content_events{
>ul{
>li:nth-child(1){
margin: 15px 0;
margin: 15px 0 0 0;
}
>li{
width: calc(100% / 3);
margin: 15px 0 15px 25px;
margin: 15px 0 0 25px;
>p{
margin-top: 15px;
color: #1A1A1E;
......@@ -1757,11 +1742,11 @@
.content_guess{
>ul{
>li:nth-child(1){
margin: 15px 0;
margin: 15px 0 0 0;
}
>li{
width: calc(100% / 3);
margin: 15px 0 15px 25px;
margin: 15px 0 0 25px;
>p{
margin-top: 15px;
color: #1A1A1E;
......
src/views/topicpage/commentdetail.vue
View file @ 47dc7f45
......@@ -499,6 +499,7 @@
});
this.commentdata.iscomment = false;
this.commentdata.commentsCountStr++;
this.commentdata.wordarea = '';
this.contentList.unshift(response.result[0]);
this.$refs.childintegral.getintegralCode('ITV002');
} else {
......@@ -713,17 +714,17 @@
.foutdivcomment{
max-width: 1440px;
margin: 0 auto;
padding:60px 0;
padding: 0;
min-height: 800px;
text-align: left;
background: #F8F8F8;
background-size: 100% auto;
background-repeat: no-repeat;
/*background-attachment:fixed;*/
background-position-y: 60px;
background-position-y: -1px;
}
.divclasschild{
margin: 25px 120px 0;
margin: 0 120px 0;
>div:nth-child(1){
width: calc(100% - 430px);
margin-right: 30px;
......
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