From dedfc9f1a3fb311874a360324447e717f3034c4a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 十一月 2024 09:52:58 +0800
Subject: [PATCH] 修改bug

---
 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js
index 7987c32..492ec0c 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js
@@ -173,11 +173,11 @@
         },
         {title: '订单金额', field: 'orderMoney', visible: true, align: 'center', valign: 'middle',
             formatter: function (value, row) {
-                var btn = "";
+                var btn = "0";
                 if(row.orderMoney != '' && row.orderMoney != null) {
                     btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.orderMoney + '" onfocus="TUser.tooltip()">' + row.orderMoney + '</p>']
                 }
-                if(row.state == 10){
+                if(row.state == 10 && row.cancel_money != null){
                     btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.cancel_money + '" onfocus="TUser.tooltip()">' + row.cancel_money + '</p>']
                 }
                 return btn;

--
Gitblit v1.7.1