From 81d07318083bf232e7b49c3ff848e537c0047ac2 Mon Sep 17 00:00:00 2001
From: jianweie <jianweie@163.com>
Date: Mon, 31 Jul 2023 12:11:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=9B=A0=E5=8D=87=E7=BA=A7layui=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=80=81=E7=89=88=E6=9C=AC=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E8=AF=AD=E6=B3=95=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/views/order/orders/index.html     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
index d2d80c1..c2fe322 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
@@ -82,7 +82,7 @@
                             <select name="status" id="status">
                                 <option value="">请选择订单状态</option>
                                 {{# layui.each(indexData.orderStatus, function(index, item){ }}
-                                <option value="{{ item.value }}">{{ item.description }}</option>
+                                <option value="{{ item.value }}">{{- item.description }}</option>
                                 {{# }); }}
                             </select>
                         </div>
@@ -113,7 +113,7 @@
                             <select name="receiptType" id="shipStatus">
                                 <option value="">请选择订单属性</option>
                                 {{# layui.each(indexData.receiptType, function(index, item){ }}
-                                <option value="{{ item.value }}">{{ item.description }}</option>
+                                <option value="{{ item.value }}">{{- item.description }}</option>
                                 {{# }); }}
                             </select>
                         </div>
@@ -133,7 +133,7 @@
             </div>
             <div class="layui-row">
                 <div class="layui-col-md12">
-                    <div class="layui-inline layui-input-wrap-prefix">
+                    <div class="layui-inline layui-input-wrap">
                         <div class="layui-input-inline">
                             <div class="layui-input-prefix">
                                 <i class="layui-icon layui-icon-date"></i>
@@ -142,7 +142,7 @@
                         </div>
                     </div>
 
-                    <div class="layui-inline layui-input-wrap-prefix">
+                    <div class="layui-inline layui-input-wrap">
                         <div class="layui-input-inline">
                             <div class="layui-input-prefix">
                                 <i class="layui-icon layui-icon-username"></i>
@@ -150,7 +150,7 @@
                             <input type="text" name="shipName" id="shipName" placeholder="请输入收货人姓名" class="layui-input" lay-affix="clear">
                         </div>
                     </div>
-                    <div class="layui-inline layui-input-wrap-prefix">
+                    <div class="layui-inline layui-input-wrap">
                         <div class="layui-input-inline">
                             <div class="layui-input-prefix">
                                 <i class="layui-icon layui-icon-cellphone-fine"></i>
@@ -158,7 +158,7 @@
                             <input type="text" name="shipMobile" id="shipMobile" placeholder="请输入收货电话" class="layui-input" lay-affix="clear">
                         </div>
                     </div>
-                    <div class="layui-inline layui-input-wrap-prefix">
+                    <div class="layui-inline layui-input-wrap">
                         <div class="layui-input-inline">
                             <div class="layui-input-prefix">
                                 <i class="layui-icon layui-icon-location"></i>
@@ -166,7 +166,7 @@
                             <input type="text" name="shipAddress" id="shipAddress" placeholder="请输入收货地址" class="layui-input" lay-affix="clear">
                         </div>
                     </div>
-                    <div class="layui-inline layui-input-wrap-prefix">
+                    <div class="layui-inline layui-input-wrap">
                         <div class="layui-input-inline core-time-input">
                             <div class="layui-input-prefix">
                                 <i class="layui-icon layui-icon-time"></i>
@@ -280,7 +280,11 @@
                     cols: [
                         [
                             { type: 'checkbox' },
-                            { field: 'operating', title: '操作', width: 60, align: 'center' },
+                            {
+                                field: 'operating', title: '操作', width: 90, align: 'center', templet: function (data) {
+                                    return data.operating;
+                                }
+                            },
                             {
                                 field: 'orderId',
                                 title: '订单号',