diff --git a/service/Application/Admin/Lang/zh-cn/alipaylifemessage.php b/service/Application/Admin/Lang/zh-cn/alipaylifemessage.php
index ceb441433..425a4e92f 100755
--- a/service/Application/Admin/Lang/zh-cn/alipaylifemessage.php
+++ b/service/Application/Admin/Lang/zh-cn/alipaylifemessage.php
@@ -57,5 +57,6 @@ return array(
     'alipay_life_message_selected_text'     => '已选',
     'alipay_life_message_selected_all_text' => '全选',
     'alipay_life_message_content_text'      => '内容',
+    'alipay_life_message_detail_text'       => '详情',
 );
 ?>
\ No newline at end of file
diff --git a/service/Application/Admin/View/Default/AlipayLifeMessage/Index.html b/service/Application/Admin/View/Default/AlipayLifeMessage/Index.html
index 94167b923..6fa54418c 100755
--- a/service/Application/Admin/View/Default/AlipayLifeMessage/Index.html
+++ b/service/Application/Admin/View/Default/AlipayLifeMessage/Index.html
@@ -122,6 +122,12 @@
                                     
                                     <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-trash-o submit-delete" data-url="{{:U('Admin/AlipayLifeMessage/Delete')}}" data-id="{{$v.id}}"> {{:L('common_operation_delete')}}</button>
                                 </if>
+
+                                <if condition="in_array($v['status'], [2,3])">
+                                    <a href="{{:U('Admin/AlipayLifeMessage/Detail', array('message_id'=>$v['id']))}}">
+                                        <button class="am-btn am-btn-default am-btn-xs am-radius am-icon-align-left"> {{:L('alipay_life_message_detail_text')}}</button>
+                                    </a>
+                                </if>
                             </td>
                         </tr>
                     </foreach>
diff --git a/service/Application/Service/AlipayLifeService.class.php b/service/Application/Service/AlipayLifeService.class.php
index adfa5f8e4..520a3d46b 100644
--- a/service/Application/Service/AlipayLifeService.class.php
+++ b/service/Application/Service/AlipayLifeService.class.php
@@ -410,6 +410,25 @@ class AlipayLifeService
             return DataReturn('状态不可操作['.$common_send_status_list[$message['status']]['name'].']', -2);
         }
 
+        // 获取消息内容
+        $content_count = (int) M('AlipayLifeMessageContent')->where(['alipay_life_message_id'=>$message['id']])->count();
+        switch($message['send_type'])
+        {
+            case 0 :
+                if($content_count > 1)
+                {
+                    return DataReturn('消息内容不存在', -1);
+                }
+                break;
+
+            case 1 :
+                if($content_count > 10)
+                {
+                    return DataReturn('群发消息不能超过10条内容', -1);
+                }
+                break;
+        }
+
         // 发送类型
         $data = [];
         if($message['send_type'] == 1)
diff --git a/service/Public/Upload/alipay_life_message/2018/10/26/2018102600174550081.png b/service/Public/Upload/alipay_life_message/2018/10/26/2018102600174550081.png
new file mode 100644
index 000000000..cb3be367d
Binary files /dev/null and b/service/Public/Upload/alipay_life_message/2018/10/26/2018102600174550081.png differ