From e0789d96b08b2d35df61e447faaba32c56832dfa Mon Sep 17 00:00:00 2001
From: danial <danial@gmail.com>
Date: Sat, 7 Jun 2025 01:08:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=AE=A2=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84=E5=86=BB=E7=BB=93?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=92=8C=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E7=AE=80=E5=8C=96=E9=A1=B5=E9=9D=A2=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E9=AB=98=E5=8F=AF=E8=AF=BB=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 views/order_info.html | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/views/order_info.html b/views/order_info.html
index f39912f..08d66f1 100644
--- a/views/order_info.html
+++ b/views/order_info.html
@@ -119,13 +119,13 @@
             <!--            </select>-->
             <!--        </label>-->
             <!--        <label>-->
-            冻结状态：
-            <select id="search-order-free-status" name="">
+            <!-- 冻结状态： -->
+            <!-- <select id="search-order-free-status" name="">
                 <option value="">请选择</option>
                 <option value="freeze_amount">冻结</option>
                 <option value="refund">退款</option>
             </select>
-            </label>
+            </label> -->
             <button class="btn btn-default" id="order-search" type="button">搜索</button>
             <button class="btn btn-default" onclick='loadMainContent("/order_info.html")' type="button">刷新</button>
             <button class="btn btn-default" id="order-export" type="button">导出</button>
@@ -212,8 +212,8 @@
                         <th>实付金额</th>
                         <th>卡密信息</th>
                         <th>支付状态</th>
-                        <th>冻结状态</th>
-                        <th>退款状态</th>
+                        <!-- <th>冻结状态</th>
+                        <th>退款状态</th> -->
                         <th>下单时间</th>
                         <th>支付时间</th>
                         <!--                <th>上游供应商</th>-->
@@ -276,10 +276,10 @@
                                 <div>支付状态：<span id="status"></span></div>
                                 <div>是否退款：<span id="refund"></span></div>
                                 <div>退款时间：<span id="refund-time"></span></div>
-                                <div>是否冻结：<span id="free"></span></div>
-                                <div>冻结时间：<span id="free-time"></span></div>
-                                <div>是否解冻：<span id="unfree"></span></div>
-                                <div>解冻时间：<span id="unfree-time"></span></div>
+                                <!-- <div>是否冻结：<span id="free"></span></div> -->
+                                <!-- <div>冻结时间：<span id="free-time"></span></div> -->
+                                <!-- <div>是否解冻：<span id="unfree"></span></div> -->
+                                <!-- <div>解冻时间：<span id="unfree-time"></span></div> -->
                                 <div>商户名称：<span id="merchant-name"></span></div>
                                 <div>商户编号：<span id="merchant-uid"></span></div>
                                 <div>代理编号：<span id="agent-uid"></span></div>
@@ -485,15 +485,15 @@
                 "<th>" + v.FactAmount + "</th>" +
                 "<th>" + `卡号：${exValue.cardNo !== undefined ? exValue.cardNo : ''}<br />卡密：${exValue.data !== undefined ? exValue.data : ''}` + "</th>" +
                 "<th>" + (v.Status === "wait" ? "等待支付" : v.Status === "success" ? "支付成功" : v.Status === "fail" ? "支付失败" : v.Status === "cancel" ? "放弃支付" : v.Status === "created" ? "创建" : v.Status) + "</th>"; if (v.Freeze === "yes") {
-                    tmp += "<th style='color: red;'>" + "已经冻结" + "</th>"
+                    // tmp += "<th style='color: red;'>" + "已经冻结" + "</th>"
                 } else {
-                tmp += "<th>" + "未被冻结" + "</th>"
-            }
-            if (v.Refund === "yes") {
-                tmp += "<th style='color: red;'>" + "已经退款" + "</th>"
-            } else {
-                tmp += "<th>" + "未被退款" + "</th>"
+                // tmp += "<th>" + "未被冻结" + "</th>"
             }
+            // if (v.Refund === "yes") {
+            //     tmp += "<th style='color: red;'>" + "已经退款" + "</th>"
+            // } else {
+            //     tmp += "<th>" + "未被退款" + "</th>"
+            // }
             tmp += `<th>${new Date(v.CreateTime).toLocaleString()}</th><th>${new Date(v.PayTime).getFullYear() !== 1 ? new Date(v.PayTime).toLocaleString() : ''}</th><th>${v.CardReturnData}</th><th>${v.Ip}</th>`;
             tmp += `"<th>${v.IsBlock === 1 ? "禁用" : "正常"}</th>"`
             tmp = tmp +
@@ -509,7 +509,7 @@
                     v.BankOrderId + '" onclick="solveResult(this.value);">' + "处理" + '</button>';
             }
             if (v.Status !== "success") {
-             tmp += '<button type="button" class="btn btn-warning" style="padding: 0;margin-right: 5px;" value="' +
+                tmp += '<button type="button" class="btn btn-warning" style="padding: 0;margin-right: 5px;" value="' +
                     v.BankOrderId + '" onclick="orderSchedule(this.value);">' + "手动调度" + '</button>';
             }
             if (v.Status === "success" || v.Status === "fail") {