Commit 08189f7c authored by 李晓兵's avatar 李晓兵

'登录注册'

parent dda81058
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
</div> </div>
</h-header> </h-header>
<Tab @getTabNum="getTabNum" /> <Tab @getTabNum="getTabNum" />
<h-content> <div class="hinput">
<div class="hinput"> <div class="search-box">
<div class="search-box"> <input type="text" placeholder="请输入进件号/承租人名称">
<input type="text" placeholder="请输入进件号/承租人名称"> <img src="@/assets/distributorSign/search.png" alt="">
<img src="@/assets/distributorSign/search.png" alt="">
</div>
</div> </div>
</div>
<h-content>
<div v-for="(item,index) in contractMsg" :key="index" class="contract-list"> <div v-for="(item,index) in contractMsg" :key="index" class="contract-list">
<div class="item"> <div class="item">
<img src="@/assets/distributorSign/icon-进件合同.png" alt=""> <img src="@/assets/distributorSign/icon-进件合同.png" alt="">
...@@ -127,12 +127,15 @@ export default { ...@@ -127,12 +127,15 @@ export default {
} }
} }
} }
.content{
padding-bottom: 14px;
}
.contract-list { .contract-list {
width: 100%; width: 100%;
height: 120px; height: 120px;
// border: 1px solid #ccc; // border: 1px solid #ccc;
background: #fff; background: #fff;
margin-bottom: 8px; //margin-bottom: 8px;
.item { .item {
width: 100%; width: 100%;
height: 34px; height: 34px;
...@@ -167,8 +170,8 @@ export default { ...@@ -167,8 +170,8 @@ export default {
height: 86px; height: 86px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-evenly; justify-content: space-around;
padding: 6px 0;
.option { .option {
width: 100%; width: 100%;
height: 18px; height: 18px;
......
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
</div> </div>
</h-header> </h-header>
<Tab @getTabNum="getTabNum" /> <Tab @getTabNum="getTabNum" />
<h-content> <div class="hinput">
<div class="hinput"> <div class="search-box">
<div class="search-box"> <input type="text" placeholder="请输入进件号/承租人名称">
<input type="text" placeholder="请输入进件号/承租人名称"> <img src="@/assets/distributorSign/search.png" alt="">
<img src="@/assets/distributorSign/search.png" alt="">
</div>
</div> </div>
</div>
<h-content>
<div v-for="(item,index) in contractMsg" :key="index" class="contract-list"> <div v-for="(item,index) in contractMsg" :key="index" class="contract-list">
<div class="item"> <div class="item">
<img src="@/assets/distributorSign/icon-进件合同.png" alt=""> <img src="@/assets/distributorSign/icon-进件合同.png" alt="">
...@@ -126,6 +126,9 @@ export default { ...@@ -126,6 +126,9 @@ export default {
} }
} }
} }
.content{
padding-bottom: 14px;
}
.contract-list { .contract-list {
width: 100%; width: 100%;
height: 120px; height: 120px;
...@@ -161,44 +164,44 @@ export default { ...@@ -161,44 +164,44 @@ export default {
font-weight: bolder font-weight: bolder
} }
} }
.details { .details {
width: 100%; width: 100%;
height: 86px; height: 86px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-evenly; justify-content: space-around;
padding: 6px 0;
.option { .option {
width: 100%; width: 100%;
height: 18px; height: 18px;
display: flex; display: flex;
flex-basis: row; flex-direction: row;
.name { .name {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 13px; font-size: 13px;
color: rgba(56,63,69,0.60); color: rgba(56,63,69,0.60);
width: 80px; width: 80px;
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
padding-left: 20px; text-align: right
} }
.normal { .normal {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 13px; font-size: 13px;
color: #383F45; color: #383F45;
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
margin-left: 8px; margin-left: 8px;
} }
.money { .money {
color: #FCC800; color: #FCC800;
} }
img { img {
margin-left: 55% margin-left: 55%
} }
} }
} }
} }
} }
</style> </style>
<template> <template>
<scroll id="login" ref="scroll" class="content"> <scroll id="login" ref="scroll" class="content">
<div> <div class="bird-icon"/>
<div class="bird-icon"><img src="../assets/image/login/bird-icon.png"></div> <div class="login-wrap">
<div class="pwd"> <div class="pwd">
<div class="pwd-icon"><img src="../assets/image/login/user.png"></div> <div class="pwd-icon"><img src="../assets/login/user.png"></div>
<div class="pwd-input"><input v-model="username" type="text" placeholder="请输入用户名/手机号"></div> <div class="pwd-input"><input v-model="username" type="text" placeholder="请输入用户名/手机号"></div>
<div v-if="username" class="delete" @click="clearAccount"><img src="../assets/image/login/delete.png"></div> <div v-if="username" class="delete" @click="clearAccount"><img src="../assets/login/delete.png"></div>
</div> </div>
<div class="pwd"> <div class="pwd">
<div class="pwd-icon"><img src="../assets/image/login/password.png"></div> <div class="pwd-icon"><img src="../assets/login/password.png"></div>
<div class="pwd-input"><input v-model="password" type="password" placeholder="请输入密码"></div> <div class="pwd-input"><input v-model="password" :type="pwdType" placeholder="请输入密码"></div>
<div v-if="password" class="delete" @click="clearPassword"><img src="../assets/image/login/delete.png"></div> <div v-if="password" class="delete" @click="changeType"><img :src="openEye"></div>
</div> </div>
<div class="button submit" @click="access">登录</div>
<div class="other-function"> <div class="other-function">
<div class="register" @click="registerNew">用户注册</div> <div class="register" @click="registerNew">注册</div>
<div class="pwd-forgotten" @click="pwdForgotten">忘记密码</div> <div class="pwd-forgotten" @click="pwdForgotten">忘记密码</div>
</div> </div>
<div class="button submit" @click="access">登录</div>
</div> </div>
</scroll> </scroll>
</template> </template>
...@@ -26,6 +27,8 @@ var CryptoJS = require('crypto-js') ...@@ -26,6 +27,8 @@ var CryptoJS = require('crypto-js')
export default { export default {
data () { data () {
return { return {
pwdType: 'password', // 密码类型
openEye: require('@/assets/login/passNoShow.png'), // 图片地址
username: window.localStorage.username ? window.localStorage.username : '', username: window.localStorage.username ? window.localStorage.username : '',
password: '', password: '',
version: process.env.currentVersion, version: process.env.currentVersion,
...@@ -33,42 +36,41 @@ export default { ...@@ -33,42 +36,41 @@ export default {
} }
}, },
methods: { methods: {
changeType () {
this.pwdType = this.pwdType === 'password' ? 'text' : 'password'
this.openEye = this.pwdType === 'password' ? require('@/assets/login/passNoShow.png') : require('@/assets/login/passShow.png')
},
login: function () { login: function () {
let vm = this let vm = this
vm.$router.push('tab')
/* let vm = this
// debugger;
// vm.password = CryptoJS.MD5(vm.password).toString().toUpperCase(); // vm.password = CryptoJS.MD5(vm.password).toString().toUpperCase();
let md5passwprd = CryptoJS.MD5(vm.password).toString().toUpperCase() let md5passwprd = CryptoJS.MD5(vm.password).toString().toUpperCase()
let param = { let param = {
'user_name': vm.username, 'phone': vm.username,
'user_password': md5passwprd, 'password': md5passwprd,
'platform': 'C',
} }
vm.$post(process.env.basePath + 'tc_app_login', param) vm.$post(process.env.basePath + 'app_login', param)
.then(function (res) { .then(function (res) {
if (res.result === 'S') { if (res.result === 'S') {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
window.localStorage.setItem('username', vm.username.toUpperCase()) window.localStorage.setItem('user_phone', vm.username)
window.localStorage.setItem('password', md5passwprd) window.localStorage.setItem('password', md5passwprd)
window.localStorage.setItem('user_id', res.user_id) /* if (res.bp_id && res.bp_id !== 'undefined') {
if (res.bp_id && res.bp_id !== 'undefined') {
window.localStorage.setItem('bp_id', res.bp_id) window.localStorage.setItem('bp_id', res.bp_id)
} } */
// if (vm.routeName) { // if (vm.routeName) {
// vm.$router.push({name: vm.routeName}) // vm.$router.push({name: vm.routeName})
// } else { // } else {
vm.$router.push('tab') vm.$router.push('tab')
// } // }
let tagOption = { /* let tagOption = {
'username': vm.username.toUpperCase(), 'username': vm.username.toUpperCase(),
'user_id': res.user_id, 'user_id': res.user_id,
} }
vm.Jpush._jpush_config(tagOption) vm.Jpush._jpush_config(tagOption) */
} }
// 极光推送 // 极光推送
})*/ })
}, },
access: function () { access: function () {
let vm = this let vm = this
...@@ -105,77 +107,32 @@ export default { ...@@ -105,77 +107,32 @@ export default {
<style lang="less" scoped type="text/less"> <style lang="less" scoped type="text/less">
#login { #login {
background: url("../assets/image/login/bg@2x.png") no-repeat; background: url("../assets/login/bg@2x.png") no-repeat;
background-size: cover; background-size: cover;
background-position-x: 0px; background-position-x: 0px;
color: #FFFFFF; color: #FFFFFF;
width: 100%; width: 100%;
height: 100%; height: 100%;
margin: 0 auto; margin: 0 auto;
.bird-icon { .scrollContent{
padding-top: 25%; display: flex;
width: 100%;
display: flex;
display: -webkit-flex;
justify-content: center; justify-content: center;
-webkit-justify-content: center; align-items: center;
img {
width: 138px;
height: 48px;
}
} }
.login { .bird-icon{
border-bottom: 1px solid #5D98F6; padding-top: 25%;
display: flex; }
display: -webkit-flex; .login-wrap{
margin: 15% auto 0; width: 100%;
width: 250px; margin-top: 60%;
justify-content: center;
.person-icon {
margin-bottom: 9px;
margin-right: 15px;
margin-left: 3px;
img {
width: 18px;
height: 20px;
}
}
.admin-input {
//width: 380px;
height: 25px;
display: flex;
display: -webkit-flex;
align-items: center;
-webkit-align-items: center;
input {
width: 100%;
height: 100%;
font-size: 16px;
color: #9e9e9e;
margin-bottom: 5px;
line-height: 22px;
}
input::-webkit-input-placeholder {
font-size: 16px;
color: #CDD1D3;
}
}
.delete {
img {
margin-top: 5px;
width: 12px;
height: 12px;
}
}
} }
.pwd { .pwd {
border-bottom: 1px solid #5D98F6; border-bottom: 1px solid #5D98F6;
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
margin: 15% auto 0; margin: 5% 0 5% 14%;
width: 250px;
.pwd-icon { .pwd-icon {
margin-bottom: 9px; margin-bottom: 6px;
margin-right: 15px; margin-right: 15px;
margin-left: 3px; margin-left: 3px;
img { img {
...@@ -184,19 +141,21 @@ export default { ...@@ -184,19 +141,21 @@ export default {
} }
} }
.pwd-input { .pwd-input {
//width: 380px; margin-left: 4%;
height: 25px; width: 100%;
margin-bottom: 10px;
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
align-items: center; align-items: center;
-webkit-align-items: center; -webkit-align-items: center;
// background-color: #0057C3 !important;
input { input {
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 16px; font-size: 16px;
color: #9e9e9e; color: #fff;
line-height: 22px; line-height: 22px;
margin-bottom: 5px; background-color: rgba(0,87,195,0) !important;
} }
input::-webkit-input-placeholder { input::-webkit-input-placeholder {
font-size: 16px; font-size: 16px;
...@@ -205,19 +164,20 @@ export default { ...@@ -205,19 +164,20 @@ export default {
} }
.delete { .delete {
img { img {
margin-right: 20px;
margin-top: 5px; margin-top: 5px;
width: 12px; width: 14px;
height: 12px; height: 14px;
} }
} }
} }
.other-function { .other-function {
width: 250px; width: 64%;
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
justify-content: space-between; justify-content: space-between;
-webkit-justify-content: space-between; -webkit-justify-content: space-between;
margin: 8% auto 0; margin: 0 0 0 23%;
.register { .register {
color: #5D98F6; color: #5D98F6;
font-size: 15px; font-size: 15px;
...@@ -228,14 +188,14 @@ export default { ...@@ -228,14 +188,14 @@ export default {
} }
} }
.submit { .submit {
width: 250px;
opacity: 1; opacity: 1;
background-color: #5D98F6; background: #FDFDFD;
border-radius: 4px; border-radius: 8px 0 0 8px;
height: 40px; height: 50px;
margin: 22% auto 0; margin: 10% 0 6% 14%;
font-size:16px; font-size:16px;
color: #FEFEFE; color: #000000;
display: flex; display: flex;
display: -webkit-flex; display: -webkit-flex;
justify-content: center; justify-content: center;
......
This diff is collapsed.
This diff is collapsed.
...@@ -43,7 +43,8 @@ export default new Router({ ...@@ -43,7 +43,8 @@ export default new Router({
{ {
path: '/', path: '/',
redirect: to => { redirect: to => {
if (!window.localStorage.needGuid || window.localStorage.needGuid === 'true') { return {name: 'Login'}
/* if (!window.localStorage.needGuid || window.localStorage.needGuid === 'true') {
return {name: 'Guide'} return {name: 'Guide'}
} else { } else {
if (window.localStorage.isOpenFingerLogin) { if (window.localStorage.isOpenFingerLogin) {
...@@ -52,7 +53,7 @@ export default new Router({ ...@@ -52,7 +53,7 @@ export default new Router({
// if none of the above states are matched, use this as the fallback // if none of the above states are matched, use this as the fallback
return {name: 'Login'} return {name: 'Login'}
} }
} } */
}, },
}, },
{ {
...@@ -104,7 +105,7 @@ export default new Router({ ...@@ -104,7 +105,7 @@ export default new Router({
{path: '/refund', component: Refund, name: 'Refund', meta: {keepAlive: false}}, {path: '/refund', component: Refund, name: 'Refund', meta: {keepAlive: false}},
{path: '/intoList', component: IntoList, name: 'IntoList', meta: {keepAlive: false}}, {path: '/intoList', component: IntoList, name: 'IntoList', meta: {keepAlive: false}},
// 经销商签约 // 经销商签约
{path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: true}}, {path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: false}},
{path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: true}}, {path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: true}},
{path: '/financ-details', component: FinancDetails, name: 'FinancDetails', meta: {keepAlive: true}}, {path: '/financ-details', component: FinancDetails, name: 'FinancDetails', meta: {keepAlive: true}},
], ],
......
...@@ -24,10 +24,6 @@ ...@@ -24,10 +24,6 @@
font-size: @size; font-size: @size;
color: @color; color: @color;
} }
//字体大小、行高、字体
.font(@size, @line-height, @family: 'Microsoft YaHei') {
font: #{@size}/#{@line-height} @family;
}
//字体大小,颜色 //字体大小,颜色
.sc(@size, @color){ .sc(@size, @color){
font-size: @size; font-size: @size;
...@@ -43,6 +39,9 @@ ...@@ -43,6 +39,9 @@
.border-right{ .border-right{
border-right: 1px solid rgba(1, 17, 27, 0.1); border-right: 1px solid rgba(1, 17, 27, 0.1);
} }
.border-left{
border-left: 1px solid rgba(1, 17, 27, 0.1);
}
.border{ .border{
border: 1px solid rgba(1, 17, 27, 0.1); border: 1px solid rgba(1, 17, 27, 0.1);
} }
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