Skip to content

T
techbook
Commit 7891cd40 authored by zhangyanni's avatar zhangyanni
Browse files
Options

登录之后返回 

嘉宾交换名片
parent 5dcaa595
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 42 deletions
src/common/commonApi.js
View file @ 7891cd40
......@@ -221,6 +221,16 @@ export default {
},
selectDictList(params) {
return api.fetchGet('/business/dict/selectDictList?groupCode='+params );
return api.fetchGet("/business/dict/selectDictList?groupCode="+params );
},
//获取活动嘉宾列表
getActGuestListAxios(params){
return api.fetchLoadingGet("/base/activity/getActivityGuestList?"+Qs.stringify(params));
},
//获取活动嘉宾详情
getGuestDetailInfoAxios(params){
return api.fetchLoadingGet("/base/activity/showGuestInfo?guestId="+params);
}
}
src/common/lang/en.js
View file @ 7891cd40
......@@ -1953,7 +1953,9 @@ module.exports = {
realName:"your real name",
activityGuest:"Event Guests",
recentParticipated:"Recently Participated",
recentParticipatedList:"Participant List"
recentParticipatedList:"Participant List",
guestList:"Guest List"
......
src/common/lang/zh.js
View file @ 7891cd40
......@@ -2048,7 +2048,8 @@ module.exports = {
realName:"您的真实姓名",
activityGuest:"活动嘉宾",
recentParticipated:"最近参与",
recentParticipatedList:"参与者列表"
recentParticipatedList:"参与者列表",
guestList:"嘉宾列表"
},
......
src/components/mobile/guestDialogCmpt.vue
View file @ 7891cd40
This diff is collapsed.
src/components/mobile/guestFollowCmpt.vue
View file @ 7891cd40
This diff is collapsed.
src/views/mobile/activityApply/detail.vue
View file @ 7891cd40
......@@ -51,25 +51,25 @@
</div>
<div class="divHeight15px">
</div>
<div class="guestInfo">
<div class="guestInfo" v-if="detailInfo.guestCount>0">
<div class="activityIntro">
<div>
<span class="leftTab"></span><span>{{$t("activityInfo.activityGuest")}}</span>
</div>
<div>
<div v-show="detailInfo.guestCount>4">
<span @click="handleToGuest">{{$t("indexCount.lookMore")}}</span>
</div>
</div>
<div>
<followCmpt ref="followCmpt" :guestList="true" @quicklyLoginFunc="quicklyLoginFunc"
:circleType="25" :fixed="false"></followCmpt>
<div v-if="detailInfo.guestCount>0">
<followCmpt ref="followCmpt" :activityId="Number($route.query.id)" :guestList="true" @quicklyLoginFunc="quicklyLoginFunc"
:circleType="25" :fixed="false" @showGuestDialogFunc="showGuestDialogFunc"></followCmpt>
</div>
</div>
<div class="divHeight15px">
<div class="divHeight15px" v-if="detailInfo.guestCount>0">
</div>
<div class="contentInfo">
<p class="activityIntro"><span class="leftTab"></span><span>{{$t("Otherjson.activityview")}}</span></p>
<div>
<div v-if="detailInfo.guestCount>0">
<div v-html="detailInfo.channelIntroduction" v-if="!showAll"
style="max-height: 4rem;overflow: hidden;margin-bottom: .2rem;">
......@@ -81,6 +81,7 @@
:class="showAll?'icon-xiala-copy':'icon-xiala'"></i></span>
</div>
</div>
<div v-if="detailInfo.guestCount==0" v-html="detailInfo.channelIntroduction"></div>
</div>
<div class="divHeight15px">
</div>
......@@ -95,11 +96,11 @@
</div>
<div class="inviteCustumer" v-if="recentlyList.length>0">
<div v-for="item in recentlyList">
<img :src="item.empLogo" alt="" @click="handleToPersonal(item)">
<img :src="item.empLogo?item.empLogo:require('../../../assets/img/defaultlogo.png')" alt="" @click="handleToPersonal(item)">
</div>
</div>
</div>
<div class="divHeight15px" v-if="recentlyList.length>0">
<div class="divHeight15px" v-if="recentlyList">
</div>
<div class="sameContentwrap" v-if="lang==1&&sameContentData">
<p class="activityIntro"><span
......@@ -111,6 +112,9 @@
<div class="leftInfo">
<img :src="item.resourceType=='RAT02'||item.resourceType=='RAT01'?item.coverUrl:item.resourceType=='RAT03'?require('../../../assets/img/mobile/pdfImg@2x.png'):require('../../../assets/img/mobile/activityArticleImg@2x.png')"
alt="">
<!--资源类型 RAT01（话题） RAT02（活动） RAT03（报告） RAT04（文章）-->
<span class="activityStatusTip" style="background: rgba(0, 0, 0, 0.5);"><span
class="scaleFont">{{item.resourceType=='RAT01'?"话题":item.resourceType=='RAT02'?"活动":item.resourceType=='RAT03'?"报告":"文章"}}</span></span>
</div>
<div class="rightInfo" v-if="item.resourceType=='RAT02'">
<p class="activityTitle activityLive">
......@@ -334,7 +338,7 @@
:visible="isLogin"></applyLoginCmpt>
<itegralCmpt :visible="getIntegralVisible" v-if="getIntegralVisible" :integral="integral"
@handleHideIntegral="handleHideIntegral"></itegralCmpt>
<guestDialogCmpt v-if="guestVisible"></guestDialogCmpt>
<guestDialogCmpt @closeGuestDialog="closeGuestDialog" v-if="guestVisible" :guestInfo="guestInfo"></guestDialogCmpt>
</div>
</template>
<script>
......@@ -394,7 +398,8 @@
recommendedData: [],
currentCommendActivity: null,
recentlyList: [],
sameContentData: []
sameContentData: [],
guestInfo:null
}
},
......@@ -843,6 +848,15 @@
this.isLogin = true;
},
showGuestDialogFunc(data){
this.guestInfo = data;
this.guestVisible = true;
},
closeGuestDialog(){
this.guestVisible = false;
},
handleShowAll() {
this.showAll = !this.showAll;
},
......@@ -904,18 +918,16 @@
if (this.lang == 1) {
if (!this.userInfo) this.isLogin = true;
else {
if (!flag) {
if(data.empId){
if (data.empId != this.userInfo.empId) this.$router.push({
path: "/personalCenterInfo",
query: {empId: data.empId}
});
else this.$router.push({path: "/mine"});
} else {
if (data.otherEmpId != this.userInfo.empId) this.$router.push({
path: "/personalCenterInfo",
query: {empId: data.otherEmpId}
});
else this.$router.push({path: "/mine"});
}else {
this.guestInfo = data;
this.guestVisible = true;
}
}
}
......@@ -1299,6 +1311,7 @@
width: 2.5rem;
height: 1.5rem;
border-radius: .06rem;
object-fit: cover;
}
}
div.rightInfo {
......
src/views/mobile/activityApply/guestList.vue
View file @ 7891cd40
......@@ -3,11 +3,13 @@
<breadTop :title="title" :isReturn="true" :isTop="true" :isSearch="false" :isColor="false"
:grayColor="true" style="border-bottom:1px solid #F2F2F2"></breadTop>
<div class="contentWrapper">
<followCmpt ref="followCmpt" :isShowCount="false" @quicklyLoginFunc="quicklyLoginFunc" :guestList="true"
:circleType="25" :fixed="true"></followCmpt>
<followCmpt ref="followCmpt" :activityId="Number($route.query.id)" :isShowCount="false" @quicklyLoginFunc="quicklyLoginFunc" :guestList="true"
:circleType="25" :fixed="true" @showGuestDialogFunc="showGuestDialogFunc"></followCmpt>
</div>
<applyLoginCmpt v-if="isLogin" @isShowLoginDialogFunc="isShowLoginDialogFunc" :registerType="loginType"
:visible="isLogin"></applyLoginCmpt>
<guestDialogCmpt @closeGuestDialog="closeGuestDialog" v-if="guestVisible" :guestInfo="guestInfo"></guestDialogCmpt>
</div>
</template>
......@@ -18,20 +20,24 @@
import {Toast} from 'mint-ui';
import applyLoginCmpt from '../../../components/mobile/applyLogin';
import followCmpt from '../../../components/mobile/guestFollowCmpt';
import guestDialogCmpt from '../../../components/mobile/guestDialogCmpt';
export default {
name: "guestList",
components: {
breadTop,
applyLoginCmpt,
followCmpt
followCmpt,
guestDialogCmpt
},
data() {
return {
title: "嘉宾列表",
title: this.$t("activityInfo.guestList"),
isLogin: false,
userInfo: this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
loginType: 64,
guestVisible:false,
guestInfo:null
}
},
......@@ -49,6 +55,16 @@
this.isLogin = data;
this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
},
closeGuestDialog(){
this.guestVisible = false;
},
showGuestDialogFunc(data){
this.guestInfo = data;
this.guestVisible = true;
},
},
mounted() {
......
src/views/mobile/activityApply/list.vue
View file @ 7891cd40
......@@ -72,7 +72,7 @@
<el-button size="mini" plain type="primary" @click="handleApply(item)"
:disabled="item.disabledFlag>0"
v-if="item.activityState==2&&item.isJoin==2">
{{$t("activityInfo.freeApply")}}
{{item.viewDesc?item.viewDesc:$t("activityInfo.freeApply")}}
</el-button>
<el-button type="text" @click="handleToDetail(item)" class="hasApplied" size="mini"
v-if="item.activityState==2&&item.isJoin==1"><span>{{$t("activityInfo.hasApply")}}</span>
......
src/views/mobile/activityApply/participatedList.vue
View file @ 7891cd40
......@@ -4,10 +4,12 @@
:grayColor="true" style="border-bottom:1px solid #F2F2F2"></breadTop>
<div class="contentWrapper">
<followCmpt ref="followCmpt" :activityId="Number($route.query.id)" :isShowCount="false" @quicklyLoginFunc="quicklyLoginFunc" :partList="true"
:circleType="27" :fixed="true"></followCmpt>
:circleType="27" :fixed="true" @showGuestDialogFunc="showGuestDialogFunc"></followCmpt>
</div>
<applyLoginCmpt v-if="isLogin" @isShowLoginDialogFunc="isShowLoginDialogFunc" :registerType="loginType"
:visible="isLogin"></applyLoginCmpt>
<guestDialogCmpt @closeGuestDialog="closeGuestDialog" v-if="guestVisible" :guestInfo="guestInfo"></guestDialogCmpt>
</div>
</template>
......@@ -18,13 +20,15 @@
import {Toast} from 'mint-ui';
import applyLoginCmpt from '../../../components/mobile/applyLogin';
import followCmpt from '../../../components/mobile/guestFollowCmpt';
import guestDialogCmpt from '../../../components/mobile/guestDialogCmpt';
export default {
name: "guestList",
components: {
breadTop,
applyLoginCmpt,
followCmpt
followCmpt,
guestDialogCmpt
},
data() {
return {
......@@ -32,7 +36,8 @@
isLogin: false,
userInfo: this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
loginType: 64,
guestInfo:null,
guestVisible:false
}
},
methods: {
......@@ -49,6 +54,15 @@
this.isLogin = data;
this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
},
closeGuestDialog(){
this.guestVisible = false;
},
showGuestDialogFunc(data){
this.guestInfo = data;
this.guestVisible = true;
},
},
mounted() {
......
src/views/mobile/index/index.vue
View file @ 7891cd40
......@@ -154,7 +154,7 @@
v-if="((userInfo&&userInfo.empId!=item.contentDetail.createdBy)||!userInfo)&&item.contentDetail.channelType!=5">
<p @click="handleApply(item.contentDetail)" class="freeApply"
v-if="item.contentDetail.activityState==2&&item.contentDetail.isJoin==2">
{{$t("activityInfo.freeApply")}}</p>
{{item.contentDetail.viewDesc?item.contentDetail.viewDesc:$t("activityInfo.freeApply")}}</p>
<el-button type="text" @click="handleToActivity(item.contentDetail)"
class="hasApplied" size="mini"
v-if="item.contentDetail.activityState==2&&item.contentDetail.isJoin==1">
......@@ -312,7 +312,7 @@
<div class="right"
v-if="((userInfo&&userInfo.empId!=item.createdBy)||!userInfo)&&item.channelType!=5">
<p @click="handleApply(item)" class="freeApply"
v-if="item.activityState==2&&item.isJoin==2">{{$t("activityInfo.freeApply")}}</p>
v-if="item.activityState==2&&item.isJoin==2">{{item.viewDesc?item.viewDesc:$t("activityInfo.freeApply")}}</p>
<el-button type="text" @click="handleToActivity(item)" class="hasApplied"
size="mini" v-if="item.activityState==2&&item.isJoin==1"><span>{{$t("activityInfo.hasApply")}}</span>
</el-button>
......
src/views/mobile/loginregister/emCodeCmpt.vue
View file @ 7891cd40
......@@ -294,6 +294,9 @@
else if(this.pathfrom=="/mine"){
this.$router.push(this.pathfrom);
}
else if(this.pathfrom == "/settings"){
this.$router.push("/mine");
}
else this.$router.go(-1);
}
else {
......
src/views/mobile/loginregister/emPwdCmpt.vue
View file @ 7891cd40
......@@ -238,6 +238,9 @@
else if(this.pathfrom=="/mine"){
this.$router.push(this.pathfrom);
}
else if(this.pathfrom == "/settings"){
this.$router.push("/mine");
}
else this.$router.go(-1);
}
else {
......
src/views/mobile/loginregister/phoneCodeCmpt.vue
View file @ 7891cd40
......@@ -186,6 +186,9 @@
else if(this.pathfrom=="/mine"){
this.$router.push(this.pathfrom);
}
else if(this.pathfrom == "/settings"){
this.$router.push("/mine");
}
else this.$router.go(-1);
}
......
src/views/mobile/selectInterset.vue
View file @ 7891cd40
......@@ -3,8 +3,10 @@
<div class="closeBtn" v-if="isCmpt&&!isSearch">
<i class="iconfont icon-cuowu" @click="handleTo"></i>
</div>
<intersetedCmpt :screenlist="intersetList" :isCmpt="isCmpt" :isGou="isChannel" v-if="intersetList.length>0" :isSearch="isSearch"
:title="isChannel?'全部频道':$t('interseted.title')" :otherTitle="isChannel?false:true" :isEditInfo="isEditInfo"
<intersetedCmpt :screenlist="intersetList" :isCmpt="isCmpt" :isGou="isChannel" v-if="intersetList.length>0"
:isSearch="isSearch"
:title="isChannel?'全部频道':$t('interseted.title')" :otherTitle="isChannel?false:true"
:isEditInfo="isEditInfo"
@postCheckBoxGroup="handleConfirm"></intersetedCmpt>
</div>
</template>
......@@ -13,6 +15,7 @@
import intersetedCmpt from '../../components/mobile/intersetedCmpt';
import api from '../../common/commonApi';
import {Toast} from 'mint-ui'
export default {
name: "selectInterset",
components: {
......@@ -41,9 +44,9 @@
type: Boolean,
default: true
},
isEditInfo:{//编辑兴趣领域标签
type:Boolean,
default:false
isEditInfo: {//编辑兴趣领域标签
type: Boolean,
default: false
},
init: {
type: Boolean,
......@@ -58,7 +61,7 @@
return {
intersetList: [],
disabledFlag: 0,
selectedFlagArr:[],
selectedFlagArr: [],
userInfo: this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
}
......@@ -68,7 +71,7 @@
getInitSelect() {
var that = this;
this.selectedFlagArr = this.selectedFlag;
if(this.init){
if (this.init) {
if (this.userInfo) {
api.getUserIntersetedFlagAxios().then((res) => {
if (res.code == 0) {
......@@ -81,14 +84,14 @@
this.$toast(err);
})
}
}else{
} else {
this.initAllData()
}
},
//所有初始化数据
initAllData(){
initAllData() {
var that = this;
api.getIntersetedDictAxios().then(response => {
if (response.code == 0) {
......@@ -123,7 +126,7 @@
var that = this;
if (this.disabledFlag == 0) {
this.disabledFlag++;
if (this.isChannel||this.isSearch) {
if (this.isChannel || this.isSearch) {
this.$emit("postData", data);
} else {
api.postIntersetedDictAxios(data).then(res => {
......@@ -182,6 +185,9 @@
else if (this.pathfrom == "/mine") {
this.$router.push(this.pathfrom);
}
else if(this.pathfrom == "/settings"){
this.$router.push("/mine");
}
else {
this.$router.go(-1);
}
......@@ -265,7 +271,7 @@
padding-bottom: 1rem;
overflow: auto;
z-index: 9999;
&.paddingTopWrap{
&.paddingTopWrap {
top: 1rem;
padding-left: .3rem;
padding-right: .3rem;
......
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