From d36641e8110268d68f41ae1b3b9d3123c688f291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=9B=AA=E8=BF=8E?= <202222430543>
Date: Fri, 23 Jun 2023 15:30:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/layout_details.xml | 160 +++++++++++++++++++++
 1 file changed, 160 insertions(+)
 create mode 100644 app/src/main/res/layout/layout_details.xml

diff --git a/app/src/main/res/layout/layout_details.xml b/app/src/main/res/layout/layout_details.xml
new file mode 100644
index 0000000..dd93d49
--- /dev/null
+++ b/app/src/main/res/layout/layout_details.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbarSize="10dp">
+
+
+    <TextView
+        android:id="@+id/shop"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#03A9F4"
+        android:gravity="center"
+        android:text="水果介绍"
+        android:textColor="@color/white"
+        android:textSize="20sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+    </TextView>
+
+    <ImageView
+        android:id="@+id/caiping"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.497"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/shop" />
+
+    <TextView
+        android:id="@+id/textView8"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="64dp"
+        android:text="销量:"
+        android:textSize="20sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/caiping" />
+
+    <TextView
+        android:id="@+id/tvSales"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:hint="输入浏览量"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toBottomOf="@+id/textView8"
+        app:layout_constraintStart_toEndOf="@+id/textView8"
+        app:layout_constraintTop_toTopOf="@+id/textView8" />
+
+    <TextView
+        android:id="@+id/textView9"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="80dp"
+        android:text="简介："
+        android:textSize="24sp"
+        app:layout_constraintStart_toStartOf="@+id/textView8"
+        app:layout_constraintTop_toBottomOf="@+id/textView8" />
+
+    <TextView
+        android:id="@+id/tvDetails"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="72dp"
+        android:hint="输入水果介绍"
+        android:scrollbars="vertical"
+        android:textSize="18sp"
+        app:layout_constraintStart_toStartOf="@+id/textView9"
+        app:layout_constraintTop_toTopOf="@+id/textView9" />
+
+    <Button
+        android:id="@+id/queding"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:onClick="place"
+        android:text="支付"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.724"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:onClick="fanhui"
+        android:text="返回"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/queding"
+        app:layout_constraintHorizontal_bias="0.479"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/tvname"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="水果名"
+        android:textSize="25sp"
+        app:layout_constraintBottom_toTopOf="@+id/tvSales"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/caiping" />
+
+    <TextView
+        android:id="@+id/tvPrice"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="输入水果价格"
+        android:textSize="20dp"
+        app:layout_constraintBottom_toBottomOf="@+id/tvSales"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.045"
+        app:layout_constraintStart_toEndOf="@+id/textView4"
+        app:layout_constraintTop_toTopOf="@+id/tvSales"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <TextView
+        android:id="@+id/textView5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:text="库存："
+        android:textSize="18sp"
+        app:layout_constraintBottom_toTopOf="@+id/textView9"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView8"
+        app:layout_constraintVertical_bias="0.553" />
+
+    <TextView
+        android:id="@+id/tvinventory"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="输入库存"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toBottomOf="@+id/textView5"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.063"
+        app:layout_constraintStart_toEndOf="@+id/textView5"
+        app:layout_constraintTop_toTopOf="@+id/textView5"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <TextView
+        android:id="@+id/textView4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:text="价格："
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="@+id/tvSales"
+        app:layout_constraintStart_toEndOf="@+id/tvSales"
+        app:layout_constraintTop_toTopOf="@+id/tvSales"
+        app:layout_constraintVertical_bias="0.333" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-- 
Gitee


From efe2f2cc2d358ee3034a5d7f885de3f743889ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=9B=AA=E8=BF=8E?= <202222430543>
Date: Fri, 23 Jun 2023 15:32:26 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=AF=A6=E6=83=85bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/layout_details.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/layout_details.xml b/app/src/main/res/layout/layout_details.xml
index dd93d49..603039b 100644
--- a/app/src/main/res/layout/layout_details.xml
+++ b/app/src/main/res/layout/layout_details.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:background="#03A9F4"
         android:gravity="center"
-        android:text="水果介绍"
+        android:text="介绍"
         android:textColor="@color/white"
         android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
@@ -66,7 +66,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="72dp"
-        android:hint="输入水果介绍"
+        android:hint="输入介绍"
         android:scrollbars="vertical"
         android:textSize="18sp"
         app:layout_constraintStart_toStartOf="@+id/textView9"
-- 
Gitee


From 38954ff8e1fa4d33cd454b6184db674c94b09754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=9B=AA=E8=BF=8E?= <202222430543>
Date: Fri, 23 Jun 2023 15:33:54 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=AF=A6=E6=83=85bug=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/layout_details.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/layout_details.xml b/app/src/main/res/layout/layout_details.xml
index 603039b..e2627f3 100644
--- a/app/src/main/res/layout/layout_details.xml
+++ b/app/src/main/res/layout/layout_details.xml
@@ -157,4 +157,5 @@
         app:layout_constraintTop_toTopOf="@+id/tvSales"
         app:layout_constraintVertical_bias="0.333" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
+<!-- bug完成 -->
\ No newline at end of file
-- 
Gitee


From 5665703eaf34d1e8663597c1582251a8060887c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=9B=AA=E8=BF=8E?= <202222430543>
Date: Fri, 23 Jun 2023 15:34:49 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/layout_order.xml | 65 ++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 app/src/main/res/layout/layout_order.xml

diff --git a/app/src/main/res/layout/layout_order.xml b/app/src/main/res/layout/layout_order.xml
new file mode 100644
index 0000000..bc46018
--- /dev/null
+++ b/app/src/main/res/layout/layout_order.xml
@@ -0,0 +1,65 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity"
+    android:orientation="vertical">
+    <TextView
+        android:id="@+id/shop"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="我的订单"
+        android:textSize="20sp"
+        android:gravity="center"
+        android:background="#03A9F4"
+        android:textColor="@color/white"
+        android:textStyle="bold">
+
+    </TextView>
+
+    <LinearLayout
+        android:id="@+id/LLV"
+        android:layout_width="match_parent"
+        android:layout_height="570dp">
+
+        <ListView
+            android:id="@+id/lv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            >
+
+
+        </ListView>
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/rl"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        >
+
+        <View
+            android:id="@+id/view"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_above="@id/ll_nav"
+            android:background="#E0E0E0" />
+
+        <include
+            android:id="@+id/ll_nav"
+            layout="@layout/layout_bottom2"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:layout_alignParentBottom="true" />
+
+
+    </RelativeLayout>
+
+
+
+
+</LinearLayout>
\ No newline at end of file
-- 
Gitee