diff --git a/app/src/main/java/com/fengliyan/tianlesue/view/login/ForgetActivity.java b/app/src/main/java/com/fengliyan/tianlesue/view/login/ForgetActivity.java
index 6606c29..a0a127f 100644
--- a/app/src/main/java/com/fengliyan/tianlesue/view/login/ForgetActivity.java
+++ b/app/src/main/java/com/fengliyan/tianlesue/view/login/ForgetActivity.java
@@ -87,8 +87,9 @@ public class ForgetActivity extends BaseActivity implements View.OnClickListener
     public void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_forget);
-        setTitleName("找回密码");
-        setDefaultTitle();
+       // setTitleName("找回密码");
+       // setDefaultTitle();
+        hideTitleBar();
         initPicCode();
         dissmissTitleBottomLine();
         initView();
@@ -140,6 +141,13 @@ public class ForgetActivity extends BaseActivity implements View.OnClickListener
                 }
             }
         });
+
+        findViewById(R.id.rl_return).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
     }
 
     @Override
diff --git a/app/src/main/java/com/fengliyan/tianlesue/view/login/LoginActivity.java b/app/src/main/java/com/fengliyan/tianlesue/view/login/LoginActivity.java
index 229bc94..d879b24 100644
--- a/app/src/main/java/com/fengliyan/tianlesue/view/login/LoginActivity.java
+++ b/app/src/main/java/com/fengliyan/tianlesue/view/login/LoginActivity.java
@@ -89,6 +89,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
     public static int REQUEST_INFO = 202;
     private TextView tv_login_sms;
     private TextView tv_login_pw;
+    private View tv_login_sms_line;
+    private View tv_login_pw_line;
     private LinearLayout lin_sms_login;
     private CaiEditText login_sms_phone_number_layout;
     private CaiEditText login_vcode;
