diff --git a/.idea/misc.xml b/.idea/misc.xml
index b2e8ffe..7222c2e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,11 +3,28 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/add_shopping_cart_24.xml" value="0.108" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/drawable/btn_normal.xml" value="0.183" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/drawable/btn_pressed.xml" value="0.183" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/drawable/btn_selector.xml" value="0.183" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/drawable/custom_rc_divider.xml" value="0.187" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/drawable/divider.xml" value="0.1" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/drawable/setting_arrow.xml" value="0.1" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/activity_delivery.xml" value="0.2203125" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/activity_delivery_detail.xml" value="0.2203125" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/activity_goods_details.xml" value="0.2203125" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/activity_login.xml" value="0.2" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/activity_main.xml" value="0.23505434782608695" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/fragment_my_page.xml" value="0.11277173913043478" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/fragment_publish_page.xml" value="0.11277173913043478" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/item_book_info.xml" value="0.2203125" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/item_delivery.xml" value="0.2203125" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/item_delivery_select.xml" value="0.2203125" />
+        <entry key="..\:/Android/Projects/android_-design/app/src/main/res/layout/third_fragment.xml" value="0.23505434782608695" />
+        <entry key="..\:/Users/HP/Desktop/android_Course_setting/androidF/android_course_design/app/src/main/res/layout/goods_show_item.xml" value="0.25" />
+        <entry key="..\:/Users/HP/Desktop/android_Course_setting/androidF/android_course_design/app/src/main/res/layout/item_stagger.xml" value="0.3729166666666667" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_account_circle_18.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_account_circle_20.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_account_circle_24.xml" value="0.1345" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_add_shopping_cart_24.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_explore_24.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_favorite_24.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/baseline_feedback_24.xml" value="0.1345" />
@@ -21,23 +38,15 @@
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/ic_person_outline_black_24dp.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/ic_visibility_black_24dp.xml" value="0.1345" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/drawable/ic_visibility_off_black_24dp.xml" value="0.1345" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_confirm_purchase.xml" value="0.2" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_detail.xml" value="0.11354166666666667" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_goods_details.xml" value="0.1" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_home_page.xml" value="0.2" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_home_page.xml" value="0.152" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_login.xml" value="0.176" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/activity_main.xml" value="0.1" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_goods_type.xml" value="0.15208333333333332" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_home_page.xml" value="0.12" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_home_page.xml" value="0.4" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_message_page.xml" value="0.13229166666666667" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_my_page.xml" value="0.176" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_phone.xml" value="0.10572916666666667" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_publish_page.xml" value="0.264" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_shop_page.xml" value="0.2" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/goods_show_item.xml" value="0.128" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/item_stagger.xml" value="0.2" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/list_good_stype_item.xml" value="0.2" />
-        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/third_fragment.xml" value="0.264" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_my_page.xml" value="0.13229166666666667" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/fragment_shop_page.xml" value="0.1837916063675832" />
+        <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/layout/list_good_stype_item.xml" value="0.264" />
         <entry key="..\:/andriod/Android_Couser_Design/app/src/main/res/menu/bottom_navigation_menu.xml" value="0.176" />
       </map>
     </option>
diff --git a/app/build.gradle b/app/build.gradle
index ab5dbe7..4862c56 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
     def fragment_version = "1.4.1"
     //    okhttp
     implementation('com.squareup.okhttp3:okhttp:5.0.0-alpha.7')
diff --git a/app/src/main/java/com/android/activity/fragment/MyPageFragment.java b/app/src/main/java/com/android/activity/fragment/MyPageFragment.java
index 1b3cad7..5df3a80 100644
--- a/app/src/main/java/com/android/activity/fragment/MyPageFragment.java
+++ b/app/src/main/java/com/android/activity/fragment/MyPageFragment.java
@@ -100,10 +100,11 @@ public class MyPageFragment extends Fragment {
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
 
-        rootView = inflater.inflate(R.layout.fragment_my_page, container, false);
-        textView = rootView.findViewById(R.id.tv_my);
+//        rootView = inflater.inflate(R.layout.fragment_my_page, container, false);
+//        textView = rootView.findViewById(R.id.tv_my);
 
-        return rootView;
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_my_page, container, false);
     }
 
     @Subscribe(threadMode = ThreadMode.POSTING,sticky = true)
