Skip to content

T
techbook
Commit 79675f75 authored by zhangyanni's avatar zhangyanni
Browse files
Options

提交

parent eea01e5a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 640 additions and 32 deletions
public/css/phone.scss
View file @ 79675f75
......@@ -1920,6 +1920,12 @@ i, em {
background: rgba(246, 246, 246, 1);
}
.divHeight15px {
height: .15rem;
width: 100%;
background: rgba(246, 246, 246, 1);
}
//社区打分星星
.leftStar {
.el-rate {
......@@ -3447,4 +3453,7 @@ i, em {
background-position: center;
background-repeat: no-repeat;
}
.noBorderTop{
border-top: unset !important;
}
}
\ No newline at end of file
src/assets/font/iconfont.css
View file @ 79675f75
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/font/iconfont.js
View file @ 79675f75
This diff is collapsed.
src/assets/font/iconfont.svg
View file @ 79675f75
......@@ -20,6 +20,12 @@ Created by iconfont
/>
<missing-glyph />
<glyph glyph-name="shiqu" unicode="&#60454;" d="M64 384c0-121.6 44.8-230.4 121.6-307.2 44.8 38.4 96 64 153.6 83.2-12.8 70.4-19.2 147.2-19.2 224H64z m6.4 64h256c0 57.6 6.4 108.8 19.2 160-64 19.2-115.2 44.8-160 83.2-64-64-102.4-147.2-115.2-243.2zM960 384H704c0-76.8-6.4-153.6-19.2-224 57.6-19.2 108.8-51.2 153.6-83.2C915.2 153.6 960 262.4 960 384z m-6.4 64C940.8 544 896 627.2 832 691.2c-44.8-38.4-96-64-153.6-83.2 12.8-51.2 19.2-102.4 25.6-160h249.6zM384 384c0-76.8 6.4-140.8 19.2-204.8 32 6.4 70.4 12.8 108.8 12.8s76.8-6.4 108.8-12.8c12.8 64 19.2 128 19.2 204.8H384z m0 64h256c0 51.2-6.4 96-12.8 140.8-38.4-6.4-76.8-12.8-115.2-12.8s-76.8 6.4-108.8 12.8C396.8 544 390.4 499.2 384 448zM236.8 32c51.2-38.4 108.8-70.4 179.2-83.2-25.6 38.4-44.8 89.6-57.6 153.6-51.2-19.2-89.6-44.8-121.6-70.4z m550.4 0c-38.4 25.6-76.8 51.2-115.2 64-12.8-64-38.4-115.2-57.6-153.6 64 19.2 121.6 51.2 172.8 89.6z m96 0A511.36 511.36 0 0 0 512-128C230.4-128 0 102.4 0 384S230.4 896 512 896c147.2 0 281.6-64 371.2-160 89.6-89.6 140.8-217.6 140.8-352s-51.2-262.4-140.8-352zM416 115.2C441.6 6.4 480-64 512-64s70.4 70.4 96 179.2c-32 6.4-64 12.8-96 12.8s-64-6.4-96-12.8zM236.8 736c38.4-25.6 76.8-51.2 115.2-64 12.8 64 38.4 115.2 57.6 153.6-64-19.2-121.6-51.2-172.8-89.6z m550.4 0C736 774.4 678.4 806.4 608 819.2c25.6-38.4 44.8-89.6 57.6-153.6 51.2 19.2 89.6 44.8 121.6 70.4zM416 652.8c32-6.4 64-12.8 96-12.8s64 6.4 96 12.8C582.4 761.6 544 832 512 832s-70.4-70.4-96-179.2z" horiz-adv-x="1024" />
<glyph glyph-name="setting" unicode="&#59073;" d="M981.67466667 254.63466667l-74.52444445 63.71555555c3.52711111 21.61777778 5.34755555 43.69066667 5.34755556 65.76355556s-1.82044445 44.14577778-5.34755556 65.76355555l74.52444445 63.71555556c11.49155555 9.78488889 15.70133333 25.71377778 10.58133333 40.04977778l-1.024 2.95822222c-20.59377778 57.45777778-51.08622222 110.25066667-90.68088889 156.89955556l-2.048 2.38933333c-9.78488889 11.49155555-25.6 15.81511111-39.936 10.80888889l-92.50133333-32.88177778c-34.13333333 27.98933333-72.24888889 50.06222222-113.43644445 65.536l-17.86311111 96.71111111c-2.73066667 14.90488889-14.44977778 26.51022222-29.35466667 29.24088889l-3.072 0.56888889c-59.27822222 10.69511111-121.62844445 10.69511111-180.90666666 0l-3.072-0.56888889c-14.90488889-2.73066667-26.624-14.336-29.35466667-29.24088889l-17.97688889-97.16622222c-40.84622222-15.47377778-78.73422222-37.43288889-112.64-65.30844445l-93.184 33.10933334c-14.22222222 5.00622222-30.15111111 0.79644445-39.936-10.80888889l-2.048-2.38933333c-39.59466667-46.76266667-70.08711111-99.55555555-90.68088888-156.89955556l-1.024-2.95822222c-5.12-14.22222222-0.91022222-30.15111111 10.58133333-40.04977778l75.43466667-64.39822222c-3.52711111-21.39022222-5.23377778-43.23555555-5.23377778-64.96711112 0-21.84533333 1.70666667-43.69066667 5.23377778-64.9671111L42.09777778 254.86222222000004c-11.49155555-9.78488889-15.70133333-25.71377778-10.58133333-40.04977777l1.024-2.95822223c20.59377778-57.344 51.08622222-110.25066667 90.68088888-156.89955555l2.048-2.38933334c9.78488889-11.49155555 25.6-15.81511111 39.936-10.80888888l93.184 33.10933333c33.90577778-27.87555555 71.79377778-49.94844445 112.64-65.30844445l17.97688889-97.16622222c2.73066667-14.90488889 14.44977778-26.51022222 29.35466667-29.24088889l3.072-0.56888889c29.696-5.34755555 60.07466667-8.07822222 90.45333333-8.07822222 30.37866667 0 60.87111111 2.73066667 90.45333333 8.07822222l3.072 0.56888889c14.90488889 2.73066667 26.624 14.336 29.35466667 29.24088889l17.86311111 96.71111111c41.18755555 15.47377778 79.30311111 37.43288889 113.43644445 65.536l92.50133333-32.88177777c14.22222222-5.00622222 30.15111111-0.79644445 39.936 10.80888888l2.048 2.38933334c39.59466667 46.76266667 70.08711111 99.55555555 90.68088889 156.89955555l1.024 2.95822223c5.12 13.99466667 0.91022222 29.92355555-10.58133333 39.82222222zM826.368 436.45155555c2.84444445-17.18044445 4.32355555-34.816 4.32355555-52.45155555s-1.47911111-35.27111111-4.32355555-52.45155555l-7.50933333-45.6248889 84.992-72.704c-12.85688889-29.696-29.12711111-57.68533333-48.46933334-83.74044444L749.79555555 166.91200000000003l-35.72622222-29.35466667c-27.19288889-22.30044445-57.45777778-39.82222222-90.22577778-52.11022222l-43.34933333-16.27022222-20.36622222-110.36444444c-31.97155555-3.64088889-64.62577778-3.64088889-96.71111111 0l-20.36622222 110.592-43.008 16.49777777c-32.42666667 12.288-62.57777778 29.80977778-89.54311112 51.99644445l-35.72622222 29.46844444-106.26844444-37.77422222c-19.34222222 26.05511111-35.49866667 54.15822222-48.46933334 83.74044444l85.90222223 73.38666667-7.39555556 45.51111111c-2.73066667 16.95288889-4.20977778 34.47466667-4.20977777 51.76888889 0 17.408 1.36533333 34.816 4.20977777 51.76888889l7.39555556 45.51111111-85.90222223 73.38666667c12.85688889 29.696 29.12711111 57.68533333 48.46933334 83.74044444l106.26844444-37.77422222 35.72622222 29.46844444c26.96533333 22.18666667 57.11644445 39.70844445 89.54311112 51.99644445l43.12177778 16.27022222 20.36622222 110.592c31.97155555 3.64088889 64.62577778 3.64088889 96.71111111 0l20.36622222-110.36444445 43.34933333-16.27022222c32.65422222-12.288 63.03288889-29.80977778 90.22577778-52.11022222l35.72622222-29.35466666 105.58577778 37.43288888c19.34222222-26.05511111 35.49866667-54.15822222 48.46933334-83.74044444L818.97244445 481.84888889l7.39555555-45.39733334zM512 595.6266666700001c-110.592 0-200.24888889-89.65688889-200.24888889-200.24888889s89.65688889-200.24888889 200.24888889-200.24888889 200.24888889 89.65688889 200.24888889 200.24888889-89.65688889 200.24888889-200.24888889 200.24888889z m90.112-290.36088889C577.99111111 281.25866667 546.01955555 267.94666667 512 267.94666667c-34.01955555 0-65.99111111 13.312-90.112 37.31911111C397.88088889 329.38666666999995 384.56888889 361.35822222 384.56888889 395.37777778c0 34.01955555 13.312 65.99111111 37.31911111 90.112C446.00888889 509.61066667 477.98044445 522.8088888899999 512 522.8088888899999c34.01955555 0 65.99111111-13.19822222 90.112-37.31911111C626.11911111 461.36888889 639.43111111 429.39733333 639.43111111 395.37777778c0-34.01955555-13.312-65.99111111-37.31911111-90.112z" horiz-adv-x="1024" />
<glyph glyph-name="hangye1" unicode="&#59074;" d="M949.729453 652.258149L528.854654 891.391558a33.956944 33.956944 0 0 1-34.161915 0L73.81794 652.258149c-10.248575-6.149145-17.080958-17.764196-17.080957-29.379247v-477.583578c0-12.29829 6.832383-23.230103 17.080957-29.379248l420.874799-239.133408c5.465906-2.732953 10.931813-4.782668 17.080958-4.782668s11.615051 1.366477 17.080957 4.782668l420.874799 239.133408c10.931813 6.149145 17.080958 17.080958 17.080958 29.379248V622.878902c0 11.615051-6.149145 23.230103-17.080958 29.379247z m-51.926112-487.832153l-386.029644-219.319497-386.029645 219.319497V603.064991l386.029645 219.319497 386.029644-219.319497v-438.638995zM224.130368 534.74116c-9.565336-15.714481-4.09943-36.894869 12.29829-45.776967h0.683238l239.816647-136.647662v-269.879132c0-19.130673 15.714481-34.161915 34.161915-34.161915 19.130673 0 34.161915 15.031243 34.845154 33.478677V351.633293l241.183123 137.3309c16.397719 9.565336 21.863626 30.062486 12.981528 46.460205a34.503535 34.503535 0 0 1-47.143443 12.29829l-240.499885-136.647662-240.499885 136.647662a36.006659 36.006659 0 0 1-47.826682-12.981528z m0 0" horiz-adv-x="1024" />
......
src/common/lang/en.js
View file @ 79675f75
......@@ -1950,7 +1950,12 @@ module.exports = {
timeoutTitle1:"Time is up, you still have ",
timeoutTitle2:" a chance to continue to answer.",
goGuess:"Guess to win more rewards",
realName:"your real name"
realName:"your real name",
activityGuest:"Event Guests",
recentParticipated:"Recently Participated",
recentParticipatedList:"Participant List"
},
......
src/common/lang/zh.js
View file @ 79675f75
......@@ -2045,7 +2045,10 @@ module.exports = {
timeoutTitle1: "您答题超时，失去一次机会，你还有",
timeoutTitle2: "次机会。",
goGuess: "竞猜赢取更多奖励",
realName:"您的真实姓名"
realName:"您的真实姓名",
activityGuest:"活动嘉宾",
recentParticipated:"最近参与",
recentParticipatedList:"参与者列表"
},
......
src/components/apply/applyPro.vue
View file @ 79675f75
......@@ -722,6 +722,10 @@
defaultCheckedArr:{
type:Array,
default:[]
},
recommendData:{
type:Boolean,
default:false
}
},
data() {
......@@ -920,11 +924,11 @@
// 9：上传附件")
this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
var resultObj = {
activityId:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,
activityId:this.recommendData?this.detailInfo.channelId:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,
createdBy:this.userInfo?this.userInfo.empId:null,
channelType:this.detailInfo.channelType,
baseModuleEnter:{
activityId:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,
activityId:this.recommendData?this.detailInfo.channelId:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,
moduleId:this.moduleId
}
......@@ -989,7 +993,7 @@
globalMsg.$emit("getUserInfo");
}
if(res.code==0){
var query = {aid:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,id:res.result.enterId,page:this.$route.query.page,isList:this.$route.name=='activitylist'?true:false,isSearchList:this.$route.name=='activitySearchResult'?true:false,isApply:this.$route.query.isApply?this.$route.query.isApply:0,key:this.$route.query.key?this.$route.query.key:'',type:this.detailInfo.channelType}
var query = {aid:this.recommendData?this.detailInfo.channelId:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,id:res.result.enterId,page:this.$route.query.page,isList:this.$route.name=='activitylist'?true:false,isSearchList:this.$route.name=='activitySearchResult'?true:false,isApply:this.$route.query.isApply?this.$route.query.isApply:0,key:this.$route.query.key?this.$route.query.key:'',type:this.detailInfo.channelType}
if(this.$route.name=='activitySearchResult'){
query['key'] = this.$route.query.key;
}
......@@ -1004,7 +1008,7 @@
if(this.detailInfo.baseLive&&this.detailInfo.baseLive.liveState==1){
this.liveOperatorFunc(this.detailInfo,true);
}else{
this.$router.replace({path:"/applySuccess",query:{isIndex:this.isIndex,page:this.$route.query.page,id:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,isList:this.$route.name=='activitylist'?true:false,isSearchList:this.$route.name=='activitySearchResult'?true:false,isApply:this.$route.query.isApply?this.$route.query.isApply:0,key:this.$route.query.key?this.$route.query.key:'',type:this.detailInfo.channelType}})
this.$router.replace({path:"/applySuccess",query:{isIndex:this.isIndex,page:this.$route.query.page,id:this.recommendData?this.detailInfo.channelId:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,isList:this.$route.name=='activitylist'?true:false,isSearchList:this.$route.name=='activitySearchResult'?true:false,isApply:this.$route.query.isApply?this.$route.query.isApply:0,key:this.$route.query.key?this.$route.query.key:'',type:this.detailInfo.channelType}})
}
}
}else{
......@@ -1032,7 +1036,7 @@
//报名
applyFunc(data) {
var resultObj = {
activityId: this.$route.query.id ? this.$route.query.id : this.detailInfo.channelId,
activityId: this.recommendData?this.detailInfo.channelId:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,
createdBy: this.userInfo ? this.userInfo.empId : null,
channelType: this.detailInfo.channelType
};
......@@ -1046,7 +1050,7 @@
var query = {
isList: this.$route.name == 'activitylist' ? true : false,
isSearchList: this.$route.name == 'activitySearchResult' ? true : false,
aid: this.$route.query.id ? this.$route.query.id : this.detailInfo.channelId,
aid: this.recommendData?this.detailInfo.channelId:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,
id: res.result.enterId,
page: this.$route.query.page,
type: this.detailInfo.channelType
......@@ -1070,7 +1074,7 @@
query: {
isList: true,
page: this.$route.query.page,
id: this.$route.query.id ? this.$route.query.id : this.detailInfo.channelId,
id: this.recommendData?this.detailInfo.channelId:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,
type: this.detailInfo.channelType
}
})
......@@ -1130,7 +1134,7 @@
//获取模版信息
getInitTemplateInfo() {
let that = this;
let params= this.$route.query.id?this.$route.query.id:this.detailInfo.channelId;
let params= this.recommendData?this.detailInfo.channelId:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId;
api.getBasicInfoAxios(params).then((res) => {
if (res.code == 0) {
if(res.result.length>0){
......
src/components/mobile/faceCmpt.vue
View file @ 79675f75
......@@ -63,8 +63,9 @@
</div>
<div class="publishButton">
<i class="iconfont icon-biaoqing" @click="pBodyStatus(0)"></i>
<span style="color: #7A7A7A;" v-if="isCanPublishTopic!=2">发布</span>
<span @click="handlePublish" v-if="isCanPublishTopic==2">发布</span>
<!--<span style="color: #7A7A7A;" v-if="isCanPublishTopic!=2">发布</span>-->
<!--<span @click="handlePublish" v-if="isCanPublishTopic==2">发布</span>-->
<span @click="handlePublish">发布</span>
</div>
<div class="hbl-comm" v-if="pBodyMap">
<div class="comment" :style="{width:commentWidth}">
......@@ -576,7 +577,16 @@
//发布
handlePublish() {
if(this.textareaMap[0]){
this.checkIsErrorComment(this.textareaMap[0])
if(this.isCanPublishTopic!=2){
this.$toast({
message: "您的评论未达到10个字，无法发布!",
duration: 5000,
className: 'noticeError'
})
}
if(this.isCanPublishTopic==2){
this.checkIsErrorComment(this.textareaMap[0])
}
}else{
this.$toast({
......
src/components/mobile/faceCmpt1.vue
View file @ 79675f75
......@@ -77,8 +77,9 @@
</div>
<div class="publishButton">
<i class="iconfont icon-biaoqing" @click="pBodyStatus(0)"></i>
<span v-if="(!currentFirstTopic&&isTopicList)||isCanPublishTopic!=2" style="color: #B9BED5;">发布</span>
<span v-if="((currentFirstTopic&&isTopicList)||!isTopicList)&&isCanPublishTopic==2" @click="handlePublish">发布</span>
<!--<span v-if="(!currentFirstTopic&&isTopicList)||isCanPublishTopic!=2" style="color: #B9BED5;">发布</span>-->
<!--<span v-if="((currentFirstTopic&&isTopicList)||!isTopicList)&&isCanPublishTopic==2" @click="handlePublish">发布</span>-->
<span @click="handlePublish">发布</span>
</div>
<div class="hbl-comm" v-if="pBodyMap">
<div class="comment" :style="{width:commentWidth}">
......@@ -687,7 +688,17 @@
//发布
handlePublish() {
if (this.textareaMap[0]) {
this.checkIsErrorComment(this.textareaMap[0])
if((!this.currentFirstTopic&&this.isTopicList)||this.isCanPublishTopic!=2){
this.$toast({
message: "您的讨论未达到10个字，无法发布!",
duration: 5000,
className: 'noticeError'
})
}
if(((this.currentFirstTopic&&this.isTopicList)||!this.isTopicList)&&this.isCanPublishTopic==2){
this.checkIsErrorComment(this.textareaMap[0])
}
} else {
this.$toast({
message: "请输入评论内容",
......
src/components/mobile/guestDialogCmpt.vue 0 → 100644
View file @ 79675f75
<template>
<div class="guestDialog">
<div class="v-modal transparentBg" tabindex="0" style="z-index: 2001;"></div>
<div class="closeIcon" @click="handleClose"><i class="iconfont icon-cuowu"></i></div>
<div class="guestInfoWrap">
<!--<div class="topInfo" :style="{backgroundImage:contactObj.empLogo?'url('+contactObj.empLogo+')':'url('+require('../../assets/img/defaultlogo.png')+')'}">-->
<!--</div>-->
<div class="topInfo">
<div class="img" :style="{backgroundImage:'url('+require('../../assets/img/defaultlogo.png')+')'}">
</div>
<el-row class="personInfo">
<el-col :span="18">
<div class="fontWeight">郭翠鸽</div>
<div>郭翠鸽郭翠鸽郭翠鸽郭翠鸽郭翠鸽郭翠鸽郭翠鸽郭翠鸽郭翠鸽郭翠鸽郭翠鸽郭翠鸽</div>
</el-col>
<el-col :span="6">
<span class="follow" @click="handleClick">交换名片</span>
</el-col>
</el-row>
</div>
<div class="bottomInfo">
一个互联网行业的优秀产品总监，应该无限接近一个优秀的CEO；向着更高职业发展，潜心沉淀，做出更多优秀的产品来改善大家的生活。简简单单生活，把产品当作自己的孩子！一个互联网行业的优秀产品总监，应该无限接近一个优秀的CEO；向着更高职业发展，潜心沉淀，做出更多优秀的产品来改善大家的生活。简简单单生活，把产品当作自己的孩子！一个互联网行业的优秀产品总监，应该无限接近一个优秀的CEO；向着更高职业发展，潜
</div>
</div>
</div>
</template>
<script>
export default {
name: "guestDialogCmpt",
data() {
return {}
},
props:{
guestInfo:{
type:Object,
default:()=>{}
}
},
methods: {
handleClick(data){
},
handleClose(){
}
},
mounted() {
}
}
</script>
<style scoped lang="scss">
.guestDialog {
width: 100%;
display: flex;
justify-content: center;
align-items: center;
.closeIcon {
width: 100%;
height: .6rem;
position: fixed;
right: 0;
top: 3.5rem;
display: flex;
justify-content: flex-end;
padding-right: 3%;
z-index: 2013;
i:before {
color: #FFFFFF;
font-weight: bold;
font-size: .4rem;
}
}
.guestInfoWrap {
width: 94%;
min-height: 4rem;
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
position: fixed;
left: 3%;
top: 4rem;
z-index: 2013;
background: #FFFFFF;
border-radius: .2rem;
padding: .3rem;
.topInfo {
width: 100%;
border-bottom: 1px solid #E8EAF3;
display: flex;
padding-bottom: .1rem;
.img {
width: 1rem;
height: 1rem;
border-radius: 50%;
background-repeat: no-repeat;
background-size: contain;
}
.personInfo{
width: calc(100% - 1.1rem);
display: flex;
justify-content: space-between;
.follow {
margin-top: .1rem;
width: 1.5rem;
display: inline-block;
text-align: center;
padding: .1rem;
font-size: .24rem;
color: #ff5d5d;
border-radius: 1rem;
border: 1px solid #ff5d5d;
}
.el-col-18{
padding-left: .15rem;
color: #1A1A1E;
font-size: .28rem;
.fontWeight{
font-size: .32rem;
}
}
}
}
.bottomInfo{
width: 100%;
color: #484848;
font-size: .28rem;
text-align: justify;
padding-top: .2rem;
}
}
}
</style>
\ No newline at end of file
src/components/mobile/guestFollowCmpt.vue 0 → 100644
View file @ 79675f75
This diff is collapsed.
src/router.js
View file @ 79675f75
......@@ -133,6 +133,11 @@ const mySchoolmate = () => import('views/mobile/circle/mySchoolmate').catch(rout
const myColleague = () => import('views/mobile/circle/myColleague').catch(routerUtils.catchImport);//我的同事
const follower = () => import('views/mobile/mine/follow').catch(routerUtils.catchImport);//关注/关注着
const message = () => import('views/mobile/mine/message').catch(routerUtils.catchImport);//消息
const settings = () => import('views/mobile/settings/settings').catch(routerUtils.catchImport);//设置
const editPassword = () => import('views/mobile/settings/editPassword').catch(routerUtils.catchImport);//修改密码
const guestList = () => import('views/mobile/activityApply/guestList').catch(routerUtils.catchImport);//嘉宾列表
const participatedList = () => import('views/mobile/activityApply/participatedList').catch(routerUtils.catchImport);//最近参与列表
Vue.use(Router)
const originalReplace = Router.prototype.replace;
Router.prototype.replace = function replace(location) {
......@@ -143,8 +148,9 @@ Router.prototype.push = function replace(location) {
return originalPush.call(this, location).catch(err => err);
};
const router = new Router({
mode: 'history',
routes: [
{path: '*', component: notServer},
{path: '*', component: notFind},
{
path: '/',
name: 'index',
......@@ -292,7 +298,7 @@ const router = new Router({
},
{
path: '/peoplehome',
name:"peoplehome",
name: "peoplehome",
component: resolve => require(['views/peoplehomepage/peoplehome.vue'], resolve).catch(routerUtils.catchImport),
meta: {title: '个人中心'}
},
......@@ -969,7 +975,7 @@ const router = new Router({
path: "/expertAccepting",
components: {
default: resolve => require(['views/indexAccepting/projectManage.vue'], resolve).catch(routerUtils.catchImport),
secondStage:resolve => require(['views/indexAccepting/kolProfessorsManage.vue'], resolve).catch(routerUtils.catchImport),
secondStage: resolve => require(['views/indexAccepting/kolProfessorsManage.vue'], resolve).catch(routerUtils.catchImport),
thirdStage: resolve => require(['views/partner/auditList.vue'], resolve).catch(routerUtils.catchImport),
forthStage: resolve => require(['views/busgovernment/auditList.vue'], resolve).catch(routerUtils.catchImport),
......@@ -2012,7 +2018,17 @@ const router = new Router({
name: "notServerParentRouter",
component: notServerPhone,
}
},
{
path: '/guestList',
name: "guestList",
component: guestList,
},
{
path: '/participatedList',
name: "participatedList",
component: participatedList,
},
]
},
//没有头部且不需登录
......@@ -2134,7 +2150,17 @@ const router = new Router({
path: "/myColleague",
name: "myColleague",
component: myColleague
}
},
{
path: "/settings",
name: "settings",
component: settings
},
{
path: "/editPassword",
name: "editPassword",
component: editPassword
},
]
}
//没有头部且需登录
......
src/views/dashboard/pages/statistics.vue
View file @ 79675f75
This diff is collapsed.
src/views/mobile/activityApply/api.js
View file @ 79675f75
......@@ -101,5 +101,15 @@ export default {
//报名红包活动
applyRedEnvelopeAxios(params){
return api.fetchLoadingLogin("/business/packet/addUserAccountInfo",params);
},
//活动推荐
activityDetailRecommend(params){
return api.fetchGet("/business/index/getRecommendActivity?"+Qs.stringify(params));
},
//最近参与
getRecentlyPartAxios(params){
return api.fetchGet("/base/activity/getActivityNewestJoin?"+Qs.stringify(params));
}
}
src/views/mobile/activityApply/detail.vue
View file @ 79675f75
This diff is collapsed.
src/views/mobile/activityApply/detail1.vue 0 → 100644
View file @ 79675f75
This diff is collapsed.
src/views/mobile/activityApply/guestList.vue 0 → 100644
View file @ 79675f75
<template>
<div class="overfolowWrapper">
<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>
</div>
<applyLoginCmpt v-if="isLogin" @isShowLoginDialogFunc="isShowLoginDialogFunc" :registerType="loginType"
:visible="isLogin"></applyLoginCmpt>
</div>
</template>
<script>
import api from './api';
import commonApi from '../../../common/commonApi';
import breadTop from '../../../components/mobile/breadTop';
import {Toast} from 'mint-ui';
import applyLoginCmpt from '../../../components/mobile/applyLogin';
import followCmpt from '../../../components/mobile/guestFollowCmpt';
export default {
name: "guestList",
components: {
breadTop,
applyLoginCmpt,
followCmpt
},
data() {
return {
title: "嘉宾列表",
isLogin: false,
userInfo: this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
loginType: 64,
}
},
methods: {
handleToTurn() {
this.$router.go(-1)
},
quicklyLoginFunc() {
this.isLogin = true;
},
//是否显示登录
isShowLoginDialogFunc(data, data1) {
this.isLogin = data;
this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
},
},
mounted() {
}
}
</script>
<style scoped lang="scss">
.contentWrapper {
margin-top: 1rem;
}
</style>
\ No newline at end of file
src/views/mobile/activityApply/participatedList.vue 0 → 100644
View file @ 79675f75
<template>
<div class="overfolowWrapper">
<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" :activityId="Number($route.query.id)" :isShowCount="false" @quicklyLoginFunc="quicklyLoginFunc" :partList="true"
:circleType="27" :fixed="true"></followCmpt>
</div>
<applyLoginCmpt v-if="isLogin" @isShowLoginDialogFunc="isShowLoginDialogFunc" :registerType="loginType"
:visible="isLogin"></applyLoginCmpt>
</div>
</template>
<script>
import api from './api';
import commonApi from '../../../common/commonApi';
import breadTop from '../../../components/mobile/breadTop';
import {Toast} from 'mint-ui';
import applyLoginCmpt from '../../../components/mobile/applyLogin';
import followCmpt from '../../../components/mobile/guestFollowCmpt';
export default {
name: "guestList",
components: {
breadTop,
applyLoginCmpt,
followCmpt
},
data() {
return {
title: this.$t("activityInfo.recentParticipatedList"),
isLogin: false,
userInfo: this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
loginType: 64,
}
},
methods: {
handleToTurn() {
this.$router.go(-1)
},
quicklyLoginFunc() {
this.isLogin = true;
},
//是否显示登录
isShowLoginDialogFunc(data, data1) {
this.isLogin = data;
this.userInfo = this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null;
},
},
mounted() {
}
}
</script>
<style scoped lang="scss">
.contentWrapper {
margin-top: 1rem;
}
</style>
\ No newline at end of file
src/views/mobile/api.js
View file @ 79675f75
......@@ -121,6 +121,11 @@ export default {
//获取是否交换名片
getIsChangeAxios(params){
return api.fetchLoadingPost("/base/emp/selectChannelOpenState?"+Qs.stringify(params));
},
//获取活动最近参与列表
getRecentParticipatedListAxios(params){
return api.fetchLoadingGet("/base/activity/getActivityJoinList?"+Qs.stringify(params));
}
}
\ No newline at end of file
src/views/mobile/index/index.vue
View file @ 79675f75
......@@ -467,7 +467,7 @@
</div>
<div class="centerWrapper">
<div class="tabTitle">
{{$t("topNav.importCorper")}}
{{$t("topNav.starCompany")}}
</div>
<div class="tabBar"><span></span></div>
<div class="tabImg tabImg1">
......@@ -477,7 +477,7 @@
</div>
<div class="centerWrapper" style="padding-bottom: .1rem;">
<div class="tabTitle">
{{$t("topNav.starCompany")}}
{{$t("topNav.importCorper")}}
</div>
<div class="tabBar"><span></span></div>
<div class="tabImg tabImg2">
......
src/views/mobile/loginregister/emRegister.vue
View file @ 79675f75
......@@ -214,12 +214,16 @@
handleToProtocol(type){
globalMsg.$emit('isProtocol',0);
if(type==1) {
var url = this.$router.resolve({path:"/termservice"});
window.open(url.href,"_blank")
// var url = this.$router.resolve({path:"/termservice"});
// window.open(url.href,"_blank")
this.$router.push("/termserviceed")
}
else {
var url =this.$router.resolve({path:"/privacypolicy"});
window.open(url.href,"_blank")
// var url =this.$router.resolve({path:"/privacypolicy"});
// window.open(url.href,"_blank")
this.$router.push("/privacypolicyed")
}
// this.protocolVisible = true;
......
src/views/mobile/loginregister/phoneRegister.vue
View file @ 79675f75
......@@ -215,12 +215,15 @@
handleToProtocol(type){
globalMsg.$emit('isProtocol',0);
if(type==1) {
var url = this.$router.resolve({path:"/termservice"});
window.open(url.href,"_blank")
// var url = this.$router.resolve({path:"/termservice"});
// window.open(url.href,"_blank")
this.$router.push("/termserviceed")
}
else {
var url =this.$router.resolve({path:"/privacypolicy"});
window.open(url.href,"_blank")
// var url =this.$router.resolve({path:"/privacypolicy"});
// window.open(url.href,"_blank")
this.$router.push("/privacypolicyed")
}
// this.protocolVisible = true;
......
src/views/mobile/mineOrOther.vue
View file @ 79675f75
This diff is collapsed.
src/views/mobile/mineOrOther1.vue 0 → 100644
View file @ 79675f75
This diff is collapsed.
src/views/mobile/settings/editPassword.vue 0 → 100644
View file @ 79675f75
<template>
<div class="overfolowWrapper">
<breadTop :title="title" :isReturn="true" :isTop="true" :isSearch="false" :isColor="false"
:grayColor="true" style="border-bottom:1px solid #F2F2F2"></breadTop>
<div class="formbody" v-if="!isShowSuccess">
<p><span style="font-weight: bold;">{{$t('personalAuth.account')+'：'}}</span>{{userInfo.empAccount}}</p>
<div>
<el-form label-position="top" :label-width="lang==1?'150px':'300px'" :model="ruleForm" :rules="rules"
ref="ruleForm" class="smallFocusForm">
<!--<el-form-item :label="$t('personalAuth.account')+'：'" style="text-align: left;margin-bottom: 0;border-bottom: 1px solid #E8EAF3;">-->
<!--<span>{{userInfo.empAccount}}</span>-->
<!--</el-form-item>-->
<el-form-item prop="oldPwd" :label="$t('personalAuth.oldPass')+'：'">
<el-input type="password" v-model="ruleForm.oldPwd" :placeholder="$t('personalAuth.oldPass')"
maxlength="18"
autocomplete></el-input>
<input type="text" class="is-hidden">
</el-form-item>
<el-form-item prop="newPwd" :label="$t('personalAuth.newPass')+'：'">
<el-input type="password" v-model="ruleForm.newPwd" :placeholder="$t('personalAuth.newPass')"
maxlength="18"
autocomplete></el-input>
<input type="text" class="is-hidden">
</el-form-item>
<el-form-item prop="confirmationPwd" :label="$t('personalAuth.confirmPass')+'：'"
style="margin-bottom: 40px;">
<el-input type="password" v-model="ruleForm.confirmationPwd"
:placeholder="$t('personalAuth.confirmPass')" maxlength="18"
autocomplete></el-input>
</el-form-item>
<el-form-item style="text-align: center;">
<el-button type="primary" @click="submitForm('ruleForm')" style="width: 100%;"
:disabled="disabledFlag>0" v-loading.fullscreen.lock="fullscreenLoading">
{{$t("personalAuth.confirmModify")}}
</el-button>
</el-form-item>
</el-form>
</div>
</div>
<div class="wrapper" v-if="isShowSuccess">
<div class="successIcon">
<i class="iconfont icon-success"></i>
</div>
<div class="successTitle">
<p>{{$t("findPassword.successTitle")}}</p>
</div>
<div class="successButton">
<el-button plain type="primary" @click="handleToIndex">{{$t("personalAuth.reLogin")}}</el-button>
</div>
</div>
</div>
</template>
<script>
import {Toast} from 'mint-ui';
import api from '../../../views/accountmanage/api/api'
import commonApi from '../../../common/commonApi';
import applyLoginCmpt from '../../../components/mobile/applyLogin';
import breadTop from '../../../components/mobile/breadTop';
import validate from '../../../common/validate';
export default {
name: "settings",
components: {
applyLoginCmpt,
breadTop,
},
data() {
return {
title: this.$t('findPassword.modifyTitle'),
userInfo: this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
ruleForm: {
newPwd: "",
oldPwd: "",
confirmationPwd: ""
},
lang: this.$i18n.locale == "zh-CN" ? 1 : 2,
disabledFlag: 0,
fullscreenLoading: false,
isShowSuccess: false,
rules: {
newPwd: [
{required: true, validator: validate.checkPassWord, trigger: 'blur'}
],
oldPwd: [
{required: true, validator: validate.checkPassWord, trigger: 'blur'}
],
confirmationPwd: [
{required: true, validator: this.checkConfirmPass, trigger: 'blur'}
]
},
}
},
methods: {
//确认密码
checkConfirmPass(rule, value, callback) {
var that = this;
if (value === '') {
callback(new Error(that.$t('findPassword.confirmPassword')));
} else if (this.ruleForm.newPwd != '' && value !== this.ruleForm.newPwd) {
callback(new Error(that.$t('findPassword.passwordNo')));
} else {
callback();
}
},
//修改密码
submitForm(formName) {
var that = this;
this.$refs[formName].validate((valid) => {
if (valid) {
let params = {
oldPwd: this.$md5(this.ruleForm.oldPwd),
newPwd: this.$md5(this.ruleForm.newPwd),
confirmationPwd: this.$md5(this.ruleForm.confirmationPwd)
}
if (this.disabledFlag == 0) {
this.disabledFlag++;
this.fullscreenLoading = true;
api.modifyPasswordAxios(params).then((res) => {
this.fullscreenLoading = false;
if (res.code == 0) {
that.isShowSuccess = true;
} else {
that.$toast(res.msg);
}
setTimeout(function () {
that.disabledFlag = 0;
return false;
}, 500)
}).catch((err) => {
that.$toast(err)
setTimeout(function () {
that.disabledFlag = 0;
return false;
}, 500)
})
} else {
setTimeout(function () {
that.disabledFlag = 0;
return false;
}, 500)
}
} else {
return false;
}
});
},
handleToIndex() {
let that = this;
api.logoutAxios().then((res) => {
if (res.code == 0) {
this.publicFun.removeCookieType();
that.$router.push("/mobileLogin");
} else {
that.$toast(res.msg);
}
}).catch((err) => {
that.$toast(err);
})
}
}
}
</script>
<style scoped lang="scss">
.formbody {
margin-top: 1rem;
padding: .3rem .2rem;
> p {
border-bottom: 1px solid #E8EAF3;
padding: .2rem;
font-size: .28rem;
}
>div{
padding: 0 .2rem;
}
}
.wrapper {
margin-top: 2rem;
width: 100%;
display: -webkit-flex; /*新版本语法：chrome 21+*/
display: -webkit-box; /*老版本语法：Safari,iOS,Android browser,old Webkit browser*/
display: -moz-box; /*老版本语法：Firefox(buggy)*/
display: -ms-flexbox; /*混合版本语法：IE 10*/
display: flex; /*新版本语法:opera 12.1,Firefox 22+*/
justify-content: space-around;
flex-wrap: wrap;
text-align: center;
& > div {
width: 100%;
}
& .icon-success:before {
font-size: 94px;
}
& > .successIcon {
/*padding-top: 100px;*/
}
& > .successTitle {
font-weight: 400;
color: #3F3F53;
& > p {
font-size: 22px;
padding-top: 30px;
padding-bottom: 48px;
}
}
& > .successButton {
& > .el-button {
width: 140px;
margin: 0 10px;
}
}
}
</style>
\ No newline at end of file
src/views/mobile/settings/settings.vue 0 → 100644
View file @ 79675f75
This diff is collapsed.
src/views/mobile/topic/detail.vue
View file @ 79675f75
This diff is collapsed.
src/views/mobile/topic/discussDialog.vue
View file @ 79675f75
......@@ -86,6 +86,9 @@
<!--<vue-preview :slides="detailInfo.contentUrlList"></vue-preview>-->
<!--</div>-->
</div>
<div class="dwote fromInfo" @click="handleClose" v-if="topicInfo">
来自于&nbsp;#{{topicInfo.topicTitle}}#
</div>
<div class="praiseInfo" v-if="detailInfo.likeNumberStr!=null&&detailInfo.likeNumberStr>0">
<i class="iconfont icon-zan1"></i>&nbsp;&nbsp;{{detailInfo.likeNumberStr}}
</div>
......@@ -524,6 +527,11 @@
var topicdata = e.target.innerText.replace("#", "");
this.getTopicIdByTitle(topicdata);
}
// if(e.toElement.nodeName=="A"){
// console.log(e)
// e.target.target = "unset";
// window.open(e.target.innerText)
// }
}
// if (event.target.nodeName === 'INPUT') {
// if (event.target.className === "ipt") {
......@@ -1393,7 +1401,7 @@
className: 'noticeError'
});
})
},
}
},
......@@ -2104,5 +2112,11 @@
margin-left: -1rem;
}
}
.fromInfo{
color: #5D78FF;
font-size: .28rem;
padding: 0 .2rem;
width: 100%;
}
</style>
\ No newline at end of file
vue.config.js
View file @ 79675f75
This diff is collapsed.
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