Skip to content

T
techbook
Commit 47d2cb67 authored by anxixi's avatar anxixi
Browse files
Options

找活动pc版及条件筛选修改

parent cadf6363
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 410 additions and 37 deletions
src/components/index/Pagescreen.vue
View file @ 47d2cb67
This diff is collapsed.
src/router.js
View file @ 47d2cb67
......@@ -177,6 +177,11 @@ const router = new Router({
component: resolve => require(['views/findeventpage/eventdetail.vue'], resolve).catch(routerUtils.catchImport),
meta: {title: '活动详情'}
},
{
path: '/eventsuccess',
component: resolve => require(['views/findeventpage/eventsuccess.vue'], resolve).catch(routerUtils.catchImport),
meta: {title: '活动报名成功'}
},
// {
// path: '/knowledge',
// component: resolve => require(['views/knowledge/computer/computerlist.vue'], resolve),
......@@ -677,6 +682,21 @@ const router = new Router({
component: resolve => require(['views/industryreportspage/pushindustry.vue'], resolve).catch(routerUtils.catchImport),
meta: {title: '创建报告'}
},
{
path: '/myevent',
component: resolve => require(['views/findeventpage/myevent.vue'], resolve).catch(routerUtils.catchImport),
meta: {title: '我参与的活动'}
},
{
path: '/myeventdetail',
component: resolve => require(['views/findeventpage/eventdetail.vue'], resolve).catch(routerUtils.catchImport),
meta: {title: '我参与的活动详情'}
},
{
path: '/myeventsuccess',
component: resolve => require(['views/findeventpage/eventsuccess.vue'], resolve).catch(routerUtils.catchImport),
meta: {title: '我参与的活动详情报名成功'}
},
]
},
{
......
src/views/conmanagementpage/articleservice.vue
View file @ 47d2cb67
......@@ -9,7 +9,7 @@
<page-screen :screenlist="classifyList" :checkboxGroupstate="classifyrow" :screenchildListIf="false" ref="classifychild" titleName="按分类检索 " @changecheck="classifyData"></page-screen>
</el-row>
<el-row class="statebottm">
<page-screen :screenlist="dictList" :screenchildListIf="false" ref="dictchild" titleName="按标记检索 " @changecheck="dictData"></page-screen>
<page-screen :screenlist="dictList" :checkboxGroupstate="dictrow" :screenchildListIf="false" ref="dictchild" titleName="按标记检索 " @changecheck="dictData"></page-screen>
</el-row>
<el-row style="margin: 20px 0 0 10px" class="contnetform">
<el-form :inline="true" label-width="80px" label-position="left" style="width: 100%;">
......@@ -128,10 +128,13 @@
classifyIds:this.classifyrow
},
contentlist:[],
channelrow:[],
classifyrow:[],
dictrow:[],
}
},
props:[
'channelrow','classifyrow'
'searchdata'
],
components:{
pageScreen
......@@ -340,6 +343,7 @@
},
//编辑
editarticle(row){
this.publicFun.setUserInfoCookie("articleaudit",JSON.stringify(this.searchs))
this.$router.push({path:"/contentarticle",query:{contentId:row.contentId}});
},
//发布文章
......@@ -352,7 +356,16 @@
this.getChannelList();
this.getClassifyList();
this.getselectDictList();
this.getsearchContents();
// this.getsearchContents();
},
watch:{
searchdata(val){
this.searchs = val;
this.channelrow = val.channelIds;
this.classifyrow = val.classifyIds;
this.dictrow = val.codes;
this.getsearchContents();
}
}
}
</script>
......
src/views/conmanagementpage/conmanagement.vue
View file @ 47d2cb67
......@@ -9,8 +9,8 @@
<div class="projectTabadd">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="文章" name="first">
<articleservice v-if='showNum/2 === 0' :key='showNum' :classifyrow="classifyrow" :channelrow="channelrow" ref="childone"></articleservice>
<articleservice v-else :key='showNum' :classifyrow="classifyrow" :channelrow="channelrow" ref="childone"></articleservice>
<articleservice :searchdata="searchs" v-if='showNum/2 === 0' :key='showNum' ref="childone"></articleservice>
<articleservice :searchdata="searchs" v-else :key='showNum' ref="childone"></articleservice>
</el-tab-pane>
<el-tab-pane label="频道" name="second">
<channelservice @channelclk="channelclk" ref="childtwo"></channelservice>
......@@ -37,14 +37,24 @@
data() {
return {
activeName:'first',
channelrow:[],
classifyrow:[],
showNum: 2
showNum: 2,
searchs:{}
}
},
components:{
channelservice,classification,articleservice,articlesettings
},
beforeRouteEnter(to, from, next) {
next(vm=>{ // 这里的vm指的就是vue实例，可以用来当做this使用
console.log(from.path)
if(from.path == '/contentarticle'){
vm.searchs = JSON.parse(vm.publicFun.getCookie("articleaudit"));
}else{
vm.publicFun.removeCookie("articleaudit")
vm.$refs.childone.getsearchContents();
}
})
},
methods: {
handleClick(tab, event) {
if(tab.name == 'first'){
......@@ -60,8 +70,8 @@
},
channelclk(val){
++this.showNum
this.channelrow = [];
this.classifyrow = [];
this.searchs.channelrow = [];
this.searchs.classifyrow = [];
this.activeName = 'first';
this.channelrow.push(val.channelId);
// this.$refs.childone.getsearchContents();
......@@ -69,8 +79,8 @@
classifyclk(val){
++this.showNum
this.activeName = 'first';
this.channelrow = [];
this.classifyrow = [];
this.searchs.channelrow = [];
this.searchs.classifyrow = [];
this.classifyrow.push(val.classifyId);
// this.$refs.childone.getsearchContents();
},
......
src/views/findeventpage/api/api.js
View file @ 47d2cb67
......@@ -15,6 +15,16 @@ export default {
return api.fetchLoadingGet(url +params);
},
//报名活动详情
activityDetailAxios(params){
return api.fetchGet("/business/activityEnter/getActivityDetails?channelId="+params);
},
//我参与的活动
myJoinActivityAxios(params){
return api.fetchGet("/business/activityEnter/getBaseActivityList?"+Qs.stringify(params));
},
//发送账户验证码
sendAccountCode(params){
return api.fetchLogin("/base/code/sendCode",Qs.stringify(params))
......@@ -47,4 +57,8 @@ export default {
selectDictList(params) {
return api.fetchGet('/business/dict/selectDictList?groupCode='+params );
},
selectBasicParams (){
return api.fetchLogin('/base/tools/selectBasicParams');
},
}
\ No newline at end of file
src/views/findeventpage/eventdetail.vue
View file @ 47d2cb67
This diff is collapsed.
src/views/findeventpage/eventpage.vue
View file @ 47d2cb67
......@@ -11,26 +11,26 @@
:src="item.channelPic"
fit="cover"></el-image>
<p class="ellipsisFont1" @click="$router.push({path:'/eventdetail',query:{id:item.channelId}})">{{item.channelTitle}}</p>
<p class="ellipsisFont1" @click="$router.push({path:'/eventdetail',query:{id:item.channelId}})">时区：{{item.versionType==0?'北京时间':item.timeZoneName}}</p>
<span @click="$router.push({path:'/eventdetail',query:{id:item.channelId}})">{{item.channelStartTime}} 至 {{item.channelEndTime}}</span>
<p class="ellipsisFont1" @click="$router.push({path:'/eventdetail',query:{id:item.channelId}})">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>
<span @click="$router.push({path:'/eventdetail',query:{id:item.channelId}})">{{item.channelStartTime}} {{$t('adminDash.zhi')}} {{item.channelEndTime}}</span>
<span @click="$router.push({path:'/eventdetail',query:{id:item.channelId}})"> &nbsp;<i v-if="item.channelCityStr" class="iconfont icon-dingwei"></i> {{item.channelCityStr}}</span>
<div class="gendisplay">
<p class="ellipsisFont1">{{item.channelLabel}}</p>
<span v-if="item.isJoin==1">已报名</span>
<span v-if="item.activityState == 2&&item.isJoin==2"><el-button type="primary" @click="handleApply(item)" round plain size="mini">免费报名</el-button></span>
<span v-if="item.activityState == 3&&item.isJoin==2">报名截止</span>
<span style="color: #FF5D5D" v-if="item.activityState == 4&&item.isJoin==2">名额已满</span>
<span style="color: #9197B4" v-if="item.activityState == 5&&item.isJoin==2">活动已结束</span>
<span v-if="item.isJoin==1">{{$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 == 3&&item.isJoin==2">{{$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>
</div>
<i
class="signing"
:class="item.activityState == 2||item.activityState == 4?'signingup':item.activityState == 3?'applyend':item.activityState == 5?'activityEnd':''">
{{item.activityState == 2||item.activityState == 4?'报名中':item.activityState == 3?'报名截止':item.activityState == 5?'活动已结束':''}}
{{item.activityState == 2||item.activityState == 4?$t('activityInfo.applying'):item.activityState == 3?$t('activityInfo.applyEnd'):item.activityState == 5?$t('activityInfo.activityEnd'):''}}
</i>
</div>
</div>
<div v-if="contentList==0" style="text-align: center;line-height: 50px;">
暂无数据
{{$t('activityInfo.noActivity')}}
</div>
<div class="pagination">
<el-pagination
......@@ -212,7 +212,7 @@
this.secondStepInfo = query;
}
else {
this.$router.replace({path:"/applySuccess",query:{isList:true,id:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,type:this.detailInfo.channelType}})
this.$router.replace({path:"/eventsuccess",query:{id:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,type:this.detailInfo.channelType}})
}
}else{
this.$message.error(res.msg)
......
src/views/findeventpage/eventsuccess.vue 0 → 100644
View file @ 47d2cb67
<template>
<div>
<div v-if="!ismyevent" style="width: 100%;height: 100%;min-height: 700px;padding-top: 100px; background: #ffffff;">
<div style="margin: 0 80px;">
<div class="breadcrumb">
<el-breadcrumb separator=">">
<el-breadcrumb-item :to="{ path: '/' }">{{$t("topNav.index")}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/eventpage' }">{{$t("topNav.Findevent")}}</el-breadcrumb-item>
<el-breadcrumb-item>{{$t("activityInfo.applySuccess")}}</el-breadcrumb-item>
</el-breadcrumb>
</div>
<p style="border-bottom: 1px solid #E8EAF3;width: 100%;margin: 15px 0 50px 0;height: 2px;">&nbsp;</p>
<el-row>
<el-col :span="14" :offset="5" style="text-align: center;color:#3F3F53;">
<i style="font-size: 94px;color: #0ABB87;" class="iconfont icon-success"></i>
<p style="font-weight:400;font-size: 22px;margin-top: 30px">{{$t("activityInfo.applySuccess")}}</p>
<div v-if="$route.query.type!=4">
<p style="font-weight:400;line-height: 28px;margin-top: 28px;">{{$t("activityInfo.applySuccessTitleOne")}}</p>
<p style="font-weight:400;line-height: 28px;">{{$t("activityInfo.applySuccessTitleTwo")}}</p>
</div>
<div v-if="$route.query.type==4">
<p style="color: #565B79;" v-if="detailInfo&&detailInfo.signSuccessContent">{{detailInfo&&detailInfo.signSuccessContent?detailInfo.signSuccessContent:""}}</p>
<div v-if="detailInfo&&detailInfo.signSuccessPic">
<img :src="detailInfo.signSuccessPic" alt="">
<el-image
style="width: 300px;height: 180px;"
:src="detailInfo.signSuccessPic"
fit="cover"></el-image>
</div>
</div>
<el-row style="margin-top: 28px">
<el-button type="primary" @click="handleReturn" style="width: 180px;height: 42px">{{$t("activityInfo.shareButton")}}</el-button>
<el-button plain type="primary" @click="handleShare" style="width: 180px;height: 42px">{{$t("workPlace.goreturn")}}</el-button>
</el-row>
</el-col>
</el-row>
</div>
</div>
<div v-else class="soutform loginedWrapper">
<div class="breadcrumb">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '/litemlist' }">{{$t("litemlistjson.wrkbench")}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/myevent' }">{{$t("activityInfo.myJoin")}}</el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: pathfrom }">{{$t("Otherjson.activityview")}}</el-breadcrumb-item>
<el-breadcrumb-item>{{$t("activityInfo.applySuccess")}}</el-breadcrumb-item>
</el-breadcrumb>
<el-row class="projectTabadd" style="margin-top: 10px">
<el-col :span="14" :offset="5" style="text-align: center;color:#3F3F53;min-height: 400px;padding-top: 50px;">
<i style="font-size: 94px;color: #0ABB87;" class="iconfont icon-success"></i>
<p style="font-weight:400;font-size: 22px;margin-top: 30px">{{$t("activityInfo.applySuccess")}}</p>
<div v-if="$route.query.type!=4">
<p style="font-weight:400;line-height: 28px;margin-top: 28px;">{{$t("activityInfo.applySuccessTitleOne")}}</p>
<p style="font-weight:400;line-height: 28px;">{{$t("activityInfo.applySuccessTitleTwo")}}</p>
</div>
<div v-if="$route.query.type==4">
<p style="color: #565B79;" v-if="detailInfo&&detailInfo.signSuccessContent">{{detailInfo&&detailInfo.signSuccessContent?detailInfo.signSuccessContent:""}}</p>
<div v-if="detailInfo&&detailInfo.signSuccessPic">
<img :src="detailInfo.signSuccessPic" alt="">
<el-image
style="width: 300px;height: 180px;"
:src="detailInfo.signSuccessPic"
fit="cover"></el-image>
</div>
</div>
<el-row style="margin-top: 28px">
<el-button type="primary" @click="handleReturn" style="width: 180px;height: 42px">{{$t("activityInfo.shareButton")}}</el-button>
<el-button plain type="primary" @click="handleShare" style="width: 180px;height: 42px">{{$t("workPlace.goreturn")}}</el-button>
</el-row>
</el-col>
</el-row>
</div>
</div>
<div v-if="vueQrVisible">
<qrCmpt :url="url" @sendVisible="isVueQrVisible"></qrCmpt>
</div>
</div>
</template>
<script>
import qrCmpt from "../../components/common/qrcodeCmpt";
import api from "./api/api";
export default {
name: "eventsuccess",
data(){
return{
vueQrVisible:false,
url:'',
detailInfo:{},
pathfrom:'',
ismyevent:false,
}
},
components:{
qrCmpt
},
beforeRouteEnter(to, from, next) {
next(vm=>{ // 这里的vm指的就是vue实例，可以用来当做this使用
vm.pathfrom = from.fullPath;
if(from.path == '/myeventdetail')vm.ismyevent = true
})
},
methods:{
//二维码
isVueQrVisible(data){
this.vueQrVisible = data;
},
handleReturn(){
this.vueQrVisible = true;
api.selectBasicParams().then(response => {
if(response.code == 0) {
this.url = response.result.websitePrefix +"#/activitydetail?id="+this.$route.query.id+'&isApply=1&type='+this.$route.query.type;
} else {
this.$toast(response.msgCode);
}
}).catch(error => {
console.log("提交出错");
return false;
});
},
handleShare(){
this.$router.push({path:this.pathfrom});
},
getDetailInfo(){
api.activityDetailAxios(472).then((res)=>{
if(res.code==0){
this.detailInfo = res.result;
}else{
this.$toast(res.msg);
}
}).catch((err)=>{
this.$toast(err);
})
},
},
mounted() {
if(this.$route.query.type == 4){
this.getDetailInfo();
}
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
src/views/findeventpage/myevent.vue 0 → 100644
View file @ 47d2cb67
<template>
<div class="soutform loginedWrapper">
<div class="breadcrumb">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '/litemlist' }">{{$t("releasejson.wrkbench")}}</el-breadcrumb-item>
<el-breadcrumb-item>{{$t("activityInfo.myJoin")}}</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="projectTabadd" style="margin-top: 10px;position: relative;border-radius: 3px;min-height: 700px">
<el-tabs v-model="activeName">
<el-tab-pane :label="$t('activityInfo.myJoin')" name="first">
<div v-for="(item,index) in myeventlist" :key="index" style="padding:0 20px;cursor: pointer;" @click="$router.push({path:'/myeventdetail',query:{id:item.channelId}})">
<el-row style="padding: 20px 0;border-bottom: 1px solid #E7E9F5;">
<el-col :span="4">
<div style="position: relative;">
<el-image
style="width: 150px;height: 90px;"
:src="item.channelPic"
fit="cover"></el-image>
<i
class="signing"
:class="item.activityState == 2||item.activityState == 4?'signingup':item.activityState == 3?'applyend':item.activityState == 5?'activityEnd':''">
{{item.activityState == 2||item.activityState == 4?$t('activityInfo.applying'):item.activityState == 3?$t('activityInfo.applyEnd'):item.activityState == 5?$t('activityInfo.activityEnd'):''}}
</i>
</div>
</el-col>
<el-col :sm="18">
<p style="color: #1A1A1E;font-weight: bold;">{{item.channelTitle}}</p>
<p style="color: #69697A;font-size: 12px;margin: 10px 0 5px;" class="ellipsisFont1" @click="$router.push({path:'/eventdetail',query:{id:item.channelId}})">{{$t('activityInfo.timeZone')}}：{{item.versionType==0?$t('pubactivities.beijingtime'):item.timeZoneName}}</p>
<p style="color: #69697A;font-size: 12px;" @click="$router.push({path:'/eventdetail',query:{id:item.channelId}})">{{item.channelStartTime}} {{$t('adminDash.zhi')}} {{item.channelEndTime}}</p>
<p style="font-size: 12px;margin-top: 5px;">
<span style="color:#0ABB87;margin-right: 20px;">{{$t('activityInfo.hasApply')}}</span>
<span style="margin-right: 20px;">&nbsp;<i v-if="item.channelCityStr" class="iconfont icon-dingwei"></i> {{item.channelCityStr}}</span>
<span v-if="item.channelLabelList" style="color:#5D78FF;">
<i style="margin-right: 5px;" v-for="(itemchannel,index) in item.channelLabelList" :key="index">{{itemchannel}}</i>
</span>
</p>
</el-col>
</el-row>
</div>
<div class="pagination">
<el-pagination
@current-change="handleCurrentChange"
background
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="10"
:current-page="cur_page"
layout=" total, prev, pager, next"
:total="totalListResult">
</el-pagination>
</div>
</el-tab-pane>
</el-tabs>
</div>
</div>
</template>
<script>
import api from "../mobile/activityApply/api";
export default {
name : "myevent",
data() {
return {
activeName:'first',
myeventlist:[],
cur_page: 1, //页数
totalListResult: 0,
numberData: 10, //设置个数
userInfo:this.publicFun.getCookie("userInfo") ? JSON.parse(this.Base64.decode(this.publicFun.getCookie("userInfo"))) : null,
}
},
methods:{
// 分页导航
handleCurrentChange(val) {
this.cur_page = val;
this.getInitFunc();
},
getInitFunc(){
let params = {
page:this.cur_page,
pageSize:this.numberData,
createdBy:this.userInfo.empId
};
api.myJoinActivityAxios(params).then(response => {
if(response.code == 0) {
this.myeventlist = response.result.records;
this.totalListResult = response.result.total;
} else {
this.$toast(response.msg);
}
}).catch(error => {
console.log("提交出错");
return false;
});
},
},
mounted() {
this.getInitFunc();
}
}
</script>
<style scoped lang="scss">
.signingup{
background: #FF9E29;
}
.applyend{
background: #FD387A;
}
.activityEnd{
background: #3F3F53;
}
.signing{
position: absolute;
left: 0px;
top: 0px;
padding: 2px 15px;
color: #FFFFFF;
font-size: 12px;
}
</style>
\ No newline at end of file
src/views/findeventpage/signupbar.vue
View file @ 47d2cb67
......@@ -1015,7 +1015,7 @@
this.secondStepInfoObj = query;
}
else {
this.$router.replace({path:"/applySuccess",query:{id:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,isList:this.$route.name=='activitylist'?true:false,isApply:this.$route.query.isApply?this.$route.query.isApply:0,type:this.detailInfo.channelType}})
this.$router.replace({path:"/eventsuccess",query:{id:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,type:this.detailInfo.channelType}})
}
}else{
this.$message.error(res.msg)
......@@ -1184,7 +1184,7 @@
});
api.applyForProjectAxios(resultObj).then((res)=>{
if(res.code==0){
this.$router.replace({path:"/applySuccess",query:{id:this.secondStepInfoObj.aid,isApply:this.$route.query.isApply?this.$route.query.isApply:0,type:this.$route.query.type}})
this.$router.replace({path:"/eventsuccess",query:{id:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,type:this.detailInfo.channelType}})
}else{
this.$message.error(res.msg)
setTimeout(function () {
......@@ -1457,6 +1457,7 @@
display: flex;
align-items: center;
padding-bottom: 25px;
padding-left: 20px;
}
.leftTab{
display: inline-block;
......
src/views/industryreportspage/industryall.vue
View file @ 47d2cb67
......@@ -3,13 +3,13 @@
<el-row>
<el-row class="tabPdding">
<el-row class="statebottm">
<page-screen :screenlist="groupalllist" :screenchildListIf="false" ref="classifychild" titleName="按分类检索 " @changecheck="classifyData"></page-screen>
<page-screen :screenlist="groupalllist" :checkboxGroupstate="groupallrow" :screenchildListIf="false" ref="classifychild" titleName="按分类检索 " @changecheck="classifyData"></page-screen>
</el-row>
<el-row class="statebottm" style="line-height: 60px;">
<span style="font-weight: bold;padding: 0 45px 0 10px;">版本：</span>
<el-radio v-model="radio" label="0">全部</el-radio>
<el-radio v-model="radio" label="zh">中文</el-radio>
<el-radio v-model="radio" label="en">英文</el-radio>
<el-radio v-model="searchs.languageType" label="0">全部</el-radio>
<el-radio v-model="searchs.languageType" label="zh">中文</el-radio>
<el-radio v-model="searchs.languageType" label="en">英文</el-radio>
</el-row>
<el-row style="margin: 20px 0 0 10px" class="contnetform">
<el-form :inline="true" label-width="80px" label-position="left" style="width: 100%;">
......@@ -105,7 +105,7 @@
searchs:{
pageIndex:1,
pageSize:10,
languageType:this.radio,
languageType:'0',
},
cur_page: 1, //页数
totalListResult: 0,
......@@ -113,8 +113,12 @@
reportslist:[],
radio:'0',
industryalllist:[],
groupallrow:[],
}
},
props:[
'searchdata'
],
components:{
pageScreen
},
......@@ -137,6 +141,7 @@
},
//编辑
editreports(row){
this.publicFun.setUserInfoCookie("industryaudit",JSON.stringify(this.searchs))
this.$router.push({path:"/pushindustry",query:{reportId:row.reportId}});
},
//删除
......@@ -240,6 +245,13 @@
console.log("提交出错");
return false;
});
},
watch:{
searchdata(val){
this.searchs = val;
this.groupallrow = val.dataIds;
this.getsearchreports();
}
}
}
</script>
......
src/views/industryreportspage/industrymanagement.vue
View file @ 47d2cb67
......@@ -9,8 +9,8 @@
<div class="projectTabadd">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="行业报告" name="first">
<industryall v-if='showNum/2 === 0' :key='showNum' ref="childone"></industryall>
<industryall v-else :key='showNum' ref="childone"></industryall>
<industryall :searchdata="searchs" v-if='showNum/2 === 0' :key='showNum' ref="childone"></industryall>
<industryall :searchdata="searchs" v-else :key='showNum' ref="childone"></industryall>
</el-tab-pane>
<el-tab-pane label="设置" name="second">
<div style="margin-top: 20px;">
......@@ -38,9 +38,20 @@
return {
activeName:'first',
showNum: 2,
numberData:''
numberData:'',
searchs:{}
}
},
beforeRouteEnter(to, from, next) {
next(vm=>{ // 这里的vm指的就是vue实例，可以用来当做this使用
vm.pathfrom = from.path;
if(vm.pathfrom == '/pushindustry'){
vm.searchs = JSON.parse(vm.publicFun.getCookie("industryaudit"));
}else{
vm.publicFun.removeCookie("industryaudit")
}
})
},
components:{
industryall
},
......
src/views/publishactivity/proactivity.vue
View file @ 47d2cb67
......@@ -336,6 +336,7 @@
channelPic:'',
personMax:500,
versionType:0,
channelIntroduction:''
},
isShowErrorText2:false,
inputValue:'',//添加小标签
......@@ -463,6 +464,7 @@
}else{
this.valuelist = null;
}
this.$forceUpdate();
},
subcontacts(){
this.$refs.contactsform.validate((valid) => {
......@@ -525,11 +527,15 @@
editpublishActivity(){
this.$refs.formData.validate((valid) => {
if(valid) {
if(!this.formData.channelEndTime && this.formData.channelEndTime == ''){
if(this.formData.channelIntroduction&&this.formData.channelIntroduction.length == 11){
this.$message.error(this.$t('pubactivities.plactivities'))
return
}
if(!this.formData.channelEndTime || this.formData.channelEndTime == ''){
this.$message.error(this.$t('pubactivities.plactivityendtime'));
return;
}
if(!this.formData.activityEndTime && this.formData.activityEndTime == ''){
if(!this.formData.activityEndTime || this.formData.activityEndTime == ''){
this.$message.error(this.$t('pubactivities.plsignupendtime'));
return;
}
......@@ -584,11 +590,11 @@
subpublishActivity(){
this.$refs.formData.validate((valid) => {
if(valid) {
if(!this.formData.channelEndTime && this.formData.channelEndTime == ''){
if(!this.formData.channelEndTime || this.formData.channelEndTime == ''){
this.$message.error(this.$t('pubactivities.plactivityendtime'));
return;
}
if(!this.formData.activityEndTime && this.formData.activityEndTime == ''){
if(!this.formData.activityEndTime || this.formData.activityEndTime == ''){
this.$message.error(this.$t('pubactivities.plsignupendtime'));
return;
}
......@@ -643,6 +649,14 @@
getviewActivity(){
this.$refs.formData.validate((valid) => {
if(valid) {
if(!this.formData.channelEndTime || this.formData.channelEndTime == ''){
this.$message.error(this.$t('pubactivities.plactivityendtime'));
return;
}
if(!this.formData.activityEndTime || this.formData.activityEndTime == ''){
this.$message.error(this.$t('pubactivities.plsignupendtime'));
return;
}
if(this.publicFun.getDataCheck(this.formData.channelStartTime,this.formData.channelEndTime)){
this.$message.error(this.$t('pubactivities.judgingtime1'));
return;
......
src/views/publishactivity/pubactivities.vue
View file @ 47d2cb67
......@@ -12,7 +12,7 @@
<el-button type="primary" @click="soutClk">{{$t("pubactivities.newactivity")}}</el-button>
</el-form-item>
<el-form-item class="formcontentnk">
<el-input :placeholder="$t('pubactivities.newactivity')" v-model="search.channelTitle" class="input-with-select" style="width: 290px">
<el-input :placeholder="$t('commonTitle.searchKeyword')" v-model="search.channelTitle" class="input-with-select" style="width: 290px">
<el-button slot="append" icon="el-icon-search" @click="searchchannel"></el-button>
</el-input>
</el-form-item>
......
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