From b87922420561a35c1e99b67fb6caf3fe30bc8ccf Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 16 十一月 2023 08:57:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCouponExamine/TCouponExamineInfo.html | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCouponExamine/TCouponExamineInfo.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCouponExamine/TCouponExamineInfo.html
index 4cb94ef..5958b29 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCouponExamine/TCouponExamineInfo.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCouponExamine/TCouponExamineInfo.html
@@ -53,12 +53,32 @@
<div class="row">
<div class="col-sm-6">
<div class="form-group">
+ <label class="col-sm-3 control-label">*当前状态: </label>
+
+ <div class="col-sm-9">
+ @if(state == "待审核"){
+ <h3 style="color: yellowgreen">${state}</h3>
+ @}
+ @if(state == "已拒绝"){
+ <h3 style="color: green">${state}</h3>
+ @}
+ @if(state == "未通过"){
+ <h3 style="color: red">${state}</h3>
+ @}
+ </div>
+
+
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="form-group">
<label class="col-sm-3 control-label">*优惠券名称: </label>
<div class="col-sm-9">
<input class="form-control" id="name" name="name" autocomplete="off" placeholder="请输入优惠券名称" value="${item.name}" readonly>
</div>
</div>
-
</div>
</div>
@@ -155,7 +175,7 @@
</div>
</div>
-
+ @if(cash!=null){
<div class="row" id="needAmount" >
<div class="col-sm-6">
<div class="form-group">
@@ -169,6 +189,8 @@
</div>
</div>
@}
+ @}
+ @if(integral!=null){
<div class="row" id="needIntegral" >
<div class="col-sm-6">
<div class="form-group">
@@ -181,7 +203,7 @@
</div>
</div>
-
+ @}
<div class="row">
<div class="col-sm-6">
<div class="form-group">
--
Gitblit v1.7.1