@@ -210,6 +212,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
     private void initView() {
         tv_login_sms = findViewById(R.id.tv_login_sms);
         tv_login_pw = findViewById(R.id.tv_login_pw);
+        tv_login_sms_line = findViewById(R.id.tv_login_sms_line);
+        tv_login_pw_line = findViewById(R.id.tv_login_pw_line);
         lin_sms_login = findViewById(R.id.lin_sms_login);
         login_sms_phone_number_layout = findViewById(R.id.login_sms_phone_number_layout);
         login_vcode = findViewById(R.id.login_vcode);
@@ -306,6 +310,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
             tv_login_pw.setTextColor(ContextCompat.getColor(this, R.color.three_text));
             tv_login_sms.setBackgroundResource(R.drawable.white_bg_40);
             tv_login_sms.setTextColor(ContextCompat.getColor(this, R.color.one_text));
+            tv_login_sms_line.setVisibility(View.VISIBLE);
+            tv_login_pw_line.setVisibility(View.INVISIBLE);
             lin_sms_login.setVisibility(View.VISIBLE);
             lin_password_login.setVisibility(View.GONE);
             initLoginBtnEnabled();
@@ -315,6 +321,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
             tv_login_sms.setTextColor(ContextCompat.getColor(this, R.color.three_text));
             tv_login_pw.setBackgroundResource(R.drawable.white_bg_40);
             tv_login_pw.setTextColor(ContextCompat.getColor(this, R.color.one_text));
+            tv_login_sms_line.setVisibility(View.INVISIBLE);
+            tv_login_pw_line.setVisibility(View.VISIBLE);
             lin_sms_login.setVisibility(View.GONE);
             lin_password_login.setVisibility(View.VISIBLE);
             initLoginBtnEnabled();
diff --git a/app/src/main/res/drawable/edit_change_avatar.xml b/app/src/main/res/drawable/edit_change_avatar.xml
index 45599e1..4e1b9b1 100644
--- a/app/src/main/res/drawable/edit_change_avatar.xml
+++ b/app/src/main/res/drawable/edit_change_avatar.xml
@@ -3,8 +3,8 @@
     android:shape="rectangle">
 
     <gradient
-        android:endColor="#925BF7"
-        android:startColor="#E69EFF" />
+        android:endColor="#EB6969"
+        android:startColor="#EA6FEE" />
     <corners
         android:bottomRightRadius="12dp"
         android:topLeftRadius="12dp" />
diff --git a/app/src/main/res/drawable/onkeylogin_bg.png b/app/src/main/res/drawable/onkeylogin_bg.png
index d834522..cd74623 100644
Binary files a/app/src/main/res/drawable/onkeylogin_bg.png and b/app/src/main/res/drawable/onkeylogin_bg.png differ
diff --git a/app/src/main/res/drawable/shape_button_disable_v2.xml b/app/src/main/res/drawable/shape_button_disable_v2.xml
index 0e67aba..beca69e 100644
--- a/app/src/main/res/drawable/shape_button_disable_v2.xml
+++ b/app/src/main/res/drawable/shape_button_disable_v2.xml
@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient android:angle="0"
-        android:startColor="#B9C2FF"
-        android:endColor="#CAADFF"/>
+        android:startColor="#F9CBFA"
+        android:endColor="#FDC1C1"/>
 
     <!--<solid android:color="@color/yellow_ffd33e"/>-->
 
diff --git a/app/src/main/res/drawable/shape_button_enable.xml b/app/src/main/res/drawable/shape_button_enable.xml
index 2afc94e..d1456c9 100644
--- a/app/src/main/res/drawable/shape_button_enable.xml
+++ b/app/src/main/res/drawable/shape_button_enable.xml
@@ -2,8 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient android:angle="0"
-        android:startColor="#E69EFF"
-        android:endColor="#925BF7"/>
+        android:startColor="#EA6FEE"
+        android:endColor="#EB6969"/>
 
     <!--<solid android:color="@color/yellow_ffd33e"/>-->
 
diff --git a/app/src/main/res/layout/activity_forget.xml b/app/src/main/res/layout/activity_forget.xml
index e5649df..4ae5fc5 100644
--- a/app/src/main/res/layout/activity_forget.xml
+++ b/app/src/main/res/layout/activity_forget.xml
@@ -5,188 +5,236 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:viewBindingIgnore="true"
     xmlns:cai="http://schemas.android.com/apk/res-auto"
-    android:background="@color/colorPrimary">
+    android:background="@drawable/onkeylogin_bg">
 
-    <TextView
-        android:id="@+id/forget_phone_num_title"
-        android:layout_width="wrap_content"
-        android:layout_height="54dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="40dp"
-        android:gravity="center_vertical"
-        android:text="账号"
-        android:textColor="@color/loginText" />
-
-    <com.fengliyan.uikit.editor.CaiEditText
-        android:id="@+id/forget_phone_num_layout"
-        android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="40dp"
-        android:layout_marginTop="16dp"
-        android:layout_toRightOf="@+id/forget_phone_num_title"
-        android:gravity="center_vertical"
-        cai:hint="手机号"
-        cai:hint_color="@color/infoEditTextColor"
-        cai:edit_type="phone"
-        cai:right_img="@drawable/ic_sign_input1"/>
-
-    <View
-        android:id="@+id/register_phone_number_line"
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:background="@color/loginLine"
-        android:layout_marginRight="40dp"
-        android:layout_marginLeft="40dp"
-        android:layout_below="@+id/forget_phone_num_layout"/>
-
-
-    <TextView
-        android:id="@+id/forget_password_title"
-        android:layout_width="wrap_content"
-        android:layout_height="54dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginLeft="40dp"
-        android:gravity="center_vertical"
-        android:layout_below="@+id/register_phone_number_line"
-        android:text="密码"
-        android:textColor="@color/loginText" />
-
-    <com.fengliyan.uikit.editor.CaiEditText
-        android:id="@+id/forget_password_layout"
-        android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="40dp"
-        android:layout_marginTop="16dp"
-        android:layout_below="@+id/register_phone_number_line"
-        android:layout_toRightOf="@+id/forget_password_title"
-        android:gravity="center_vertical"
-        cai:hint="密码"
-        cai:hint_color="@color/infoEditTextColor"
-        cai:edit_type="textPassword"
-        cai:right_img="@drawable/ic_sign_input2"/>
-
-    <View
-        android:id="@+id/forget_password_line"
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:background="@color/loginLine"
-        android:layout_marginRight="56dp"
-        android:layout_marginLeft="56dp"
-        android:layout_below="@+id/forget_password_layout"/>
-
-
-    <LinearLayout
-        android:id="@+id/register_image_verify_layout"
-        android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:orientation="horizontal"
-        android:layout_marginLeft="40dp"
-        android:layout_marginRight="40dp"
-        android:layout_marginTop="16dp"
-        android:layout_below="@+id/forget_password_line"
-        android:gravity="center_vertical"
+    <RelativeLayout
+        android:id="@+id/rl_return"
+        android:layout_width="@dimen/dp60"
+        android:layout_height="@dimen/dp60"
+        android:layout_marginLeft="@dimen/dp10"
+        android:layout_marginTop="@dimen/dp30"
         >
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="54dp"
-            android:gravity="center_vertical"
-            android:layout_below="@+id/register_phone_number_line"
-            android:text="图片码"
-            android:textColor="@color/loginText" />
-
-        <com.fengliyan.uikit.editor.CaiEditText
-            android:id="@+id/register_image_verify_edit"
-            android:layout_width="match_parent"
-            android:layout_height="54dp"
-            android:layout_marginLeft="2dp"
-            android:layout_weight="15"
-            android:gravity="center_vertical"
-            cai:edit_type="text"
-            cai:hint="图片验证码"
-            cai:hint_color="@color/infoEditTextColor"
-            cai:right_img_enable="false" />
 
         <ImageView
-            android:layout_width="100dp"
-            android:id="@+id/image"
-            android:layout_margin="5dp"
-            android:layout_height="54dp"
-            />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:src="@drawable/ic_return"/>
 
-    </LinearLayout>
+    </RelativeLayout>
 
 
-    <View
-        android:id="@+id/register_image_verify_line"
+    <TextView
+        android:id="@+id/tv_big_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp20"
+        android:textSize="@dimen/dp28"
+        android:layout_below="@+id/rl_return"
+        android:layout_marginTop="@dimen/dp30"
+        android:text="忘记密码"
+        android:textColor="@color/black"/>
+
+    <TextView
+        android:id="@+id/tv_small_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp20"
+        android:textSize="@dimen/dp15"
+        android:layout_below="@+id/tv_big_title"
+        android:text="请牢记密码"
+        android:textColor="@color/three_text"/>
+
+
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:background="@color/loginLine"
-        android:layout_marginRight="40dp"
-        android:layout_marginLeft="40dp"
-        android:layout_below="@+id/register_image_verify_layout"/>
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_small_title">
 
-    <LinearLayout
-        android:id="@+id/forget_verify_layout"
-        android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:orientation="horizontal"
-        android:layout_marginLeft="40dp"
-        android:layout_marginRight="40dp"
-        android:layout_marginTop="16dp"
-        android:layout_below="@+id/register_image_verify_line"
-        android:gravity="center_vertical">
 
         <TextView
+            android:id="@+id/forget_phone_num_title"
             android:layout_width="wrap_content"
             android:layout_height="54dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginLeft="40dp"
             android:gravity="center_vertical"
-            android:text="验证码"
+            android:text="账号"
             android:textColor="@color/loginText" />
 
         <com.fengliyan.uikit.editor.CaiEditText
-            android:id="@+id/forget_verify_edit"
+            android:id="@+id/forget_phone_num_layout"
             android:layout_width="match_parent"
             android:layout_height="54dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="40dp"
+            android:layout_marginTop="16dp"
+            android:layout_toRightOf="@+id/forget_phone_num_title"
             android:gravity="center_vertical"
-            android:layout_marginLeft="2dp"
-            cai:hint="验证码"
+            cai:hint="手机号"
             cai:hint_color="@color/infoEditTextColor"
-            cai:edit_type="number"
-            cai:right_img_enable="false"
-            android:layout_weight="5"/>
+            cai:edit_type="phone"
+            cai:right_img="@drawable/ic_sign_input1"/>
+
+        <View
+            android:id="@+id/register_phone_number_line"
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:background="@color/loginLine"
+            android:layout_marginRight="40dp"
+            android:layout_marginLeft="40dp"
+            android:layout_below="@+id/forget_phone_num_layout"/>
+
+
+        <TextView
+            android:id="@+id/forget_password_title"
+            android:layout_width="wrap_content"
+            android:layout_height="54dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginLeft="40dp"
+            android:gravity="center_vertical"
+            android:layout_below="@+id/register_phone_number_line"
+            android:text="密码"
+            android:textColor="@color/loginText" />
+
+        <com.fengliyan.uikit.editor.CaiEditText
+            android:id="@+id/forget_password_layout"
+            android:layout_width="match_parent"
+            android:layout_height="54dp"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="40dp"
+            android:layout_marginTop="16dp"
+            android:layout_below="@+id/register_phone_number_line"
+            android:layout_toRightOf="@+id/forget_password_title"
+            android:gravity="center_vertical"
+            cai:hint="密码"
+            cai:hint_color="@color/infoEditTextColor"
+            cai:edit_type="textPassword"
+            cai:right_img="@drawable/ic_sign_input2"/>
+
+        <View
+            android:id="@+id/forget_password_line"
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:background="@color/loginLine"
+            android:layout_marginRight="56dp"
+            android:layout_marginLeft="56dp"
+            android:layout_below="@+id/forget_password_layout"/>
+
+
+        <LinearLayout
+            android:id="@+id/register_image_verify_layout"
+            android:layout_width="match_parent"
+            android:layout_height="54dp"
+            android:orientation="horizontal"
+            android:layout_marginLeft="40dp"
+            android:layout_marginRight="40dp"
+            android:layout_marginTop="16dp"
+            android:layout_below="@+id/forget_password_line"
+            android:gravity="center_vertical"
+            >
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="54dp"
+                android:gravity="center_vertical"
+                android:layout_below="@+id/register_phone_number_line"
+                android:text="图片码"
+                android:textColor="@color/loginText" />
+
+            <com.fengliyan.uikit.editor.CaiEditText
+                android:id="@+id/register_image_verify_edit"
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:layout_marginLeft="2dp"
+                android:layout_weight="15"
+                android:gravity="center_vertical"
+                cai:edit_type="text"
+                cai:hint="图片验证码"
+                cai:hint_color="@color/infoEditTextColor"
+                cai:right_img_enable="false" />
+
+            <ImageView
+                android:layout_width="100dp"
+                android:id="@+id/image"
+                android:layout_margin="5dp"
+                android:layout_height="54dp"
+                />
+
+        </LinearLayout>
+
+
+        <View
+            android:id="@+id/register_image_verify_line"
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:background="@color/loginLine"
+            android:layout_marginRight="40dp"
+            android:layout_marginLeft="40dp"
+            android:layout_below="@+id/register_image_verify_layout"/>
+
+        <LinearLayout
+            android:id="@+id/forget_verify_layout"
+            android:layout_width="match_parent"
+            android:layout_height="54dp"
+            android:orientation="horizontal"
+            android:layout_marginLeft="40dp"
+            android:layout_marginRight="40dp"
+            android:layout_marginTop="16dp"
+            android:layout_below="@+id/register_image_verify_line"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="54dp"
+                android:gravity="center_vertical"
+                android:text="验证码"
+                android:textColor="@color/loginText" />
+
+            <com.fengliyan.uikit.editor.CaiEditText
+                android:id="@+id/forget_verify_edit"
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:gravity="center_vertical"
+                android:layout_marginLeft="2dp"
+                cai:hint="验证码"
+                cai:hint_color="@color/infoEditTextColor"
+                cai:edit_type="number"
+                cai:right_img_enable="false"
+                android:layout_weight="5"/>
+            <Button
+                android:id="@+id/forget_send_code_button"
+                android:layout_width="90dp"
+                android:layout_height="28dp"
+                android:textColor="@color/zhimi_one_text"
+                android:textSize="14sp"
+                android:text="获取验证码"
+                android:enabled="false"
+                android:layout_weight="0.5"/>
+        </LinearLayout>
+
+        <View
+            android:id="@+id/forget_verify_line"
+            android:layout_width="match_parent"
+            android:layout_height="2px"
+            android:background="@color/loginLine"
+            android:layout_marginRight="56dp"
+            android:layout_marginLeft="56dp"
+            android:layout_below="@+id/forget_verify_layout"/>
+
         <Button
-            android:id="@+id/forget_send_code_button"
-            android:layout_width="90dp"
-            android:layout_height="28dp"
+            android:id="@+id/forget_button"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginLeft="40dp"
+            android:layout_marginRight="40dp"
+            android:layout_marginTop="48dp"
+            android:textSize="17sp"
             android:textColor="@color/zhimi_one_text"
-            android:textSize="14sp"
-            android:text="获取验证码"
+            android:layout_below="@+id/forget_verify_line"
             android:enabled="false"
-            android:layout_weight="0.5"/>
-    </LinearLayout>
+            android:text="确定"/>
 
-    <View
-        android:id="@+id/forget_verify_line"
-        android:layout_width="match_parent"
-        android:layout_height="2px"
-        android:background="@color/loginLine"
-        android:layout_marginRight="56dp"
-        android:layout_marginLeft="56dp"
-        android:layout_below="@+id/forget_verify_layout"/>
+    </RelativeLayout>
 
-    <Button
-        android:id="@+id/forget_button"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginLeft="40dp"
-        android:layout_marginRight="40dp"
-        android:layout_marginTop="48dp"
-        android:textSize="17sp"
-        android:textColor="@color/zhimi_one_text"
-        android:layout_below="@+id/forget_verify_line"
-        android:enabled="false"
-        android:text="确定"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_info_edit.xml b/app/src/main/res/layout/activity_info_edit.xml
index 507c27f..172b0c6 100644
--- a/app/src/main/res/layout/activity_info_edit.xml
+++ b/app/src/main/res/layout/activity_info_edit.xml
@@ -55,7 +55,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:text="上传真实头像，更容易获得异性喜欢"
-            android:textColor="#925BF7"
+            android:textColor="#E472ED"
             android:textSize="12sp"
             android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 1d336ed..447cf3e 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -26,49 +26,121 @@
         android:src="@drawable/ic_return"
         android:visibility="gone" />
 
+    <!-- android:background="@drawable/login_top_bg" -->
+
     <LinearLayout
-        android:id="@+id/lin_login_type"
+        android:id="@+id/lin_login_type_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/login_logo"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="@dimen/dp20"
         android:layout_marginTop="10dp"
-        android:layout_marginEnd="16dp"
-        android:background="@drawable/login_top_bg"
         android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/tv_login_sms"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="6dp"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:minHeight="35dp"
-            android:text="短信登录"
-            android:textColor="@color/three_text"
-            android:textSize="16dp"
-            android:textStyle="bold" />
 
-        <TextView
-            android:id="@+id/tv_login_pw"
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_login_sms"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="6dp"
+                android:gravity="center"
+                android:minHeight="35dp"
+                android:text="短信登录"
+                android:textColor="@color/three_text"
+                android:textSize="16dp"
+                android:textStyle="bold" />
+
+            <View
+                android:id="@+id/tv_login_sms_line"
+                android:layout_width="@dimen/dp25"
+                android:layout_height="@dimen/dp5"
+                android:layout_gravity="center"
+                android:visibility="invisible"
+                android:background="@drawable/shape_button_enable"
+                android:gravity="center" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp45"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_login_pw"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="6dp"
+                android:layout_marginBottom="6dp"
+                android:gravity="center"
+                android:minHeight="35dp"
+                android:text="密码登录"
+                android:textColor="@color/one_text"
+                android:textSize="16dp"
+                android:textStyle="bold" />
+
+            <View
+                android:id="@+id/tv_login_pw_line"
+                android:layout_width="@dimen/dp25"
+                android:layout_height="@dimen/dp5"
+                android:layout_gravity="center"
+                android:background="@drawable/shape_button_enable"
+                android:gravity="center" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <!--<LinearLayout
+        android:id="@+id/lin_login_type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/lin_login_type_title"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:orientation="horizontal">
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="6dp"
+            android:layout_gravity="center"
             android:layout_weight="1"
-            android:background="@drawable/white_bg_40"
             android:gravity="center"
-            android:minHeight="35dp"
-            android:text="密码登录"
-            android:textColor="@color/one_text"
-            android:textSize="16dp"
-            android:textStyle="bold" />
-    </LinearLayout>
+            android:orientation="vertical">
+
+            <View
+                android:id="@+id/tv_login_sms"
+                android:layout_width="@dimen/dp25"
+                android:layout_height="@dimen/dp5"
+                android:background="@drawable/shape_button_enable"
+                android:gravity="center" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <View
+                android:id="@+id/tv_login_pw"
+                android:layout_width="@dimen/dp25"
+                android:layout_height="@dimen/dp5"
+                android:background="@drawable/shape_button_enable"
+                android:gravity="center" />
+        </LinearLayout>
+    </LinearLayout>-->
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/lin_login_type"
+        android:layout_below="@+id/lin_login_type_title"
         android:layout_marginTop="30dp"
         android:orientation="vertical">
 
@@ -76,67 +148,83 @@
             android:id="@+id/lin_sms_login"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="48dp"
-            android:layout_marginEnd="48dp"
+            android:layout_marginStart="@dimen/dp20"
+            android:layout_marginEnd="@dimen/dp20"
             android:orientation="vertical"
             android:visibility="gone">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="短信登录"
-                android:textColor="@color/one_text"
-                android:textSize="16dp"
-                android:textStyle="bold" />
 
-            <com.fengliyan.uikit.editor.CaiEditText
-                android:id="@+id/login_sms_phone_number_layout"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:gravity="center_vertical"
-                cai:edit_type="phone"
-                cai:hint="请输入手机号"
-                cai:right_img="@drawable/ic_sign_input1" />
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="手机号"
+                    android:textColor="@color/three_text"
+                    android:textSize="14sp" />
+
+                <com.fengliyan.uikit.editor.CaiEditText
+                    android:id="@+id/login_sms_phone_number_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:layout_marginLeft="@dimen/dp14"
+                    android:gravity="center_vertical"
+                    cai:edit_type="phone"
+                    cai:hint="请输入手机号"
+                    cai:right_img="@drawable/ic_sign_input1" />
+            </LinearLayout>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
                 android:background="#8D73EE" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="28dp"
-                android:text="短信验证码"
-                android:textColor="@color/one_text"
-                android:textSize="16dp"
-                android:textStyle="bold" />
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:gravity="center_vertical"
                 android:orientation="horizontal">
 
-                <com.fengliyan.uikit.editor.CaiEditText
-                    android:id="@+id/login_vcode"
-                    android:layout_width="0dp"
-                    android:layout_height="48dp"
-                    android:layout_weight="1"
-                    android:gravity="center_vertical"
-                    cai:edit_type="text"
-                    cai:hint="请输入验证码" />
-
                 <TextView
-                    android:id="@+id/tv_send_code"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:text="获取"
-                    android:textColor="#8D73EE"
-                    android:textSize="14dp" />
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="验证码"
+                    android:textColor="@color/three_text"
+                    android:textSize="14sp" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp14"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <com.fengliyan.uikit.editor.CaiEditText
+                        android:id="@+id/login_vcode"
+                        android:layout_width="0dp"
+                        android:layout_height="48dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        cai:edit_type="text"
+                        cai:hint="请输入验证码" />
+
+                    <TextView
+                        android:id="@+id/tv_send_code"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp25"
+                        android:background="@drawable/shape_button_enable"
+                        android:gravity="center"
+                        android:paddingHorizontal="@dimen/dp8"
+                        android:text="获取验证码"
+                        android:textColor="@color/white"
+                        android:textSize="12dp" />
+                </LinearLayout>
             </LinearLayout>
 
             <View
@@ -149,57 +237,81 @@
             android:id="@+id/lin_password_login"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_marginHorizontal="@dimen/dp20"
+            android:orientation="vertical"
+            >
 
-            <com.fengliyan.uikit.editor.CaiEditText
-                android:id="@+id/login_phone_number_layout"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_marginLeft="48dp"
-                android:layout_marginRight="48dp"
-                android:gravity="center_vertical"
-                cai:edit_type="phone"
-                cai:hint="请输入手机号"
-                cai:left_img="@mipmap/login_phone"
-                cai:left_img_enable="true"
-                cai:right_img="@drawable/ic_sign_input1" />
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="手机号"
+                    android:textColor="#999999"
+                    android:textSize="14sp" />
+
+                <com.fengliyan.uikit.editor.CaiEditText
+                    android:id="@+id/login_phone_number_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:layout_marginLeft="@dimen/dp14"
+                    android:gravity="center_vertical"
+                    cai:edit_type="phone"
+                    cai:hint="请输入手机号"
+                    cai:left_img="@null"
+                    cai:left_img_enable="true"
+                    cai:right_img="@drawable/ic_sign_input1" />
+            </LinearLayout>
+
 
             <View
                 android:id="@+id/login_phone_number_line"
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
-                android:layout_marginLeft="48dp"
-                android:layout_marginRight="48dp"
-                android:background="#8D73EE" />
+                android:background="#DDDDDD" />
 
-            <com.fengliyan.uikit.editor.CaiEditText
-                android:id="@+id/login_password_layout"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_marginLeft="48dp"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
-                android:layout_marginRight="48dp"
-                android:gravity="center_vertical"
-                android:paddingLeft="4dp"
-                cai:edit_type="textPassword"
-                cai:hint="请输入密码"
-                cai:left_img="@mipmap/login_password"
-                cai:left_img_enable="true"
-                cai:right_img="@drawable/ic_sign_input2" />
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="密码"
+                    android:textColor="#999999"
+                    android:textSize="14sp" />
+
+                <com.fengliyan.uikit.editor.CaiEditText
+                    android:id="@+id/login_password_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:layout_marginLeft="@dimen/dp25"
+                    android:gravity="center_vertical"
+                    cai:edit_type="textPassword"
+                    cai:hint="请输入密码"
+                    cai:left_img="@null"
+                    cai:left_img_enable="true"
+                    cai:right_img="@drawable/ic_sign_input2" />
+            </LinearLayout>
 
             <View
                 android:id="@+id/login_password_line"
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
-                android:layout_marginLeft="48dp"
-                android:layout_marginRight="48dp"
-                android:background="#8D73EE" />
+                android:background="#DDDDDD" />
 
             <RelativeLayout
                 android:id="@+id/login_menu_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="@dimen/dp14"
                 android:gravity="center_vertical">
 
                 <TextView
@@ -207,7 +319,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
-                    android:layout_marginLeft="48dp"
                     android:text="忘记密码?"
                     android:textColor="#333333"
                     android:textSize="14sp" />
@@ -217,7 +328,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:layout_marginRight="48dp"
                     android:text="注册"
                     android:textColor="@color/mainColors"
                     android:textSize="14sp" />
diff --git a/app/src/main/res/mipmap-xhdpi/check_check.png b/app/src/main/res/mipmap-xhdpi/check_check.png
index afe4df1..dac3e34 100644
Binary files a/app/src/main/res/mipmap-xhdpi/check_check.png and b/app/src/main/res/mipmap-xhdpi/check_check.png differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2d43713..2aeb0da 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,7 +8,7 @@
     <!--登陆页用色-->
     <color name="loginLine">#cccccc</color>
     <color name="loginText">#333333</color>
-    <color name="mainColor">#6B2CC4</color>
+    <color name="mainColor">#E472ED</color>
     <color name="loginText2">#999999</color>
     <color name="loginGradientStart">#2bb1f8</color>
     <color name="loginGradientEnd">#1976e8</color>
diff --git a/uikit/src/main/res/values/color.xml b/uikit/src/main/res/values/color.xml
index fc19854..53cb527 100644
--- a/uikit/src/main/res/values/color.xml
+++ b/uikit/src/main/res/values/color.xml
@@ -30,7 +30,7 @@
     <color name="gradientStart">#FF828B</color>
     <color name="gradientEnd">#F32B2B</color>
     <color name="editNotifiction">#2A2A2A</color>
-    <color name="mainColors">#6B2CC4</color>
+    <color name="mainColors">#E472ED</color>
 
     <!-- 消息对话框的颜色-->
     <color name="base_dialog_progress_bg">#cccccc</color>