Skip to content

T
techbook
Commit 9ac61400 authored by anxixi's avatar anxixi
Browse files
Options

运营指标验收等功能

parent 6af75221
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 22 deletions
src/views/findeventpage/newEventdetail.vue
View file @ 9ac61400
......@@ -81,7 +81,7 @@
{{item.empTitle}}
</i>
</p>
<div v-if="item.empId != userInfo.empId&&$i18n.locale=='zh-CN'&&item.isFriend != 3">
<div v-if="(item.empId != userInfo.empId||item.empId == null)&&$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>
......@@ -169,9 +169,9 @@
</div>
</div>
<div class="right_module">
<div :class="[positions&&!is_positions?'positionfixed':'',is_positions?'isposition':'']">
<div class="btnOperating" v-if="positions">
<span :class="$i18n.locale=='zh-CN'?'':'iszh-CN'" class="btn_margin-right" v-if="eventdata.channelType!=5&&userInfo&&userInfo.empId!=eventdata.createdBy||eventdata.channelType!=5&&!userInfo">
<div :class="[positions?'positionfixed':'']">
<div class="btnOperating" v-if="positions&&(eventdata.channelType!=5&&userInfo&&userInfo.empId!=eventdata.createdBy||eventdata.channelType!=5&&!userInfo)">
<span :class="$i18n.locale=='zh-CN'?'':'iszh-CN'" class="btn_margin-right">
<span class="eventbtn" v-if="eventdata.activityState==2&&!eventdata.isApply" @click="handleApply(eventdata)">{{eventdata.viewDesc?eventdata.viewDesc:$t('activityInfo.freeApply')}}</span>
<span class="eventbtn" v-if="eventdata.channelType!=4&&eventdata.activityState==2&&eventdata.isApply">{{$t("activityInfo.hasApply")}}</span>
<span class="eventbtn" v-if="eventdata.channelType==4&&eventdata.activityState==2&&eventdata.isApply" @click="handleToSuccess">{{$t("commonTitle.vipLookTitle")}}</span>
......@@ -179,13 +179,13 @@
<span class="eventbtn" v-if="eventdata.activityState==1">{{$t("activityInfo.activityNoBegin")}}</span>
</span>
</div>
<div class="shareIt gendisplay" v-if="resourcesList&&resourcesList.length<=4&&$i18n.locale=='zh-CN'">
<div class="shareIt gendisplay" v-if="resourcesList&&resourcesList.length<=4">
<div>
<VueQRCodeComponent :text="url" :size="100" :margin="0"></VueQRCodeComponent>
</div>
<div>
<p>微信扫一扫</p>
<span>分享此活动给朋友/朋友圈</span>
<p>{{$t("commonTitle.shareTitle")}}</p>
<!-- <span>分享此活动给朋友/朋友圈</span>-->
</div>
</div>
<div class="right_tabs" v-if="((resourcesList.length != 0||recommendList.length != 0)&&eventdata.channelType != 2&&$i18n.locale=='zh-CN')||(recommendList.length != 0&&eventdata.channelType == 2)">
......@@ -578,13 +578,12 @@
},
menu(){
let scroll = document.documentElement.scrollTop || document.body.scrollTop;
let divhtmldetail = document.getElementById('divtop')?document.getElementById('divtop').offsetHeight:0;
console.log(divhtmldetail+'=============='+scroll)
if( divhtmldetail - scroll < 650){
this.is_positions = true;
}else{
this.is_positions = false;
}
// let divhtmldetail = document.getElementById('divtop')?document.getElementById('divtop').offsetHeight:0;
// if( divhtmldetail - scroll < 650){
// this.is_positions = true;
// }else{
// this.is_positions = false;
// }
if(scroll>250){
this.positions = true;
}else{
......@@ -952,9 +951,10 @@
}
>div:last-child{
>p{
margin: 30px 0 15px;
font-size: 16px;
font-weight: bold;
margin: 40px 10px 15px;
font-size: 14px;
line-height: 24px;
/*font-weight: bold;*/
color: #1A1A1E;
}
>span{
......
src/views/kolExpert/kolExpertManage.vue
View file @ 9ac61400
......@@ -18,11 +18,11 @@
<p style="width: 50px;text-align: center">{{$t('operationjson.tos')}}</p>
<el-date-picker style="width: 180px;" v-model="searchs.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('operationjson.authEnd')"></el-date-picker>
<el-button type="primary" style="width: 100px;margin-left: 20px" @click="searchCik">{{$t('operationjson.search')}}</el-button>
<el-button type="primary" plain style="width: 100px;margin-left: 20px" @click="resetCik">重置</el-button>
<el-button type="primary" plain style="width: 100px;margin: 0 50px 0 20px;" @click="resetCik">重置</el-button>
</div>
</template>
</el-form-item>
<el-form-item class="formcontentnk">
<el-form-item>
<el-input placeholder="请输入关键字" @keyup.enter.native="searchCik" v-model="searchs.content" class="input-with-select" style="width: 290px">
<el-button slot="append" icon="el-icon-search" @click="searchCik"></el-button>
</el-input>
......
src/views/publishactivity/proactivity.vue
View file @ 9ac61400
......@@ -881,7 +881,7 @@
return
}
}
if(this.formData.resourceList.length>=6){
if(this.formData.resourceList.length>=4){
this.$message.error('已添加上限');
return
}
......@@ -1067,7 +1067,7 @@
subguest(){
this.$refs.guestform.validate((valid) => {
if(valid) {
if(this.guestform.guestId&&this.isEditevent){
if(this.isEditevent&&this.guestform.guestId){
for(let i in this.guestlist){
if(this.guestlist[i].guestId == this.guestform.guestId){
this.$message.error('此嘉宾已存在，请勿重复添加');
......@@ -1081,7 +1081,12 @@
api.addGuestsInfo(urls,this.guestform).then(response => {
if(response.code == 0) {
this.guestform.guestId = response.result;
this.guestlist.push(this.guestform);
for(let i in this.guestlist){
if(!this.isEditevent&&this.guestlist[i].guestId == this.guestform.guestId){
this.$set(this.guestlist, i, this.guestform);
}
}
if(this.isEditevent)this.guestlist.push(this.guestform);
this.guestVisible = false;
} else {
this.$message.error(response.msg);
......
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