From 92be3cf81a249b9be61a4029ab1de0b63ad175df Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Mon, 19 Mar 2018 17:27:08 +0800
Subject: [PATCH 1/5] fix html

---
 .../templates/activity/mondelay/mondelay.html        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/activity/mondelay/mondelay.html b/src/main/resources/templates/activity/mondelay/mondelay.html
index a3815d92b..ae0ca7cc2 100644
--- a/src/main/resources/templates/activity/mondelay/mondelay.html
+++ b/src/main/resources/templates/activity/mondelay/mondelay.html
@@ -53,7 +53,7 @@
     </button>
 </div>
     <div class="button_center" th:if="${active && !apply}" id="applyButton">
-        <button class="button_position">
+        <button th:class="${operation_pause}?'disabled'" class="button_position">
             <span style="color: #FFFFFF;">我要参加</span>
         </button>
     </div>
@@ -87,7 +87,7 @@
         </div>
     </div>
     <div class="button_center cancel_posttion"  th:if="${active && apply}" id="cancelButton">
-        <button class="button_position button_color">
+        <button th:class="${operation_pause}?'disabled'" class="button_position button_color">
             <span class="cancel">放弃活动资格</span>
         </button>
     </div>
@@ -110,7 +110,7 @@
 </html>
 <script type="text/javascript" data-th-inline="javascript">
     $(document).ready(function () {
-
+        var operation_pause= /*[[${operation_pause}]]*/false;
 
         function is_weixin() {
             var ua = navigator.userAgent.toLowerCase();
@@ -121,6 +121,9 @@
             }
         }
         $('#applyButton').click(function () {
+            if(operation_pause){
+                return;
+            }
             var u = navigator.userAgent;
             var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
 
@@ -135,6 +138,9 @@
             }
         });
         $('#cancelButton').click(function () {
+            if(operation_pause){
+                return;
+            }
             var u = navigator.userAgent;
             var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
 

From 432067e04683ff7b77d5158f62d80ebedfb04ce6 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Mon, 19 Mar 2018 17:28:12 +0800
Subject: [PATCH 2/5] fix~

---
 .../core/impls/ActMonDelaySettleServiceImp.java              | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java
index f92fdadce..0d7342475 100644
--- a/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java
@@ -67,6 +67,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
         int client_id = device.getIntValue("client_id");
         List<JSONObject> clientLogs = actMonDelaySettleMapper.clientLog(client_id);
         JSONObject res = new JSONObject();
+        res.put("operation_pause",false);
         Boolean apply = false;
         if (!clientLogs.isEmpty()) {
             apply = true;
@@ -82,6 +83,10 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
             res.put("active", true);
             res.put("expire", false);
         }
+        LocalDateTime dt = LocalDateTime.now();
+        if(dt.getDayOfWeek()==DayOfWeek.MONDAY && dt.getHour()<18){
+            res.put("operation_pause",true);
+        }
         BigDecimal total_redpack = actMonDelaySettleRedPackMapper.getTotalRedPack(client_id);
         PageList<JSONObject> list = actMonDelaySettleRedPackMapper.listRedpacks(client_id, new PageBounds(Order.formString("create_time.desc")));
         res.put("apply", apply);

From bc82d0f6b711a8a28fbd084c274700ecc71cd683 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Mon, 19 Mar 2018 17:36:53 +0800
Subject: [PATCH 3/5] fix html

---
 src/main/resources/templates/activity/mondelay/mondelay.html | 4 ++--
 src/main/ui/static/templates/activity/mondelay/mondelay.css  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/activity/mondelay/mondelay.html b/src/main/resources/templates/activity/mondelay/mondelay.html
index ae0ca7cc2..c74da4a5b 100644
--- a/src/main/resources/templates/activity/mondelay/mondelay.html
+++ b/src/main/resources/templates/activity/mondelay/mondelay.html
@@ -53,7 +53,7 @@
     </button>
 </div>
     <div class="button_center" th:if="${active && !apply}" id="applyButton">
-        <button th:class="${operation_pause}?'disabled'" class="button_position">
+        <button th:class="${operation_pause}?'button_gray'" class="button_position">
             <span style="color: #FFFFFF;">我要参加</span>
         </button>
     </div>
@@ -87,7 +87,7 @@
         </div>
     </div>
     <div class="button_center cancel_posttion"  th:if="${active && apply}" id="cancelButton">
-        <button th:class="${operation_pause}?'disabled'" class="button_position button_color">
+        <button th:class="${operation_pause}?'button_gray'" class="button_position button_color">
             <span class="cancel">放弃活动资格</span>
         </button>
     </div>
diff --git a/src/main/ui/static/templates/activity/mondelay/mondelay.css b/src/main/ui/static/templates/activity/mondelay/mondelay.css
index 8e64dea98..7db5366f9 100644
--- a/src/main/ui/static/templates/activity/mondelay/mondelay.css
+++ b/src/main/ui/static/templates/activity/mondelay/mondelay.css
@@ -212,4 +212,6 @@ tbody tr:nth-child(odd){
     letter-spacing: 0px;
     padding: 0 8px;
 }
-
+.button_gray{
+    background-image: linear-gradient(0deg, #808080 0%, #808080 100%)
+}

From 5ed445e8a96167afa66d580573c5f317870ce3c6 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Mon, 19 Mar 2018 17:55:43 +0800
Subject: [PATCH 4/5] =?UTF-8?q?mondelay=20=20=E5=91=A8=E4=B8=8018=E7=82=B9?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E5=81=9C=E6=AD=A2=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/activity/mondelay/mondelay.html   | 8 ++++----
 .../ui/static/templates/activity/mondelay/mondelay.css    | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/templates/activity/mondelay/mondelay.html b/src/main/resources/templates/activity/mondelay/mondelay.html
index c74da4a5b..8c0ff0c71 100644
--- a/src/main/resources/templates/activity/mondelay/mondelay.html
+++ b/src/main/resources/templates/activity/mondelay/mondelay.html
@@ -53,8 +53,8 @@
     </button>
 </div>
     <div class="button_center" th:if="${active && !apply}" id="applyButton">
-        <button th:class="${operation_pause}?'button_gray'" class="button_position">
-            <span style="color: #FFFFFF;">我要参加</span>
+        <button  class="button_position" th:style="'background-image:' + @{(${operation_pause} ? 'linear-gradient(0deg, #808080 0%, #808080 100%)' )} + ''">
+            <span style="color: #FFFFFF;" >我要参加</span>
         </button>
     </div>
     <div th:class="${apply}?'margin_top'" th:if="${list!=null}">
@@ -87,8 +87,8 @@
         </div>
     </div>
     <div class="button_center cancel_posttion"  th:if="${active && apply}" id="cancelButton">
-        <button th:class="${operation_pause}?'button_gray'" class="button_position button_color">
-            <span class="cancel">放弃活动资格</span>
+        <button class="button_position button_color" th:style="'background-image:' + @{(${operation_pause} ? 'linear-gradient(0deg, #808080 0%, #808080 100%)' )} + ''">
+            <span class="cancel" >放弃活动资格</span>
         </button>
     </div>
 
diff --git a/src/main/ui/static/templates/activity/mondelay/mondelay.css b/src/main/ui/static/templates/activity/mondelay/mondelay.css
index 7db5366f9..336638ac2 100644
--- a/src/main/ui/static/templates/activity/mondelay/mondelay.css
+++ b/src/main/ui/static/templates/activity/mondelay/mondelay.css
@@ -212,6 +212,3 @@ tbody tr:nth-child(odd){
     letter-spacing: 0px;
     padding: 0 8px;
 }
-.button_gray{
-    background-image: linear-gradient(0deg, #808080 0%, #808080 100%)
-}

From 176b69d685b73d7a9cb95bba84e188648466ba1e Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Mon, 19 Mar 2018 18:12:28 +0800
Subject: [PATCH 5/5] update

---
 .../resources/templates/activity/mondelay/mondelay.html   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/activity/mondelay/mondelay.html b/src/main/resources/templates/activity/mondelay/mondelay.html
index 8c0ff0c71..6e76231df 100644
--- a/src/main/resources/templates/activity/mondelay/mondelay.html
+++ b/src/main/resources/templates/activity/mondelay/mondelay.html
@@ -53,8 +53,8 @@
     </button>
 </div>
     <div class="button_center" th:if="${active && !apply}" id="applyButton">
-        <button  class="button_position" th:style="'background-image:' + @{(${operation_pause} ? 'linear-gradient(0deg, #808080 0%, #808080 100%)' )} + ''">
-            <span style="color: #FFFFFF;" >我要参加</span>
+        <button  class="button_position" th:style="'background-image:' + @{(${operation_pause} ? 'linear-gradient(0deg, #eee 0%, #eee 100%)' )} + ''">
+            <span style="color: #FFFFFF;" th:style="'color:' + @{(${operation_pause} ? '#999' )} + ''">我要参加</span>
         </button>
     </div>
     <div th:class="${apply}?'margin_top'" th:if="${list!=null}">
@@ -87,8 +87,8 @@
         </div>
     </div>
     <div class="button_center cancel_posttion"  th:if="${active && apply}" id="cancelButton">
-        <button class="button_position button_color" th:style="'background-image:' + @{(${operation_pause} ? 'linear-gradient(0deg, #808080 0%, #808080 100%)' )} + ''">
-            <span class="cancel" >放弃活动资格</span>
+        <button class="button_position button_color" th:style="'background-image:' + @{(${operation_pause} ? 'linear-gradient(0deg, #eee 0%, #eee 100%)' )} + ''">
+            <span class="cancel" th:style="'color:' + @{(${operation_pause} ? '#999' )} + ''">放弃活动资格</span>
         </button>
     </div>