提交 6a7c7272 编写于 作者: 芊里

解决冲突

上级 f3fed494
...@@ -130,22 +130,6 @@ ...@@ -130,22 +130,6 @@
"style": { "style": {
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, {
"path": "uni_modules/uni-login-page/pages/index/phone-login",
"style": {
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#FFFFFF",
"app-plus": {
"titleNView": {
"buttons": [{
"text": "帮助",
"type": "none",
"fontSize": "16px",
"width": "60px"
}]
}
}
}
}, { }, {
"path": "uni_modules/uni-login-page/pages/index/pwd-login", "path": "uni_modules/uni-login-page/pages/index/pwd-login",
"style": { "style": {
......
...@@ -95,67 +95,12 @@ ...@@ -95,67 +95,12 @@
</script> </script>
<style> <style>
<<<<<<< HEAD
page {
background: transparent;
}
/* #ifndef APP-NVUE */
page{
display: flex;
flex-direction: column;
flex: 1;
height: 100%;
}
/* #endif */
.wrap{
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex-direction: column;
flex:1;
width: 750rpx;
background-color: #fff;
}
.wrap-content{
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
flex: 1;
flex-direction: column;
justify-content: flex-start;
align-items: center;
}
.content{
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
width: 630rpx;
flex-direction: column;
}
=======
@import url("../../common/loginPage.css"); @import url("../../common/loginPage.css");
>>>>>>> 4102167b2d3d22ebf4994a07a5b8421d8539345c
.content-top-title{ .content-top-title{
text-align: center; text-align: center;
} }
<<<<<<< HEAD
@import url("../../common/myStyle.css");
.lgnin-iknow {
padding-top: 24rpx;
padding-bottom: 48rpx;
}
.phone-input-box {
height: 85rpx;
background-color: #f9f9f9;
border-radius: 6rpx;
flex-direction: row;
flex-wrap: nowrap;
align-items: center;
=======
.login-iknow{ .login-iknow{
>>>>>>> 4102167b2d3d22ebf4994a07a5b8421d8539345c
justify-content: center; justify-content: center;
} }
</style> </style>
\ No newline at end of file
<template>
<view class="flex flex-column flex-1 w-750 bg-white">
<view class="flex-1 flex flex-column justify-start align-center">
<view class="w-630 flex flex-column">
<!-- 顶部文字 -->
<text class="font-32 font-blod pt-5">登陆后即可展示自己</text>
<login-ikonw class="lgnin-iknow" :link="link" text="登录即表示同意用户协议和隐私政策"></login-ikonw>
<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
<view class="phone-input-box round flex flex-row flex-nowrap align-center justify-center">
<picker mode="selector" :range="phoneArea" @change="selectPhoneArea">
<text class="px-2 font-30">{{currenPhoneArea}}</text>
</picker>
<input type="number" class="flex-1 phone-input px-2 font-30" placeholder="请输入手机号"
v-model="phoneNumber" />
</view>
<!-- tip -->
<text class="text-sub font-26 tip-text">未注册的手机号验证通过后蒋自动注册</text>
<!-- 发送按钮 -->
<view class="send-btn-box flex w-630 justify-center align-center round" hover-class="hover"
@click="sendShortMsg" :class="canGetShortMsg?'send-btn-active':''">
<text class="text-white">获取短信验证码</text>
</view>
<!-- 其他登录方式 -->
<view class="w-630 flex flex-row align-center justify-between">
<text class="font-26 login-text" hover-class="hover" @click="toPwdLogin">密码登录</text>
<text class="font-26 login-text" hover-class="hover" @click="openLoginList">其他登录方式</text>
</view>
</view>
</view>
<!-- 登录按钮弹窗 -->
<login-action-sheet ref="loginActionSheet"></login-action-sheet>
<uni-quick-login></uni-quick-login>
</view>
</template>
<script>
export default {
data() {
return {
link: [{
text: '用户协议',
to: '/baidu.com'
}, {
text: '隐私政策',
to: 'baidu'
}],
phoneArea: ['+86', '+87'],
currenPhoneArea: '+86',
phoneNumber: ''
}
},
computed: {
canGetShortMsg() {
let reg = /^1\d{10}$/;
return reg.test(this.phoneNumber);
}
},
methods: {
selectPhoneArea(event) {
this.currenPhoneArea = this.phoneArea[event.detail.value];
},
sendShortMsg() {
if (!this.canGetShortMsg) return;
/**
* 发送验证吗
*/
},
/**
* 去密码登录页
*/
toPwdLogin() {
uni.navigateTo({
url: './pwd-login'
})
},
openLoginList() {
this.$refs.loginActionSheet.open();
}
}
}
</script>
<style>
@import url("../../common/myStyle.css");
.lgnin-iknow {
padding-top: 24rpx;
padding-bottom: 48rpx;
}
.phone-input-box {
height: 85rpx;
background-color: #f9f9f9;
}
.phone-input {
border-left-width: 1px;
border-left-color: #d7d9d8;
}
.tip-text {
padding-top: 20rpx;
padding-bottom: 36rpx;
}
.send-btn-box {
height: 85rpx;
background-color: #d8d8da;
margin-bottom: 50rpx;
}
.send-btn-active {
background-color: #007aff;
}
.login-text {
color: #1c436e;
}
</style>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册