2.0页面版本更改

app.js

@@ -3,7 +3,7 @@ let wechat = require('./utils/wechat.js');
 let log = require('./utils/log.js');
 App({
   globalData: {
-    postHeadAgreement: 'https://cdgl.pjnes.com',
+    postHeadAgreement: 'http://cdgl.pjnes.com',
     helpPhoneNum: '18211188302',
     version:'2.0'
   },

app.json

@@ -33,9 +33,9 @@
   ],
   "window": {
     "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#27a6bf",
-    "navigationBarTitleText": "派捷充电",
-    "navigationBarTextStyle": "white"
+    "navigationBarBackgroundColor": "#ffffff",
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "派捷充电"
   },
   "permission": {
     "scope.userLocation": {

pages/forget/forget.js

@@ -30,9 +30,15 @@ Page({
         //console.log(res);
         //console.log(res.data.code == 1);
         if (res.data.code == 1) {
-          that.setData({
-            errorMsg: res.data.msg
-          });
+          // that.setData({
+          //   errorMsg: res.data.msg
+          // });
+          wx.showModal({
+            title: '提示',
+            content: res.data.msg,
+            showCancel: false,
+            confirmColor: '#4359b5'
+          });1
         } else {
           //跳转到下一步
           let url = `/pages/reset_password/reset_password?loginName=${loginName}`;

pages/forget/forget.wxml

@@ -1,7 +1,9 @@
 <!--pages/forget/forget.wxml-->
 <view class='main'>
-  <image class='main_image' src='/images/register.png'></image>
+  <image class='main_image' src='/images/login.png'></image>
   <view class='context'>
+    <view class="logo_view"><image class="login_logo1" src="/images/login_logo1.png"></image></view>
+    <view class="logo_view"><image class="login_logo2" src="/images/login_logo2.png"></image></view>
     <view class='context_input'>
       <view class='input_view'>
         <image class='account_img' src='/images/account.png'></image>

pages/forget/forget.wxss

@@ -6,62 +6,68 @@
 }
 
 .main_image {
-  height: 1344rpx;
+  height: 1334rpx;
   width: 750rpx;
   margin-top: -128rpx;
 }
-
+.logo_view{
+  margin: 0rpx 268rpx;
+}
+.login_logo1 {
+  height: 213rpx;
+  width: 214rpx;
+  margin-top: 90rpx;
+}
+.login_logo2 {
+  height: 120rpx;
+  width: 184rpx;
+  margin: 0rpx 15rpx;
+}
 .main .context {
   height: 100%;
   width: 100%;
   position: absolute;
   top: 0;
   left: 0;
+  box-shadow: 0rpx 6rpx 6rpx  #f5f5f5 inset;
 }
 
 .context_input {
-  margin: 30rpx 32rpx;
+  margin-top: 20rpx;
+  margin-right: 32rpx;
+  margin-left: 32rpx;
+  margin-bottom: 30rpx;
 }
 
 .account_img {
-  width: 26rpx;
+  width: 30rpx;
   height: 32rpx;
-  margin: 28rpx 32rpx 28rpx 0;
-}
-
-.password_img {
-  width: 24rpx;
-  height: 30rpx;
-  margin: 29rpx 34rpx 29rpx 0;
+  margin: 28rpx 0rpx 28rpx 30rpx;
+  padding-right:30rpx;
+  border-right: 2rpx #999999 solid;
 }
-
 .phone_img {
-  width: 24rpx;
-  height: 24rpx;
-  margin: 32rpx 34rpx 32rpx 0;
+  width: 31rpx;
+  height: 30rpx;
+  margin: 29rpx 0rpx 29rpx 30rpx;
+  padding-right:29rpx;
+  border-right: 2rpx #999999 solid;
 }
 .email_img {
-  width: 26rpx;
-  height: 20rpx;
-  margin: 34rpx 32rpx 34rpx 0;
-}
-.man_img {
-  width: 28rpx;
-  height: 24rpx;
-  margin: 32rpx 30rpx 32rpx 0;
+  width: 31rpx;
+  height: 35rpx;
+  margin: 27rpx 0rpx 26rpx 30rpx;
+  padding-right:29rpx;
+  border-right: 2rpx #999999 solid;
 }
-
-.context_input .input_view {
-  border-bottom: 1rpx solid #f1f1f1;
-}
-
 .context_input input {
-  width: calc(100% - 58rpx);
+  width: calc(100% - 122rpx);
   display: inline-block;
   font-size: 32rpx;
   height: 88rppx;
   line-height: 88rpx;
   min-height: 88rpx;
+  padding-left: 30rpx;
   color: #434343;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
@@ -73,11 +79,7 @@
 }
 
 .context_input .placeholder {
-  color: #c9c9c9;
-  font-size: 32rpx;
-  height: 88rppx;
-  line-height: 88rpx;
-  min-height: 88rpx;
+  color: #999999;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -86,9 +88,17 @@
                  Verdana,
                  sans-serif;
 }
+
+.input_view{
+  box-shadow: 0rpx 0rpx 10rpx  #dedede;
+  border-radius: 10rpx;
+  margin: 40rpx 0rpx;
+  height: 88rpx;
+}
+
 .errorMsg{
   height: 28rpx;
-  margin: 0rpx 32rpx 32rpx 30rpx;
+  margin: -28rpx 30rpx 0rpx 30rpx;
   font-size: 28rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
@@ -102,9 +112,9 @@
   white-space: nowrap;
 }
 .login_button {
-  width: calc(100% - 62rpx);
+  width: calc(100% - 270rpx);
   font-size: 32rpx;
-  margin: 0rpx 32rpx;
+  /* margin: 0rpx 32rpx; */
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -115,12 +125,16 @@
   color: #fff;
   text-overflow: ellipsis;
   white-space: nowrap;
-  background-color: #3cb8b6;
+  background-color: #00a8dc;
+  border-radius: 40rpx;
+  height: 80rpx;
+  border: none;
+  margin: 20rpx 135rpx 0 135rpx;
 }
 .login_button_disable{
-  width: calc(100% - 62rpx);
+   width: calc(100% - 270rpx);
   font-size: 32rpx;
-  margin: 0rpx 32rpx;
+  /* margin: 0rpx 32rpx; */
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -132,6 +146,10 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   background-color: #c9c9c9;
+  border-radius: 40rpx;
+  height: 80rpx;
+  border: none;
+  margin: 20rpx 135rpx 0 135rpx;
 }
 .login_button.button-hover {
   background-color: #36a9a6;

pages/login/login.js

@@ -66,10 +66,16 @@ Page({
         //console.log(res1.data.code == 1);
         log.info('[登录]', '[登录]', '[响应]', res.data);
         if (res.data.code == 1) {
-          that.setData({
-            password: null,
-            passwordFocus:true,
-            errorMsg: res.data.msg
+           that.setData({
+             password: null,
+             passwordFocus:true//,
+             //errorMsg: res.data.msg
+           });
+          wx.showModal({
+            title: '提示',
+            content:res.data.msg,
+            showCancel:false,
+            confirmColor:'#4359b5'
           });
           log.info('[登录]', '[登录]', '[失败code==1]', res.data);
         } else {
@@ -122,7 +128,6 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
   },
 
   /**

pages/login/login.wxml

@@ -2,6 +2,8 @@
 <view class='main'>
   <image class='main_image' src='/images/login.png'></image>
   <view class='context'>
+    <view class="logo_view"><image class="login_logo1" src="/images/login_logo1.png"></image></view>
+    <view class="logo_view"><image class="login_logo2" src="/images/login_logo2.png"></image></view>
     <view class='context_input'>
       <view class='input_view'>
         <image class='account_img' src='/images/account.png'></image>
@@ -12,9 +14,12 @@
         <input placeholder='请输入您的密码' value="{{password}}" focus="{{passwordFocus}}" maxlength='16' bindinput='inputPassword'type='password' placeholder-class='placeholder'></input>
       </view>
     </view>
-    <view class="errorMsg"><text>{{errorMsg}}</text></view>
+    <!-- <view class="errorMsg"><text>{{errorMsg}}</text></view> -->
     <button class='{{checkPass?"login_button":"login_button_disable"}}' bindtap="{{checkPass?'loginUser':''}}" >登录</button>
-    <text class='forget_view'  bindtap='goToForget'>忘记密码</text>
-    <view class='register_view' hover-class='active' bindtap='goToRegister'><text>注册账户</text></view>
+    <view class="other_button">
+    <text class='register_view'  bindtap='goToRegister'>注册账户</text>
+    <text class='forget_view'  bindtap='goToForget'>忘记密码？</text>
+    </view>
+    
   </view>
 </view>

pages/login/login.wxss

@@ -4,52 +4,68 @@
   height: 100%;
   width: 100%;
   position: relative;
+ 
 }
 
 .main_image {
-  height: 1344rpx;
+  height: 1334rpx;
   width: 750rpx;
   margin-top: -128rpx;
+  top: 0; 
+}
+.logo_view{
+  margin: 0rpx 268rpx;
+}
+.login_logo1 {
+  height: 213rpx;
+  width: 214rpx;
+  margin-top: 90rpx;
+}
+.login_logo2 {
+  height: 120rpx;
+  width: 184rpx;
+  margin: 0rpx 15rpx;
 }
-
 .main .context {
   height: 100%;
   width: 100%;
   position: absolute;
   top: 0;
   left: 0;
+  box-shadow: 0rpx 6rpx 6rpx  #f5f5f5 inset;
 }
 
 .context_input {
-  margin-top: 450rpx;
+  margin-top: 20rpx;
   margin-right: 32rpx;
   margin-left: 32rpx;
   margin-bottom: 30rpx;
 }
 
 .account_img {
-  width: 26rpx;
+  width: 30rpx;
   height: 32rpx;
-  margin: 28rpx 32rpx 28rpx 0;
+  margin: 28rpx 0rpx 28rpx 30rpx;
+  padding-right:30rpx;
+  border-right: 2rpx #999999 solid;
 }
 
 .password_img {
-  width: 24rpx;
-  height: 30rpx;
-  margin: 27rpx 34rpx 27rpx 0;
-}
-
-.context_input .input_view {
-  border-bottom: 1rpx solid #f1f1f1;
+  width: 26rpx;
+  height: 34rpx;
+  margin: 27rpx 0rpx 27rpx 32rpx;
+  padding-right:32rpx;
+  border-right: 2rpx #999999 solid;
 }
 
 .context_input input {
-  width: calc(100% - 58rpx);
+  width: calc(100% - 122rpx);
   display: inline-block;
   font-size: 32rpx;
   height: 88rppx;
   line-height: 88rpx;
   min-height: 88rpx;
+  padding-left: 30rpx;
   color: #434343;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
@@ -61,11 +77,7 @@
 }
 
 .context_input .placeholder {
-  color: #c9c9c9;
-  font-size: 32rpx;
-  height: 88rppx;
-  line-height: 88rpx;
-  min-height: 88rpx;
+  color: #999999;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -74,27 +86,16 @@
                  Verdana,
                  sans-serif;
 }
-
-.errorMsg {
-  height: 28rpx;
-  margin: 0rpx 32rpx 32rpx 30rpx;
-  font-size: 28rpx;
-  font-family: 'Lucida Sans',
-                 'Lucida Sans Regular',
-                 'Lucida Grande',
-                 'Lucida Sans Unicode',
-                 Geneva,
-                 Verdana,
-                 sans-serif;
-  color: red;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+.input_view{
+  box-shadow: 0rpx 0rpx 10rpx  #dedede;
+  border-radius: 10rpx;
+  margin: 40rpx 0rpx;
+  height: 88rpx;
 }
-
 .login_button {
-  width: calc(100% - 62rpx);
+  width: calc(100% - 270rpx);
   font-size: 32rpx;
-  margin: 0rpx 32rpx;
+  /* margin: 0rpx 32rpx; */
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -105,13 +106,17 @@
   color: #fff;
   text-overflow: ellipsis;
   white-space: nowrap;
-  background-color: #83c4ee;
+  background-color: #00a8dc;
+  border-radius: 40rpx;
+  height: 80rpx;
+  border: none;
+  margin: 125rpx 135rpx 0 135rpx;
 }
 
 .login_button_disable {
-  width: calc(100% - 62rpx);
+  width: calc(100% - 270rpx);
   font-size: 32rpx;
-  margin: 0rpx 32rpx;
+  /* margin: 0rpx 32rpx; */
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -123,16 +128,25 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   background-color: #c9c9c9;
+  border-radius: 40rpx;
+  height: 80rpx;
+  border: none;
+  margin: 125rpx 135rpx 0 135rpx;
 }
 
 .login_button.button-hover {
-  background-color: #76b1d8;
+  background-color: #36a9a6;
 }
-.forget_view {
-  margin: 0rpx 32rpx;
-  width: 240rpx;
+
+.other_button {
+  width: calc(100% - 270rpx);
+  margin: 20rpx 135rpx; 
+}
+
+.register_view {
+  display: inline-block;
   height: 48rpx;
-  color: #2483c0;
+  color: #999999;
   font-size: 24rpx;
   line-height: 48rpx;
   text-align: left;
@@ -144,19 +158,15 @@
                  Verdana,
                  sans-serif;
 }
-.register_view {
-  width: 240rpx;
-  height: 48rpx;
+.forget_view {
   position: absolute;
-  bottom: 88rpx;
-  left: 375rpx;
-  margin-left: -120rpx;
-  border-radius: 24rpx;
-  border: 1rpx solid #83c4ee;
-  color: #2483c0;
+  right: 135rpx;
+  display: inline-block;
+  height: 48rpx;
+  color: #999999;
   font-size: 24rpx;
   line-height: 48rpx;
-  text-align: center;
+  text-align: right;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -166,7 +176,3 @@
                  sans-serif;
 }
 
-.register_view.active {
-  color: #fff;
-  background-color: #83c4ee;
-}

pages/register/register.wxml

@@ -1,7 +1,9 @@
 <!--pages/register/register.wxml-->
 <view class='main'>
-  <image class='main_image' src='/images/register.png'></image>
+  <image class='main_image' src='/images/login.png'></image>
   <view class='context'>
+    <view class="logo_view"><image class="login_logo1" src="/images/login_logo1.png"></image></view>
+    <view class="logo_view"><image class="login_logo2" src="/images/login_logo2.png"></image></view>
     <view class='context_input'>
       <view class='input_view'>
         <image class='account_img' src='/images/account.png'></image>
@@ -12,28 +14,28 @@
         <image class='phone_img' src='/images/phone.png'></image>
         <input placeholder='请输入电话' maxlength='11' bindinput='inputPhone' type='number' placeholder-class='placeholder'></input>
       </view>  
-      <view class='input_view'>
+      <!-- <view class='input_view'>
         <image class='email_img' src='/images/email.png'></image>
         <input placeholder='请输入邮箱' maxlength='48' bindinput='inputEmail' type='text' placeholder-class='placeholder'></input>
-      </view>
+      </view> -->
       <!-- 
         <view class='input_view'>
           <image class='man_img' src='/images/man.png'></image>
           <input placeholder='请选择性别' maxlength='16' bindinput='checkPassword' type='password' placeholder-class='placeholder'></input>
         </view> 
       -->  
-      <view class='input_view'>
+      <!-- <view class='input_view'>
         <image class='carNum_img' src='/images/car.png'></image>
         <input placeholder='请输入车牌号' maxlength='8' bindinput='inputCarNum' type='text' placeholder-class='placeholder'></input>
-      </view>
+      </view> -->
       <view class='input_view'>
         <image class='password_img' src='/images/password.png'></image>
         <input placeholder='请设置密码' maxlength='16' bindinput='inputPassword' type='password' placeholder-class='placeholder'></input>
       </view>
-      <view class='input_view'>
+      <!-- <view class='input_view'>
         <image class='password_img' src='/images/password.png'></image>
         <input placeholder='请确认密码' maxlength='16' bindinput='inputRepassword' type='password' placeholder-class='placeholder'></input>
-      </view>
+      </view> -->
     </view>
     <view class="errorMsg"><text>{{errorMsg}}</text></view>
     <button class='{{checkPass?"login_button":"login_button_disable"}}' open-type="getUserInfo" bindgetuserinfo="{{checkPass?'bindGetUserInfo':''}}">

pages/register/register.wxss

@@ -6,41 +6,63 @@
 }
 
 .main_image {
-  height: 1344rpx;
+  height: 1334rpx;
   width: 750rpx;
   margin-top: -128rpx;
 }
-
+.logo_view{
+  margin: 0rpx 268rpx;
+}
+.login_logo1 {
+  height: 213rpx;
+  width: 214rpx;
+  margin-top: 90rpx;
+}
+.login_logo2 {
+  height: 120rpx;
+  width: 184rpx;
+  margin: 0rpx 15rpx;
+}
 .main .context {
   height: 100%;
   width: 100%;
   position: absolute;
   top: 0;
   left: 0;
+  box-shadow: 0rpx 6rpx 6rpx  #f5f5f5 inset;
 }
 
 .context_input {
-  margin: 30rpx 32rpx;
+  margin-top: 20rpx;
+  margin-right: 32rpx;
+  margin-left: 32rpx;
+  margin-bottom: 30rpx;
 }
 
 .account_img {
-  width: 26rpx;
+  width: 30rpx;
   height: 32rpx;
-  margin: 28rpx 32rpx 28rpx 0;
+  margin: 28rpx 0rpx 28rpx 30rpx;
+  padding-right:30rpx;
+  border-right: 2rpx #999999 solid;
 }
 
 .password_img {
-  width: 24rpx;
-  height: 30rpx;
-  margin: 29rpx 34rpx 29rpx 0;
+  width: 26rpx;
+  height: 34rpx;
+  margin: 27rpx 0rpx 27rpx 32rpx;
+  padding-right:32rpx;
+  border-right: 2rpx #999999 solid;
 }
 
 .phone_img {
-  width: 24rpx;
-  height: 24rpx;
-  margin: 32rpx 34rpx 32rpx 0;
+  width: 31rpx;
+  height: 30rpx;
+  margin: 29rpx 0rpx 29rpx 30rpx;
+  padding-right:29rpx;
+  border-right: 2rpx #999999 solid;
 }
-.email_img {
+/* .email_img {
   width: 26rpx;
   height: 20rpx;
   margin: 34rpx 32rpx 34rpx 0;
@@ -54,19 +76,16 @@
   width: 28rpx;
   height: 24rpx;
   margin: 32rpx 30rpx 32rpx 0;
-}
-
-.context_input .input_view {
-  border-bottom: 1rpx solid #f1f1f1;
-}
+} */
 
 .context_input input {
-  width: calc(100% - 58rpx);
+  width: calc(100% - 122rpx);
   display: inline-block;
   font-size: 32rpx;
   height: 88rppx;
   line-height: 88rpx;
   min-height: 88rpx;
+  padding-left: 30rpx;
   color: #434343;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
@@ -78,11 +97,7 @@
 }
 
 .context_input .placeholder {
-  color: #c9c9c9;
-  font-size: 32rpx;
-  height: 88rppx;
-  line-height: 88rpx;
-  min-height: 88rpx;
+  color: #999999;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -91,9 +106,15 @@
                  Verdana,
                  sans-serif;
 }
+.input_view{
+  box-shadow: 0rpx 0rpx 10rpx  #dedede;
+  border-radius: 10rpx;
+  margin: 40rpx 0rpx;
+  height: 88rpx;
+}
 .errorMsg{
   height: 28rpx;
-  margin: 0rpx 32rpx 32rpx 30rpx;
+  margin: -28rpx 30rpx 0rpx 30rpx;
   font-size: 28rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
@@ -107,9 +128,9 @@
   white-space: nowrap;
 }
 .login_button {
-  width: calc(100% - 62rpx);
+  width: calc(100% - 270rpx);
   font-size: 32rpx;
-  margin: 0rpx 32rpx;
+  /* margin: 0rpx 32rpx; */
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -120,12 +141,16 @@
   color: #fff;
   text-overflow: ellipsis;
   white-space: nowrap;
-  background-color: #3cb8b6;
+  background-color: #00a8dc;
+  border-radius: 40rpx;
+  height: 80rpx;
+  border: none;
+  margin: 20rpx 135rpx 0 135rpx;
 }
 .login_button_disable{
-  width: calc(100% - 62rpx);
+   width: calc(100% - 270rpx);
   font-size: 32rpx;
-  margin: 0rpx 32rpx;
+  /* margin: 0rpx 32rpx; */
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -137,6 +162,10 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   background-color: #c9c9c9;
+  border-radius: 40rpx;
+  height: 80rpx;
+  border: none;
+  margin: 20rpx 135rpx 0 135rpx;
 }
 .login_button.button-hover {
   background-color: #36a9a6;

pages/reset_password/reset_password.js

@@ -28,8 +28,14 @@ Page({
         //console.log(res);
         //console.log(res.data.code == 1);
         if (res.data.code == 1) {
-          that.setData({
-            errorMsg: res.data.msg
+          // that.setData({
+          //   errorMsg: res.data.msg
+          // });
+          wx.showModal({
+            title: '提示',
+            content: res.data.msg,
+            showCancel: false,
+            confirmColor: '#4359b5'
           });
         } else {
           wx.navigateBack();

pages/reset_password/reset_password.json

@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "忘记密码"
+  "navigationBarTitleText": "找回密码"
 }

pages/reset_password/reset_password.wxml

@@ -1,15 +1,19 @@
 <!--pages/reset_password/reset_password.wxml-->
 <view class='main'>
-  <image class='main_image' src='/images/register.png'></image>
+  <image class='main_image' src='/images/login.png'></image>
   <view class='context'>
     <view class='context_input'>
+    <view class='input_view'>
+        <!-- <image class='password_img' src='/images/password.png'></image> -->
+        <input placeholder='请输入您的手机号/邮箱/账号' value='{{userName}}' disabled='true' placeholder-class='placeholder'></input>
+      </view>
       <view class='input_view'>
-        <image class='password_img' src='/images/password.png'></image>
-        <input placeholder='请设置密码' maxlength='16' bindinput='inputPassword' type='password' placeholder-class='placeholder'></input>
+        <!-- <image class='password_img' src='/images/password.png'></image> -->
+        <input placeholder='输入新密码' maxlength='16'  bindinput='inputPassword' type='password' placeholder-class='placeholder'></input>
       </view>
       <view class='input_view'>
-        <image class='password_img' src='/images/password.png'></image>
-        <input placeholder='请确认密码' maxlength='16' bindinput='inputRepassword' type='password' placeholder-class='placeholder'></input>
+        <!-- <image class='password_img' src='/images/password.png'></image> -->
+        <input placeholder='确认新密码' maxlength='16' bindinput='inputRepassword' type='password' placeholder-class='placeholder'></input>
       </view>
     </view>
     <view class="errorMsg"><text>{{errorMsg}}</text></view>

pages/reset_password/reset_password.wxss

@@ -6,7 +6,7 @@
 }
 
 .main_image {
-  height: 1344rpx;
+  height: 1334rpx;
   width: 750rpx;
   margin-top: -128rpx;
 }
@@ -17,51 +17,27 @@
   position: absolute;
   top: 0;
   left: 0;
+  box-shadow: 0rpx 6rpx 6rpx  #f5f5f5 inset;
 }
 
-.context_input {
+/* .context_input {
   margin: 30rpx 32rpx;
-}
-
-.account_img {
-  width: 26rpx;
-  height: 32rpx;
-  margin: 28rpx 32rpx 28rpx 0;
-}
+} */
 
-.password_img {
-  width: 24rpx;
-  height: 30rpx;
-  margin: 29rpx 34rpx 29rpx 0;
-}
-
-.phone_img {
-  width: 24rpx;
-  height: 24rpx;
-  margin: 32rpx 34rpx 32rpx 0;
-}
-.email_img {
-  width: 26rpx;
-  height: 20rpx;
-  margin: 34rpx 32rpx 34rpx 0;
-}
-.man_img {
-  width: 28rpx;
-  height: 24rpx;
-  margin: 32rpx 30rpx 32rpx 0;
-}
 
 .context_input .input_view {
-  border-bottom: 1rpx solid #f1f1f1;
+  border-bottom: 2rpx solid #f1f1f1;
+  padding-left: 60rpx;
+  height: 100rpx;
 }
 
 .context_input input {
   width: calc(100% - 58rpx);
   display: inline-block;
   font-size: 32rpx;
-  height: 88rppx;
-  line-height: 88rpx;
-  min-height: 88rpx;
+  height: 100rpx;
+  line-height: 100rpx;
+  min-height: 100rpx;
   color: #434343;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
@@ -73,11 +49,7 @@
 }
 
 .context_input .placeholder {
-  color: #c9c9c9;
-  font-size: 32rpx;
-  height: 88rppx;
-  line-height: 88rpx;
-  min-height: 88rpx;
+  color: #999999;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -88,7 +60,7 @@
 }
 .errorMsg{
   height: 28rpx;
-  margin: 0rpx 32rpx 32rpx 30rpx;
+  margin: 32rpx 60rpx 32rpx 60rpx;
   font-size: 28rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
@@ -101,10 +73,11 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
 .login_button {
-  width: calc(100% - 62rpx);
+  width: calc(100% - 152rpx);
   font-size: 32rpx;
-  margin: 0rpx 32rpx;
+  /* margin: 0rpx 32rpx; */
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -115,12 +88,17 @@
   color: #fff;
   text-overflow: ellipsis;
   white-space: nowrap;
-  background-color: #3cb8b6;
+  background-color: #00a8dc;
+  border-radius: 40rpx;
+  height: 80rpx;
+  border: none;
+  margin: 235rpx 76rpx 0 76rpx;
 }
-.login_button_disable{
-  width: calc(100% - 62rpx);
+
+.login_button_disable {
+  width: calc(100% - 152rpx);
   font-size: 32rpx;
-  margin: 0rpx 32rpx;
+  /* margin: 0rpx 32rpx; */
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -132,7 +110,12 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   background-color: #c9c9c9;
+  border-radius: 40rpx;
+  height: 80rpx;
+  border: none;
+  margin: 235rpx 76rpx 0 76rpx;
 }
+
 .login_button.button-hover {
   background-color: #36a9a6;
-}
+}

project.config.json

@@ -38,7 +38,36 @@
 		},
 		"miniprogram": {
 			"current": -1,
-			"list": []
+			"list": [
+				{
+					"id": -1,
+					"name": "登录",
+					"pathName": "pages/login/login",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "忘记密码",
+					"pathName": "pages/forget/forget",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": 2,
+					"name": "找回密码",
+					"pathName": "pages/reset_password/reset_password",
+					"query": "loginName=1234444",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "注册",
+					"pathName": "pages/register/register",
+					"query": "",
+					"scene": null
+				}
+			]
 		}
 	}
 }