diff --git a/pages/mine/mine.js b/pages/mine/mine.js
index cbb1f71..e53e11f 100644
--- a/pages/mine/mine.js
+++ b/pages/mine/mine.js
@@ -5,6 +5,7 @@ const profile = require('../../utils/profile.js')
Page({
data: {
needBindMobile: true,
+ useCodeToLogIn: true,
mobile: '',
userInfo: {
avatarUrl: '',
@@ -88,6 +89,15 @@ Page({
profile.getCustomerInfo(data, this.infoCallback)
},
+ bindLoginPassword: function(e) {
+ var data = {mobile: e.detail.mobile, password: e.detail.password}
+ profile.getCustomerInfo(data, this.infoCallback)
+ },
+
+ changeLoginType: function(e) {
+ this.setData({useCodeToLogIn: !this.data.useCodeToLogIn})
+ },
+
bindLogout: function(e) {
var that = this
app.request({
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index 76ed7e0..3459b5f 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -7,20 +7,31 @@
- 关联手机号
-
-
+
+
+ 使用密码登录
+
+
+ 使用密码登录
+
-
-
+ 使用手机验证码登录
+
diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss
index 72f698c..7576612 100644
--- a/pages/mine/mine.wxss
+++ b/pages/mine/mine.wxss
@@ -109,7 +109,7 @@
/* 绑定手机号的两个form */
.login-title {
- margin: 20rpx 0 25rpx;
+ margin: 20rpx 0 35rpx;
text-align: center;
font-size: 30rpx;
}
@@ -137,7 +137,7 @@
.login .second-line {
height: 80rpx;
display: flex;
- width: 600rpx;
+ width: 602rpx;
margin-bottom: 50rpx;
}
@@ -159,11 +159,25 @@
background-color: #FFC800;
}
+.login .password-second-line {
+ height: 80rpx;
+ display: flex;
+ width: 600rpx;
+ margin-bottom: 50rpx;
+}
+
+.login .password-second-line input {
+ height: 80rpx;
+ width: 600rpx;
+ border: 1rpx solid rgb(217, 217, 217);
+ padding-left: 20rpx;
+ border-radius: 5px;
+}
+
.third-line {
margin-left: auto;
margin-right: auto;
width: 600rpx;
- margin-bottom: 20rpx;
}
.third-line button {
@@ -171,6 +185,16 @@
font-size: 32rpx;
background-color: #FFC800;
}
+
+.login-type {
+ width: 600rpx;
+ margin: 60rpx auto 0 auto;
+ padding: 20rpx 0 20rpx;
+ font-size: 32rpx;
+ text-align: right;
+ text-decoration: underline;
+}
+
/*************/
.profile-button-container {