From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js b/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
index bb07fe9..936a40a 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ticket/ticket.js
@@ -30,7 +30,7 @@
},
{title: '兑换地点', field: 'useScope', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row, index) {
- return {1: "全国", 2: "指定城市", 3: "指定门店"}[value]
+ return {1: "全国", 2: "指定城市", 3: "指定门店",4:"指定场地"}[value]
}
},
{title: '用户人群', field: 'userPopulation', visible: true, align: 'center', valign: 'middle',
@@ -57,6 +57,10 @@
return {1: "上架", 2: "下架"}[value]
}
},
+ {title: '审核状态', field: 'auditStatus', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row, index) {
+ return {2: "待审核", 1: "已通过",3: "已拒绝"}[value]
+ }},
];
};
function currentTime(timestamp){
--
Gitblit v1.7.1