diff --git a/app/build.gradle b/app/build.gradle
index 2cd4448..4632b70 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 30
     buildToolsVersion "30.0.0"
 
     defaultConfig {
         applicationId "com.shuyue.snack"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 30
         versionCode 2
         versionName '1.1'
 
diff --git a/app/src/main/java/com/android/jingdong/adaptor/TaobaoLeftAdapter.java b/app/src/main/java/com/android/jingdong/adaptor/TaobaoLeftAdapter.java
index f44e0ae..41c21eb 100644
--- a/app/src/main/java/com/android/jingdong/adaptor/TaobaoLeftAdapter.java
+++ b/app/src/main/java/com/android/jingdong/adaptor/TaobaoLeftAdapter.java
@@ -11,7 +11,7 @@ import java.util.List;
 public class TaobaoLeftAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
 
     public TaobaoLeftAdapter(List<String> types) {
-        super(R.layout.item_taobao_left, types);
+        super(R.layout.item_jingdong_left, types);
     }
 
     /**
diff --git a/app/src/main/java/com/android/jingdong/adaptor/TaobaoRightAdapter.java b/app/src/main/java/com/android/jingdong/adaptor/TaobaoRightAdapter.java
index 5fec983..28a20df 100644
--- a/app/src/main/java/com/android/jingdong/adaptor/TaobaoRightAdapter.java
+++ b/app/src/main/java/com/android/jingdong/adaptor/TaobaoRightAdapter.java
@@ -12,7 +12,7 @@ import java.util.List;
 public class TaobaoRightAdapter extends BaseQuickAdapter<JD, BaseViewHolder> {
 
     public TaobaoRightAdapter(List<JD> JDS) {
-        super(R.layout.item_taobao_right, JDS);
+        super(R.layout.item_jingdong_right, JDS);
     }
 
     @Override
diff --git a/app/src/main/java/com/android/jingdong/data/DataServer.java b/app/src/main/java/com/android/jingdong/data/DataServer.java
index 3b4f77a..e334ece 100644
--- a/app/src/main/java/com/android/jingdong/data/DataServer.java
+++ b/app/src/main/java/com/android/jingdong/data/DataServer.java
@@ -37,12 +37,13 @@ public class DataServer {
     public static List<JD> getHomeList() {
         if (homeList == null) {
             homeList = new ArrayList<JD>() {{
-                add(new JD("苹果13", 5999, R.mipmap.sp1, "苹果13一般指iPhone 13。 iPhone 13是美国苹果公司于北京时间2021年9月15日凌晨1点在Apple Park发布的iPhone手机。"));
-                add(new JD("华为mate40", 5888, R.mipmap.sp2, "华为Mate40一般指HUAWEI Mate 40。 HUAWEI Mate 40是华为公司于2020年10月22日发布的手机，于2020年12月21日上市。"));
+                add(new JD("苹果14", 10999, R.mipmap.sp1, "iPhone 14是苹果公司（Apple）于2022年9月8日发布的手机产品。\n"));
+                add(new JD("华为mate40pro", 5888, R.mipmap.sp2, "华为Mate40pro一般指HUAWEI Mate 40pro。 HUAWEI Mate 40pro是华为公司于2020年10月22日发布的手机，于2020年12月21日上市。"));
                 add(new JD("联想Y9000P", 8999, R.mipmap.sp3, "联想Y9000P采用了双面金属设计，搭载16英寸四边窄边框屏，2560*1600 分辨率，165Hz刷新率，500nit亮度，100%sRGB色域，HDR400认证，支持杜比视界。"));
                 add(new JD("暗影精灵8", 8699, R.mipmap.sp4, "暗影精灵8 Plus，搭载全新i7处理器，全系标配DDR5 4800MHz双通道内存，还有游戏级PCle 4.0 SSD加持，游戏载入少等待、尽情存储少焦虑。"));
-                add(new JD("海盗船K100", 1299, R.mipmap.sp5, "海盗船K100键盘采用的是悬浮式按键设计，搭配高品质精密二色注塑PBT透光键帽，1.5mm的厚度超耐用，防滑性能很好，使用手感非常赞。"));
-                add(new JD("罗技G502", 229, R.mipmap.sp6, "罗技G502游戏鼠标，在配重，平衡及追踪表面的适应性需要有更好的提升，尽可能满足每一位玩家的精确需求。"));
+                add(new JD("海蓝之谜", 3099, R.mipmap.sp5, "海蓝之谜（LA MER）保湿修护套装(精萃水+面霜)护肤品套装化妆品礼盒生日礼物女预售"));
+                add(new JD("雅诗兰黛", 2685, R.mipmap.sp6, "雅诗兰黛修护礼盒(棕瓶50ml+樱花水200ml+胶原霜50ml)护肤品化妆品套装\n"));
+                add(new JD("SK-II", 2685, R.mipmap.sp7, "SK-II神仙水75ml精华液sk2全明星晶透礼盒护肤品套装生日礼物女skii\n"));
 
             }};
         }
@@ -57,7 +58,7 @@ public class DataServer {
             snackOrderList = new ArrayList<String>() {{
                 add("手机");
                 add("电脑");
-                add("电子配件");
+                add("美妆");
 //                add("鼠标");
 //                add("耳机");
             }};
@@ -71,8 +72,8 @@ public class DataServer {
     public static List<JD> getFujianList() {
         if (fujianList == null) {
             fujianList = new ArrayList<JD>() {{
-                add(new JD("苹果13", 5999, R.mipmap.sp1, "苹果13一般指iPhone 13。 iPhone 13是美国苹果公司于北京时间2021年9月15日凌晨1点在Apple Park发布的iPhone手机。"));
-                add(new JD("华为mate40", 5888, R.mipmap.sp2, "华为Mate40一般指HUAWEI Mate 40。 HUAWEI Mate 40是华为公司于2020年10月22日发布的手机，于2020年12月21日上市。"));
+                add(new JD("苹果14", 10999, R.mipmap.sp1, "iPhone 14是苹果公司（Apple）于2022年9月8日发布的手机产品。\n"));
+                add(new JD("华为mate40pro", 5888, R.mipmap.sp2, "华为Mate40pro一般指HUAWEI Mate 40pro。 HUAWEI Mate 40pro是华为公司于2020年10月22日发布的手机，于2020年12月21日上市。"));
 
             }};
         }
@@ -98,8 +99,10 @@ public class DataServer {
     public static List<JD> getGuangzhouList() {
         if (guangzhouList == null) {
             guangzhouList = new ArrayList<JD>() {{
-                add(new JD("海盗船K100", 1299, R.mipmap.sp5, "海盗船K100键盘采用的是悬浮式按键设计，搭配高品质精密二色注塑PBT透光键帽，1.5mm的厚度超耐用，防滑性能很好，使用手感非常赞。"));
-                add(new JD("罗技G502", 229, R.mipmap.sp6, "罗技G502游戏鼠标，在配重，平衡及追踪表面的适应性需要有更好的提升，尽可能满足每一位玩家的精确需求。"));
+                add(new JD("海蓝之谜", 3099, R.mipmap.sp5, "海蓝之谜（LA MER）保湿修护套装(精萃水+面霜)护肤品套装化妆品礼盒生日礼物女预售"));
+                add(new JD("雅诗兰黛", 2685, R.mipmap.sp6, "雅诗兰黛修护礼盒(棕瓶50ml+樱花水200ml+胶原霜50ml)护肤品化妆品套装\n"));
+                add(new JD("SK-II", 2685, R.mipmap.sp7, "SK-II神仙水75ml精华液sk2全明星晶透礼盒护肤品套装生日礼物女skii\n"));
+
             }};
         }
         return guangzhouList;
@@ -135,7 +138,7 @@ public class DataServer {
     public static List<User> getAccountList() {
         if (accountList == null) {
             accountList = new ArrayList<User>() {{
-                add(new User("123456", "123", "小新", R.drawable.one4));
+                add(new User("luokaiwen", "123456", "帅哥", R.drawable.one4));
             }};
         }
         return accountList;
diff --git a/app/src/main/java/com/android/jingdong/ui/JD/TaobaoFragment.java b/app/src/main/java/com/android/jingdong/ui/JD/JingDongFragment.java
similarity index 95%
rename from app/src/main/java/com/android/jingdong/ui/JD/TaobaoFragment.java
rename to app/src/main/java/com/android/jingdong/ui/JD/JingDongFragment.java
index 0ffa122..0dcce92 100644
--- a/app/src/main/java/com/android/jingdong/ui/JD/TaobaoFragment.java
+++ b/app/src/main/java/com/android/jingdong/ui/JD/JingDongFragment.java
@@ -29,9 +29,9 @@ import java.util.Objects;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class TaobaoFragment extends Fragment {
+public class JingDongFragment extends Fragment {
 
-    private TaobaoViewModel taobaoViewModel;
+    private JingDongViewModel jingDongViewModel;
 
     // 乐器页面左边列表已选择的Position
     private int leftSelectPosition = 0;
@@ -45,14 +45,14 @@ public class TaobaoFragment extends Fragment {
     // 右边适配器
     private TaobaoRightAdapter rightAdapter;
 
-    public static TaobaoFragment newInstance() {
-        return new TaobaoFragment();
+    public static JingDongFragment newInstance() {
+        return new JingDongFragment();
     }
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
-        taobaoViewModel = ViewModelProviders.of(this).get(TaobaoViewModel.class);
+        jingDongViewModel = ViewModelProviders.of(this).get(JingDongViewModel.class);
         View root = inflater.inflate(R.layout.fragment_snack, container, false);
         // 绑定资源
         ButterKnife.bind(this, root);
diff --git a/app/src/main/java/com/android/jingdong/ui/JD/TaobaoViewModel.java b/app/src/main/java/com/android/jingdong/ui/JD/JingDongViewModel.java
similarity index 80%
rename from app/src/main/java/com/android/jingdong/ui/JD/TaobaoViewModel.java
rename to app/src/main/java/com/android/jingdong/ui/JD/JingDongViewModel.java
index 0f4f1c0..40fc0be 100644
--- a/app/src/main/java/com/android/jingdong/ui/JD/TaobaoViewModel.java
+++ b/app/src/main/java/com/android/jingdong/ui/JD/JingDongViewModel.java
@@ -4,11 +4,11 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MediatorLiveData;
 import androidx.lifecycle.ViewModel;
 
-public class TaobaoViewModel extends ViewModel {
+public class JingDongViewModel extends ViewModel {
 
     private MediatorLiveData<String> mText;
 
-    public TaobaoViewModel() {
+    public JingDongViewModel() {
         mText = new MediatorLiveData<>();
         mText.setValue("点单页面");
     }
diff --git a/app/src/main/res/drawable/one4.png b/app/src/main/res/drawable/one4.png
index 84cdbdb..42175de 100644
Binary files a/app/src/main/res/drawable/one4.png and b/app/src/main/res/drawable/one4.png differ
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index 1128945..447610e 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -31,7 +31,7 @@
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="淘宝"
+        android:text="京东"
         android:textSize="30dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_my.xml b/app/src/main/res/layout/fragment_my.xml
index 6d99ac6..15afa23 100644
--- a/app/src/main/res/layout/fragment_my.xml
+++ b/app/src/main/res/layout/fragment_my.xml
@@ -259,182 +259,238 @@
                     android:textSize="18sp"
                     tools:ignore="RtlSymmetry" />
 
-                <LinearLayout
-                    android:id="@+id/myGeneralView"
+                <View
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/my_general_setting"
-                    android:orientation="vertical"
-                    android:visibility="gone">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <CheckBox
-                            android:id="@+id/checkBox"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="24dp"
-                            android:text="不要葱"
-                            android:visibility="gone"
-                            app:layout_constraintStart_toStartOf="@+id/guideline3"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <CheckBox
-                            android:id="@+id/checkBox2"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:text="不要香菜"
-                            android:visibility="gone"
-
-                            app:layout_constraintStart_toStartOf="@+id/guideline3"
-                            app:layout_constraintTop_toBottomOf="@+id/checkBox" />
-
-                        <CheckBox
-                            android:id="@+id/checkBox4"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:text="不要蒜"
-                            android:visibility="gone"
-
-                            app:layout_constraintStart_toStartOf="@+id/guideline3"
-                            app:layout_constraintTop_toBottomOf="@+id/checkBox2" />
-
-                        <CheckBox
-                            android:id="@+id/checkBox5"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:text="不要动物油"
-                            android:visibility="gone"
-
-                            app:layout_constraintStart_toStartOf="@+id/guideline3"
-                            app:layout_constraintTop_toBottomOf="@+id/checkBox4" />
-
-                        <CheckBox
-                            android:id="@+id/checkBox6"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:layout_marginBottom="12dp"
-                            android:text="不要肉"
-                            android:visibility="gone"
-
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="@+id/guideline3"
-                            app:layout_constraintTop_toBottomOf="@+id/checkBox5" />
-
-                        <RadioGroup
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="24dp"
-                            app:layout_constraintEnd_toStartOf="@+id/guideline4"
-                            app:layout_constraintTop_toTopOf="parent">
-
-                            <RadioButton
-                                android:id="@+id/radioButton"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="8sp"
-                                android:text="不辣"
-                                android:visibility="gone"
-                                />
-
-                            <RadioButton
-                                android:id="@+id/radioButton2"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="8sp"
-                                android:visibility="gone"
-                                android:text="微辣" />
-
-                            <RadioButton
-                                android:id="@+id/radioButton3"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="8sp"
-                                android:text="中辣"
-                                android:visibility="gone"
-
-                                />
-
-                            <RadioButton
-                                android:id="@+id/radioButton4"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="8sp"
-                                android:text="特辣"
-                                android:visibility="gone"
-
-                                />
-
-                            <RadioButton
-                                android:id="@+id/radioButton5"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="麻辣"
-                                android:visibility="gone"
-
-                                />
-
-                        </RadioGroup>
-
-                        <androidx.constraintlayout.widget.Guideline
-                            android:id="@+id/guideline3"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            app:layout_constraintGuide_percent="0.15" />
+                    android:layout_height="1dp"
+                    android:background="#EEEEEE" />
 
-                        <androidx.constraintlayout.widget.Guideline
-                            android:id="@+id/guideline4"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            app:layout_constraintGuide_percent="0.8" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp"
+                    android:gravity="center_vertical"
+                    android:paddingStart="16dp"
+                    android:text="隐私设置"
+                    android:textSize="18sp"
+                    tools:ignore="RtlSymmetry" />
 
-                    <Button
-                        android:id="@+id/myGeneralBtn"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="end"
-                        android:layout_marginEnd="32sp"
-                        android:layout_marginBottom="12sp"
-                        android:text="确定" />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#EEEEEE" />
 
-                </LinearLayout>
-            </LinearLayout>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp"
+                    android:gravity="center_vertical"
+                    android:paddingStart="16dp"
+                    android:text="消息通知设置"
+                    android:textSize="18sp"
+                    tools:ignore="RtlSymmetry" />
 
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="16dp"
-                android:background="@drawable/radius_content"
-                android:orientation="vertical"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#EEEEEE" />
 
                 <TextView
-                    android:id="@+id/logoutBtn"
                     android:layout_width="match_parent"
                     android:layout_height="45dp"
-                    android:gravity="center"
+                    android:gravity="center_vertical"
                     android:paddingStart="16dp"
-                    android:text="退出账号"
-                    android:textSize="16sp"
+                    android:text="功能反馈"
+                    android:textSize="18sp"
                     tools:ignore="RtlSymmetry" />
 
-            </LinearLayout>
-
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#EEEEEE" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </ScrollView>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="45dp"
+                    android:gravity="center_vertical"
+                    android:paddingStart="16dp"
+                    android:text="个人权限说明"
+                    android:textSize="18sp"
+                    tools:ignore="RtlSymmetry" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+                               <LinearLayout
+                                    android:id="@+id/myGeneralView"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:background="@drawable/my_general_setting"
+                                    android:orientation="vertical"
+                                    android:visibility="gone">
+
+                                    <androidx.constraintlayout.widget.ConstraintLayout
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content">
+
+                                        <CheckBox
+                                            android:id="@+id/checkBox"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginTop="24dp"
+                                            android:text="不要葱"
+                                            android:visibility="gone"
+                                            app:layout_constraintStart_toStartOf="@+id/guideline3"
+                                            app:layout_constraintTop_toTopOf="parent" />
+
+                                        <CheckBox
+                                            android:id="@+id/checkBox2"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginTop="8dp"
+                                            android:text="不要香菜"
+                                            android:visibility="gone"
+
+                                            app:layout_constraintStart_toStartOf="@+id/guideline3"
+                                            app:layout_constraintTop_toBottomOf="@+id/checkBox" />
+
+                                        <CheckBox
+                                            android:id="@+id/checkBox4"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginTop="8dp"
+                                            android:text="不要蒜"
+                                            android:visibility="gone"
+
+                                            app:layout_constraintStart_toStartOf="@+id/guideline3"
+                                            app:layout_constraintTop_toBottomOf="@+id/checkBox2" />
+
+                                        <CheckBox
+                                            android:id="@+id/checkBox5"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginTop="8dp"
+                                            android:text="不要动物油"
+                                            android:visibility="gone"
+
+                                            app:layout_constraintStart_toStartOf="@+id/guideline3"
+                                            app:layout_constraintTop_toBottomOf="@+id/checkBox4" />
+
+                                        <CheckBox
+                                            android:id="@+id/checkBox6"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginTop="8dp"
+                                            android:layout_marginBottom="12dp"
+                                            android:text="不要肉"
+                                            android:visibility="gone"
+
+                                            app:layout_constraintBottom_toBottomOf="parent"
+                                            app:layout_constraintStart_toStartOf="@+id/guideline3"
+                                            app:layout_constraintTop_toBottomOf="@+id/checkBox5" />
+
+                                        <RadioGroup
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginTop="24dp"
+                                            app:layout_constraintEnd_toStartOf="@+id/guideline4"
+                                            app:layout_constraintTop_toTopOf="parent">
+
+                                            <RadioButton
+                                                android:id="@+id/radioButton"
+                                                android:layout_width="match_parent"
+                                                android:layout_height="wrap_content"
+                                                android:layout_marginBottom="8sp"
+                                                android:text="不辣"
+                                                android:visibility="gone"
+                                                />
+
+                                            <RadioButton
+                                                android:id="@+id/radioButton2"
+                                                android:layout_width="match_parent"
+                                                android:layout_height="wrap_content"
+                                                android:layout_marginBottom="8sp"
+                                                android:visibility="gone"
+                                                android:text="微辣" />
+
+                                            <RadioButton
+                                                android:id="@+id/radioButton3"
+                                                android:layout_width="match_parent"
+                                                android:layout_height="wrap_content"
+                                                android:layout_marginBottom="8sp"
+                                                android:text="中辣"
+                                                android:visibility="gone"
+
+                                                />
+
+                                            <RadioButton
+                                                android:id="@+id/radioButton4"
+                                                android:layout_width="match_parent"
+                                                android:layout_height="wrap_content"
+                                                android:layout_marginBottom="8sp"
+                                                android:text="特辣"
+                                                android:visibility="gone"
+
+                                                />
+
+                                            <RadioButton
+                                                android:id="@+id/radioButton5"
+                                                android:layout_width="match_parent"
+                                                android:layout_height="wrap_content"
+                                                android:text="麻辣"
+                                                android:visibility="gone"
+
+                                                />
+
+                                        </RadioGroup>
+
+                                        <androidx.constraintlayout.widget.Guideline
+                                            android:id="@+id/guideline3"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:orientation="vertical"
+                                            app:layout_constraintGuide_percent="0.15" />
+
+                                        <androidx.constraintlayout.widget.Guideline
+                                            android:id="@+id/guideline4"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:orientation="vertical"
+                                            app:layout_constraintGuide_percent="0.8" />
+                                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                    <Button
+                                        android:id="@+id/myGeneralBtn"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_gravity="end"
+                                        android:layout_marginEnd="32sp"
+                                        android:layout_marginBottom="12sp"
+                                        android:text="确定" />
+
+                                </LinearLayout>
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="16dp"
+                                android:layout_marginBottom="16dp"
+                                android:background="@drawable/radius_content"
+                                android:orientation="vertical"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
+
+                                <TextView
+                                    android:id="@+id/logoutBtn"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="45dp"
+                                    android:gravity="center"
+                                    android:paddingStart="16dp"
+                                    android:text="退出账号"
+                                    android:textSize="16sp"
+                                    tools:ignore="RtlSymmetry" />
+
+                            </LinearLayout>
+
+
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+                    </ScrollView>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_snack.xml b/app/src/main/res/layout/fragment_snack.xml
index 7b7155f..3829145 100644
--- a/app/src/main/res/layout/fragment_snack.xml
+++ b/app/src/main/res/layout/fragment_snack.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="horizontal"
     android:weightSum="10"
-    tools:context=".ui.JD.TaobaoFragment">
+    tools:context=".ui.JD.JingDongFragment">
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_taobao_left.xml b/app/src/main/res/layout/item_jingdong_left.xml
similarity index 100%
rename from app/src/main/res/layout/item_taobao_left.xml
rename to app/src/main/res/layout/item_jingdong_left.xml
diff --git a/app/src/main/res/layout/item_taobao_right.xml b/app/src/main/res/layout/item_jingdong_right.xml
similarity index 100%
rename from app/src/main/res/layout/item_taobao_right.xml
rename to app/src/main/res/layout/item_jingdong_right.xml
diff --git a/app/src/main/res/mipmap-xhdpi/sp1.png b/app/src/main/res/mipmap-xhdpi/sp1.png
index 072ae32..b3fc568 100644
Binary files a/app/src/main/res/mipmap-xhdpi/sp1.png and b/app/src/main/res/mipmap-xhdpi/sp1.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/sp2.png b/app/src/main/res/mipmap-xhdpi/sp2.png
index b0ae367..d242a4f 100644
Binary files a/app/src/main/res/mipmap-xhdpi/sp2.png and b/app/src/main/res/mipmap-xhdpi/sp2.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/sp5.jpg b/app/src/main/res/mipmap-xhdpi/sp5.jpg
new file mode 100644
index 0000000..b42b57b
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/sp5.jpg differ
diff --git a/app/src/main/res/mipmap-xhdpi/sp5.png b/app/src/main/res/mipmap-xhdpi/sp5.png
deleted file mode 100644
index 8984407..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/sp5.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/sp6.jpg b/app/src/main/res/mipmap-xhdpi/sp6.jpg
new file mode 100644
index 0000000..e4a39c3
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/sp6.jpg differ
diff --git a/app/src/main/res/mipmap-xhdpi/sp6.png b/app/src/main/res/mipmap-xhdpi/sp6.png
deleted file mode 100644
index 35d838b..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/sp6.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/sp7.jpg b/app/src/main/res/mipmap-xhdpi/sp7.jpg
new file mode 100644
index 0000000..7880251
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/sp7.jpg differ
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 9702191..0d18aa6 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -13,7 +13,7 @@
 
     <fragment
         android:id="@+id/navigation_snack"
-        android:name="com.android.jingdong.ui.JD.TaobaoFragment"
+        android:name="com.android.jingdong.ui.JD.JingDongFragment"
         android:label="商店"
         tools:layout="@layout/fragment_snack" />