From c002bef5ab3af1b598a0206fdd463daa13ef4a60 Mon Sep 17 00:00:00 2001
From: wsb1224 <shuobo1224@qq.com>
Date: Sun, 5 Jul 2026 19:07:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=B5=81=E7=A8=8B=E4=B8=AD=E6=8F=90=E6=88=90?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Web管理后台：模板中commission_amount(snake_case)与数据对象commissionAmount(camelCase)不匹配，
导致待结算按钮永远不显示，所有已完成订单直接跳到标记结算。
小程序：零提成订单缺少直接标记结算路径，调用/settle API会因状态不匹配报错。

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../pages/manager/approve-detail/approve-detail.js       | 1 +
 .../pages/manager/approve-detail/approve-detail.wxml     | 9 +++++++--
 frontend/web-admin/src/views/OrdersPage.vue              | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/mini-app/pages/manager/approve-detail/approve-detail.js b/frontend/mini-app/pages/manager/approve-detail/approve-detail.js
index 961c070..39f17ab 100644
--- a/frontend/mini-app/pages/manager/approve-detail/approve-detail.js
+++ b/frontend/mini-app/pages/manager/approve-detail/approve-detail.js
@@ -497,6 +497,7 @@ Page({
       shipped: "确认收货",
       completed: "标记完成",
       pending_settle: "待结算",
+      settled: "标记结算",
     };
     wx.showModal({
       title: "确认操作",
diff --git a/frontend/mini-app/pages/manager/approve-detail/approve-detail.wxml b/frontend/mini-app/pages/manager/approve-detail/approve-detail.wxml
index 39f3737..fd249b9 100644
--- a/frontend/mini-app/pages/manager/approve-detail/approve-detail.wxml
+++ b/frontend/mini-app/pages/manager/approve-detail/approve-detail.wxml
@@ -279,8 +279,13 @@
       <button class="action-btn pass-btn" type="primary" loading="{{actionLoading}}" bindtap="handleSimpleTransition" data-target="pending_settle">待结算</button>
     </block>
 
-    <!-- 已完成（无佣金）/ 待结算：结算 -->
-    <block wx:elif="{{orderInfo.order_status === 'completed' || orderInfo.order_status === 'pending_settle'}}">
+    <!-- 已完成（无佣金）：直接标记结算 -->
+    <block wx:elif="{{orderInfo.order_status === 'completed'}}">
+      <button class="action-btn pass-btn" type="primary" loading="{{actionLoading}}" bindtap="handleSimpleTransition" data-target="settled">标记结算</button>
+    </block>
+
+    <!-- 待结算：结算提成 -->
+    <block wx:elif="{{orderInfo.order_status === 'pending_settle'}}">
       <button class="action-btn pass-btn" type="primary" loading="{{actionLoading}}" bindtap="handleSettle">结算提成</button>
     </block>
   </view>
diff --git a/frontend/web-admin/src/views/OrdersPage.vue b/frontend/web-admin/src/views/OrdersPage.vue
index ba238c2..eb99f1b 100644
--- a/frontend/web-admin/src/views/OrdersPage.vue
+++ b/frontend/web-admin/src/views/OrdersPage.vue
@@ -195,11 +195,11 @@
               <button v-if="detail.order.rawStatus === 'shipped'" class="primary-btn" :disabled="detailActionBusy"
                       @click="handleDetailStatusChange('completed')">标记完成
               </button>
-              <button v-if="detail.order.rawStatus === 'completed' && detail.order.commission_amount > 0"
+              <button v-if="detail.order.rawStatus === 'completed' && Number(detail.order.commissionAmount) > 0"
                       class="primary-btn" :disabled="detailActionBusy"
                       @click="handleDetailStatusChange('pending_settle')">待结算
               </button>
-              <button v-if="detail.order.rawStatus === 'completed' && !(detail.order.commission_amount > 0)"
+              <button v-if="detail.order.rawStatus === 'completed' && !(Number(detail.order.commissionAmount) > 0)"
                       class="primary-btn" :disabled="detailActionBusy" @click="handleDetailStatusChange('settled')">标记结算
               </button>
               <button v-if="detail.order.rawStatus === 'pending_settle'" class="primary-btn"