diff --git a/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyPickupCodeDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyPickupCodeDialog.java
index 6b50993..ad3024d 100644
--- a/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyPickupCodeDialog.java
+++ b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyPickupCodeDialog.java
@@ -81,7 +81,6 @@ public class BuyPickupCodeDialog extends DialogAbstract {
                                 setButtonCancelText(Integer.valueOf(message));
                             break;
                         case SET_PRICE:
-                                binding.textPrice.setText(String.valueOf(getTotalPrice()));
                                 closeDialogCountdown.setCountdown(40);
                             break;
                         case RESET_COUNTDOWM:
@@ -130,7 +129,6 @@ public class BuyPickupCodeDialog extends DialogAbstract {
         closeDialogCountdown = new CloseDialogOnThreadHandler(getHandlerMain());
         closeDialogCountdown.start(40);
 
-        binding.textPrice.setText(String.valueOf(getTotalPrice()));
     }
 
     public int getTotalPrice() {
diff --git a/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogPickupCodeBuyListAdpter.java b/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogPickupCodeBuyListAdpter.java
index 133caac..7292ed4 100644
--- a/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogPickupCodeBuyListAdpter.java
+++ b/app/src/main/java/com/unibuy/smartdevice/ui/recycler/RecyclerDialogPickupCodeBuyListAdpter.java
@@ -84,7 +84,7 @@ public class RecyclerDialogPickupCodeBuyListAdpter extends RecyclerView.Adapter<
         int price = machinePrice > 0? machinePrice: sellingPrice;
 
         holder.binding.textPrice.setText("$"+price);
-        holder.binding.textCount.setText("x"+String.valueOf(count));
+        holder.binding.textCount.setText("出貨數量：" + count + "件");
 
         logs.info("field:" + buyProduct.getField());
     }
diff --git a/app/src/main/res/layout/dialog_pickup_code_buy.xml b/app/src/main/res/layout/dialog_pickup_code_buy.xml
index 74dfc27..d5da15c 100644
--- a/app/src/main/res/layout/dialog_pickup_code_buy.xml
+++ b/app/src/main/res/layout/dialog_pickup_code_buy.xml
@@ -5,14 +5,18 @@
     android:id="@+id/linearLayout3"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/light_gray">
+    android:background="@android:color/transparent">
 
     <LinearLayout
         android:id="@+id/linearLayout4"
         android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:background="@color/light_gray"
+        android:layout_height="wrap_content"
+        app:layout_constraintWidth_percent="0.95"
+        android:background="@drawable/bg_dialog_rounded"
         android:orientation="vertical"
+        android:paddingTop="24dp"
+        android:paddingHorizontal="24dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -20,46 +24,14 @@
         <TextView
             android:id="@+id/textView"
             android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@color/error"
+            android:layout_height="60dp"
+            android:background="@android:color/transparent"
             android:gravity="center"
-            android:text="@string/cart"
-            android:textColor="@color/white"
-            android:visibility="gone"
-            android:textSize="20sp"
+            android:text="請確認您的商品是否正確"
+            android:textColor="@color/black"
+            android:textSize="28sp"
             android:textStyle="bold" />
 
-        <LinearLayout
-            android:id="@+id/linearLayout"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginBottom="1dp"
-            android:background="@color/white"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1.15"
-                android:gravity="center|end"
-                android:text="@string/total_amount"
-                android:textColor="@color/error"
-                android:textSize="30sp"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/textPrice"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:layout_weight="0.85"
-                android:gravity="center|start"
-                android:text="0"
-                android:textColor="@color/error"
-                android:textSize="30sp"
-                android:textStyle="bold" />
-        </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerDialogBuyList"
@@ -76,30 +48,35 @@
         </LinearLayout>
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
             android:gravity="center"
             android:orientation="horizontal">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/buttonCancel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+                android:layout_width="0dp"
+                android:layout_height="64dp"
                 android:layout_weight="1"
-                android:backgroundTint="@color/white"
+                android:backgroundTint="@color/warning"
                 android:text="@string/cancel_40"
+                android:textColor="@color/white"
                 android:textSize="20sp"
-                android:textColor="@color/black" />
+                app:cornerRadius="8dp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/buttonGetProduct"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+                android:layout_width="0dp"
+                android:layout_height="64dp"
                 android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:text="@string/pickup"
-                android:textColor="@color/black"
+                android:layout_marginStart="16dp"
+                android:backgroundTint="@color/primary"
+                android:text="確認"
+                android:textColor="@color/onPrimary"
                 android:textSize="20sp"
-                android:visibility="visible" />
+                app:cornerRadius="8dp" />
         </LinearLayout>
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/recycler_dialog_pickup_code_buy_list.xml b/app/src/main/res/layout/recycler_dialog_pickup_code_buy_list.xml
index 7aef5f6..474c058 100644
--- a/app/src/main/res/layout/recycler_dialog_pickup_code_buy_list.xml
+++ b/app/src/main/res/layout/recycler_dialog_pickup_code_buy_list.xml
@@ -1,109 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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="wrap_content"
-    android:paddingTop="1dp"
-    android:paddingBottom="1dp"
-    >
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    android:clipToPadding="false"
+    android:clipChildren="false">
 
-    <LinearLayout
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:layout_marginTop="1dp"
-        android:background="@color/white"
-        android:orientation="horizontal"
-        android:gravity="center"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:id="@+id/textPosition"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginStart="5dp"
-            android:layout_marginEnd="2dp"
-            android:layout_weight="0.3"
-            android:gravity="center"
-            android:text="0"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:visibility="visible" />
-
-        <RelativeLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.5"
-            android:paddingTop="5dp"
-            android:paddingBottom="5dp">
-
-            <ImageView
-                android:id="@+id/imageProductPicture"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:adjustViewBounds="true"
-                android:scaleType="fitCenter"
-                android:src="@drawable/default_product"
-                app:layout_constraintDimensionRatio="16:9" />
-        </RelativeLayout>
+        android:layout_height="wrap_content"
+        app:cardBackgroundColor="@color/cardSurface"
+        app:cardCornerRadius="12dp"
+        app:cardElevation="4dp"
+        app:cardUseCompatPadding="true">
 
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="@color/white"
-            android:gravity="center"
-            android:orientation="vertical"
-            tools:layout_editor_absoluteY="1dp">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:padding="8dp">
 
+            <!-- 商品圖片 1:1 -->
+            <ImageView
+                android:id="@+id/imageProductPicture"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/default_product" />
+
+            <!-- 商品資訊（齊左） -->
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:background="@color/white"
-                android:gravity="center_vertical"
-                android:paddingStart="10dp"
-                android:orientation="horizontal">
+                android:orientation="vertical"
+                android:paddingStart="12dp"
+                android:gravity="start">
 
                 <TextView
                     android:id="@+id/textProductName"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:text="@string/product_name"
-                    android:textSize="24sp"
-                    android:textStyle="bold" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@color/white"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/textPrice"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="$0"
-                    android:textSize="24sp"
-                    android:textStyle="bold" />
+                    android:text="@string/product_name"
+                    android:textColor="@color/black"
+                    android:textSize="22sp"
+                    android:textStyle="bold"
+                    android:maxLines="2"
+                    android:ellipsize="end" />
+
                 <TextView
                     android:id="@+id/textCount"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="x0"
-                    android:textSize="24sp"
+                    android:layout_marginTop="4dp"
+                    android:text="出貨數量：0件"
+                    android:textColor="@color/primary"
+                    android:textSize="20sp"
                     android:textStyle="bold" />
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </androidx.cardview.widget.CardView>
+
+    <!-- 隱藏但保留 binding 參照 -->
+    <TextView
+        android:id="@+id/textPosition"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/textPrice"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="gone" />
+
+</FrameLayout>
\ No newline at end of file