From 2a0ec23b7da17819861a9e0a916df03f201f08e0 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Wed, 31 Oct 2018 10:17:27 +0800
Subject: [PATCH] debug

---
 .../Application/Admin/View/Default/AlipayLifeMessage/Index.html | 2 +-
 service/Application/Service/AlipayLifeService.class.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/Application/Admin/View/Default/AlipayLifeMessage/Index.html b/service/Application/Admin/View/Default/AlipayLifeMessage/Index.html
index c14ecd062..ee7d04adf 100755
--- a/service/Application/Admin/View/Default/AlipayLifeMessage/Index.html
+++ b/service/Application/Admin/View/Default/AlipayLifeMessage/Index.html
@@ -109,7 +109,7 @@
                                 </div>
                             </td>
                             <td class="view-operation">
-                                <if condition="$v['status'] eq 0">
+                                <if condition="in_array($v['status'], [0,4])">
                                     <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-send-o submit-ajax" data-url="{{:U('Admin/AlipayLifeMessage/Send')}}" data-id="{{$v.id}}" data-view="reload"> {{:L('common_send_text')}}</button>
 
                                     <a href="{{:U('Admin/AlipayLifeMessage/ContentIndex', array('message_id'=>$v['id']))}}">
diff --git a/service/Application/Service/AlipayLifeService.class.php b/service/Application/Service/AlipayLifeService.class.php
index 2b95fe406..454b66064 100755
--- a/service/Application/Service/AlipayLifeService.class.php
+++ b/service/Application/Service/AlipayLifeService.class.php
@@ -412,7 +412,7 @@ class AlipayLifeService
             return DataReturn('消息纪录不存在', -1);
         }
         $common_send_status_list = L('common_send_status_list');
-        if($message['status'] != 0)
+        if(!in_array($message['status'], [0,4]))
         {
             return DataReturn('状态不可操作['.$common_send_status_list[$message['status']]['name'].']', -2);
         }