Skip to content

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

Merge remote-tracking branch 'origin/dev1.0.11' into dev1.0.11

parents 7ca9ffd9 ef2ce8e1
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 23 deletions
public/css/index.css
View file @ 67657370
...@@ -4823,7 +4823,7 @@ ...@@ -4823,7 +4823,7 @@
.el-form-item__error { .el-form-item__error {
color: #FF5D5D; color: #FF5D5D;
font-size: 12px; font-size: 12px;
line-height: 1; line-height: 14px;
padding-top: 4px; padding-top: 4px;
position: absolute; position: absolute;
top: 100%; top: 100%;
......
public/css/phone.scss
View file @ 67657370
...@@ -952,7 +952,7 @@ i, em { ...@@ -952,7 +952,7 @@ i, em {
left: 0; left: 0;
bottom: 0; bottom: 0;
} }
.tabClass{ .tabClass,.tabEnclass{
.mint-navbar .mint-tab-item{ .mint-navbar .mint-tab-item{
min-width:1.5rem; min-width:1.5rem;
} }
...@@ -960,6 +960,11 @@ i, em { ...@@ -960,6 +960,11 @@ i, em {
border-bottom-width: .1rem; border-bottom-width: .1rem;
} }
} }
.tabEnclass{
.mint-navbar .mint-tab-item{
min-width: 2.5rem;
}
}
::-webkit-scrollbar{ ::-webkit-scrollbar{
display: none; display: none;
background-color:transparent !important; background-color:transparent !important;
......
src/common/validate.js
View file @ 67657370
...@@ -53,7 +53,8 @@ export default { ...@@ -53,7 +53,8 @@ export default {
if(value ===''){ if(value ===''){
callback(new Error(i18n.t("errorValidate.errorNoPassword"))); callback(new Error(i18n.t("errorValidate.errorNoPassword")));
}else if(!reg.test(value)){ }else if(!reg.test(value)){
callback(new Error(i18n.t("errorValidate.errorErrorPassword"))); if(window.localStorage.getItem("ismobile")==1) callback(new Error(i18n.t("commonTips.passwordDescriptionOne")+i18n.t("commonTips.passwordDescriptionTwo")+i18n.t("commonTips.passwordDescriptionThree")));
else callback(new Error(i18n.t("errorValidate.errorErrorPassword")));
}else{ }else{
callback(); callback();
} }
......
src/components/index/PageBottom.vue
View file @ 67657370
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
}, },
useHelp(){ useHelp(){
this.$router.push("/useHelp"); this.$router.push("/useHelp");
this.$emit("itemBtn",5); this.$emit("itemBtn",4);
}, },
} }
}; };
......
src/components/index/PageTop.vue
View file @ 67657370
...@@ -8,12 +8,17 @@ ...@@ -8,12 +8,17 @@
</div> </div>
<div class="header-content" v-if="isShow" :class="lang=='en'?'ieEnUl':''"> <div class="header-content" v-if="isShow" :class="lang=='en'?'ieEnUl':''">
<ul> <ul class="navListLi">
<li <li
@click.stop="handleClick(index)" @click.stop="handleClick(index)"
@mouseenter="handleShowChildren(index)"
:class="currentIndex==index?'activeLi':''" :class="currentIndex==index?'activeLi':''"
v-for="(item,index) in list">{{$t('topNav.'+item.name)}} v-for="(item,index) in list">{{$t('topNav.'+item.name)}}
</li> </li>
<div class="childrenLi" v-if="isShowChildren">
<p @click="handleToIndustryFocus">{{$t('topNav.professionfocusing')}}</p>
<p @click="handleToCase">{{$t('topNav.cooperationcase')}}</p>
</div>
<li v-if="userInfo" class="workPlaceLi" @click="handleToWork"><span class="iconfont icon-ic_web" style="color: #ff9e29;"></span>{{$t("topNav.workPlace")}}</li> <li v-if="userInfo" class="workPlaceLi" @click="handleToWork"><span class="iconfont icon-ic_web" style="color: #ff9e29;"></span>{{$t("topNav.workPlace")}}</li>
</ul> </ul>
</div> </div>
...@@ -131,6 +136,7 @@ ...@@ -131,6 +136,7 @@
<script> <script>
import api from '../../views/loginregister/api/api'; import api from '../../views/loginregister/api/api';
import publicFunc from '../../common/public' import publicFunc from '../../common/public'
import $ from 'jquery';
export default { export default {
name: 'PageTop', name: 'PageTop',
props: { props: {
...@@ -150,8 +156,10 @@ ...@@ -150,8 +156,10 @@
}, },
data() { data() {
return { return {
isShowChildren:false,
keyword:"", keyword:"",
searchword:"", searchword:"",
activeIndex: '1',
list: [{ list: [{
id: 1, id: 1,
name: "index" name: "index"
...@@ -163,13 +171,13 @@ ...@@ -163,13 +171,13 @@
name: "findCustomer" name: "findCustomer"
}, { }, {
id: 4, id: 4,
name: "professionfocusing" name: "industryActive"
}, { }, {
id: 5,
name: "cooperationcase"
}, {
id: 6, id: 6,
name: "useHelp" name: "useHelp"
}, {
id: 7,
name: "knowledge"
}], }],
currentIndex: window.sessionStorage.getItem("currentNav")==null||window.sessionStorage.getItem("currentNav")==undefined||window.sessionStorage.getItem("currentNav")==1||window.sessionStorage.getItem("currentNav")==2?0:window.sessionStorage.getItem("currentNav"), currentIndex: window.sessionStorage.getItem("currentNav")==null||window.sessionStorage.getItem("currentNav")==undefined||window.sessionStorage.getItem("currentNav")==1||window.sessionStorage.getItem("currentNav")==2?0:window.sessionStorage.getItem("currentNav"),
lang: this.$i18n.locale, lang: this.$i18n.locale,
...@@ -187,6 +195,25 @@ ...@@ -187,6 +195,25 @@
} }
}, },
methods: { methods: {
handleToIndustryFocus(){
this.currentIndex = 3;
this.$emit("itemNav",3);
globalMsg.$emit("sendItemNav",3);
window.sessionStorage.setItem("currentNav",3);
this.$router.push("/lndustryfocus");
},
handleToCase(){
this.currentIndex = 3;
this.$emit("itemNav",3);
globalMsg.$emit("sendItemNav",3);
window.sessionStorage.setItem("currentNav",3);
this.$router.push("/successfulcase");
},
handleClick(index) { handleClick(index) {
this.$emit('aboutwebtn',index+''); this.$emit('aboutwebtn',index+'');
if(this.currentIndex!=index){ if(this.currentIndex!=index){
...@@ -197,10 +224,11 @@ ...@@ -197,10 +224,11 @@
if((index==1||index==2)&&!this.userInfo) { if((index==1||index==2)&&!this.userInfo) {
this.$router.push('/login'); this.$router.push('/login');
} }
if(index==5) this.$router.push("/useHelp"); if(index==5) this.$router.push("/knowledge");
if(index==4) this.$router.push("/useHelp");
if(index==0) this.$router.push("/"); if(index==0) this.$router.push("/");
if(index==4) this.$router.push("/successfulcase"); // if(index==4) this.$router.push("/successfulcase");
if(index==3) this.$router.push("/lndustryfocus"); // if(index==3) this.$router.push("/lndustryfocus");
if(index==1){ if(index==1){
if(this.isCompleteInfo){ if(this.isCompleteInfo){
this.$router.push("/seeprojectlist"); this.$router.push("/seeprojectlist");
...@@ -212,12 +240,20 @@ ...@@ -212,12 +240,20 @@
this.$router.push("/bigBusiness/list"); this.$router.push("/bigBusiness/list");
}else this.$router.push("/completeInfoCmpt"); }else this.$router.push("/completeInfoCmpt");
} }
this.$emit("itemNav",index); if(index!=3){
globalMsg.$emit("sendItemNav",index); this.$emit("itemNav",index);
globalMsg.$emit("sendItemNav",index);
}
}, },
handleShowChildren(index){
if(index==3) this.isShowChildren =true;
else this.isShowChildren =false;
},
//去消息 //去消息
handleToAnnounce(){ handleToAnnounce(){
this.getInitList(); this.getInitList();
...@@ -301,12 +337,16 @@ ...@@ -301,12 +337,16 @@
//登录 //登录
handleLogin(){ handleLogin(){
this.currentIndex = 0;
window.sessionStorage.setItem("currentNav",this.currentIndex);
if (this.$i18n.locale == "zh-CN") this.$router.push("/mobileLoginCmpt"); if (this.$i18n.locale == "zh-CN") this.$router.push("/mobileLoginCmpt");
else this.$router.push('/emailLoginCmpt'); else this.$router.push('/emailLoginCmpt');
}, },
//注册 //注册
handleRegister(){ handleRegister(){
this.currentIndex = 0;
window.sessionStorage.setItem("currentNav",this.currentIndex);
if (this.$i18n.locale == "zh-CN") this.$router.push("/mobileRegisterCmpt"); if (this.$i18n.locale == "zh-CN") this.$router.push("/mobileRegisterCmpt");
else this.$router.push('/emailRegisterCmpt'); else this.$router.push('/emailRegisterCmpt');
}, },
...@@ -458,7 +498,7 @@ ...@@ -458,7 +498,7 @@
} }
}, },
numone(val){ numone(val){
if(val == 5||val==-1){ if(val == 4||val==-1){
this.currentIndex = Number(val); this.currentIndex = Number(val);
window.sessionStorage.setItem("currentNav",this.currentIndex); window.sessionStorage.setItem("currentNav",this.currentIndex);
...@@ -699,4 +739,25 @@ ...@@ -699,4 +739,25 @@
margin: 0 12px; margin: 0 12px;
} }
} }
.childrenLi{
background: #fff;
position: absolute;
top:60px;
left: 580px;
width: 110px;
&>p{
text-align: center;
color:#3F3F53;
height: 40px;
line-height: 40px;
border-bottom: 1px solid #E8EAF3;
cursor: pointer;
font-size:14px;
font-weight: 400;
&:hover{
color: #5d78ff;
}
}
}
</style> </style>
src/components/mobile/mobileTop.vue
View file @ 67657370
...@@ -79,6 +79,9 @@ ...@@ -79,6 +79,9 @@
}, { }, {
id: 6, id: 6,
name: "useHelp" name: "useHelp"
}, {
id: 7,
name: "knowledge"
}], }],
keyword:window.sessionStorage.getItem("keyword")?window.sessionStorage.getItem("keyword"):null, keyword:window.sessionStorage.getItem("keyword")?window.sessionStorage.getItem("keyword"):null,
currentIndex:window.sessionStorage.getItem("mobileIndex")?window.sessionStorage.getItem("mobileIndex"):-1, currentIndex:window.sessionStorage.getItem("mobileIndex")?window.sessionStorage.getItem("mobileIndex"):-1,
...@@ -102,6 +105,7 @@ ...@@ -102,6 +105,7 @@
if(index==2) this.$router.push("/lndustryfocused"); if(index==2) this.$router.push("/lndustryfocused");
if(index==3) this.$router.push("/successfulcaseed"); if(index==3) this.$router.push("/successfulcaseed");
if(index==4) this.$router.push("/usehelped"); if(index==4) this.$router.push("/usehelped");
if(index==5) this.$router.push("/knowledgeList");
} }
window.sessionStorage.setItem("mobileIndex",this.currentIndex); window.sessionStorage.setItem("mobileIndex",this.currentIndex);
this.drawer = false; this.drawer = false;
......
src/views/knowledge/mobile/list.vue
View file @ 67657370
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<p style="text-align: center;margin-top: -1.85rem;font-size: 0.38rem;color: #ffffff">{{$t('topNav.knowledge')}}</p> <p style="text-align: center;margin-top: -1.85rem;font-size: 0.38rem;color: #ffffff">{{$t('topNav.knowledge')}}</p>
<p style="text-align: center;margin-top: 0.2rem;font-size: 0.28rem;color: #C8CBE0">{{$t('Otherjson.knowledgeTitle1')}}&nbsp;&nbsp;&nbsp;&nbsp;{{$t('Otherjson.knowledgeTitle2')}}</p> <p style="text-align: center;margin-top: 0.2rem;font-size: 0.28rem;color: #C8CBE0">{{$t('Otherjson.knowledgeTitle1')}}&nbsp;&nbsp;&nbsp;&nbsp;{{$t('Otherjson.knowledgeTitle2')}}</p>
</div> </div>
<div class="tabClass"> <div class="tabClass" :class="this.$i18n.locale&&this.$i18n.locale=='en'?'tabEnclass tabClass':'tabClass'">
<mt-navbar v-model="activeName" style="overflow: auto;padding-left: .4rem;"> <mt-navbar v-model="activeName" style="overflow: auto;padding-left: .4rem;">
<mt-tab-item id="first">{{$t('Otherjson.all')}}</mt-tab-item> <mt-tab-item id="first">{{$t('Otherjson.all')}}</mt-tab-item>
<mt-tab-item id="second">{{$t('Otherjson.knowledgeTab1')}}</mt-tab-item> <mt-tab-item id="second">{{$t('Otherjson.knowledgeTab1')}}</mt-tab-item>
......
src/views/loginregister/pages/emailRegisterCmpt.vue
View file @ 67657370
<template> <template>
<div class="wrapper" element-loading-background="rgba(0, 0, 0, 0.8)"> <div class="wrapper" element-loading-background="rgba(0, 0, 0, 0.8)">
<p>{{$t('register.title')}}</p> <!--<p>{{$t('register.title')}}</p>-->
<div style="width: 100%;">
<img src="../../../assets/img/login/banner5@2x.png" alt="" style="height: 85px;margin-top: 20px;">
</div>
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane :label="$t('register.registerEmail')" name="first"> <el-tab-pane :label="$t('register.registerEmail')" name="first">
<el-form :model="registerForm" :rules="rules" ref="registerForm" <el-form :model="registerForm" :rules="rules" ref="registerForm"
...@@ -325,6 +328,9 @@ ...@@ -325,6 +328,9 @@
<style scoped lang="scss"> <style scoped lang="scss">
.wrapper{ .wrapper{
display: flex;
flex-wrap: wrap;
justify-content: center;
& > p { & > p {
font-size: 30px; font-size: 30px;
line-height: 42px; line-height: 42px;
......
src/views/loginregister/pages/login.vue
View file @ 67657370
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
}, },
handleToIndex(){ handleToIndex(){
this.$router.push("/"); this.$router.push({name:"dashboard",params:{show:true}});
}, },
changeUrl(){ changeUrl(){
......
src/views/loginregister/pages/mobileRegisterCmpt.vue
View file @ 67657370
<template> <template>
<div class="wrapper" element-loading-background="rgba(0, 0, 0, 0.8)"> <div class="wrapper" element-loading-background="rgba(0, 0, 0, 0.8)">
<p>{{$t('register.title')}}</p> <!--<p>{{$t('register.title')}}</p>-->
<div style="width: 100%;">
<img src="../../../assets/img/login/banner5@2x.png" alt="" style="height: 85px;margin-top: 20px;">
</div>
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane :label="$t('register.registerByPhone')" name="first"> <el-tab-pane :label="$t('register.registerByPhone')" name="first">
<el-form :model="registerForm" :rules="rules" ref="registerForm" <el-form :model="registerForm" :rules="rules" ref="registerForm"
...@@ -319,6 +322,9 @@ ...@@ -319,6 +322,9 @@
<style scoped lang="scss"> <style scoped lang="scss">
.wrapper{ .wrapper{
display: flex;
flex-wrap: wrap;
justify-content: center;
& > p { & > p {
font-size: 30px; font-size: 30px;
line-height: 42px; line-height: 42px;
......
src/views/mobile/loginregister/emRegister.vue
View file @ 67657370
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<!--</el-tooltip>--> <!--</el-tooltip>-->
<el-form-item class="agreeprotocol" style="line-height: 0 !important;"> <el-form-item class="agreeprotocol" style="line-height: 0 !important;" :style="{marginTop:lang==1?'unset':'1rem'}">
<el-checkbox name="type" v-model="checked"> <el-checkbox name="type" v-model="checked">
</el-checkbox> </el-checkbox>
......
src/views/mobile/loginregister/phoneRegister.vue
View file @ 67657370
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<!--</el-tooltip>--> <!--</el-tooltip>-->
<el-form-item class="agreeprotocol"> <el-form-item class="agreeprotocol" style="margin-top: .8rem;">
<el-checkbox name="type" v-model="checked"> <el-checkbox name="type" v-model="checked">
</el-checkbox> </el-checkbox>
......
src/views/mobile/loginregister/register.vue
View file @ 67657370
<template> <template>
<div class="wrapper" element-loading-background="rgba(0, 0, 0, 0.8)"> <div class="wrapper" element-loading-background="rgba(0, 0, 0, 0.8)">
<p>{{$t("register.title")}}</p> <img src="../../../assets/img/login/banner4@2x.png" alt="" style="height: 2.4rem;width: 100%;">
<!--<p>{{$t("register.title")}}</p>-->
<!--<span class="positionLoginOrRegister" @click="handleChange">{{activeMethod==1?$t('login.phoneCodeLogin'):$t('login.phonePwdLogin')}}</span>--> <!--<span class="positionLoginOrRegister" @click="handleChange">{{activeMethod==1?$t('login.phoneCodeLogin'):$t('login.phonePwdLogin')}}</span>-->
<el-tabs v-model="activeName" :class="lang==1?'':'registerPhoneTab'"> <el-tabs v-model="activeName" :class="lang==1?'':'registerPhoneTab'">
<el-tab-pane :label="lang==1?$t('register.registerByPhone'):$t('register.registerEmail')" name="first"> <el-tab-pane :label="lang==1?$t('register.registerByPhone'):$t('register.registerEmail')" name="first">
......
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