Skip to content

T
techbook
Commit 2111a297 authored by zhangyanni's avatar zhangyanni
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents b258b80a 0d5f22fd
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 32 deletions
src/App.vue
View file @ 2111a297
......@@ -76,7 +76,7 @@
maiDianFunc(data) {
if (data.type == 'report-channel-list-click') {
this.$router.push({
path: '/eventdetail',
path: '/activitydetail',
query: {id: data.channelId, ismyevent: 0, type: data.channelType}
});
}
......
src/components/index/PageTopindex.vue
View file @ 2111a297
......@@ -174,7 +174,7 @@
indextab:this.indextab_zh,
indextab_zh:[
{id:1,name:this.$t("topNav.index"),path:'/',pathchild:'/'},
{id:3,name:this.$t("topNav.activity"),path:'/activitylist',pathchild:'/eventdetail'},
{id:3,name:this.$t("topNav.activity"),path:'/activitylist',pathchild:'/activitydetail'},
{id:4,name:this.$t("topNav.topic"),path:'/topicList',pathchild:'/topicDetails'},
{id:6,name:'人脉',path:'/circleList',pathchild:'/networkSearch'},
{id:5,name:this.$t("topNav.match"),path:'/tabconnect',pathchild:'/tabconnect'},
......@@ -186,7 +186,7 @@
{id:1,name:this.$t("topNav.index"),path:'/',pathchild:'/'},
{id:2,name:this.$t("topNav.findProject"),path:'/seeprojectlist',pathchild:'/seeprojectlist'},
{id:3,name:this.$t("topNav.findCustomer"),path:'/bigBusiness/list',pathchild:'/bigBusiness/list'},
{id:4,name:this.$t("topNav.Findevent"),path:'/activitylist',pathchild:'/eventdetail'},
{id:4,name:this.$t("topNav.Findevent"),path:'/activitylist',pathchild:'/activitydetail'},
{id:5,name:this.$t("topNav.industry"),path:'/industryReport',pathchild:'/industryReport'},
{id:6,name:this.$t("topNav.cooperationcase"),path:'/successfulcase',pathchild:'/casedetails'},
],
......
src/views/findeventpage/eventdetail.vue
View file @ 2111a297
......@@ -21,6 +21,12 @@
methods:{
},
mounted() {
document.getElementsByTagName("body")[0].style.overflow = "auto";
globalMsg.$emit('topisInit', false);
globalMsg.$emit('sendIndex', 3);
globalMsg.$emit('maidianfunc',({type:'report-channel-read',channelId:this.$route.query.id}));
}
}
</script>
......
src/views/findeventpage/eventpage.vue
View file @ 2111a297
......@@ -37,7 +37,7 @@
</div>
<div v-if="item.channelType!=5&&userInfo&&userInfo.empId!=item.createdBy||item.channelType!=5&&!userInfo">
<span style="color: #0ABB87;" v-if="item.isJoin==1&&item.activityState != 3">{{$t('activityInfo.hasApply')}}</span>
<span v-if="item.activityState == 2&&item.isJoin==2"><el-button type="primary" @click="handleApply(item)" round plain size="mini">{{$t('activityInfo.freeApply')}}</el-button></span>
<span v-if="item.activityState == 2&&item.isJoin==2"><el-button type="primary" @click="handleApply(item)" round plain size="mini">{{item.viewDesc?item.viewDesc:$t('activityInfo.freeApply')}}</el-button></span>
<span v-if="item.activityState == 3">{{$t('activityInfo.applyEnd')}}</span>
<span style="color: #FF5D5D" v-if="item.activityState == 4&&item.isJoin==2">{{$t('activityInfo.hasFilled')}}</span>
<span style="color: #9197B4" v-if="item.activityState == 5&&item.isJoin==2">{{$t('activityInfo.activityEnd')}}</span>
......@@ -388,9 +388,15 @@
.content_list{
display: flex;
flex-wrap:wrap;
>div:nth-child(4){
margin:25px 0 0 0!important;
}
>div:nth-child(8){
margin:25px 0 0 0!important;
}
>div{
width: calc(25% - 20px);
margin:25px 20px 0 0;
margin:25px 26.5px 0 0;
/*padding-bottom: 15px;*/
border: 1px solid #F2F2F2;
text-align: left;
......
src/views/findeventpage/newEventdetail.vue
View file @ 2111a297
......@@ -20,8 +20,8 @@
</div>
<div class="gendisplay information_2">
<div>
<p>{{$t('activityInfo.timeZone')}}：{{eventdata.timeZoneName}}</p>
<p>{{$t('activityInfo.activitytime')}}：{{eventdata.channelStartTime}} - {{eventdata.channelStartTime}}</p>
<p>{{$t('activityInfo.timeZone')}}：{{eventdata.versionType==0?$t('pubactivities.beijingtime'):eventdata.timeZoneName}}</p>
<p>{{$t('activityInfo.activityTime')}}：{{eventdata.channelStartTime}} - {{eventdata.channelStartTime}}</p>
<p>{{$t('activityInfo.applyEnd')}}：{{eventdata.activityEndTime}}</p>
<p>{{$t('activityInfo.activityCreated')}}：{{eventdata.channelOriginateName}}
<span v-if="eventdata.isOfficial"><img style="height: 15px;" :src="$i18n.locale=='zh-CN'?require('../../assets/img/apply/official@2x.png'):require('../../assets/img/apply/officialEn.png')" alt=""></span>
......@@ -81,7 +81,7 @@
{{item.empTitle}}
</i>
</p>
<div v-if="item.empId != userInfo.empId&&$i18n.locale=='zh-CN'">
<div v-if="item.empId != userInfo.empId&&$i18n.locale=='zh-CN'&&item.isFriend != 3">
<popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item"></popoverBardbar>
<btnbar v-else @loginState="loginState" @successState="successState" :row="item" :index="index" :btnType="1" :eventId="$route.query.id"></btnbar>
</div>
......@@ -129,7 +129,7 @@
</div>
</div>
</div>
<div class="p_tabs" v-if="resourcesList.length == 0&&recommendList.length != 0&&eventdata.channelType != 2&&$i18n.locale=='zh-CN'">
<div class="p_tabs" v-if="resourcesList.length != 0&&recommendList.length != 0&&eventdata.channelType != 2&&$i18n.locale=='zh-CN'">
<div class="gendisplay p_tabs_title">
<p>
<span>{{$t('activityInfo.recommendFor')}}<i></i></span>
......@@ -145,7 +145,7 @@
<div>
<p class="ellipsisFont1 mouseHover">{{item.channelTitle}}</p>
<div>
<p>{{item.timeZoneName}}</p>
<p>{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>
<p>
<span>{{item.channelStartTime}} - {{item.channelEndTime}}</span>
<span>{{item.channelCityStr}}</span>
......@@ -401,10 +401,10 @@
},
newOpen(item,state){
if(state){
window.open(this.publicFun.getCurrentHrefEnv()+"/eventdetail?id=" + item.channelId + "&ismyevent=0&type=" + item.channelType);
window.open(this.publicFun.getCurrentHrefEnv()+"/activitydetail?id=" + item.channelId + "&ismyevent=0&type=" + item.channelType);
}else{
if(item.resourceType == 'RAT01')window.open(this.publicFun.getCurrentHrefEnv()+"/topicDetails?id=" + item.resourceId+'&newnpen=true');
if(item.resourceType == 'RAT02')window.open(this.publicFun.getCurrentHrefEnv()+"/eventdetail?id=" + item.resourceId + "&ismyevent=0&type=" + item.channelType);
if(item.resourceType == 'RAT02')window.open(this.publicFun.getCurrentHrefEnv()+"/activitydetail?id=" + item.resourceId + "&ismyevent=0&type=" + item.channelType);
if(item.resourceType == 'RAT03')window.open(this.publicFun.getCurrentHrefEnv()+"/industryReportDetail?id=" + item.resourceId);
if(item.resourceType == 'RAT04')window.open(this.publicFun.getCurrentHrefEnv()+"/articleDetail?id=" + item.resourceId+'&newnpen=true');
......@@ -615,7 +615,7 @@
background-size: contain;
height: 300px;
position: absolute;
top: 44px;
top: 0;
left: 0;
}
.event_home{
......
src/views/findeventpage/oldEventdetail.vue
View file @ 2111a297
......@@ -358,11 +358,7 @@
this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
this.getActivityDetails();
});
globalMsg.$emit('topisInit', false);
globalMsg.$emit('sendIndex', 3);
globalMsg.$emit('maidianfunc',({type:'report-channel-read',channelId:this.$route.query.id}));
this.getActivityDetails();
document.getElementsByTagName("body")[0].style.overflow = "auto";
api.selectBasicParams().then(response => {
if(response.code == 0) {
this.urltext = response.result.websitePrefix+'/redEnvelopeActDetail?id=';
......
src/views/findeventpage/userlist.vue
View file @ 2111a297
......@@ -14,7 +14,7 @@
<i @click="item.empId?tohome(item):''" class="hover_cursor">{{item.empName}}</i>
<i v-if="item.isOnline!=2" :style="item.isOnline != 0?'background:#AAAAAA;':''" class="userOnline"></i>
</p>
<div style="margin-right: 10px;" v-if="item.empId != userInfo.empId">
<div style="margin-right: 10px;" v-if="item.empId != userInfo.empId&&item.isFriend != 3">
<popoverBardbar :iseventlive="true" v-if="item.isFriend == 2" :row="item" :placement="true"></popoverBardbar>
<btnbar v-else :btnType="1" :channelId="$route.query.id" @successState="successState" :row="item" :index="index"></btnbar>
</div>
......
src/views/index/pages/index.vue
View file @ 2111a297
......@@ -65,7 +65,7 @@
<li class="li_live" v-for="(item,index) in hotcontentlist" :key="index">
<p class="ellipsisFont2"
style="cursor: pointer;"
@click="handleMore('detail',item.contentType == 'activity'?'/eventdetail':item.contentType == 'guess'?'/guessDetail':item.contentType== 'topic'?'/topicDetails':'/',item,true)">
@click="handleMore('detail',item.contentType == 'activity'?'/activitydetail':item.contentType == 'guess'?'/guessDetail':item.contentType== 'topic'?'/topicDetails':'/',item,true)">
<span class="hot_lable">热门</span>
<span style="color: #1A1A1E;">{{item.contentType == 'activity'?'活动':item.contentType == 'guess'?'竞猜':item.contentType== 'topic'?'话题':''}} <i style="margin: 0 3px;">|</i></span>
<span class="mouseHover" style="color: #1A1A1E;">{{item.contentType == 'activity'?item.contentDetail.channelTitle:item.contentType == 'guess'?item.contentDetail.guessTitle:item.contentType== 'topic'?'#'+item.contentDetail.topicTitle+'#':''}}</span>
......@@ -111,7 +111,7 @@
<ul class="gendisplay">
<li v-for="(item,index) in hotactivityList" :key="index">
<div style="position: relative;">
<p class="content_img" style="margin: 0;" @click="handleMore('detail','/eventdetail',item)">
<p class="content_img" style="margin: 0;" @click="handleMore('detail','/activitydetail',item)">
<span class="indeximgInfo" style="border-radius: 3px;background-size: cover;" :style="{backgroundImage:'url('+(item.channelPic?item.channelPic:'')+')'}"></span>
</p>
<i
......@@ -121,7 +121,7 @@
</i>
</div>
<p @click="handleMore('detail','/eventdetail',item)" class="ellipsisFont2 mouseHover" style="width: 100%;height: 44px;overflow: hidden;cursor: pointer;">{{item.channelTitle}}</p>
<p @click="handleMore('detail','/activitydetail',item)" class="ellipsisFont2 mouseHover" style="width: 100%;height: 44px;overflow: hidden;cursor: pointer;">{{item.channelTitle}}</p>
<div style="font-size: 12px;">
<p class="ellipsisFont1" style="width: 100%;height: 18px;overflow: hidden;">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>
<div class="gendisplay">
......@@ -594,11 +594,11 @@
<el-row :gutter="30">
<el-col :span="12" v-for="(item,index) in hotactivityList" :key="item.channelId">
<div class="gendisplay" style="margin-top: 20px;position: relative;">
<p class="imgInfo" @click="handleMore('detail','/eventdetail',item)" style="width: 150px;height: 90px;margin-right: 15px;cursor: pointer;" :style="{backgroundImage:'url('+(item.channelPic?item.channelPic:'')+')'}">
<p class="imgInfo" @click="handleMore('detail','/activitydetail',item)" style="width: 150px;height: 90px;margin-right: 15px;cursor: pointer;" :style="{backgroundImage:'url('+(item.channelPic?item.channelPic:'')+')'}">
&nbsp;
</p>
<div style="width: calc(100% - 165px);">
<p @click="handleMore('detail','/eventdetail',item)" class="ellipsisFont2" style="color:#1A1A1E;font-size: 16px;font-weight: bold;cursor: pointer;">{{item.channelTitle}}</p>
<p @click="handleMore('detail','/activitydetail',item)" class="ellipsisFont2" style="color:#1A1A1E;font-size: 16px;font-weight: bold;cursor: pointer;">{{item.channelTitle}}</p>
<p style="color:#69697A;margin: 14px 0 10px;font-size: 12px;line-height: 22px;">
{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}
<span>{{item.activityStartTime}} - {{item.activityEndTime}}</span>
......@@ -1041,7 +1041,7 @@
}else if(state == 'detail'){
var open_url = '';
if(path == '/guessDetail')open_url = '/guessDetail?id='+(hotstate?val.contentDetail.guessId:val.guessId);
if(path == '/eventdetail')open_url = '/eventdetail?id='+(hotstate?val.contentDetail.channelId:val.channelId)+'&type='+(hotstate?val.contentDetail.channelType:val.channelType);
if(path == '/activitydetail')open_url = '/activitydetail?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';
......
src/views/index/pages/temporary.vue
View file @ 2111a297
......@@ -934,7 +934,7 @@
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}})
this.$router.push({path:'/activitydetail',query:{id:row.channelId,ismyevent:0}})
globalMsg.$emit('maidianfunc',({type:'report-channel-index-recommend',channelId:row.channelId}));
}
......
src/views/keySearchpage/eventlist.vue
View file @ 2111a297
......@@ -65,7 +65,7 @@
},
methods:{
newOpenroute(row){
window.open(this.publicFun.getCurrentHrefEnv()+"/eventdetail?id="+row.channelId+'&ismyevent=0&type=4');
window.open(this.publicFun.getCurrentHrefEnv()+"/activitydetail?id="+row.channelId+'&ismyevent=0&type=4');
},
noDataopen(){
window.open(this.publicFun.getCurrentHrefEnv()+"/activitylist");
......
src/views/peoplehomepage/introductionbar.vue
View file @ 2111a297
......@@ -181,7 +181,7 @@
}else if(state == 2){
window.open(this.publicFun.getCurrentHrefEnv()+"/articleDetail?id="+row.pid+'&newnpen=true');
}else if(state == 4){
window.open(this.publicFun.getCurrentHrefEnv()+"/eventdetail?id="+row.activityDTO.channelId+'&ismyevent=0'+'&type='+row.activityDTO.channelType);
window.open(this.publicFun.getCurrentHrefEnv()+"/activitydetail?id="+row.activityDTO.channelId+'&ismyevent=0'+'&type='+row.activityDTO.channelType);
}else if(state == 5){
window.open(this.publicFun.getCurrentHrefEnv()+"/guessDetail?id="+row.baseGuessDTO.guessId);
}
......
src/views/peoplehomepage/tabActivitybar.vue
View file @ 2111a297
......@@ -86,7 +86,7 @@
methods: {
myeventdetail(row){
// this.$router.push({path:'/myeventdetail',query:{id:row.channelId,ismyevent:1}});
window.open(this.publicFun.getCurrentHrefEnv()+"/eventdetail?id=" + row.channelId + "&ismyevent=0&type=" + row.channelType);
window.open(this.publicFun.getCurrentHrefEnv()+"/activitydetail?id=" + row.channelId + "&ismyevent=0&type=" + row.channelType);
// window.open(this.publicFun.getCurrentHrefEnv()+"/myeventdetail?id="+row.channelId+'&ismyevent=1');
},
//打开直播
......
src/views/peoplehomepage/tabNewsbar.vue
View file @ 2111a297
......@@ -224,7 +224,7 @@
},
//活动
toevent(row){
window.open(this.publicFun.getCurrentHrefEnv()+"/eventdetail?id="+row.baseChannel.channelId+'&ismyevent=0&type=4');
window.open(this.publicFun.getCurrentHrefEnv()+"/activitydetail?id="+row.baseChannel.channelId+'&ismyevent=0&type=4');
},
},
mounted() {
......
src/views/publishactivity/proactivity.vue
View file @ 2111a297
......@@ -381,7 +381,7 @@
</div>
</div>
<div v-if="formData.channelState!=2&&formData.channelState!=3">
<div v-if="formData.channelState!=2&&formData.channelState!=3&&formData.channelState!=4">
<div class="btodiv">
<p>{{$t('pubactivities.eventsettings')}}</p>
<div style="margin-top: 20px">
......@@ -1017,7 +1017,7 @@
},
//嘉宾发短信消息
guestmsg(row){
api.sendActivityGuestsMsg(row.guestId).then(response => {
api.sendActivityGuestsMsg(row.id).then(response => {
if(response.code == 0) {
this.$message.success('发送成功');
} else {
......
src/views/publishactivity/pubactivities.vue
View file @ 2111a297
......@@ -163,7 +163,7 @@
});
},
newopen(val){
window.open(this.publicFun.getCurrentHrefEnv()+"/eventdetail?id="+val.channelId+'&ismyevent=0&type='+val.channelType);
window.open(this.publicFun.getCurrentHrefEnv()+"/activitydetail?id="+val.channelId+'&ismyevent=0&type='+val.channelType);
},
// 分页导航
handleCurrentChange(val) {
......
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