From 9b51a95fa8bc9b3a86108c6900e17fc55f8db467 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:02:07 +0800
Subject: [PATCH] refactor(vip): 优化积分和返佣计算逻辑

---
 src/main/resources/templates/febs/views/modules/goods/goodsList.html |   46 +++++++++++++++++++++++++++-------------------
 1 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsList.html b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
index 9a75209..518d7a3 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsList.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
@@ -8,8 +8,9 @@
                             <div class="layui-col-md10">
                                 <div class="layui-form-item">
                                     <div class="layui-inline">
+                                        <label class="layui-form-label layui-form-label-sm">商品名称</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>
@@ -27,7 +28,7 @@
                             </div>
                         </div>
                     </form>
-                    <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
+                    <table lay-filter="goodsListTable" lay-data="{id: 'goodsListTable'}"></table>
                     <style type="text/css">
                         .layui-table-cell{
                             text-align:center;
@@ -38,6 +39,10 @@
                         }
                         .layui-table img{
                             max-width:100px
+                        }
+                        ::-webkit-scrollbar {
+                            height: 20px !important;
+                            background-color: #f4f4f4;
                         }
                     </style>
                 </div>
@@ -99,16 +104,18 @@
             $reset = $view.find('#reset'),
             $searchForm = $view.find('form'),
             $add = $view.find('#add'),
-            sortObject = {field: 'phone', type: null},
+            sortObject = {field: 'isSale', type: 'asc'},
             tableIns;
 
         form.render();
-
+        let currPageGoods = 1;//首先默认值为1,防止出错
+        //获取当前页
+        currPageGoods = $view.find(".layui-laypage-em").next().html();
         // 表格初始化
         initTable();
 
         // 初始化表格操作栏各个按钮功能
-        table.on('tool(userTable)', function (obj) {
+        table.on('tool(goodsListTable)', function (obj) {
             var data = obj.data,
                 layEvent = obj.event;
             if (layEvent === 'downGoods') {
@@ -193,14 +200,15 @@
         // 查询按钮
         $query.on('click', function () {
             var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
-            tableIns.reload({where: params, page: {curr: 1}});
+            // params.pageNum = $view.find(".layui-laypage-em").next().html();
+            tableIns.reload({where: params, page: {curr: currPageGoods}});
         });
 
         // 刷新按钮
         $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: currPageGoods}, initSort: sortObject});
         });
 
         $add.on('click', function () {
@@ -219,24 +227,24 @@
         function initTable() {
             tableIns = febs.table.init({
                 elem: $view.find('table'),
-                id: 'userTable',
+                id: 'goodsListTable',
                 url: ctx + 'admin/goods/goodsList?goodsType=1',
                 cols: [[
-                    {field: 'goodsNo', title: '商品编号', minWidth: 150,align:'left'},
-                    {field: 'goodsName', title: '商品名称', minWidth: 150,align:'left'},
+                    {field: 'goodsNo', title: '商品编号', minWidth: 100,align:'left'},
+                    {field: 'goodsName', title: '商品名称', minWidth: 140,align:'left'},
                     {field: 'thumb', title: '缩略图',
                         templet: function (d) {
                             return '<a lay-event="seeImgThumb"><img id="seeImgThumb'+d.id+'" src="'+d.thumb+'" alt=""></a>';
                         }, minWidth: 150,align:'center'},
-                    {field: 'categaryName', title: '分类', minWidth: 150,align:'left'},
-                    {field: 'isSale', title: '是否上架', templet: '#upOrDownSwitch', minWidth: 130,align:'center'},
-                    {field: 'isHot', title: '是否主推', templet: '#isHotSwitch', minWidth: 130,align:'center'},
-                    {templet:"#goodsTypeFormat",  title: '商品类型', minWidth: 150,align:'left'},
-                    {templet:"#isSkuFormat", title: '是否多规格', minWidth: 150,align:'left'},
-                    {field: 'presentPrice', title: '现价', minWidth: 150,align:'left'},
-                    {field: 'originalPrice', title: '原价', minWidth: 150,align:'left'},
-                    {field: 'stock', title: '商品库存', minWidth: 150,align:'left'},
-                    {field: 'skuVolume', title: '商品销量', minWidth: 150,align:'left'},
+                    {field: 'categaryName', title: '分类', minWidth: 140,align:'left'},
+                    {field: 'isSale', title: '是否上架', templet: '#upOrDownSwitch', minWidth: 100,align:'center'},
+                    {field: 'isHot', title: '是否主推', templet: '#isHotSwitch', minWidth: 100,align:'center'},
+                    {templet:"#goodsTypeFormat",  title: '商品类型', minWidth: 140,align:'left'},
+                    {templet:"#isSkuFormat", title: '是否多规格', minWidth: 100,align:'left'},
+                    {field: 'presentPrice', title: '现价', minWidth: 100,align:'left'},
+                    {field: 'originalPrice', title: '原价', minWidth: 100,align:'left'},
+                    {field: 'stock', title: '商品库存', minWidth: 100,align:'left'},
+                    {field: 'skuVolume', title: '商品销量', minWidth: 100,align:'left'},
                     {title: '操作',
                         templet: function (d) {
                             if (d.isSale === 1) {

--
Gitblit v1.9.1