diff --git a/app/src/main/res/drawable/bg_layout_shape.xml b/app/src/main/res/drawable/bg_layout_shape.xml
new file mode 100644
index 0000000..d947a40
--- /dev/null
+++ b/app/src/main/res/drawable/bg_layout_shape.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <corners android:topRightRadius="8dp" android:topLeftRadius="8dp"/>
+    <corners android:radius="8dp"/>
+    <solid android:color="@color/White"/>
+    <stroke android:width="1px" android:color="@color/border_clo"/>
+</shape>
diff --git a/app/src/main/res/drawable/btn_normal.xml b/app/src/main/res/drawable/btn_normal.xml
new file mode 100644
index 0000000..4fcd5f0
--- /dev/null
+++ b/app/src/main/res/drawable/btn_normal.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <!-- 圆角的半径 -->
+    <corners android:radius="10dp"/>
+
+    <!-- 填充颜色 -->
+    <solid android:color="#3a8fea"/>
+
+</shape>
diff --git a/app/src/main/res/drawable/btn_pressed.xml b/app/src/main/res/drawable/btn_pressed.xml
new file mode 100644
index 0000000..32d8b7c
--- /dev/null
+++ b/app/src/main/res/drawable/btn_pressed.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <!-- 圆角的半径 -->
+    <corners android:radius="10dp"/>
+
+    <!-- 填充颜色 -->
+    <solid android:color="#0662f5"/>
+
+</shape>
diff --git a/app/src/main/res/drawable/btn_selector.xml b/app/src/main/res/drawable/btn_selector.xml
new file mode 100644
index 0000000..5259843
--- /dev/null
+++ b/app/src/main/res/drawable/btn_selector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- 正常状态 -->
+    <item android:drawable="@drawable/btn_normal" android:state_pressed="false"/>
+
+    <!-- 按下状态 -->
+    <item android:drawable="@drawable/btn_pressed" android:state_pressed="true"/>
+
+</selector>
diff --git a/app/src/main/res/drawable/custom_rc_divider.xml b/app/src/main/res/drawable/custom_rc_divider.xml
new file mode 100644
index 0000000..9c6b5b8
--- /dev/null
+++ b/app/src/main/res/drawable/custom_rc_divider.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/recyclerview_divider_color"/>
+    <size android:height="1dp" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml
new file mode 100644
index 0000000..759edc3
--- /dev/null
+++ b/app/src/main/res/drawable/divider.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#7b7a7a"/>
+    <size android:height="1dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/receivegoods.png b/app/src/main/res/drawable/receivegoods.png
new file mode 100644
index 0000000..7841377
Binary files /dev/null and b/app/src/main/res/drawable/receivegoods.png differ
diff --git a/app/src/main/res/drawable/setting_arrow.xml b/app/src/main/res/drawable/setting_arrow.xml
new file mode 100644
index 0000000..a8b409b
--- /dev/null
+++ b/app/src/main/res/drawable/setting_arrow.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_delivery.xml b/app/src/main/res/layout/activity_delivery.xml
new file mode 100644
index 0000000..08c978a
--- /dev/null
+++ b/app/src/main/res/layout/activity_delivery.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    app:left_btn_src="@drawable/icon_back"
+    app:left_btn_visible="true"
+    app:title_text="我的地址簿"
+    app:title_visible="true"
+    android:background="#E6E6E6">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rv_delivery"
+        android:background="#E6E6E6"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+    </android.support.v7.widget.RecyclerView>
+
+    <Button
+        android:id="@+id/btn_delivery_add"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:background="#008B8B"
+        android:textColor="#FFFFFF"
+        android:textSize="23sp"
+        android:text="添加新地址"/>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_delivery_detail.xml b/app/src/main/res/layout/activity_delivery_detail.xml
new file mode 100644
index 0000000..efc99b4
--- /dev/null
+++ b/app/src/main/res/layout/activity_delivery_detail.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:divider="@drawable/custom_rc_divider"
+    android:showDividers="middle|end"
+    app:left_btn_src="@drawable/icon_back"
+    app:left_btn_visible="true"
+    app:title_text="新增地址"
+    app:title_visible="true"
+    app:right_tv_text="保存"
+    app:right_tv_visible="true"
+    android:background="#000000">
+    
+    <LinearLayout
+        android:layout_marginTop="15dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:orientation="horizontal"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left|center_vertical"
+            android:layout_weight="1"
+            android:textColor="@color/text_clo"
+            android:textSize="20sp"
+            android:text="收货人"
+            />
+        <EditText
+            android:id="@+id/et_delivery_receiver"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:textColor="@color/editText_clo"
+            android:textSize="20sp"
+            android:textColorHint="@color/editText_clo"
+            android:maxLines="1"
+            android:hint="请填写"
+            />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_marginTop="15dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:orientation="horizontal"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left|center_vertical"
+            android:layout_weight="1"
+            android:textColor="@color/text_clo"
+            android:textSize="20sp"
+            android:text="联系电话"
+            />
+        <EditText
+            android:id="@+id/et_delivery_phone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:textColor="@color/editText_clo"
+            android:textSize="20sp"
+            android:textColorHint="@color/editText_clo"
+            android:hint="请填写"
+            android:inputType="number"
+            android:maxLines="1"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_marginTop="15dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:orientation="horizontal"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left|center_vertical"
+            android:layout_weight="1"
+            android:textColor="@color/text_clo"
+            android:textSize="20sp"
+            android:text="所在地区"
+            />
+        <TextView
+            android:id="@+id/et_delivery_region"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:textColor="@color/editText_clo"
+            android:textSize="20sp"
+            android:textColorHint="@color/editText_clo"
+            android:hint="请选择"
+            />
+    </LinearLayout>
+    
+    <EditText
+        android:id="@+id/et_delivery_location"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:maxLines="3"
+        android:textColor="@color/editText_clo"
+        android:textSize="20sp"
+        android:textColorHint="@color/editText_clo"
+        android:hint="请填写详细地址,不少于5字"
+        />
+
+    <LinearLayout
+        android:layout_marginTop="15dp"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:orientation="horizontal"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp">
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left|center_vertical"
+            android:layout_weight="1"
+            android:textColor="@color/text_clo"
+            android:textSize="20sp"
+            android:text="设为默认"
+            />
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/sc_delivery_default"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:theme="@style/AppTheme" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
index 9604e25..5774948 100644
--- a/app/src/main/res/layout/fragment_my_page.xml
+++ b/app/src/main/res/layout/fragment_my_page.xml
@@ -1,15 +1,186 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
     tools:context=".activity.fragment.MyPageFragment">
 
     <!-- TODO: Update blank fragment layout -->
