diff --git a/doc/~$无人物流管理系统需求构思及描述.docx b/doc/~$无人物流管理系统需求构思及描述.docx
deleted file mode 100644
index 17560ba..0000000
Binary files a/doc/~$无人物流管理系统需求构思及描述.docx and /dev/null differ
diff --git a/src/Logistics/.idea/deploymentTargetDropDown.xml b/src/Logistics/.idea/deploymentTargetDropDown.xml
index 458bd4f..e8919a9 100644
--- a/src/Logistics/.idea/deploymentTargetDropDown.xml
+++ b/src/Logistics/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="E:\SDK\avd\.android\avd\Pixel_XL_API_30.avd" />
+            <value value="D:\AndroidSDK\.android\.android\avd\Pixel_2_API_31.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-05-08T06:33:21.724571700Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-06-14T12:27:15.523840400Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/Logistics/.idea/misc.xml b/src/Logistics/.idea/misc.xml
index 7bf2527..92bf35a 100644
--- a/src/Logistics/.idea/misc.xml
+++ b/src/Logistics/.idea/misc.xml
@@ -33,6 +33,24 @@
         <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/pickup.xml" value="0.5" />
         <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/tab1.xml" value="0.10235507246376811" />
         <entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/top.xml" value="0.3717105263157895" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.1" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/drawable/bg_go.xml" value="0.255" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/drawable/border_input_box.xml" value="0.1" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/drawable/button_shape.xml" value="0.1" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/drawable/ic_launcher_background.xml" value="0.1" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/drawable/translucent_edit.xml" value="0.1555" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/activity_history.xml" value="0.2" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/activity_main.xml" value="0.264" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/activity_menu.xml" value="0.20652173913043478" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/activity_no_pick.xml" value="0.20652173913043478" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/activity_sign_up.xml" value="0.20652173913043478" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/forget.xml" value="0.20652173913043478" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/item.xml" value="0.20652173913043478" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/my_fragment1.xml" value="0.20652173913043478" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/my_fragment2.xml" value="0.20652173913043478" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/my_fragment3.xml" value="0.20652173913043478" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/pickup.xml" value="0.2" />
+        <entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.255" />
       </map>
     </option>
   </component>
diff --git a/src/Logistics/app/src/main/AndroidManifest.xml b/src/Logistics/app/src/main/AndroidManifest.xml
index bb8590b..1edd0cc 100644
--- a/src/Logistics/app/src/main/AndroidManifest.xml
+++ b/src/Logistics/app/src/main/AndroidManifest.xml
@@ -8,11 +8,11 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/logo"
         android:label="@string/app_name"
         android:usesCleartextTraffic="true"
         android:name="com.example.logistics.tools.RCApplication"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/logo"
         android:supportsRtl="true"
         android:theme="@style/Theme.Logistics">
         <activity
