Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/duanju/new_app into test
This commit is contained in:
commit
cd1bfa9ec1
|
|
@ -1,20 +1,23 @@
|
||||||
<template>
|
<template>
|
||||||
<view class="container">
|
<view class="container">
|
||||||
<view class="nav" style="width: 100%;height: 96rpx;"></view>
|
|
||||||
<view class="bg" >
|
<view class="bg" >
|
||||||
<image src="../../static/default/i_bg.png" style="width: 100%;height:100%" mode="aspectFill"></image>
|
<image src="../../static/default/i_bg.png" style="width: 100%;height:100%" mode="aspectFill"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="wrapper u-relative" style="padding-top: 48rpx;box-sizing: border-box;">
|
<view class="wrapper u-relative" style="padding-top: 48rpx;box-sizing: border-box;">
|
||||||
|
<view class="nav" style="width: 100%;height: 96rpx;"></view>
|
||||||
<view class="input-content">
|
<view class="input-content">
|
||||||
<view style="font-size: 58rpx;font-weight: bold;color: #333;margin-bottom: 48rpx;">重置密码</view>
|
<view style="font-size: 58rpx;font-weight: bold;color: #333;margin-bottom: 48rpx;">重置密码</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">手机号</view>
|
<view class="title">手机号</view>
|
||||||
<input class="input" type="number" :value="data.mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile"
|
<view class="input" style="padding-left: 20rpx;">
|
||||||
@input="inputChange" />
|
<input class="input" type="number" :value="data.mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile"
|
||||||
|
@input="inputChange" />
|
||||||
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<text class="title">验证码</text>
|
<text class="title">验证码</text>
|
||||||
<view class="input flex">
|
<view class="input flex" style="padding-left: 20rpx;padding-right: 20rpx;">
|
||||||
<input type="number" :value="data.code" placeholder="请输入验证码" maxlength="6" data-key="code"
|
<input type="number" :value="data.code" placeholder="请输入验证码" maxlength="6" data-key="code"
|
||||||
@input="inputChange" @confirm="reset" />
|
@input="inputChange" @confirm="reset" />
|
||||||
<button class="send-msg" @click="sendMsg" :disabled="data.sending">{{ data.sendTime }}</button>
|
<button class="send-msg" @click="sendMsg" :disabled="data.sending">{{ data.sendTime }}</button>
|
||||||
|
|
@ -23,8 +26,11 @@
|
||||||
|
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<text class="title">设置密码</text>
|
<text class="title">设置密码</text>
|
||||||
<input class="input" type="password" :value="data.password" placeholder="请设置新密码" placeholder-class="input-empty"
|
<view class="input" style="padding-left: 20rpx;">
|
||||||
maxlength="20" minlength="6" data-key="password" @input="inputChange" @confirm="reset" />
|
<input class="input" type="password" :value="data.password" placeholder="请设置新密码" placeholder-class="input-empty"
|
||||||
|
maxlength="20" minlength="6" data-key="password" @input="inputChange" @confirm="reset" />
|
||||||
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<button class="confirm-btn" @click="reset">立即重置</button>
|
<button class="confirm-btn" @click="reset">立即重置</button>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -188,10 +194,10 @@
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
color: #333333;
|
color: #333333;
|
||||||
position: absolute;
|
// position: absolute;
|
||||||
left: 0;
|
// left: 0;
|
||||||
right: 0;
|
// right: 0;
|
||||||
bottom: 78rpx;
|
// bottom: 78rpx;
|
||||||
|
|
||||||
}
|
}
|
||||||
.cuIcon::before{
|
.cuIcon::before{
|
||||||
|
|
@ -254,14 +260,20 @@
|
||||||
}
|
}
|
||||||
.input{
|
.input{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 84rpx;
|
// height: 84rpx;
|
||||||
line-height: 84rpx;
|
// line-height: 84rpx;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 22rpx 32rpx 22rpx 24rpx;
|
// padding: 22rpx 32rpx 22rpx 24rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
input{
|
||||||
|
height: 84rpx!important;
|
||||||
|
}
|
||||||
|
v-deep .uni-input-input{
|
||||||
|
height: 84rpx!important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,22 +1,24 @@
|
||||||
<template>
|
<template>
|
||||||
<view class="container">
|
<view class="container">
|
||||||
<view class="nav" style="width: 100%;height: 96rpx;"></view>
|
|
||||||
<view class="bg" >
|
<view class="bg" >
|
||||||
<image src="../../static/default/i_bg.png" style="width: 100%;height:100%" mode="aspectFill"></image>
|
<image src="../../static/default/i_bg.png" style="width: 100%;height:100%" mode="aspectFill"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="wrapper">
|
<view class="wrapper">
|
||||||
|
<view class="nav" style="width: 100%;height: 96rpx;"></view>
|
||||||
<view class="input-content">
|
<view class="input-content">
|
||||||
<view style="font-size: 58rpx;font-weight: bold;color: #333;margin-bottom: 48rpx;">登录</view>
|
<view style="font-size: 58rpx;font-weight: bold;color: #333;margin-bottom: 48rpx;">登录</view>
|
||||||
|
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">手机号</view>
|
<view class="title">手机号</view>
|
||||||
<input class="input" type="number" :value="data.mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile"
|
<view class="input" style="padding-left: 20rpx;">
|
||||||
@input="inputChange" />
|
<input class="input" type="number" :value="data.mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile"
|
||||||
|
@input="inputChange" />
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<text class="title">密码</text>
|
<text class="title">密码</text>
|
||||||
<view class="input flex" style="padding-left: 0;">
|
<view class="input flex" style="padding-left: 20rpx;padding-right: 20rpx;">
|
||||||
<input class="input" type="password" :value="data.password" placeholder="请输入密码" placeholder-class="input-empty"
|
<input class="input" type="password" :value="data.password" placeholder="请输入密码" placeholder-class="input-empty"
|
||||||
maxlength="20" minlength="6" data-key="password" @input="inputChange" @confirm="toLogin" />
|
maxlength="20" minlength="6" data-key="password" @input="inputChange" @confirm="toLogin" />
|
||||||
<text class="send-msg" @click="linkTo('/pages/login/forgetPwd')" style="flex-shrink: 0;">忘记密码</text>
|
<text class="send-msg" @click="linkTo('/pages/login/forgetPwd')" style="flex-shrink: 0;">忘记密码</text>
|
||||||
|
|
@ -222,11 +224,17 @@
|
||||||
}
|
}
|
||||||
.cu-form-group .input{
|
.cu-form-group .input{
|
||||||
width: 100%!important;
|
width: 100%!important;
|
||||||
height: 84rpx;
|
// height: 84rpx;
|
||||||
line-height: 84rpx;
|
// line-height: 84rpx;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 22rpx 32rpx 22rpx 24rpx;
|
// padding: 22rpx 32rpx 22rpx 24rpx!important;
|
||||||
|
input{
|
||||||
|
height: 84rpx!important;
|
||||||
|
}
|
||||||
|
v-deep .uni-input-input{
|
||||||
|
height: 84rpx!important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.flex{
|
.flex{
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,24 @@
|
||||||
<template>
|
<template>
|
||||||
<view class="container">
|
<view class="container">
|
||||||
<view class="nav" style="width: 100%;height: 96rpx;"></view>
|
|
||||||
<view class="bg" >
|
<view class="bg" >
|
||||||
<image src="../../static/default/i_bg.png" style="width: 100%;height:100%" mode="aspectFill"></image>
|
<image src="../../static/default/i_bg.png" style="width: 100%;height:100%" mode="aspectFill"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="wrapper u-relative" style="padding-top: 48rpx;box-sizing: border-box;">
|
<view class="wrapper u-relative" style="padding-top: 48rpx;box-sizing: border-box;">
|
||||||
|
<view class="nav" style="width: 100%;height: 96rpx;"></view>
|
||||||
<view class="input-content">
|
<view class="input-content">
|
||||||
<view style="font-size: 58rpx;font-weight: bold;color: #333;margin-bottom: 48rpx;">注册</view>
|
<view style="font-size: 58rpx;font-weight: bold;color: #333;margin-bottom: 48rpx;">注册</view>
|
||||||
|
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">手机号</view>
|
<view class="title">手机号</view>
|
||||||
<input class="input" type="number" :value="data.mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile"
|
<view class="input" style="padding-left: 20rpx;">
|
||||||
@input="inputChange" />
|
<input class="input" type="number" :value="data.mobile" placeholder="请输入手机号" maxlength="11" data-key="mobile"
|
||||||
|
@input="inputChange" />
|
||||||
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<text class="title">验证码</text>
|
<text class="title">验证码</text>
|
||||||
<view class="input flex">
|
<view class="input flex" style="padding-left: 20rpx;padding-right: 20rpx;">
|
||||||
<input type="number" :value="data.code" placeholder="请输入验证码" maxlength="6" data-key="code"
|
<input type="number" :value="data.code" placeholder="请输入验证码" maxlength="6" data-key="code"
|
||||||
@input="inputChange" @confirm="toRegister" />
|
@input="inputChange" @confirm="toRegister" />
|
||||||
<button class="send-msg" @click="sendMsg" :disabled="data.sending">{{ data.sendTime }}</button>
|
<button class="send-msg" @click="sendMsg" :disabled="data.sending">{{ data.sendTime }}</button>
|
||||||
|
|
@ -24,8 +27,11 @@
|
||||||
|
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<text class="title">设置密码</text>
|
<text class="title">设置密码</text>
|
||||||
<input class="input" type="password" :value="data.password" placeholder="请设置新密码" placeholder-class="input-empty"
|
<view class="input" style="padding-left: 20rpx;">
|
||||||
maxlength="20" minlength="6" data-key="password" @input="inputChange" @confirm="toRegister" />
|
<input class="input" type="password" :value="data.password" placeholder="请设置新密码" placeholder-class="input-empty"
|
||||||
|
maxlength="20" minlength="6" data-key="password" @input="inputChange" @confirm="toRegister" />
|
||||||
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<button class="confirm-btn" @click="toRegister">注册</button>
|
<button class="confirm-btn" @click="toRegister">注册</button>
|
||||||
<button class="confirm-btn" @click="toLogin">登录</button>
|
<button class="confirm-btn" @click="toLogin">登录</button>
|
||||||
|
|
@ -270,7 +276,7 @@
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" >
|
<style lang="scss" scoped>
|
||||||
page {
|
page {
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
}
|
}
|
||||||
|
|
@ -299,10 +305,7 @@
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
color: #333333;
|
color: #333333;
|
||||||
position: absolute;
|
margin-top: 50rpx;
|
||||||
left: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 178rpx;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
.cuIcon::before{
|
.cuIcon::before{
|
||||||
|
|
@ -324,12 +327,15 @@
|
||||||
color: #EC6F48;
|
color: #EC6F48;
|
||||||
border: none;
|
border: none;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
}
|
}
|
||||||
.send-msg::after{
|
.send-msg::after{
|
||||||
border: none;
|
border: none;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.container {
|
.container {
|
||||||
position: relative;
|
position: relative;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
@ -363,14 +369,20 @@
|
||||||
}
|
}
|
||||||
.input{
|
.input{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 84rpx;
|
// height: 84rpx;
|
||||||
line-height: 84rpx;
|
// line-height: 84rpx;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 22rpx 32rpx 22rpx 24rpx;
|
// padding: 22rpx 32rpx 22rpx 24rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
input{
|
||||||
|
height: 84rpx!important;
|
||||||
|
}
|
||||||
|
v-deep .uni-input-input{
|
||||||
|
height: 84rpx!important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -311,10 +311,10 @@
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
color: #333333;
|
color: #333333;
|
||||||
position: absolute;
|
// position: absolute;
|
||||||
left: 0;
|
// left: 0;
|
||||||
right: 0;
|
// right: 0;
|
||||||
bottom: 178rpx;
|
// bottom: 178rpx;
|
||||||
.cuIcon::before{
|
.cuIcon::before{
|
||||||
width: 30rpx;
|
width: 30rpx;
|
||||||
height: 30rpx;
|
height: 30rpx;
|
||||||
|
|
|
||||||
|
|
@ -133,7 +133,7 @@
|
||||||
getInviter()
|
getInviter()
|
||||||
queryInviter()
|
queryInviter()
|
||||||
getBgImg()
|
getBgImg()
|
||||||
data.erweima = config.baseUrl + `/pages/login/register/?invitation=${data.invitationCode}&qdCode=${uni.getStorageSync('userInfo').qdCode}`
|
data.erweima = config.shareUrl + `/pages/login/register/?invitation=${data.invitationCode}&qdCode=${uni.getStorageSync('userInfo').qdCode}`
|
||||||
console.log(data.erweima)
|
console.log(data.erweima)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue