From 96a7c6149c60a3b5229a1c351bed4ffc9514eae7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 30 Apr 2025 14:42:16 +0800
Subject: [PATCH] feat(happyActivity): 排除 voteActivityHot 接口的跨域访问限制
---
src/main/resources/templates/febs/views/modules/votesActivity/optionList.html | 65 +++++++++++++-------------------
1 files changed, 26 insertions(+), 39 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/votesActivity/optionList.html b/src/main/resources/templates/febs/views/modules/votesActivity/optionList.html
index 109ee31..3648f8c 100644
--- a/src/main/resources/templates/febs/views/modules/votesActivity/optionList.html
+++ b/src/main/resources/templates/febs/views/modules/votesActivity/optionList.html
@@ -1,4 +1,4 @@
-<div class="layui-fluid layui-anim febs-anim" id="febs-activity-option" lay-title="活动选手列表">
+<div class="layui-fluid layui-anim febs-anim" id="febs-activity-option" lay-title="活动选项列表">
<div class="layui-row febs-container">
<div class="layui-col-md12">
<div class="layui-card">
@@ -10,25 +10,25 @@
<div class="layui-inline">
<label class="layui-form-label layui-form-label-sm">选项名称</label>
<div class="layui-input-inline">
- <input type="text" placeholder="选项名称" name="beautyName" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="选项名称" name="optionName" 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-type">
+ <select name="activityId" class="activity-type-option">
<option value="">请选择</option>
</select>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">审核状态</label>
+ <label class="layui-form-label layui-form-label-sm">状态</label>
<div class="layui-input-inline">
- <select name="audit">
+ <select name="state">
<option value="">请选择</option>
- <option value="1">待审核</option>
- <option value="2">同意</option>
- <option value="3">拒绝</option>
+ <option value="0">待审核</option>
+ <option value="1">同意</option>
+ <option value="2">拒绝</option>
</select>
</div>
</div>
@@ -49,12 +49,6 @@
</div>
</form>
<table lay-filter="optionTable" lay-data="{id: 'optionTable'}"></table>
-<!-- <style type="text/css">-->
-<!-- ::-webkit-scrollbar {-->
-<!-- height: 20px !important;-->
-<!-- background-color: #f4f4f4;-->
-<!-- }-->
-<!-- </style>-->
</div>
</div>
</div>
@@ -68,18 +62,15 @@
<a lay-event="edit" shiro:hasPermission="votesActivityUpdate:update"><i
class="layui-icon febs-edit-area febs-blue"></i></a>
</script>
-<script type="text/html" id="auditType">
+<script type="text/html" id="optionStateType">
{{#
- var audit = {
+ var state = {
0: {title: '待审核', color: 'blue'},
- 1: {title: '待审核', color: 'blue'},
- 2: {title: '同意', color: 'green'},
- 3: {title: '拒绝', color: 'red'},
- 4: {title: '进行中', color: 'purple'},
- 5: {title: '已完成', color: 'gray'}
- }[d.audit];
+ 1: {title: '同意', color: 'green'},
+ 2: {title: '拒绝', color: 'red'},
+ }[d.state];
}}
- <span class="layui-badge febs-bg-{{audit.color}}">{{ audit.title }}</span>
+ <span class="layui-badge febs-bg-{{state.color}}">{{ state.title }}</span>
</script>
<script type="text/html" id="optionToolbar">
<div class="layui-btn-container">
@@ -116,11 +107,11 @@
form.render();
//(下拉框)
- $.get(ctx + 'admin/votesActivity/allActivities', function (res) {
+ $.get(ctx + 'admin/happyActivity/allActivities', function (res) {
var data = res.data;
for (let k in data)
{
- $(".activity-type").append("<option value='" + data[k].id + "'>" + data[k].name + "</option>");
+ $(".activity-type-option").append("<option value='" + data[k].id + "'>" + data[k].name + "</option>");
}
layui.use('form', function () {
var form = layui.form;
@@ -159,7 +150,7 @@
}
});
function optionDelete(id) {
- febs.get(ctx + 'admin/votesActivity/optionDelete/' + id, null, function (data) {
+ febs.get(ctx + 'admin/happyActivity/optionDelete/' + id, null, function (data) {
febs.alert.success(data.message);
$query.click();
});
@@ -185,7 +176,7 @@
});
function changeState(id,state) {
- febs.get(ctx + 'admin/votesActivity/changeState/' + id+'/' + state, null, function (data) {
+ febs.get(ctx + 'admin/happyActivity/changeOptionState/' + id+'/' + state, null, function (data) {
febs.alert.success(data.message);
$query.click();
});
@@ -196,19 +187,15 @@
tableIns = febs.table.init({
elem: $view.find('table'),
id: 'optionTable',
- url: ctx + 'admin/votesActivity/optionList',
+ url: ctx + 'admin/happyActivity/optionList',
toolbar:"#optionToolbar",
defaultToolbar:[],
cols: [[
- {type: 'numbers', title: '序号', width: 80},
+ {type: 'numbers', title: '', width: 80},
{title: '操作', toolbar: '#optionOption', minWidth: 200, align: 'center'},
- {field: 'number', title: '编号', minWidth: 100,align:'center'},
- {field: 'beautyName', title: '选项名称', minWidth: 200,align:'center'},
- // {field: 'rank', title: '排名', minWidth: 150,align:'center'},
- {field: 'voteCount', title: '总票数', minWidth: 100,align:'center'},
- // {field: 'diffPrevious', title: '票数差', minWidth: 150,align:'center'},
- // {field: 'description', title: '选项描述', minWidth: 100,align:'center'},
- {title: '审核状态', templet: '#auditType', minWidth: 100,align:'center'},
+ {field: 'orderCnt', title: '编号', minWidth: 100,align:'center'},
+ {field: 'optionName', title: '选项名称', minWidth: 200,align:'center'},
+ {title: '审核状态', templet: '#optionStateType', minWidth: 100,align:'center'},
{field: 'createdTime', title: '创建时间', minWidth: 150,align:'left'}
]]
});
@@ -235,7 +222,7 @@
var params = getQueryParams();
var queryString = Object.keys(params).map(key => `${key}=${encodeURIComponent(params[key])}`).join('&');
- window.location.href = ctx + 'admin/votesOption/exportOptionList?' + queryString;
+ window.location.href = ctx + 'admin/happyActivity/exportOptionList?' + queryString;
});
// 刷新按钮
$reset.on('click', function () {
@@ -246,9 +233,9 @@
// 获取查询参数
function getQueryParams() {
return {
- beautyName: $searchForm.find('input[name="beautyName"]').val().trim(),
+ optionName: $searchForm.find('input[name="optionName"]').val().trim(),
activityId: $searchForm.find("select[name='activityId']").val(),
- audit: $searchForm.find("select[name='audit']").val(),
+ state: $searchForm.find("select[name='state']").val(),
};
}
--
Gitblit v1.9.1