From fda57b880c57c2a7e9d26d7912eed310e028042d Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sat, 03 Jun 2023 03:25:42 +0800
Subject: [PATCH] fix

---
 src/main/resources/templates/febs/views/modules/goods/goodsList.html |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 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 e5e0519..74ae8f3 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsList.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
@@ -51,7 +51,7 @@
     <span shiro:lacksPermission="user:view,user:update,user:delete">
         <span class="layui-badge-dot febs-bg-orange"></span> 无权限
     </span>
-    <a lay-event="edit" shiro:hasPermission="user:update"><i
+    <a lay-event="edit" shiro:hasPermission="goodsUpdateNew:update"><i
             class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
 </script>
 <script type="text/html" id="upOrDownSwitch">
@@ -104,6 +104,9 @@
             tableIns;
 
         form.render();
+        let currPageGoods = 1;//首先默认值为1，防止出错
+        //获取当前页
+        currPageGoods = $view.find(".layui-laypage-em").next().html();
 
         // 表格初始化
         initTable();
@@ -194,14 +197,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: 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 () {
@@ -223,32 +226,30 @@
                 id: 'userTable',
                 url: ctx + 'admin/goods/goodsList?goodsType=1',
                 cols: [[
+                    {field: 'sortCnt', title: '序号', minWidth: 80,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: 140,align:'left'},
+                    {field: 'categaryName', title: '分类', minWidth: 100,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:"#goodsTypeFormat",  title: '商品类型', minWidth: 100,align:'left'},
                     {templet:"#isSkuFormat", title: '是否多规格', minWidth: 100,align:'left'},
                     {field: 'presentPrice', title: '现价', minWidth: 100,align:'left'},
-                    {field: 'originalPrice', 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'},
+                    {field: 'scorePercent', title: '兑换比例', minWidth: 100,align:'left'},
                     {title: '操作',
                         templet: function (d) {
                             if (d.isSale === 1) {
                                 return '';
-                                // return '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-orange" lay-event="downGoods" shiro:hasPermission="user:update">下架</button>'
-                                // + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="detailGoods" shiro:hasPermission="user:update">详情</button>'
                             }else{
-                                // '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-green" lay-event="upGoods" shiro:hasPermission="user:update">上架</button>'
-                                return ''
-                                + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="goodsUpdate" shiro:hasPermission="user:update">编辑</button>'
-                                    + '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="delGoods" shiro:hasPermission="user:update">删除</button>'
+                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="goodsUpdate" shiro:hasPermission="goodsUpdateNew:update">编辑</button>'
+                                    + '<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="delGoods" shiro:hasPermission="goodsUpdateNew:update">删除</button>'
 
                             }
                         },minWidth: 160,align:'center'}

--
Gitblit v1.9.1