diff --git a/src/sixaunyi/app/src/main/res/layout/activity_login.xml b/src/sixaunyi/app/src/main/res/layout/activity_login.xml
index 207f5a5..73e9821 100644
--- a/src/sixaunyi/app/src/main/res/layout/activity_login.xml
+++ b/src/sixaunyi/app/src/main/res/layout/activity_login.xml
@@ -1,30 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="16dp">
+    android:layout_height="match_parent">
 
+    <!--添加背景图-->
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/bg_login"/>
+
+    <!--顶部Logo-->
+    <ImageView
+        android:id="@+id/logo"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="60dp"
+        android:src="@mipmap/ic_launcher"/>
+
+    <!--用户名输入框-->
     <EditText
         android:id="@+id/username"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="用户名"/>
+        android:layout_height="50dp"
+        android:layout_below="@+id/iv_logo"
+        android:layout_marginTop="30dp"
+        android:layout_marginLeft="45dp"
+        android:layout_marginRight="45dp"
+        android:background="@drawable/bg_edittext"
+        android:drawableLeft="@drawable/ic_username"
+        android:drawablePadding="10dp"
+        android:hint="请输入用户名"
+        android:paddingLeft="10dp"
+        android:textColorHint="#d5d5d5"
+        android:textSize="16sp"/>
 
+    <!--密码输入框-->
     <EditText
         android:id="@+id/password"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/username"
-        android:layout_marginTop="16dp"
-        android:hint="密码"
-        android:inputType="textPassword"/>
+        android:layout_height="50dp"
+        android:layout_below="@+id/et_username"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="45dp"
+        android:layout_marginRight="45dp"
+        android:background="@drawable/bg_edittext"
+        android:drawableLeft="@drawable/ic_password"
+        android:drawablePadding="10dp"
+        android:hint="请输入密码"
+        android:paddingLeft="10dp"
+        android:inputType="textPassword"
+        android:textColorHint="#d5d5d5"
+        android:textSize="16sp"/>
 
+    <!--登录按钮-->
     <Button
         android:id="@+id/login"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/password"
-        android:layout_marginTop="32dp"
-        android:text="登陆"/>
+        android:layout_height="50dp"
+        android:layout_below="@+id/et_password"
+        android:layout_marginTop="30dp"
+        android:layout_marginLeft="45dp"
+        android:layout_marginRight="45dp"
+        android:background="@drawable/bg_button"
+        android:text="登录"
+        android:textColor="#ffffff"
+        android:textSize="18sp"/>
 
 </RelativeLayout>
diff --git a/src/sixaunyi/app/src/main/res/layout/bg_button.xml b/src/sixaunyi/app/src/main/res/layout/bg_button.xml
new file mode 100644
index 0000000..efcc6af
--- /dev/null
+++ b/src/sixaunyi/app/src/main/res/layout/bg_button.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <gradient android:startColor="#FF6F00"
+                android:endColor="#FFAB40"
+                android:angle="270"/>
+            <corners android:radius="25dp"/>
+            <stroke android:width="1dp" android:color="#FF6F00" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <gradient android:startColor="#FF9800"
+                android:endColor="#FFC107"
+                android:angle="270"/>
+            <corners android:radius="25dp"/>
+            <stroke android:width="1dp" android:color="#FF9800" />
+        </shape>
+    </item>
+</selector>
diff --git a/src/sixaunyi/app/src/main/res/layout/bg_edittext.xml b/src/sixaunyi/app/src/main/res/layout/bg_edittext.xml
new file mode 100644
index 0000000..376a424
--- /dev/null
+++ b/src/sixaunyi/app/src/main/res/layout/bg_edittext.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ffffff"/>
+    <corners android:radius="25dp"/>
+    <stroke android:width="1dp" android:color="#d5d5d5"/>
+</shape>