diff --git a/src/Logistics/app/src/main/java/com/example/logistics/tools/DBOpenHelper.java b/src/Logistics/app/src/main/java/com/example/logistics/tools/DBOpenHelper.java
index 73f0b02..3a5cef4 100644
--- a/src/Logistics/app/src/main/java/com/example/logistics/tools/DBOpenHelper.java
+++ b/src/Logistics/app/src/main/java/com/example/logistics/tools/DBOpenHelper.java
@@ -7,9 +7,9 @@ import java.sql.SQLException;
 public class DBOpenHelper {
     private static String diver = "com.mysql.jdbc.Driver";
     //加入utf-8是为了后面往表中输入中文，表中不会出现乱码的情况
-    private static String url = "jdbc:mysql://192.168.43.203:3306/logistics?characterEncoding=utf-8";
+    private static String url = "jdbc:mysql://192.168.43.139:3306/logistics?characterEncoding=utf-8";
     private static String user = "root";//用户名
-    private static String password = "";//密码
+    private static String password = "123...iamfan";//密码
     /*
      * 连接数据库
      * */
diff --git a/src/Logistics/app/src/main/res/drawable/bg_go.xml b/src/Logistics/app/src/main/res/drawable/bg_go.xml
new file mode 100644
index 0000000..6cf69fb
--- /dev/null
+++ b/src/Logistics/app/src/main/res/drawable/bg_go.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <corners android:radius="0dp" />   <!-- 设置圆角弧度 -->
+    <solid android:color="#FF7001" />   <!-- 设置背景颜色 -->
+    <size
+        android:width="40dp"
+        android:height="40dp" />
+    <stroke
+        android:width="0dp"
+        android:color="#fff" />
+</shape>
\ No newline at end of file
diff --git a/src/Logistics/app/src/main/res/drawable/login.png b/src/Logistics/app/src/main/res/drawable/login.png
new file mode 100644
index 0000000..0c9138d
Binary files /dev/null and b/src/Logistics/app/src/main/res/drawable/login.png differ
diff --git a/src/Logistics/app/src/main/res/layout/activity_main.xml b/src/Logistics/app/src/main/res/layout/activity_main.xml
index 9e033a5..d7bfeb4 100644
--- a/src/Logistics/app/src/main/res/layout/activity_main.xml
+++ b/src/Logistics/app/src/main/res/layout/activity_main.xml
@@ -9,19 +9,22 @@
         android:id="@+id/linearLayout2"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#F5F5F5"
+        android:background="#EAF1F1"
         android:orientation="vertical">
 
         <!--Logo-->
+
+
+        <!--嵌套线性布局-->
+
         <ImageView
             android:id="@+id/LogoImage"
-            android:layout_width="match_parent"
-            android:layout_height="160dp"
-            android:layout_marginTop="100dp"
+            android:layout_width="505dp"
+            android:layout_height="256dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="30dp"
             android:src="@drawable/logo" />
 
-
-        <!--嵌套线性布局-->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -37,16 +40,18 @@
                 <EditText
                     android:id="@+id/UserNameEdit"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_marginLeft="20dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginRight="20dp"
                     android:layout_marginBottom="15dp"
                     android:background="@drawable/translucent_edit"
+                    android:gravity="center"
                     android:hint="输入用户名"
+                    android:maxLines="1"
                     android:padding="15dp"
                     android:singleLine="true"
-                    android:textSize="24dp" />
+                    android:textSize="20sp" />
 
             </LinearLayout>
 
@@ -55,7 +60,6 @@
                 android:id="@+id/PassWordLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-
                 <!--密码输入-->
                 <EditText
                     android:id="@+id/PassWordEdit"
@@ -66,74 +70,84 @@
                     android:layout_marginRight="20dp"
                     android:layout_marginBottom="15dp"
                     android:background="@drawable/translucent_edit"
+                    android:gravity="center"
                     android:hint="输入用户密码"
                     android:inputType="textPassword"
                     android:maxLength="16"
+                    android:maxLines="1"
                     android:padding="15dp"
                     android:singleLine="true"
-                    android:textSize="24dp" />
+                    android:textSize="20sp" />
 
             </LinearLayout>
 
             <!--嵌套线性布局-->
+
+            <Button
+                android:id="@+id/phonenum"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginTop="0dp"
+                android:background="#00000000"
+
+                android:text="手机号登录" />
+
             <LinearLayout
                 android:id="@+id/LayoutButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:layout_height="129dp"
+                android:gravity="center"
                 android:orientation="horizontal">
 
                 <!--登录按钮-->
-                <Button
-                    android:id="@+id/LoginButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="15dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/translucent_button"
-                    android:padding="15dp"
-                    android:text="登   录"
-                    android:textColor="@color/white"
-                    android:textSize="24dp" />
 
                 <!--注册按钮-->
+
                 <Button
-                    android:id="@+id/SignUpButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="15dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/translucent_button"
-                    android:padding="15dp"
-                    android:text="注   册"
-                    android:textColor="@color/white"
-                    android:textSize="24dp" />
+                    android:id="@+id/LoginButton"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
 
+
+                    android:layout_marginTop="20dp"
+                    android:background="@drawable/login"
+                    android:padding="15dp"
+                    android:visibility="visible" />
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
 
-                <Button
-                    android:id="@+id/forget"
-                    android:layout_width="wrap_content"
-                    android:layout_height="20dp"
-                    android:layout_marginLeft="15dp"
-                    android:background="#F5F5F5"
-                    android:text="忘记密码" />
+        </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="79dp"
+            android:layout_margin="10dp"
+            android:layout_weight="2"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/SignUpButton"
+                android:layout_width="174dp"
+                android:layout_height="45dp"
+                android:layout_gravity="bottom"
+                android:layout_marginLeft="15dp"
+                android:background="#00000000"
+                android:text="注   册"
+                android:textSize="18dp" />
+
+            <Button
+                android:id="@+id/forget"
+                android:layout_width="170dp"
+                android:layout_height="45dp"
+                android:layout_gravity="bottom"
+                android:layout_marginLeft="15dp"
+                android:background="#00000000"
+                android:text="忘记密码"
+                android:textSize="18dp" />
 
-                <Button
-                    android:id="@+id/phonenum"
-                    android:layout_width="249dp"
-                    android:layout_height="20dp"
-                    android:background="#F5F5F5"
-                    android:gravity="right"
-                    android:text="手机号登录" />
+        </LinearLayout>
 
-            </LinearLayout>
 
-        </LinearLayout>
     </LinearLayout>
 
 
diff --git a/src/Logistics/app/src/main/res/layout/activity_no_pick.xml b/src/Logistics/app/src/main/res/layout/activity_no_pick.xml
index 38ae3b8..4321808 100644
--- a/src/Logistics/app/src/main/res/layout/activity_no_pick.xml
+++ b/src/Logistics/app/src/main/res/layout/activity_no_pick.xml
@@ -26,14 +26,6 @@
             android:layout_marginLeft="100dp"
             android:src="@drawable/sync" />
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="入库时间  "
-            android:background="@color/blue"
-            android:textColor="#FFFFFF"
-            android:textSize="25dp"
-            android:gravity="right|center_vertical"/>
     </LinearLayout>
 
 
@@ -44,6 +36,15 @@
             android:id="@+id/lv_nopick"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" >
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/blue"
+                android:gravity="right|center_vertical"
+                android:text="入库时间  "
+                android:textColor="#FFFFFF"
+                android:textSize="25dp" />
         </ListView>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/Logistics/app/src/main/res/layout/activity_sign_up.xml b/src/Logistics/app/src/main/res/layout/activity_sign_up.xml
index 87ade65..9d9a60e 100644
--- a/src/Logistics/app/src/main/res/layout/activity_sign_up.xml
+++ b/src/Logistics/app/src/main/res/layout/activity_sign_up.xml
@@ -44,6 +44,7 @@
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
                     android:background="@drawable/translucent_edit"
+                    android:gravity="center"
                     android:hint="输入用户名"
                     android:textSize="24dp"
                     android:singleLine="true" />
@@ -68,6 +69,7 @@
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
                     android:background="@drawable/translucent_edit"
+                    android:gravity="center"
                     android:hint="输入密码"
                     android:textSize="24dp"
                     android:maxLength="16"
@@ -94,6 +96,7 @@
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
                     android:background="@drawable/translucent_edit"
+                    android:gravity="center"
                     android:hint="再次输入密码"
                     android:maxLength="16"
                     android:textSize="24dp"
@@ -120,6 +123,7 @@
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
                     android:background="@drawable/translucent_edit"
+                    android:gravity="center"
                     android:hint="输入手机号码"
                     android:textSize="24dp"
                     android:maxLength="16"
@@ -139,10 +143,11 @@
                     android:id="@+id/SignUpButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:padding="15dp"
-                    android:layout_margin="15dp"
+                    android:layout_marginTop="70dp"
+
                     android:layout_weight="1"
                     android:background="@drawable/translucent_button"
+                    android:padding="15dp"
                     android:text="立即注册"
                     android:textColor="@color/white"
                     android:textSize="24dp" />
@@ -152,12 +157,12 @@
                     android:id="@+id/BackLoginButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:padding="15dp"
-                    android:layout_margin="15dp"
+                    android:layout_marginTop="70dp"
                     android:layout_weight="1"
-                    android:textColor="@color/white"
                     android:background="@drawable/translucent_button"
+                    android:padding="15dp"
                     android:text="返回登录"
+                    android:textColor="@color/white"
                     android:textSize="24dp" />
 
             </LinearLayout>
diff --git a/src/Logistics/app/src/main/res/layout/forget.xml b/src/Logistics/app/src/main/res/layout/forget.xml
index acc385b..c2f5e00 100644
--- a/src/Logistics/app/src/main/res/layout/forget.xml
+++ b/src/Logistics/app/src/main/res/layout/forget.xml
@@ -1,37 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center">
+    android:background="#90376997"
+    android:gravity="center"
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
+
         <EditText
+            android:id="@+id/fphonenum"
             android:layout_width="200dp"
             android:layout_height="wrap_content"
-            android:id="@+id/fphonenum"
-            android:hint="请输入注册时手机号"
-            />
+            android:hint="请输入注册时手机号" />
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
+
         <EditText
+            android:id="@+id/fpassword"
             android:layout_width="200dp"
             android:layout_height="wrap_content"
-            android:id="@+id/fpassword"
-            android:hint="请输入新密码"
-            />
+            android:hint="请输入新密码" />
     </LinearLayout>
+
     <Button
+        android:id="@+id/change"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="修改"
-        android:id="@+id/change"/>
+        android:text="修改" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/Logistics/app/src/main/res/layout/my_fragment1.xml b/src/Logistics/app/src/main/res/layout/my_fragment1.xml
index b84f84d..b7fce86 100644
--- a/src/Logistics/app/src/main/res/layout/my_fragment1.xml
+++ b/src/Logistics/app/src/main/res/layout/my_fragment1.xml
@@ -15,54 +15,57 @@
             android:layout_marginTop="100dp"
             android:orientation="vertical">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    style="@style/InputBoxStyle">
+            <LinearLayout
+                style="@style/InputBoxStyle"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
-                    <EditText
-                        android:id="@+id/Sea_PickUpCode"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="输入取件码"
-                        android:padding="15dp"
-                        android:singleLine="true"
-                        android:textSize="24dp"
-                        style="@style/EditTextStyle"/>
-                </LinearLayout>
+                <EditText
+                    android:id="@+id/Sea_PickUpCode"
+                    style="@style/EditTextStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:hint="输入取件码"
+                    android:padding="15dp"
+                    android:singleLine="true"
+                    android:textSize="24dp" />
+            </LinearLayout>
 
             <LinearLayout
+                style="@style/InputBoxStyle"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="20dp"
-                style="@style/InputBoxStyle">
+                android:layout_marginTop="20dp">
 
                 <EditText
                     android:id="@+id/Sea_PhoneNum"
+                    style="@style/EditTextStyle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:gravity="center"
                     android:hint="输入手机尾号后四位"
                     android:padding="15dp"
                     android:singleLine="true"
-                    android:textSize="24dp"
-                    style="@style/EditTextStyle"/>
+                    android:textSize="24dp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="245dp"
                 android:layout_marginTop="50dp"
-                android:orientation="horizontal"
-                android:gravity="center">
+                android:gravity="center"
+                android:orientation="horizontal">
 
                 <Button
                     android:id="@+id/Sea_Button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
                     android:background="@drawable/button_shape"
                     android:text="查询"
                     android:textColor="@color/white"
-                    android:textSize="38dp"/>
+                    android:textSize="38dp" />
 
             </LinearLayout>
         </LinearLayout>
diff --git a/src/Logistics/app/src/main/res/layout/my_fragment2.xml b/src/Logistics/app/src/main/res/layout/my_fragment2.xml
index 00f578a..d75533e 100644
--- a/src/Logistics/app/src/main/res/layout/my_fragment2.xml
+++ b/src/Logistics/app/src/main/res/layout/my_fragment2.xml
@@ -6,27 +6,40 @@
     android:padding="5dp"
     android:background="#F5F5F5">
 
+
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
+        android:layout_height="626dp"
+        android:gravity="center"
+
+        android:orientation="vertical">
+
+
+        <ImageView
+            android:id="@+id/logoImage"
+            android:layout_width="match_parent"
+            android:layout_height="272dp"
+            android:layout_alignParentTop="true"
+            android:layout_marginTop="0dp"
+            android:src="@drawable/logo" />
 
-        android:gravity="center">
         <WebView
             android:id="@+id/webview"
             android:layout_width="0dp"
-            android:layout_height="0dp"/>
+            android:layout_height="0dp" />
 
         <Button
             android:id="@+id/Pick_Button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/button_shape"
+            android:layout_width="158dp"
+            android:layout_height="158dp"
+            android:layout_marginTop="50dp"
+            android:layout_weight="0"
             android:width="200dp"
             android:height="200dp"
+            android:background="@drawable/button_shape"
             android:text="取件"
             android:textColor="@color/white"
-            android:textSize="38dp"/>
+            android:textSize="38dp" />
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/Logistics/app/src/main/res/layout/my_fragment3.xml b/src/Logistics/app/src/main/res/layout/my_fragment3.xml
index 4945bcd..79c7e2a 100644
--- a/src/Logistics/app/src/main/res/layout/my_fragment3.xml
+++ b/src/Logistics/app/src/main/res/layout/my_fragment3.xml
@@ -6,23 +6,31 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#F5F5F5"
+        android:background="#FAF9F9"
         android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:gravity="center">
+            android:gravity="center"
+            android:orientation="vertical">
+
 
             <ImageView
-                android:id="@+id/userLogo"
-                android:layout_width="match_parent"
-                android:layout_height="160dp"
-                android:layout_marginTop="100dp"
+                android:id="@+id/LogoImage"
+                android:layout_width="505dp"
+                android:layout_height="256dp"
+                android:layout_gravity="center"
+                android:layout_marginTop="30dp"
                 android:src="@drawable/logo" />
+
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_gravity="bottom"
+            android:background="#F4F2F2" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -32,65 +40,65 @@
 
             <LinearLayout
                 android:id="@+id/waiting"
-                android:clickable="true"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:clickable="true"
                 android:orientation="horizontal">
 
                 <TextView
 
-                    android:layout_width="wrap_content"
+                    android:layout_width="133dp"
                     android:layout_height="wrap_content"
-                    android:background="#ffffff"
-                    android:text="待取件"
-                    android:padding="15dp"
+                    android:background="#EDE9E9"
                     android:clickable="false"
-                    android:textSize="24dp"
-                    />
+                    android:padding="15dp"
+                    android:text=" 待取件"
+                    android:textSize="24dp" />
+
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="#FFFFFF"
+                    android:clickable="false"
                     android:gravity="right|center_vertical"
                     android:text="> "
-                    android:clickable="false"
-                    android:textSize="24dp"/>
+                    android:textSize="24dp" />
 
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/history"
                 android:layout_width="match_parent"
-                android:clickable="true"
                 android:layout_height="match_parent"
                 android:layout_marginTop="20dp"
+                android:clickable="true"
                 android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="#ffffff"
-                    android:text="历史取件"
-                    android:padding="15dp"
                     android:clickable="false"
-                    android:textSize="24dp"
-                    />
+                    android:padding="15dp"
+                    android:text=" 历史取件"
+                    android:textSize="24dp" />
+
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="#FFFFFF"
+                    android:clickable="false"
                     android:gravity="right|center_vertical"
                     android:text="> "
-                    android:clickable="false"
-                    android:textSize="24dp"/>
+                    android:textSize="24dp" />
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/exit"
-                android:clickable="true"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginTop="20dp"
+                android:clickable="true"
                 android:orientation="horizontal">
 
                 <TextView
@@ -98,19 +106,19 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="#ffffff"
-                    android:text="退出登录"
-                    android:padding="15dp"
                     android:clickable="false"
-                    android:textSize="24dp"
-                    />
+                    android:padding="15dp"
+                    android:text=" 退出登录"
+                    android:textSize="24dp" />
+
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:background="#FFFFFF"
+                    android:clickable="false"
                     android:gravity="right|center_vertical"
                     android:text="> "
-                    android:clickable="false"
-                    android:textSize="24dp"/>
+                    android:textSize="24dp" />
             </LinearLayout>
 
         </LinearLayout>
diff --git a/src/Logistics/app/src/main/res/layout/pickup.xml b/src/Logistics/app/src/main/res/layout/pickup.xml
index 6a8c944..b30423a 100644
--- a/src/Logistics/app/src/main/res/layout/pickup.xml
+++ b/src/Logistics/app/src/main/res/layout/pickup.xml
@@ -1,37 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center">
+    android:gravity="center|top"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/logoImage"
+        android:layout_width="match_parent"
+        android:layout_height="272dp"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="50dp"
+        android:src="@drawable/logo" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-        <EditText
-            android:layout_width="200dp"
-            android:layout_height="wrap_content"
-            android:id="@+id/pk_PickUp"
-            android:hint="请输入取件码"
-            />
+
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-        <EditText
-            android:layout_width="200dp"
-            android:layout_height="wrap_content"
-            android:id="@+id/pk_PhoneNum"
-            android:hint="请输入手机尾号后四位"
-            />
+
     </LinearLayout>
+
+    <EditText
+        android:id="@+id/pk_PickUp"
+        android:layout_width="256dp"
+        android:layout_height="wrap_content"
+        android:background="@drawable/translucent_edit"
+        android:layout_marginTop="40dp"
+        android:gravity="center"
+        android:hint="请输入取件码" />
+
+    <EditText
+        android:id="@+id/pk_PhoneNum"
+        android:layout_width="256dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/translucent_edit"
+        android:gravity="center"
+        android:hint="请输入手机尾号后四位" />
+
     <Button
-        android:layout_width="wrap_content"
+        android:id="@+id/pk_button"
+        android:layout_width="137dp"
         android:layout_height="wrap_content"
-        android:text="取件"
-        android:id="@+id/pk_button"/>
+        android:layout_marginTop="70dp"
+        android:background="@drawable/translucent_button"
+        android:text="取  件"
+        android:textColor="@color/white"
+        android:textSize="20sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/Logistics/app/src/main/res/values/colors.xml b/src/Logistics/app/src/main/res/values/colors.xml
index eaa3847..273b6d8 100644
--- a/src/Logistics/app/src/main/res/values/colors.xml
+++ b/src/Logistics/app/src/main/res/values/colors.xml
@@ -6,7 +6,151 @@
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
+
     <color name="blue">#FF0000FF</color>
     <color name="gray">#FF999999</color>
+    <color name="white">#ffffff</color>
+    <color name="ivory">#fffff0</color>
+    <color name="lightyellow">#ffffe0</color>
+    <color name="yellow">#ffff00</color>
+    <color name="snow">#fffafa</color>
+    <color name="floralwhite">#fffaf0</color>
+    <color name="lemonchiffon">#fffacd</color>
+    <color name="cornsilk">#fff8dc</color>
+    <color name="seaShell">#fff5ee</color>
+    <color name="lavenderblush">#fff0f5</color>
+    <color name="papayawhip">#ffefd5</color>
+    <color name="blanchedalmond">#ffebcd</color>
+    <color name="mistyrose">#ffe4e1</color>
+    <color name="bisque">#ffe4c4</color>
+    <color name="moccasin">#ffe4b5</color>
+    <color name="navajowhite">#ffdead</color>
+    <color name="peachpuff">#ffdab9</color>
+    <color name="gold">#ffd700</color>
+    <color name="pink">#ffc0cb</color>
+    <color name="lightpink">#ffb6c1</color>
+    <color name="orange">#ffa500</color>
+    <color name="lightsalmon">#ffa07a</color>
+    <color name="darkorange">#ff8c00</color>
+    <color name="coral">#ff7f50</color>
+    <color name="hotpink">#ff69b4</color>
+    <color name="tomato">#ff6347</color>
+    <color name="orangered">#ff4500</color>
+    <color name="deeppink">#ff1493</color>
+    <color name="fuchsia">#ff00ff</color>
+    <color name="magenta">#ff00ff</color>
+    <color name="red">#ff0000</color>
+    <color name="oldlace">#fdf5e6</color>
+    <color name="lightgoldenrodyellow">#fafad2</color>
+    <color name="linen">#faf0e6</color>
+    <color name="antiquewhite">#faebd7</color>
+    <color name="salmon">#fa8072</color>
+    <color name="ghostwhite">#f8f8ff</color>
+    <color name="mintcream">#f5fffa</color>
+    <color name="whitesmoke">#f5f5f5</color>
+    <color name="beige">#f5f5dc</color>
+    <color name="wheat">#f5deb3</color>
+    <color name="sandybrown">#f4a460</color>
+    <color name="azure">#f0ffff</color>
+    <color name="honeydew">#f0fff0</color>
+    <color name="aliceblue">#f0f8ff</color>
+    <color name="khaki">#f0e68c</color>
+    <color name="lightcoral">#f08080</color>
+    <color name="palegoldenrod">#eee8aa</color>
+    <color name="violet">#ee82ee</color>
+    <color name="darksalmon">#e9967a</color>
+    <color name="lavender">#e6e6fa</color>
+    <color name="lightcyan">#e0ffff</color>
+    <color name="burlywood">#deb887</color>
+    <color name="plum">#dda0dd</color>
+    <color name="gainsboro">#dcdcdc</color>
+    <color name="crimson">#dc143c</color>
+    <color name="palevioletred">#db7093</color>
+    <color name="goldenrod">#daa520</color>
+    <color name="orchid">#da70d6</color>
+    <color name="thistle">#d8bfd8</color>
+    <color name="lightgray">#d3d3d3</color>
+    <color name="lightgrey">#d3d3d3</color>
+    <color name="tan">#d2b48c</color>
+    <color name="chocolate">#d2691e</color>
+    <color name="peru">#cd853f</color>
+    <color name="indianred">#cd5c5c</color>
+    <color name="mediumvioletred">#c71585</color>
+    <color name="silver">#c0c0c0</color>
+    <color name="darkkhaki">#bdb76b</color>
+    <color name="rosybrown">#bc8f8f</color>
+    <color name="mediumorchid">#ba55d3</color>
+    <color name="darkgoldenrod">#b8860b</color>
+    <color name="firebrick">#b22222</color>
+    <color name="powderblue">#b0e0e6</color>
+    <color name="lightsteelblue">#b0c4de</color>
+    <color name="paleturquoise">#afeeee</color>
+    <color name="greenyellow">#adff2f</color>
+    <color name="lightblue">#add8e6</color>
+    <color name="darkgray">#a9a9a9</color>
+    <color name="darkgrey">#a9a9a9</color>
+    <color name="brown">#a52a2a</color>
+    <color name="sienna">#a0522d</color>
+    <color name="darkorchid">#9932cc</color>
+    <color name="palegreen">#98fb98</color>
+    <color name="darkviolet">#9400d3</color>
+    <color name="mediumpurple">#9370db</color>
+    <color name="lightgreen">#90ee90</color>
+    <color name="darkseagreen">#8fbc8f</color>
+    <color name="saddlebrown">#8b4513</color>
+    <color name="darkmagenta">#8b008b</color>
+    <color name="darkred">#8b0000</color>
+    <color name="blueviolet">#8a2be2</color>
+    <color name="lightskyblue">#87cefa</color>
+    <color name="skyblue">#87ceeb</color>
+    <color name="grey">#808080</color>
+    <color name="olive">#808000</color>
+    <color name="purple">#800080</color>
+    <color name="maroon">#800000</color>
+    <color name="aquamarine">#7fffd4</color>
+    <color name="chartreuse">#7fff00</color>
+    <color name="lawngreen">#7cfc00</color>
+    <color name="mediumslateblue">#7b68ee</color>
+    <color name="lightslategray">#778899</color>
+    <color name="lightslategrey">#778899</color>
+    <color name="slategray">#708090</color>
+    <color name="slategrey">#708090</color>
+    <color name="olivedrab">#6b8e23</color>
+    <color name="slateblue">#6a5acd</color>
+    <color name="dimgrey">#696969</color>
+    <color name="mediumaquamarine">#66cdaa</color>
+    <color name="cornflowerblue">#6495ed</color>
+    <color name="cadetblue">#5f9ea0</color>
+    <color name="darkolivegreen">#556b2f</color>
+    <color name="indigo">#4b0082</color>
+    <color name="mediumturquoise">#48d1cc</color>
+    <color name="darkslateblue">#483d8b</color>
+    <color name="steelblue">#4682b4</color>
+    <color name="royalblue">#4169e1</color>
+    <color name="turquoise">#40e0d0</color>
+    <color name="mediumseagreen">#3cb371</color>
+    <color name="limegreen">#32cd32</color>
+    <color name="darkslategray">#2f4f4f</color>
+    <color name="darkslategrey">#2f4f4f</color>
+    <color name="seagreen">#2e8b57</color>
+    <color name="forestgreen">#228b22</color>
+    <color name="lightseagreen">#20b2aa</color>
+    <color name="dodgerblue">#1e90ff</color>
+    <color name="midnightblue">#191970</color>
+    <color name="aqua">#00ffff</color>
+    <color name="cyan">#00ffff</color>
+    <color name="springgreen">#00ff7f</color>
+    <color name="lime">#00ff00</color>
+    <color name="mediumspringgreen">#00fa9a</color>
+    <color name="darkturquoise">#00ced1</color>
+    <color name="deepskyblue">#00bfff</color>
+    <color name="darkcyan">#008b8b</color>
+    <color name="teal">#008080</color>
+    <color name="green">#008000</color>
+    <color name="darkgreen">#006400</color>
+
+    <color name="mediumblue">#0000cd</color>
+    <color name="darkblue">#00008b</color>
+    <color name="navy">#000080</color>
+
 </resources>
\ No newline at end of file
diff --git a/src/Logistics/gradle.properties b/src/Logistics/gradle.properties
index f9e65bb..946c2d4 100644
--- a/src/Logistics/gradle.properties
+++ b/src/Logistics/gradle.properties
@@ -19,4 +19,5 @@ android.useAndroidX=true
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
+android.overridePathCheck=true
\ No newline at end of file