From e689c750f4390575ff619c212573be2f12e64618 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 23 Jan 2025 11:33:11 +0800
Subject: [PATCH] refactor(mall): 重构小程序定时任务获取 access_token 方式 - 移除 XcxProperties 类的使用 - 使用 @Value 注解直接注入小程序 appid 和 secret - 优化代码结构，提高可读性和维护性

---
 src/main/resources/templates/febs/views/modules/goods/goodsList.html |   46 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 38 insertions(+), 8 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 8b8520a..42e075a 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsList.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsList.html
@@ -13,6 +13,14 @@
                                             <input type="text" placeholder="商品名称" name="goodsName" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label layui-form-label-sm">活动</label>
+                                        <div class="layui-input-inline">
+                                            <select name="activityId" class="activity-option">
+                                                <option value="">请选择</option>
+                                            </select>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -28,7 +36,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;
@@ -39,6 +47,10 @@
                         }
                         .layui-table img{
                             max-width:100px
+                        }
+                        ::-webkit-scrollbar {
+                            height: 20px !important;
+                            background-color: #f4f4f4;
                         }
                     </style>
                 </div>
@@ -100,16 +112,32 @@
             $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();
+
+        //(下拉框)
+        $.get(ctx + 'admin/activity/activityListByType/1', function (res) {
+            var data = res.data;
+            for (var k in data)
+            {
+                $(".activity-option").append("<option value='" + data[k].id + "'>" + data[k].name + "</option>");
+            }
+            layui.use('form', function () {
+                var form = layui.form;
+                form.render();
+            });
+        });
 
         // 表格初始化
-        initTable();
+        initGoodsTable();
 
         // 初始化表格操作栏各个按钮功能
-        table.on('tool(userTable)', function (obj) {
+        table.on('tool(goodsListTable)', function (obj) {
             var data = obj.data,
                 layEvent = obj.event;
             if (layEvent === 'downGoods') {
@@ -194,14 +222,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 () {
@@ -217,10 +246,10 @@
             });
         });
 
-        function initTable() {
+        function initGoodsTable() {
             tableIns = febs.table.init({
                 elem: $view.find('table'),
-                id: 'userTable',
+                id: 'goodsListTable',
                 url: ctx + 'admin/goods/goodsList?goodsType=1',
                 cols: [[
                     {field: 'goodsNo', title: '商品编号', minWidth: 100,align:'left'},
@@ -276,6 +305,7 @@
         function getQueryParams() {
             return {
                 goodsName: $searchForm.find('input[name="goodsName"]').val().trim(),
+                activityId: $searchForm.find("select[name='activityId']").val(),
             };
         }
 

--
Gitblit v1.9.1