danial/kami_boss
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

移除订单信息页面中的冻结状态和退款状态相关的注释代码，简化页面结构，提高可读性。

Browse Source
This commit is contained in:
danial
2025-06-07 01:08:05 +08:00
parent 1cb6712fac
commit e0789d96b0
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
views/order_info.html
View File

@@ -119,13 +119,13 @@
<!-- </select>--> <!-- </select>-->
<!-- </label>--> <!-- </label>-->
<!-- <label>--> <!-- <label>-->
冻结状态： <!-- 冻结状态： -->
<select id="search-order-free-status" name=""> <!-- <select id="search-order-free-status" name="">
<option value="">请选择</option> <option value="">请选择</option>
<option value="freeze_amount">冻结</option> <option value="freeze_amount">冻结</option>
<option value="refund">退款</option> <option value="refund">退款</option>
</select> </select>
</label> </label> -->
<button class="btn btn-default" id="order-search" type="button">搜索</button> <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" onclick='loadMainContent("/order_info.html")' type="button">刷新</button>
<button class="btn btn-default" id="order-export" 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> -->
<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="status"></span></div>
<div>是否退款：<span id="refund"></span></div> <div>是否退款：<span id="refund"></span></div>
<div>退款时间：<span id="refund-time"></span></div> <div>退款时间：<span id="refund-time"></span></div>
<div>是否冻结：<span id="free"></span></div> <!-- <div>是否冻结：<span id="free"></span></div> -->
<div>冻结时间：<span id="free-time"></span></div> <!-- <div>冻结时间：<span id="free-time"></span></div> -->
<div>是否解冻：<span id="unfree"></span></div> <!-- <div>是否解冻：<span id="unfree"></span></div> -->
<div>解冻时间：<span id="unfree-time"></span></div> <!-- <div>解冻时间：<span id="unfree-time"></span></div> -->
<div>商户名称：<span id="merchant-name"></span></div> <div>商户名称：<span id="merchant-name"></span></div>
<div>商户编号：<span id="merchant-uid"></span></div> <div>商户编号：<span id="merchant-uid"></span></div>
<div>代理编号：<span id="agent-uid"></span></div> <div>代理编号：<span id="agent-uid"></span></div>
@@ -485,15 +485,15 @@
"<th>" + v.FactAmount + "</th>" + "<th>" + v.FactAmount + "</th>" +
"<th>" + `卡号：${exValue.cardNo !== undefined ? exValue.cardNo : ''}<br />卡密：${exValue.data !== undefined ? exValue.data : ''}` + "</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") { "<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 { } else {
tmp += "<th>" + "未被冻结" + "</th>" // tmp += "<th>" + "未被冻结" + "</th>"
}
if (v.Refund === "yes") {
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>${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>${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 += `"<th>${v.IsBlock === 1 ? "禁用" : "正常"}</th>"`
tmp = tmp + tmp = tmp +
@@ -509,7 +509,7 @@
v.BankOrderId + '" onclick="solveResult(this.value);">' + "处理" + '</button>'; v.BankOrderId + '" onclick="solveResult(this.value);">' + "处理" + '</button>';
} }
if (v.Status !== "success") { 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>'; v.BankOrderId + '" onclick="orderSchedule(this.value);">' + "手动调度" + '</button>';
} }
if (v.Status === "success" || v.Status === "fail") { if (v.Status === "success" || v.Status === "fail") {