From 177e192a5c47f1d6322ee7b2642239f54526aef7 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期六, 26 三月 2022 09:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/webapp/views/order/order.html |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 3996f2d..dbd3d97 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -87,7 +87,7 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label">璁㈠崟缂栧彿:</label>
                                 <div class="layui-input-inline">
-                                    <input name="order_no" class="layui-input" placeholder="杈撳叆璁㈠崟缂栧彿"/>
+                                    <input name="order_no" class="layui-input" id="orderNo" placeholder="杈撳叆璁㈠崟缂栧彿"/>
                                 </div>
                             </div>
                             <div class="layui-inline">&emsp;
@@ -131,6 +131,10 @@
           class="layui-badge layui-badge-gray"
           {{# } else if(d.settle === 4){ }}
           class="layui-badge layui-badge-green"
+          {{# } else if(d.settle === 11){ }}
+          class="layui-badge layui-badge-green"
+          {{# } else if(d.settle === 12){ }}
+          class="layui-badge layui-badge-blue"
           {{# } else { }}
           class="layui-badge layui-badge-gray"
           {{# } }}

--
Gitblit v1.9.1