From f3c6e2a19e1c12a64e253ff7bb2b6dc22fcf75f5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 15 Mar 2023 11:03:12 +0800
Subject: [PATCH] 图片压缩

---
 src/main/resources/templates/febs/views/modules/order/orderList.html |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index 4c1c5f5..a59b8ca 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -7,22 +7,25 @@
                         <div class="layui-form-item">
                             <div class="layui-col-md10">
                                 <div class="layui-inline">
+                                    <label class="layui-form-label">购买人:</label>
                                     <div class="layui-input-inline">
-                                        <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+                                        <input type="text" placeholder="购买人" name="name" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
+                                    <label class="layui-form-label">商品信息:</label>
                                     <div class="layui-input-inline">
-                                        <input type="text" placeholder="商品名称" name="goodsName" autocomplete="off" class="layui-input">
+                                        <input type="text" placeholder="商品信息" name="goodsName" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
+                                    <label class="layui-form-label">订单编号:</label>
                                     <div class="layui-input-inline">
                                         <input type="text" placeholder="订单编号" name="orderNo" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label layui-form-label-sm">订单状态</label>
+                                    <label class="layui-form-label">订单状态:</label>
                                     <div class="layui-input-inline">
                                         <select name="status">
                                             <option value="">请选择</option>
@@ -37,7 +40,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label layui-form-label-sm">支付状态</label>
+                                    <label class="layui-form-label">支付状态:</label>
                                     <div class="layui-input-inline">
                                         <select name="payResult">
                                             <option value="">请选择</option>
@@ -47,14 +50,14 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label layui-form-label-sm">开始时间</label>
+                                    <label class="layui-form-label">开始时间:</label>
                                     <div class="layui-input-inline">
                                         <input type="text" name="startTime" id="febs-form-group-date-start" lay-verify="date"
                                                placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label layui-form-label-sm">结束时间</label>
+                                    <label class="layui-form-label">结束时间:</label>
                                     <div class="layui-input-inline">
                                         <input type="text" name="endTime" id="febs-form-group-date-end" lay-verify="date"
                                                placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
@@ -103,11 +106,7 @@
         <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliver">导出未发货订单</button>
         <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" id="importDeliver" lay-event="importDeliver">导入发货</button>
         <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverDone">导出已发货订单</button>
-<!--        <button type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" onclick="print('tool(orderTable)')">layui自定义打印表格</button>-->
         <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain">自定义打印</button>
-<!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="getCheckData">获取选中行数据</button>-->
-<!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="getCheckLength">获取选中数目</button>-->
-<!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="isAll">验证是否全选</button>-->
     </div>
 </script>
 <!-- 表格操作栏 end -->
@@ -258,7 +257,7 @@
                 elem: $view.find('table'),
                 id: 'orderTable',
                 url: ctx + 'admin/order/orderList?orderType=1',
-                defaultToolbar: [],
+                // defaultToolbar: [],
                 toolbar: '#tableToolBar',
                 totalRow: true ,// 开启合计行
                 cols: [[
@@ -309,19 +308,18 @@
                             templet: function (d) {
                                     if (d.status === 2) {
                                         if(d.deliverType ===2){
-                                            return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="takeGoods" shiro:hasPermission="user:update">自提</button>'
+                                            return '<button class="layui-btn layui-btn-normal layui-btn-xs layui-btn-success" lay-event="takeGoods" shiro:hasPermission="user:update">自提</button>'
                                             +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                         }else{
-                                            return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
+                                            return '<button class="layui-btn layui-btn-normal layui-btn-xs layui-btn-success" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
                                                 +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                         }
                                     }else if(d.status === 7){
                                         return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
-                                            +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="delOrder" shiro:hasPermission="user:update">删除</button>'
+                                            +'<button class="layui-btn layui-btn-xs layui-btn-normal layui-btn-danger" lay-event="delOrder" shiro:hasPermission="user:update">删除</button>'
                                     }else{
-                                        return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+                                        return '<button class="layui-btn layui-btn-normal layui-btn-xs " lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                     }
-                                // }
                             },minWidth: 200,align:'center', fixed:'right'}
                 ]]
             });

--
Gitblit v1.9.1