From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Mon, 07 Jul 2025 17:51:09 +0800 Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类,添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑,增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑,移除冗余代码 --- src/main/resources/templates/febs/views/modules/score/orderList.html | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/main/resources/templates/febs/views/modules/score/orderList.html b/src/main/resources/templates/febs/views/modules/score/orderList.html index 6c7918b..132ce24 100644 --- a/src/main/resources/templates/febs/views/modules/score/orderList.html +++ b/src/main/resources/templates/febs/views/modules/score/orderList.html @@ -69,6 +69,12 @@ <a lay-event="edit" shiro:hasPermission="user:update"><i class="layui-icon febs-edit-area febs-blue"></i></a> </script> +<script type="text/html" id="tableToolBar"> + <div class="layui-btn-container"> + <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> + </div> +</script> <!-- 表格操作栏 end --> <script data-th-inline="none" type="text/javascript"> // 引入组件并初始化 @@ -89,6 +95,14 @@ // 表格初始化 initTable(); + + table.on('toolbar(orderTable)', function(obj){ + var event = obj.event; + + if (event == 'exportDeliver') { + window.location.href = ctx + "admin/order/exportOrderList?orderType=2&status=2"; + } + }); // 初始化表格操作栏各个按钮功能 table.on('tool(orderTable)', function (obj) { @@ -161,6 +175,8 @@ elem: $view.find('table'), id: 'orderTable', url: ctx + 'admin/order/orderList?orderType=2', + defaultToolbar: [], + toolbar: '#tableToolBar', cols: [[ {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'}, {field: 'memberName', title: '购买人', minWidth: 120,align:'left'}, -- Gitblit v1.9.1