From 14d67508d21d18e4b8d8d5874efe9ef946115b04 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 16 May 2025 14:17:45 +0800
Subject: [PATCH] fix(mall): 修复订单积分计算错误
---
src/main/resources/templates/febs/views/modules/votesActivity/orderList.html | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/votesActivity/orderList.html b/src/main/resources/templates/febs/views/modules/votesActivity/orderList.html
index 9fbcfb1..48408fe 100644
--- a/src/main/resources/templates/febs/views/modules/votesActivity/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/votesActivity/orderList.html
@@ -45,6 +45,9 @@
<div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
<i class="layui-icon"></i>
</div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="export" title="导出">
+ <i class="layui-icon"></i>
+ </div>
</div>
</div>
</form>
@@ -103,7 +106,7 @@
1: {title: '余额', color: 'blue'},
2: {title: '微信', color: 'green'},
3: {title: '积分', color: 'orange'},
- 4: {title: '免费', color: 'red'},
+ 0: {title: '免费', color: 'red'},
}[d.payType];
}}
<span class="layui-badge febs-bg-{{payType.color}}">{{ payType.title }}</span>
@@ -125,6 +128,7 @@
$view = $('#febs-activity-order'),
$query = $view.find('#query'),
$reset = $view.find('#reset'),
+ $export= $view.find('#export'),
$searchForm = $view.find('form'),
sortObject = {field: 'phone', type: null},
tableIns;
@@ -274,6 +278,19 @@
});
}
+ // 导出功能
+ $export.on('click', function () {
+ var params = getQueryParams();
+ let activityId = $searchForm.find("select[name='activityId']").val();
+ //如果活动ID为空，弹出提示请选择活动
+ if (activityId == null || activityId == '') {
+ febs.alert.warn('请选择活动');
+ return;
+ }
+ var queryString = Object.keys(params).map(key => `${key}=${encodeURIComponent(params[key])}`).join('&');
+ window.location.href = ctx + 'admin/happyActivity/exportOrderList?' + queryString;
+ });
+
// 查询按钮
$query.on('click', function () {
var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
--
Gitblit v1.9.1