Merge branch 'zhengjie' of pplokijuhyg/falvpingtai into master

This commit is contained in:
asd 2019-11-28 11:19:57 +08:00
commit 2f54eb9eff
4 changed files with 275 additions and 8 deletions

View File

@ -20,7 +20,7 @@
</div>
<button class="submit" @click="sub">登录</button>
<div class="other">
<p>密码登录</p>
<p @click="loginpwd">密码登录</p>
<p @click="open">需要帮助</p>
</div>
<div class="ways">
@ -53,7 +53,8 @@ export default {
tel: "",
yzm:"",
yztoken:"",
Verification:""
Verification:"",
ifsign:false
};
},
methods: {
@ -63,6 +64,11 @@ export default {
off() {
this.ifshow = false;
},
loginpwd(){
this.$router.push({
path: `/loginpwd`,
})
},
yz() {
let yz=""
if (this.tel != "") {
@ -74,6 +80,7 @@ export default {
window.console.log(res.data.data);
yz=res.data.data.yz;
t.yztoken=yz
t.ifsign=res.data.data.register
}).catch(function(error) {
window.console.log(error);
});
@ -84,12 +91,17 @@ export default {
},
sub(){
let t=this;
window.console.log(t.ifsign,4859)
if(t.ifsign){
if(t.tel&&t.yzm){
this.axios.post("http://lawpro.earnest.pro/api/Main/isVerification",{Verification: t.yzm,yz:this.yztoken, mobile:this.tel}).then((res)=>{
if(res.data.code==200){
this.axios.post("http://lawpro.earnest.pro/api/Main/sign",{yz:t.yztoken,Verification:t.yzm,mobile:this.tel}).then((res)=>{
window.console.log(res)
localStorage.setItem('token', res.data.data)
this.$router.push({
path: `/index`,
})
})
}
window.console.log(res)
@ -97,6 +109,12 @@ export default {
window.console.log(err)
})
}
}else{
this.$router.push({
path: `/sign?yztoken=`+t.yztoken+'&yzm='+t.yzm+'&tel='+t.tel,
})
}
window.console.log( t.yztoken,t.Verification,9652)
}
}

View File

@ -10,18 +10,18 @@
<input type="text" class="shuru" placeholder="输入手机号" />
</div>-->
<div class="tel yzm">
<input type="text" class="shuru tel1" placeholder="输入手机号或邮箱" />
<input type="text" class="shuru tel1" placeholder="输入手机号或邮箱" v-model="username"/>
<!-- <button class="getyzm">发送验证码</button> -->
</div>
<div class="tel yzm">
<input type="text" class="shuru tel1" placeholder="输入密码" />
<input type="password" class="shuru tel1" placeholder="输入密码" v-model="pwd"/>
<!-- <button class="getyzm">发送验证码</button> -->
</div>
<div class="ale">
<p class="alert">未注册手机验证后自动登录</p>
<p>注册即同意隐私保护指引</p>
</div>
<button class="submit">登录</button>
<button class="submit" @click="sub">登录</button>
<div class="other">
<p>密码登录</p>
<p @click="open">需要帮助</p>
@ -52,7 +52,9 @@
export default {
data() {
return {
ifshow: false
ifshow: false,
username:"",
pwd:""
};
},
methods: {
@ -61,6 +63,15 @@ export default {
},
off(){
this.ifshow=false
},
sub(){
let t=this;
this.axios.post("http://lawpro.earnest.pro/api/Main/login",{uname:t.username,password:t.pwd}).then((res)=>{
localStorage.setItem('token', res.data.data)
this.$router.push({
path: `/index`,
})
})
}
}
};

View File

@ -15,10 +15,15 @@ import IndexReport from "./IndexReport"
import IndexReport1 from "./IndexReport1"
import IndexReport2 from "./IndexReport2"
import Answer from "./Answer"
import sign from "./sign"
const router=new Router({
routes: [
{
path: '/',
path: '/sign',
component: sign
},
{
path: '/IndexReport',
component: IndexReport
},
{

233
src/sign.vue Normal file
View File

@ -0,0 +1,233 @@
<template>
<div class="login">
<div class="logo">
<img src="./assets/quit.png" alt class="close" />
</div>
<!-- <div class="tel">
<p>+86</p>
<img src="./assets/order.png" alt class="order" />
<div class="line"></div>
<input type="text" class="shuru" placeholder="输入手机号" />
</div>-->
<div class="tel yzm">
<input type="text" class="shuru tel1" placeholder="输入用户名" v-model="username"/>
<!-- <button class="getyzm">发送验证码</button> -->
</div>
<div class="tel yzm">
<input type="password" class="shuru tel1" placeholder="输入密码" v-model="pwd"/>
<!-- <button class="getyzm">发送验证码</button> -->
</div>
<div class="ale">
<p class="alert">未注册手机验证后自动登录</p>
<p>注册即同意隐私保护指引</p>
</div>
<button class="submit" @click="sign">注册</button>
</div>
</template>
<script>
export default {
data() {
return {
ifshow: false,
username:"",
pwd:""
};
},
methods: {
open() {
this.ifshow=true
},
off(){
this.ifshow=false
},
sign(){
let t=this;
window.console.log(t. $route.query.yztoken,t.$route.query.yzm)
this.axios.post("http://lawpro.earnest.pro/api/Main/sign",{yz:t. $route.query.yztoken,Verification:t.$route.query.yzm,mobile:t.$route.query.tel,username:t.username,password:t.pwd}).then((res)=>{
localStorage.setItem('token', res.data.data)
})
}
}
};
</script>
<style lang="scss">
.login {
.close {
width: 36px;
height: 36px;
float: right;
margin-top: 26px;
margin-right: 30px;
}
.logo {
width: 100%;
height: 272px;
background: url("./assets/logo.png");
background-size: 100% 100%;
}
.tel {
width: 690px;
height: 84px;
line-height: 84px;
text-indent: 9px;
font-size: 25px;
color: #333333;
display: flex;
border-bottom: 2px solid #dfdfdf;
margin-left: 30px;
.order {
width: 13px;
height: 24px;
margin: auto 0;
margin-left: 25px;
}
.line {
width: 1px;
height: 30px;
margin: auto 0;
margin-left: 35px;
background-color: #dfdfdf;
}
.shuru {
width: 75%;
height: 74px;
color: #333333;
font-size: 28px;
margin: auto 0;
margin-left: 36px;
// position: relative;
// top: -1px;
outline-style: none;
outline-width: 0px;
border: none;
border-style: none;
text-shadow: none;
-webkit-appearance: none;
-webkit-user-select: text;
outline-color: transparent;
box-shadow: none;
}
.shuru::placeholder {
color: #999999;
}
}
.tel1 {
margin-left: 11px !important;
font-size: 26px !important;
}
.yzm {
display: flex;
justify-content: space-between;
}
.getyzm {
width: 166px;
height: 54px;
border: 2px solid rgba(107, 145, 71, 1);
border-radius: 4px;
background-color: white;
margin: auto 0;
color: #6b9147;
font-size: 24px;
line-height: 54px;
}
.ale {
height: 58px;
margin: 0 auto;
margin-top: 50px;
color: #999999;
font-size: 22px;
text-align: center;
// line-height: 30px;
.alert {
text-indent: -15px;
margin-bottom: 15px;
}
}
.submit {
border: 0;
background-color: transparent;
outline: none;
width: 690px;
height: 88px;
background-color: #6b9147;
line-height: 88px;
text-align: center;
color: white;
font-size: 36px;
border-radius: 4px;
margin-left: 30px;
margin-top: 129px;
}
.other {
color: #6b9147;
font-size: 26px;
margin-top: 39px;
display: flex;
justify-content: space-between;
> p:first-child {
margin-left: 31px;
}
> p:last-child {
margin-right: 43px;
}
}
.ways {
margin-top: 149px;
.top {
display: flex;
justify-content: center;
margin-bottom: 99px;
height: 24px;
.line {
width: 120px;
height: 2px;
margin-top: 12px;
}
.text {
color: #999999;
font-size: 24px;
margin-left: 20px;
margin-right: 20px;
}
}
}
.icons {
display: flex;
justify-content: space-around;
// margin-bottom: 165px;
margin-bottom: 100px;
.icon {
width: 71px;
height: 71px;
}
}
.tanchuangbox{
width: 750px;
height: 1334px;
background: rgba(0, 0, 0, 0.3);
position: absolute;
top: 0;
.tanchuang{
width: 580px;
height: 339px;
background-color: white;
margin: auto;
margin-top: 353px;
color: #333333;
font-size: 36px;
text-align: center;
.desc{
margin-bottom:59px;
}
.desc1{
padding-top: 59px;
}
.off{
color: #666666
}
}
}
}
</style>