From a2a4dd75b0c0e51b325c4fbe89da80dfa4a5d24f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Feb 2023 17:13:57 +0800
Subject: [PATCH] 滑动条

---
 src/main/resources/templates/febs/views/modules/order/orderList.html |   67 +++++++++++++++++----------------
 1 files changed, 34 insertions(+), 33 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 5731049..5e445e9 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -7,9 +7,9 @@
                         <div class="layui-form-item">
                             <div class="layui-col-md10">
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">用户名:</label>
+                                    <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">
@@ -19,7 +19,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label layui-form-label-sm">订单状态</label>
+                                    <label class="layui-form-label layui-form-label-sm">状态</label>
                                     <div class="layui-input-inline">
                                         <select name="status">
                                             <option value="">请选择</option>
@@ -99,6 +99,11 @@
                         .layui-table img{
                             max-width:100px
                         }
+
+                        ::-webkit-scrollbar {
+                            height: 20px !important;
+                            background-color: #f4f4f4;
+                        }
                     </style>
                 </div>
             </div>
@@ -113,7 +118,7 @@
     <a lay-event="edit" shiro:hasPermission="user:update"><i
             class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
 </script>
-<script type="text/html" id="tableToolBar">
+<script type="text/html" id="tableToolBarOrder">
     <div class="layui-btn-container">
 <!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverOne">导出待发货订单,系统自动发货</button>-->
 <!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="confirmOrder">确认到货</button>-->
@@ -143,6 +148,9 @@
             laydate = layui.laydate,
             tableIns;
 
+        let currPageOrder = 1;//首先默认值为1,防止出错
+        //获取当前页
+        currPageOrder = $view.find(".layui-laypage-em").next().html();
         //日期范围
         laydate.render({
             elem: '#febs-form-group-date-start'
@@ -300,6 +308,8 @@
             ,accept: 'file' //普通文件
             ,done: function(res){
                 console.log("123");
+                febs.alert.success('操作成功');
+                $query.click();
             }
         });
 
@@ -355,14 +365,14 @@
         // 查询按钮
         $query.on('click', function () {
             var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
-            tableIns.reload({where: params, page: {curr: 1}});
+            tableIns.reload({where: params, page: {curr: currPageOrder}});
         });
 
         // 刷新按钮
         $reset.on('click', function () {
             $searchForm[0].reset();
             sortObject.type = 'null';
-            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+            tableIns.reload({where: getQueryParams(), page: {curr: currPageOrder}, initSort: sortObject});
         });
 
         $add.on('click', function () {
@@ -374,28 +384,19 @@
                 elem: $view.find('table'),
                 id: 'orderTable',
                 url: ctx + 'admin/order/orderList?orderType=1',
-                defaultToolbar: [],
-                toolbar: '#tableToolBar',
+                // defaultToolbar: [],
+                //系统自带打印导出
+                toolbar: '#tableToolBarOrder',
                 cols: [[
                         {type: 'checkbox', fixed: 'left'},
                         {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
                         {field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
                         {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
-                        // {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
                         {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
-                        {field: 'amount', title: '订单金额', minWidth: 160,align:'left'},
-                        // {field: 'leaderName', title: '团长', minWidth: 120,align:'left'},
+                        {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left'},
+                        {field: 'carriage', title: '邮费', minWidth: 80,align:'left'},
+                        {field: 'amount', title: '总金额', minWidth: 100,align:'left'},
                         {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
-                        // {field: 'isHome', title: '配送方式',
-                        //     templet: function (d) {
-                        //         if (d.isHome === 2) {
-                        //             return '<span style="color:dodgerblue;">自提</span>'
-                        //         } else if (d.isHome === 1) {
-                        //             return '<span style="color:forestgreen;">送货上门</span>'
-                        //         }else{
-                        //             return ''
-                        //         }
-                        //     }, minWidth: 100,align:'center'},
                         {field: 'status', title: '状态',
                             templet: function (d) {
                                 if (d.status === 1) {
@@ -416,18 +417,18 @@
                                     return ''
                                 }
                             }, minWidth: 80,align:'center'},
-                    {field: 'deliveryState', title: '配送状态',
-                        templet: function (d) {
-                            if (d.deliveryState === 1) {
-                                return '<span style="color:dodgerblue;">待配送</span>'
-                            } else if (d.deliveryState === 2) {
-                                return '<span style="color:forestgreen;">配送中</span>'
-                            } else if (d.deliveryState === 3) {
-                                return '<span style="color:forestgreen;">已送达</span>'
-                            }else{
-                                return ''
-                            }
-                        }, minWidth: 80,align:'center'},
+                    // {field: 'deliveryState', title: '配送状态',
+                    //     templet: function (d) {
+                    //         if (d.deliveryState === 1) {
+                    //             return '<span style="color:dodgerblue;">待配送</span>'
+                    //         } else if (d.deliveryState === 2) {
+                    //             return '<span style="color:forestgreen;">配送中</span>'
+                    //         } else if (d.deliveryState === 3) {
+                    //             return '<span style="color:forestgreen;">已送达</span>'
+                    //         }else{
+                    //             return ''
+                    //         }
+                    //     }, minWidth: 80,align:'center'},
                         {field: 'payMethod', title: '支付方式', minWidth: 100,align:'left'},
                         {field: 'payTime', title: '支付时间', minWidth: 120,align:'left'},
                         // {field: 'wxOrderNo', title: '支付订单号', minWidth: 120,align:'left'},

--
Gitblit v1.9.1