-    <TextView
-        android:id="@+id/tv_my"
+<!--    <TextView-->
+<!--        android:id="@+id/tv_my"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent"-->
+<!--        android:text="my" />-->
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_margin="15dp"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/ib_login"
+            android:background="#00000000"
+            app:srcCompat="@drawable/head_portrait"
+            android:layout_width="50dp"
+            android:layout_height="match_parent"/>
+
+        <TextView
+            android:layout_marginLeft="30dp"
+            android:id="@+id/tv_name"
+            android:text="用户名"
+            android:textSize="18sp"
+            android:gravity="center_vertical"
+            android:layout_width="250dp"
+            android:layout_height="match_parent"/>
+
+        <ImageButton
+            android:background="#00000000"
+            app:srcCompat="@drawable/setting"
+            android:id="@+id/btn_setting"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="设置"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:orientation="horizontal"
+        android:layout_margin="15dp">
+
+        <Button
+            android:background="#ffffff"
+            android:text="0\n余额"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+        <Button
+            android:background="#ffffff"
+            android:text="0\n优惠券"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+        <Button
+            android:background="#ffffff"
+            android:text="0\n收藏"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+        <Button
+            android:background="#ffffff"
+            android:text="0\n关注"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </LinearLayout>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_margin="30dp">
+
+        <TextView
+            android:textSize="13sp"
+            android:gravity="center_vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="个人订单"/>
+
+        <Button
+            android:background="#ffffff"
+            android:textSize="13sp"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="全部订单>"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true" />
+
+    </RelativeLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <Button
+            android:background="#00000000"
+            android:textColor="#33000000"
+            android:drawableTop="@drawable/my_released"
+            android:text="我发布的"
+            android:id="@+id/btn_my_released_goods"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <Button
+            android:background="#00000000"
+            android:drawableTop="@drawable/receivegoods"
+            android:text="收货地址"
+            android:textColor="#33000000"
+            android:id="@+id/btn_my_served_goods"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+    </LinearLayout>
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="my" />
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <Button
+            android:background="@drawable/btn_selector"
+            android:textColor="#33000000"
+            android:layout_marginTop="20dp"
+            android:text="退出登录"
+            android:id="@+id/btn_logout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+    </LinearLayout>
+    <!--    <LinearLayout-->
+    <!--        android:layout_width="match_parent"-->
+    <!--        android:layout_height="60dp"-->
+    <!--        android:orientation="horizontal"-->
+    <!--        android:layout_margin="15dp">-->
+
+    <!--        <Button-->
+    <!--            android:drawableTop="@drawable/daifukuan"-->
+    <!--            android:background="#ffffff"-->
+    <!--            android:text="待付款"-->
+    <!--            android:layout_weight="1"-->
+    <!--            android:layout_width="match_parent"-->
+    <!--            android:layout_height="match_parent"/>-->
+    <!--        <Button-->
+    <!--            android:drawableTop="@drawable/daijiaoyi"-->
+    <!--            android:background="#ffffff"-->
+    <!--            android:text="待交易"-->
+    <!--            android:layout_weight="1"-->
+    <!--            android:layout_width="match_parent"-->
+    <!--            android:layout_height="match_parent"/>-->
+    <!--        <Button-->
+    <!--            android:drawableTop="@drawable/daipingjia"-->
+    <!--            android:background="#ffffff"-->
+    <!--            android:text="待评价"-->
+    <!--            android:layout_weight="1"-->
+    <!--            android:layout_width="match_parent"-->
+    <!--            android:layout_height="match_parent"/>-->
+    <!--        <Button-->
+    <!--            android:drawableTop="@drawable/daishouhou"-->
+    <!--            android:background="#ffffff"-->
+    <!--            android:text="退款\售后"-->
+    <!--            android:layout_weight="1"-->
+    <!--            android:layout_width="match_parent"-->
+    <!--            android:layout_height="match_parent"/>-->
+
+    <!--        <Button-->
+    <!--            android:drawableTop="@drawable/yiwancheng"-->
+    <!--            android:background="#ffffff"-->
+    <!--            android:text="已完成"-->
+    <!--            android:layout_weight="1"-->
+    <!--            android:layout_width="match_parent"-->
+    <!--            android:layout_height="match_parent"/>-->
+
+    <!--    </LinearLayout>-->
+
 
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_book_info.xml b/app/src/main/res/layout/item_book_info.xml
new file mode 100644
index 0000000..2fadafa
--- /dev/null
+++ b/app/src/main/res/layout/item_book_info.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="@color/PureWhite"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    
+    <CheckBox
+        android:id="@+id/cb_bookinfo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:checked="true"
+        android:button="@drawable/cart_checkbox"
+        android:layout_marginLeft="10dp"/>
+
+    <ImageView
+        android:id="@+id/iv_bookinfo_cover"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="5dp"
+        android:layout_gravity="center_vertical"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:scaleType="fitCenter"
+        android:src="@mipmap/icon_book_sample"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="120dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginBottom="10dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_bookinfo_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/text_clo"
+            android:textSize="18sp"
+            android:textColorHint="@color/text_clo"
+            android:fontFamily="Helvetica"
+            android:hint="书名"
+            android:maxLines="2"/>
+
+        <TextView
+            android:id="@+id/tv_bookinfo_author"
+            android:paddingLeft="5dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/editText_clo"
+            android:textSize="16sp"
+            android:textColorHint="@color/editText_clo"
+            android:fontFamily="Helvetica"
+            android:hint="作者"
+            android:maxLines="2"/>
+
+        <LinearLayout
+            android:paddingLeft="5dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                android:id="@+id/tv_bookinfo_c1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/editText_clo"
+                android:textSize="16sp"
+                android:textColorHint="@color/editText_clo"
+                android:fontFamily="Helvetica"
+                android:hint="类型1"
+                android:maxLines="2"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="15dp"
+                android:textColor="@color/editText_clo"
+                android:text="->"
+                android:textSize="16sp"
+                android:fontFamily="Helvetica"
+                android:maxLines="2"/>
+
+            <TextView
+                android:id="@+id/tv_bookinfo_c2"
+                android:paddingLeft="15dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/editText_clo"
+                android:fontFamily="Helvetica"
+                android:textSize="16sp"
+                android:textColorHint="@color/editText_clo"
+                android:hint="类型2"
+                android:maxLines="2"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="￥ "
+                android:textColor="@color/PriceColor"
+                android:textSize="20sp"
+                android:maxLines="2"/>
+
+            <TextView
+                android:id="@+id/tv_bookinfo_price"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/PriceColor"
+                android:fontFamily="Helvetica"
+                android:textSize="16sp"
+                android:textColorHint="@color/PriceColor"
+                android:hint="0.00" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_delivery.xml b/app/src/main/res/layout/item_delivery.xml
new file mode 100644
index 0000000..6bf2a70
--- /dev/null
+++ b/app/src/main/res/layout/item_delivery.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:divider="@drawable/custom_rc_divider"
+    android:showDividers="middle"
+    android:padding="4dp"
+    android:background="@color/PureWhite">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:gravity="center_vertical">
+        <TextView
+            android:id="@+id/tv_delivery_receiver"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_weight="1"
+            android:gravity="left|center_vertical"
+            android:textColor="@color/text_clo"
+            android:textSize="18sp"
+            android:text="用户名" />
+        <TextView
+            android:id="@+id/tv_delivery_phone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="right|center_vertical"
+            android:layout_marginRight="5dp"
+            android:layout_weight="1"
+            android:textColor="@color/text_clo"
+            android:textSize="18sp"
+            android:text="手机号" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:gravity="center_vertical"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp">
+        <TextView
+            android:id="@+id/tv_delivery_location"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/text_clo"
+            android:textSize="18sp"
+            android:text="地址"
+            android:maxLines="2"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:gravity="center_vertical"
+        android:layout_marginLeft="10dp"
+        android:orientation="horizontal">
+        <RadioButton
+            android:id="@+id/rb_delivery_default"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="left|center_vertical"
+            android:textColor="@color/text_clo"
+            android:textSize="18sp"
+            android:text="设为默认"/>
+        <com.example.xmfy.yzubookshop.widget.RichText
+            android:id="@+id/tv_delivery_edit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            app:drawable_src="@mipmap/icon_delivery_edit"
+            app:drawable_location="left"
+            app:drawable_height="25dp"
+            app:drawable_width="25dp"
+            android:drawablePadding="5dp"
+            android:textColor="@color/text_clo"
+            android:textSize="18sp"
+            android:text="修改"/>
+
+        <com.example.xmfy.yzubookshop.widget.RichText
+            android:id="@+id/tv_delivery_delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            app:drawable_src="@mipmap/icon_delivery_delete"
+            app:drawable_location="left"
+            app:drawable_height="25dp"
+            app:drawable_width="25dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="10dp"
+            android:drawablePadding="5dp"
+            android:textColor="@color/text_clo"
+            android:textSize="18sp"
+            android:text="删除"/>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_delivery_select.xml b/app/src/main/res/layout/item_delivery_select.xml
new file mode 100644
index 0000000..6bf2a70
--- /dev/null
+++ b/app/src/main/res/layout/item_delivery_select.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:divider="@drawable/custom_rc_divider"
+    android:showDividers="middle"
+    android:padding="4dp"
+    android:background="@color/PureWhite">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:gravity="center_vertical">
+        <TextView
+            android:id="@+id/tv_delivery_receiver"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_weight="1"
+            android:gravity="left|center_vertical"
+            android:textColor="@color/text_clo"
+            android:textSize="18sp"
+            android:text="用户名" />
+        <TextView
+            android:id="@+id/tv_delivery_phone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="right|center_vertical"
+            android:layout_marginRight="5dp"
+            android:layout_weight="1"
+            android:textColor="@color/text_clo"
+            android:textSize="18sp"
+            android:text="手机号" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:gravity="center_vertical"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp">
+        <TextView
+            android:id="@+id/tv_delivery_location"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/text_clo"
+            android:textSize="18sp"
+            android:text="地址"
+            android:maxLines="2"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:gravity="center_vertical"
+        android:layout_marginLeft="10dp"
+        android:orientation="horizontal">
+        <RadioButton
+            android:id="@+id/rb_delivery_default"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="left|center_vertical"
+            android:textColor="@color/text_clo"
+            android:textSize="18sp"
+            android:text="设为默认"/>
+        <com.example.xmfy.yzubookshop.widget.RichText
+            android:id="@+id/tv_delivery_edit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            app:drawable_src="@mipmap/icon_delivery_edit"
+            app:drawable_location="left"
+            app:drawable_height="25dp"
+            app:drawable_width="25dp"
+            android:drawablePadding="5dp"
+            android:textColor="@color/text_clo"
+            android:textSize="18sp"
+            android:text="修改"/>
+
+        <com.example.xmfy.yzubookshop.widget.RichText
+            android:id="@+id/tv_delivery_delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            app:drawable_src="@mipmap/icon_delivery_delete"
+            app:drawable_location="left"
+            app:drawable_height="25dp"
+            app:drawable_width="25dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="10dp"
+            android:drawablePadding="5dp"
+            android:textColor="@color/text_clo"
+            android:textSize="18sp"
+            android:text="删除"/>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 447374e..5422009 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,12 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-    <color name="grey">#C8C5C5</color>
-    <color name="red">#DC0707</color>
-</resources>
\ No newline at end of file
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+    <color name="orange">#FF7F24</color>
+    <color name="BottomBar">#0F796B</color>
+    <color name="LightGreen">#B3D7D2</color>
+    <color name="White">#F5F5F5</color>
+    <color name="PureWhite">#FFFFFF</color>
+    <color name="Black">#000000</color>
+    <color name="border_clo">#ccc</color>
+    <color name="text_clo">#0D1D23</color>
+    <color name="editText_clo">#A2A2A2</color>
+    <color name="text_grey_darker">#4c4c4c</color>
+    <color name="text_grey">#959595</color>
+    <color name="LightSkyBlue">#87CEFA</color>
+    <color name="SpringGreen">#3CB371</color>
+    <color name="table_divider_color">#E6E6E6</color>
+    <color name="recyclerview_divider_color">#E6E6E6</color>
+    <color name="LakeBlue">#80CBC4</color>
+    <color name="DarkCyan">#008B8B</color>
+    <color name="PriceColor">#ED3A56</color>
+
+    <color name="icon_selling_edit">#C9C9CE</color>
+    <color name="icon_selling_delete">#F93F25</color>
+
+    <color name="menubar_default">#767676</color>
+    <color name="menubar_active">#E2752F</color>
+
+
+    <!-- color for book detail -->
+    <color name="PureBlack">#000000</color>
+    <color name="PriceOrange">#FD5300</color>
+    <color name="DefaultTextColor">#828282</color>
+
+    <!-- color for tag-->
+    <color name="tag_border">#FFFFFF</color>
+    <color name="tag_bg">#FFEBEA</color>
+    <color name="tag_text">#433837</color>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..58ac332
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,67 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:listDivider">@drawable/divider</item>
+    </style>
+
+    <!-- 最外层样式 -->
+    <style name="wrap_layout">
+        <item name="android:orientation">vertical</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_marginLeft">8dp</item>
+        <item name="android:layout_marginRight">8dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:padding">1px</item>
+        <item name="android:background">@drawable/bg_layout_shape</item>
+
+    </style>
+
+    <!-- 共用层样式 -->
+    <style name="base_layout">
+        <item name="android:orientation">horizontal</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingTop">16dp</item>
+        <item name="android:paddingBottom">16dp</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:paddingRight">12dp</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:focusable">true</item>
+        <item name="android:clickable">true</item>
+    </style>
+
+    <!-- textview样式 -->
+    <style name="usertext">
+        <item name="android:textSize">16dp</item>
+        <item name="android:textColor">@color/text_clo</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+    </style>
+
+
+    <!-- 文本右边箭头样式 -->
+    <style name="img_arrow">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:src">@drawable/setting_arrow</item>
+
+    </style>
+
+
+    <!-- view分割线样式 -->
+    <style name="bg_line">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1px</item>
+        <item name="android:background">@color/border_clo</item>
+    </style>
+
+
+
+</resources>