Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 990649ad 36209e8e
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 19 deletions
public/css/phone.scss
View file @ 2c840471
......@@ -1477,6 +1477,6 @@ i, em {
border-bottom-right-radius: 0;
}
.noticeError{
z-index: 3000 !important;
z-index: 5000 !important;
}
}
\ No newline at end of file
src/components/apply/applyPro.vue
View file @ 2c840471
......@@ -204,22 +204,27 @@
methods: {
//手机号是否正确
isTruePhone(data,flag) {
var regPhone = /^((13[0-9])|(14([0]|[5-9]))|(15([0-3]|[5-9]))|(16([2]|[5-7]))|(17[0-9])|(18[0-9])|(19([1]|[8,9])))\d{8}$/;
if (data === '') {
this.bool = false;
this.errorInfo = this.$t("commonTips.firstPlaceholderMobile");
} else if (regPhone.test(data)) {
this.bool = true;
this.errorInfo = "";
} else {
this.bool = false;
this.errorInfo = this.$t("commonTips.errorAccountMessage");
if(flag){
var regPhone = /^((13[0-9])|(14([0]|[5-9]))|(15([0-3]|[5-9]))|(16([2]|[5-7]))|(17[0-9])|(18[0-9])|(19([1]|[8,9])))\d{8}$/;
if (data === '') {
this.bool = false;
this.errorInfo = this.$t("commonTips.firstPlaceholderMobile");
} else if (regPhone.test(data)) {
this.bool = true;
this.errorInfo = "";
} else {
this.bool = false;
this.errorInfo = this.$t("commonTips.errorAccountMessage");
}
}
},
//获取验证码
handleGetCode() {
let that = this;
if(this.empUserInfo){
this.isTruePhone(this.ruleForm['contactsPhone'],true);
}
if (this.ruleForm['contactsPhone'] === ""||this.ruleForm['contactsPhone'] === undefined) {
this.errorInfo = this.$t("commonTips.firstPlaceholderMobile");
this.bool = false;
......@@ -346,6 +351,7 @@
var resultObj = {
activityId: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,
moduleId:this.moduleId
......@@ -398,7 +404,11 @@
});
api.applyForFirstStep(resultObj).then((res)=>{
if(res.code==0){
var query = {aid:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,id:res.result,page:this.$route.query.page}
if(res.result.user){
window.sessionStorage.setItem("userInfo",this.Base64.encode(JSON.stringify(res.result.user)));
globalMsg.$emit("getUserInfo");
}
var query = {aid:this.$route.query.id?this.$route.query.id:this.detailInfo.channelId,id:res.result.enterId,page:this.$route.query.page}
if(this.$route.name=='activitySearchResult'){
query['key'] = this.$route.query.key;
}
......@@ -806,15 +816,20 @@
.applyDialog {
position: absolute;
bottom: 0;
left: 0;
top: 1rem;
height: calc(100% - 1rem);
}
.vhWrapper {
width: 100%;
height: 100vh;
position: absolute;
position: fixed;
top: 0;
left: 0;
bottom: 0;
right: 0;
z-index: 3000;
}
.requiredstar{
position: absolute;
......
src/components/login/emByCodeCmpt.vue
View file @ 2c840471
......@@ -158,6 +158,7 @@
window.sessionStorage.removeItem("userInfo");
}
// publicFunc.setUserInfoCookie(that.Base64.encode(JSON.stringify(data)));
window.sessionStorage.setItem("userInfo",that.Base64.encode(JSON.stringify(data)));
this.hasSetPassword(data);
},
......
src/components/login/emByPwdCmpt.vue
View file @ 2c840471
......@@ -133,6 +133,7 @@
window.sessionStorage.removeItem("userInfo");
}
// publicFunc.setUserInfoCookie(that.Base64.encode(JSON.stringify(data)));
window.sessionStorage.setItem("userInfo",that.Base64.encode(JSON.stringify(data)));
if (data.locked == 1 && data.empType != 2) this.$router.replace("/completeInfoCmpt");
data.empType==0?this.$router.push({path:"/bigBusiness/list",query:{remind:true}}):data.empType==1?this.$router.push({path:"/seeprojectlist",query:{remind:true}}): data.roleList[0].roleType==1?this.$router.push("/sys.user"): this.$router.push("/seeprojectlist");
this.timeOutReturn();
......
src/components/login/mbByCodeCmpt.vue
View file @ 2c840471
......@@ -137,6 +137,7 @@
window.sessionStorage.removeItem("userInfo");
}
// publicFunc.setUserInfoCookie(that.Base64.encode(JSON.stringify(data)));
window.sessionStorage.setItem("userInfo",that.Base64.encode(JSON.stringify(data)));
this.hasSetPassword(data);
},
......
src/components/login/mbByPwdCmpt.vue
View file @ 2c840471
......@@ -164,6 +164,7 @@
window.sessionStorage.removeItem("userInfo");
}
// publicFunc.setUserInfoCookie(that.Base64.encode(JSON.stringify(data)));
window.sessionStorage.setItem("userInfo",that.Base64.encode(JSON.stringify(data)));
if (data.locked == 1 && data.empType != 2) this.$router.replace("/completeInfoCmpt");
data.empType==0?this.$router.push({path:"/bigBusiness/list",query:{remind:true}}):data.empType==1?this.$router.push({path:"/seeprojectlist",query:{remind:true}}): data.roleList[0].roleType==1?this.$router.push("/sys.user"): this.$router.push("/seeprojectlist");
that.timeOutReturn()
......
src/components/mobile/mobileTop.vue
View file @ 2c840471
......@@ -202,7 +202,10 @@
},
//获取用户信息
getUserInfoFunc() {
getUserInfoFunc(flag) {
if(flag){
this.userInfo = JSON.parse(this.Base64.decode(window.sessionStorage.getItem("userInfo")));
}
if (this.userInfo) {
this.showNavFunc();
if (this.userInfo.locked == 1 && this.userInfo.empType!= 2) {
......@@ -296,6 +299,12 @@
if(this.$route.name=="mobileLogin"||this.$route.name=="loginByPhone"||this.$route.name=="loginByEmail"||this.$route.name=="mobileSuccess"||this.$route.name=="mobileRegister"||this.$route.name=="registerComplete"){
window.sessionStorage.setItem("mobileIndex",-2)
}
globalMsg.$on("getUserInfo",()=>{
this.getUserInfoFunc(1);
})
},
beforeDestroy () {
globalMsg.$off('getUserInfo')
},
}
</script>
......
src/views/mobile/activityApply/applyForPro.vue
View file @ 2c840471
......@@ -230,7 +230,7 @@
<el-checkbox name="type" v-model="checked">
</el-checkbox>
<span style="font-weight: bold;margin-left: 5px;font-size: .28rem;color: #5d78ff;">自动生成项目</span>
<span style="font-weight: bold;margin-left: 5px;font-size: .28rem;color: #69697A;">自动生成项目</span>
</el-form-item>
</div>
</div>
......@@ -906,8 +906,12 @@
// 8：上传图片，
// 9：上传附件")
var listArr = [],objVal = {};
for(var i=0;i<this.detailInfoList.length-1;i++){
listArr.push(objVal);
if(this.detailInfoList.length>1){
for(var i=0;i<this.detailInfoList.length-1;i++){
listArr.push(objVal);
}
}else{
listArr = [];
}
var resultObj = {
activityId:this.$route.query.aid,
......@@ -917,7 +921,9 @@
enterId:this.$route.query.id
};
this.detailInfoList.forEach((data,index)=>{
this.$set(resultObj.baseModuleEnterList,index-1,{'moduleId':data.moduleId,activityId:this.$route.query.aid})
if(listArr.length>0){
this.$set(resultObj.baseModuleEnterList,index-1,{'moduleId':data.moduleId,activityId:this.$route.query.aid})
}
data.fieldList.forEach((item,itemInd)=>{
if(item.fieldType==1||item.fieldType==8){
......
src/views/mobile/activityApply/applyNotice.vue
View file @ 2c840471
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/mobile/loginregister/emCodeCmpt.vue
View file @ 2c840471
......@@ -149,6 +149,7 @@
// else{
// this.$router.push("/mobileSuccess");
// }
window.sessionStorage.setItem("userInfo",that.Base64.encode(JSON.stringify(data)));
this.$router.push("/mobileSuccess");
that.timeOutReturn();
......
src/views/mobile/loginregister/emPwdCmpt.vue
View file @ 2c840471
......@@ -135,6 +135,7 @@
// else{
// this.$router.push("/mobileSuccess");
// }
window.sessionStorage.setItem("userInfo",that.Base64.encode(JSON.stringify(data)));
this.$router.push("/mobileSuccess");
this.timeOutReturn();
},
......
src/views/mobile/loginregister/phoneCodeCmpt.vue
View file @ 2c840471
......@@ -132,6 +132,7 @@
// else{
// this.$router.push("/mobileSuccess");
// }
window.sessionStorage.setItem("userInfo",that.Base64.encode(JSON.stringify(data)));
this.$router.push("/mobileSuccess");
that.timeOutReturn();
},
......
src/views/mobile/loginregister/phonePwdCmpt.vue
View file @ 2c840471
......@@ -170,6 +170,7 @@
// else{
// this.$router.push("/mobileSuccess");
// }
window.sessionStorage.setItem("userInfo",that.Base64.encode(JSON.stringify(data)));
this.$router.push("/mobileSuccess");
that.timeOutReturn()
......
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