From 42c0e26bdef44826cfe436cf5bae6c41ea9fea31 Mon Sep 17 00:00:00 2001
From: YANG JIANKUAN <timyih@icloud.com>
Date: Tue, 20 Oct 2026 11:29:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(gjc):=20=E5=87=BA=E6=B8=AF=E8=BF=90?=
 =?UTF-8?q?=E6=8A=B5=E5=8D=A1=E7=89=87=E6=97=A0=E5=88=86=E5=8D=95=E4=B9=9F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=8C=E6=9F=A5=E7=9C=8B=E5=88=86=E5=8D=95?=
 =?UTF-8?q?=200=E3=80=8D=EF=BC=8C=E5=88=86=E5=8D=95=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E8=A1=A5=E7=A9=BA=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 手机卡片「查看分单」按钮始终显示，分单数为空时按 0 显示
- 无分单的运单可进入分单明细页，补「暂无分单」空态，避免整页空白

Refs: 禅道 Bug #631

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../activity_int_exp_arrive_sub_order.xml     | 59 +++++++++++++++----
 .../main/res/layout/item_int_exp_arrive.xml   |  5 +-
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/module_gjc/src/main/res/layout/activity_int_exp_arrive_sub_order.xml b/module_gjc/src/main/res/layout/activity_int_exp_arrive_sub_order.xml
index 76c3559..4598d1f 100644
--- a/module_gjc/src/main/res/layout/activity_int_exp_arrive_sub_order.xml
+++ b/module_gjc/src/main/res/layout/activity_int_exp_arrive_sub_order.xml
@@ -18,6 +18,8 @@
 
     <data>
 
+        <import type="android.view.View" />
+
         <variable
             name="viewModel"
             type="com.lukouguoji.gjc.viewModel.IntExpArriveSubOrderViewModel" />
@@ -60,21 +62,52 @@
 
             </LinearLayout>
 
-            <!-- ==================== 列表 ==================== -->
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rv"
+            <!-- ==================== 列表 + 空态 ==================== -->
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1"
-                android:clipToPadding="false"
-                android:overScrollMode="never"
-                android:paddingTop="4dp"
-                android:paddingBottom="12dp"
-                itemLayoutId="@{viewModel.itemLayoutId}"
-                viewHolder="@{viewModel.itemViewHolder}"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                tools:itemCount="3"
-                tools:listitem="@layout/item_int_exp_arrive_sub_order" />
+                android:layout_weight="1">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:clipToPadding="false"
+                    android:overScrollMode="never"
+                    android:paddingTop="4dp"
+                    android:paddingBottom="12dp"
+                    itemLayoutId="@{viewModel.itemLayoutId}"
+                    viewHolder="@{viewModel.itemViewHolder}"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:itemCount="3"
+                    tools:listitem="@layout/item_int_exp_arrive_sub_order" />
+
+                <!-- 空态（Bug #631：无分单的运单也可进入本页） -->
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:visibility="@{viewModel.displayList.empty ? View.VISIBLE : View.GONE}">
+
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:src="@drawable/ic_phone_clipboard"
+                        android:tint="@color/phone_text_hint" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="12dp"
+                        android:text="暂无分单"
+                        android:textColor="@color/phone_text_hint"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+            </FrameLayout>
 
             <!-- ==================== 底部操作条 ==================== -->
             <com.lukouguoji.module_base.ui.weight.phone.PhoneBottomBar
diff --git a/module_gjc/src/main/res/layout/item_int_exp_arrive.xml b/module_gjc/src/main/res/layout/item_int_exp_arrive.xml
index b8163db..598eba0 100644
--- a/module_gjc/src/main/res/layout/item_int_exp_arrive.xml
+++ b/module_gjc/src/main/res/layout/item_int_exp_arrive.xml
@@ -213,7 +213,7 @@
 
             </LinearLayout>
 
-            <!-- 查看分单（无分单数据时不显示） -->
+            <!-- 查看分单（Bug #631：无分单也显示，数量为 0） -->
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="36dp"
@@ -221,10 +221,9 @@
                 android:background="@drawable/bg_phone_btn_weak"
                 android:gravity="center"
                 android:onClick="@{()-> activity.openSubOrder(bean)}"
-                android:text='@{"查看分单 " + bean.haWbNumber}'
+                android:text='@{"查看分单 " + (bean.haWbNumber == null ? 0 : bean.haWbNumber)}'
                 android:textColor="@color/phone_primary"
                 android:textSize="14sp"
-                android:visibility="@{bean.haWbNumber != null &amp;&amp; bean.haWbNumber > 0 ? View.VISIBLE : View.GONE}"
                 tools:text="查看分单 3" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>