Commit 88d0a5f3 authored by xiangzj's avatar xiangzj

升级4.66

parent 7a637b55
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
box-sizing: border-box; box-sizing: border-box;
} }
/deep/.uni-scroll-view ::-webkit-scrollbar { ::v-deep .uni-scroll-view ::-webkit-scrollbar {
display: none; display: none;
width: 0; width: 0;
height: 0; height: 0;
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
background: transparent; background: transparent;
} }
/deep/::-webkit-scrollbar { ::v-deep ::-webkit-scrollbar {
display: none; display: none;
width: 0; width: 0;
height: 0; height: 0;
......
...@@ -468,7 +468,7 @@ export default { ...@@ -468,7 +468,7 @@ export default {
flex-direction: column; flex-direction: column;
} }
.check-box { .check-box {
/deep/ .uni-checkbox-wrapper { ::v-deep .uni-checkbox-wrapper {
margin-top: 14rpx; margin-top: 14rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
......
...@@ -970,18 +970,18 @@ ...@@ -970,18 +970,18 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
/deep/ .str-auto-complete-container{ ::v-deep .str-auto-complete-container{
// min-width: 50%; // min-width: 50%;
max-width: 50%; max-width: 50%;
position: fixed; position: fixed;
} }
/deep/ .str-auto-complete-item{ ::v-deep .str-auto-complete-item{
line-height: 1; line-height: 1;
} }
/deep/ .iac-input-wrap{ ::v-deep .iac-input-wrap{
min-height: 96rpx; min-height: 96rpx;
} }
/deep/ .uni-input-input{ ::v-deep .uni-input-input{
font-size: 28rpx; font-size: 28rpx;
} }
</style> </style>
...@@ -806,18 +806,18 @@ ...@@ -806,18 +806,18 @@
.steps__row-line--hide { .steps__row-line--hide {
background-color: transparent; background-color: transparent;
} }
/deep/ .str-auto-complete-container{ ::v-deep .str-auto-complete-container{
// min-width: 50%; // min-width: 50%;
max-width: 50%; max-width: 50%;
position: fixed; position: fixed;
} }
/deep/ .str-auto-complete-item{ ::v-deep .str-auto-complete-item{
line-height: 1; line-height: 1;
} }
/deep/ .iac-input-wrap{ ::v-deep .iac-input-wrap{
min-height: 96rpx; min-height: 96rpx;
} }
/deep/ .uni-input-input{ ::v-deep .uni-input-input{
font-size: 28rpx; font-size: 28rpx;
} }
</style> </style>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<text class="title">忘记密码</text> <text class="title">忘记密码</text>
</view> </view>
<view class="middle"> <view class="middle">
<view class="account-block"> <view class="account-block">
<text class="label">手机号</text> <text class="label">手机号</text>
<input class="account" type="tel" v-model="phone" placeholder="请输入手机号" <input class="account" type="tel" v-model="phone" placeholder="请输入手机号"
placeholder-class='placeholder-text' /> placeholder-class='placeholder-text' />
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
async goLogin() { async goLogin() {
const ispass = await this.validate(); const ispass = await this.validate();
if (!ispass) return; if (!ispass) return;
uni.navigateTo({ uni.navigateTo({
url: '/pages/forgetpassword/get-captcha?phone=' + this.phone url: '/pages/forgetpassword/get-captcha?phone=' + this.phone
}); });
}, },
// 校验input // 校验input
...@@ -97,31 +97,31 @@ ...@@ -97,31 +97,31 @@
} }
.top { .top {
padding-left: 24rpx; padding-left: 24rpx;
margin-top: 96rpx; margin-top: 96rpx;
} }
.title { .title {
font-size: 24px; font-size: 24px;
color: $text-base-color; color: $text-base-color;
} }
.middle { .middle {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 100rpx 0 200rpx; margin: 100rpx 0 200rpx;
padding-left: 24rpx; padding-left: 24rpx;
} }
/deep/.placeholder-text { ::v-deep .placeholder-text {
font-size: 34rpx; font-size: 34rpx;
color: $wly-palcehold-color; color: $wly-palcehold-color;
} }
.account-block{ .account-block{
position: relative; position: relative;
overflow:hidden; overflow:hidden;
height: 100rpx; height: 100rpx;
} }
.account { .account {
...@@ -130,17 +130,17 @@ ...@@ -130,17 +130,17 @@
height: 100rpx; height: 100rpx;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
padding-left: 100rpx; padding-left: 100rpx;
} }
.label{ .label{
width: 100rpx; width: 100rpx;
position: absolute; position: absolute;
left: 0; left: 0;
top: 50%; top: 50%;
margin-top: -24rpx; margin-top: -24rpx;
font-size: 14px; font-size: 14px;
color: $text-base-color; color: $text-base-color;
z-index:10; z-index:10;
} }
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
flex-direction: column; flex-direction: column;
} }
.btn { .btn {
width: 100%; width: 100%;
height: 92rpx; height: 92rpx;
background: $wly-primary-color; background: $wly-primary-color;
...@@ -163,8 +163,8 @@ ...@@ -163,8 +163,8 @@
.btn-text { .btn-text {
color: #fff; color: #fff;
font-size: 34rpx; font-size: 34rpx;
font-weight: 400; font-weight: 400;
} }
</style> </style>
...@@ -53,23 +53,23 @@ ...@@ -53,23 +53,23 @@
}, },
immediate: true immediate: true
} }
}, },
onLoad(option) { onLoad(option) {
console.log('option',option) console.log('option',option)
this.phone = option.phone this.phone = option.phone
this.loginType = option.loginType this.loginType = option.loginType
}, },
methods: { methods: {
finish(e) { finish(e) {
console.log('输入结束,当前值为:' + e); console.log('输入结束,当前值为:' + e);
if(this.loginType === 'phone'){ if(this.loginType === 'phone'){
uni.navigateTo({ uni.navigateTo({
url: `/pages/login/login?loginType="phone"&code=${e}` url: `/pages/login/login?loginType="phone"&code=${e}`
}); });
}else{ }else{
uni.navigateTo({ uni.navigateTo({
url: `/pages/forgetpassword/set-newpassword?code=${e}&phone=${this.phone}`, url: `/pages/forgetpassword/set-newpassword?code=${e}&phone=${this.phone}`,
}) })
} }
}, },
fnGetCaptcha() { fnGetCaptcha() {
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
padding-left: 24rpx; padding-left: 24rpx;
} }
/deep/.placeholder-text { ::v-deep .placeholder-text {
font-size: 34rpx; font-size: 34rpx;
color: $wly-palcehold-color; color: $wly-palcehold-color;
} }
...@@ -183,4 +183,4 @@ ...@@ -183,4 +183,4 @@
.btn-disabled { .btn-disabled {
color: #ccc; color: #ccc;
} }
</style> </style>
...@@ -20,54 +20,54 @@ ...@@ -20,54 +20,54 @@
</view> </view>
</template> </template>
<script> <script>
import { import {
mapMutations, mapMutations,
mapState mapState
} from 'vuex' } from 'vuex'
export default {
onLoad(option) { export default {
console.log('option',option) onLoad(option) {
this.account = option.phone console.log('option',option)
this.account = option.phone
}, },
data() { data() {
return { return {
account: '', account: '',
password: '', password: '',
loginType: 'password', loginType: 'password',
disabled: false, disabled: false,
} }
}, },
computed:{ computed:{
...mapState(['userInfo']) ...mapState(['userInfo'])
}, },
watch: { watch: {
password: { password: {
handler: function(val) { handler: function(val) {
if(/((?=.*\d)(?=.*\D)|(?=.*[a-zA-Z])(?=.*[^a-zA-Z]))(?!^.*[\u4E00-\u9FA5].*$)^\S{8,20}$/.test(this.password) == false){ if(/((?=.*\d)(?=.*\D)|(?=.*[a-zA-Z])(?=.*[^a-zA-Z]))(?!^.*[\u4E00-\u9FA5].*$)^\S{8,20}$/.test(this.password) == false){
this.disabled = true this.disabled = true
}else{ }else{
this.disabled = false this.disabled = false
} }
}, },
immediate: true immediate: true
} }
}, },
methods: { methods: {
...mapMutations(['$uStore']), ...mapMutations(['$uStore']),
// 登录 // 登录
async goLogin() { async goLogin() {
const ispass = await this.validate(); const ispass = await this.validate();
if (!ispass) return; if (!ispass) return;
const userInfo = {...this.userInfo} const userInfo = {...this.userInfo}
userInfo.account = this.account userInfo.account = this.account
userInfo.password = this.password userInfo.password = this.password
this.$uStore({ this.$uStore({
name: 'userInfo', name: 'userInfo',
value: userInfo value: userInfo
}); });
uni.navigateTo({ uni.navigateTo({
url: '/pages/login/login?loginType="password"' url: '/pages/login/login?loginType="password"'
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
padding-left: 24rpx; padding-left: 24rpx;
} }
/deep/.placeholder-text { ::v-deep .placeholder-text {
font-size: 34rpx; font-size: 34rpx;
color: $wly-palcehold-color; color: $wly-palcehold-color;
} }
...@@ -179,4 +179,4 @@ ...@@ -179,4 +179,4 @@
font-size: 34rpx; font-size: 34rpx;
font-weight: 400; font-weight: 400;
} }
</style> </style>
...@@ -641,11 +641,11 @@ ...@@ -641,11 +641,11 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
/deep/ .uni-checkbox-input{ ::v-deep .uni-checkbox-input{
color: #FF1D32 !important; color: #FF1D32 !important;
border-color: #FF1D32; border-color: #FF1D32;
} }
/deep/ .uni-checkbox-input:hover{ ::v-deep .uni-checkbox-input:hover{
border-color: #FF1D32 !important; border-color: #FF1D32 !important;
} }
.right-box{ .right-box{
...@@ -663,4 +663,4 @@ ...@@ -663,4 +663,4 @@
width: 60rpx; width: 60rpx;
text-align: right; text-align: right;
} }
</style> </style>
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
// height: 100%; // height: 100%;
// } // }
// /deep/ .uni-file-picker__container { // ::v-deep .uni-file-picker__container {
// width: 100%; // width: 100%;
// height: 100%; // height: 100%;
// } // }
...@@ -436,7 +436,7 @@ ...@@ -436,7 +436,7 @@
color: $wly-primary-color; color: $wly-primary-color;
} }
/deep/ .uni-popup__wrapper { ::v-deep .uni-popup__wrapper {
border-radius: 20rpx; border-radius: 20rpx;
} }
......
...@@ -673,7 +673,7 @@ ...@@ -673,7 +673,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
......
...@@ -516,7 +516,7 @@ ...@@ -516,7 +516,7 @@
height: 480rpx; height: 480rpx;
} }
/deep/ .uni-swiper__warp { ::v-deep .uni-swiper__warp {
height: 100%; height: 100%;
.swiper-box { .swiper-box {
......
...@@ -611,13 +611,13 @@ ...@@ -611,13 +611,13 @@
color: #fff; color: #fff;
font-size: 34rpx; font-size: 34rpx;
} }
/deep/ .uni-swipe{ ::v-deep .uni-swipe{
width: 100%; width: 100%;
} }
/deep/ .uni-swipe_box{ ::v-deep .uni-swipe_box{
width: 100%; width: 100%;
} }
/deep/ .uni-swipe_button{ ::v-deep .uni-swipe_button{
height: 56rpx; height: 56rpx;
border-radius: 28px; border-radius: 28px;
line-height: 100%; line-height: 100%;
......
...@@ -489,7 +489,7 @@ export default { ...@@ -489,7 +489,7 @@ export default {
flex-direction: column; flex-direction: column;
} }
.check-box { .check-box {
/deep/ .uni-checkbox-wrapper { ::v-deep .uni-checkbox-wrapper {
margin-top: 14rpx; margin-top: 14rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
......
...@@ -474,7 +474,7 @@ ...@@ -474,7 +474,7 @@
margin-top: 8rpx; margin-top: 8rpx;
font-size: 32rpx; font-size: 32rpx;
} }
/deep/ .uni-checkbox-input{ ::v-deep .uni-checkbox-input{
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
} }
......
...@@ -407,12 +407,12 @@ ...@@ -407,12 +407,12 @@
flex-direction: column; flex-direction: column;
} }
/deep/ .uni-file-picker { ::v-deep .uni-file-picker {
// display: flex; // display: flex;
// flex-direction: column; // flex-direction: column;
} }
/deep/ .uni-file-picker__container { ::v-deep .uni-file-picker__container {
// width: 100%; // width: 100%;
// height: 100%; // height: 100%;
} }
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
color: $wly-primary-color; color: $wly-primary-color;
} }
/deep/ .uni-popup__wrapper { ::v-deep .uni-popup__wrapper {
border-radius: 20rpx; border-radius: 20rpx;
} }
......
...@@ -592,7 +592,7 @@ ...@@ -592,7 +592,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
......
...@@ -569,7 +569,7 @@ ...@@ -569,7 +569,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
...@@ -620,7 +620,7 @@ ...@@ -620,7 +620,7 @@
width: 750rpx; width: 750rpx;
} }
/deep/ .uni-popup__wrapper { ::v-deep .uni-popup__wrapper {
border-radius: 20rpx; border-radius: 20rpx;
} }
......
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
...@@ -607,7 +607,7 @@ ...@@ -607,7 +607,7 @@
width: 750rpx; width: 750rpx;
} }
/deep/ .uni-popup__wrapper { ::v-deep .uni-popup__wrapper {
border-radius: 20rpx; border-radius: 20rpx;
} }
......
...@@ -1140,7 +1140,7 @@ ...@@ -1140,7 +1140,7 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
/deep/ .uni-popup__wrapper { ::v-deep .uni-popup__wrapper {
border-radius: 20rpx; border-radius: 20rpx;
} }
......
...@@ -1054,7 +1054,7 @@ ...@@ -1054,7 +1054,7 @@
.btn-text-l { .btn-text-l {
color: $wly-primary-color; color: $wly-primary-color;
} }
/deep/ .uni-popup__wrapper { ::v-deep .uni-popup__wrapper {
border-radius: 20rpx; border-radius: 20rpx;
} }
......
...@@ -465,7 +465,7 @@ ...@@ -465,7 +465,7 @@
// height: 100%; // height: 100%;
} }
/deep/ .uni-file-picker__container { ::v-deep .uni-file-picker__container {
// width: 100%; // width: 100%;
// height: 100%; // height: 100%;
// margin: 0; // margin: 0;
...@@ -512,7 +512,7 @@ ...@@ -512,7 +512,7 @@
color: $wly-primary-color; color: $wly-primary-color;
} }
/deep/ .uni-popup__wrapper { ::v-deep .uni-popup__wrapper {
border-radius: 20rpx; border-radius: 20rpx;
} }
......
...@@ -865,7 +865,7 @@ ...@@ -865,7 +865,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
......
...@@ -297,7 +297,7 @@ ...@@ -297,7 +297,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
......
...@@ -420,7 +420,7 @@ ...@@ -420,7 +420,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
...@@ -486,4 +486,4 @@ ...@@ -486,4 +486,4 @@
font-size: 12px; font-size: 12px;
color: #999; color: #999;
} }
</style> </style>
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
...@@ -400,4 +400,4 @@ ...@@ -400,4 +400,4 @@
.scroll-area { .scroll-area {
overflow: hidden; overflow: hidden;
} }
</style> </style>
...@@ -425,7 +425,7 @@ ...@@ -425,7 +425,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
...@@ -491,4 +491,4 @@ ...@@ -491,4 +491,4 @@
font-size: 12px; font-size: 12px;
color: #999; color: #999;
} }
</style> </style>
...@@ -382,7 +382,7 @@ ...@@ -382,7 +382,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
...@@ -448,4 +448,4 @@ ...@@ -448,4 +448,4 @@
font-size: 12px; font-size: 12px;
color: #999; color: #999;
} }
</style> </style>
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
......
...@@ -409,7 +409,7 @@ ...@@ -409,7 +409,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
......
...@@ -490,7 +490,7 @@ ...@@ -490,7 +490,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
...@@ -556,4 +556,4 @@ ...@@ -556,4 +556,4 @@
font-size: 12px; font-size: 12px;
color: #999; color: #999;
} }
</style> </style>
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
......
...@@ -357,7 +357,7 @@ ...@@ -357,7 +357,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
......
...@@ -362,7 +362,7 @@ export default { ...@@ -362,7 +362,7 @@ export default {
flex-direction: column; flex-direction: column;
} }
.check-box { .check-box {
/deep/ .uni-checkbox-wrapper { ::v-deep .uni-checkbox-wrapper {
margin-top: 14rpx; margin-top: 14rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
......
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
margin-bottom: 26rpx; margin-bottom: 26rpx;
} }
/deep/ .uni-swipe_box { ::v-deep .uni-swipe_box {
flex: 1; flex: 1;
} }
......
...@@ -480,7 +480,7 @@ ...@@ -480,7 +480,7 @@
width: 18rpx; width: 18rpx;
height: 32rpx; height: 32rpx;
} }
/deep/ .uni-badge{ ::v-deep .uni-badge{
position: relative; position: relative;
} }
.dot { .dot {
......
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