From ca2fdaa2f248269412a210359f844df7abd3cdde Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 12 Oct 2020 14:54:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/view/luckdraw_config/index.html | 20 ++++++++++++--------
 app/data/view/luckdraw_prize/index.html  |  1 -
 app/data/view/luckdraw_record/index.html |  6 +++---
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/data/view/luckdraw_config/index.html b/app/data/view/luckdraw_config/index.html
index d5eabe424..0f869e9c1 100644
--- a/app/data/view/luckdraw_config/index.html
+++ b/app/data/view/luckdraw_config/index.html
@@ -31,30 +31,34 @@
         {foreach $list as $key=>$vo}
         <tr>
             <td class='list-table-check-td think-checkbox'>
-                <input class="list-check-box" value='{$vo.id}' type='checkbox'>
+                <label><input class="list-check-box" value='{$vo.id}' type='checkbox'></label>
             </td>
             <td class='text-left nowrap'>
                 {$vo.code|default=''}
-                <span data-tips-text="复制活动链接" data-copy="{:url('@data/app.luckdraw/index/code/'.$vo.code,[],true,true)}" class="layui-badge pointer">
+                <span data-tips-text="复制活动链接" data-copy="{:url('@data/app.luckdraw/index/code/'.$vo.code,[],true,true)}" class="margin-left-5 pointer">
                     <i class="layui-icon layui-icon-link font-s12"></i>
                 </span>
             </td>
-            <td class='text-left nowrap'><i class="fa fa-qrcode fa-lg margin-right-5 pointer" data-load="{:url('index')}?action=qrc&code={$vo.code}" data-time="false"></i>{$vo.name|default=''}</td>
-            <td class='text-left nowrap'>{$vo.create_at|format_datetime|raw}</td>
-            <td class='text-left nowrap'>{eq name='vo.status' value='0'}<span class="layui-badge">已停止</span>{else}<span class="layui-badge layui-bg-green">进行中</span>{/eq}</td>
+            <td class='text-left nowrap'>
+                <i class="fa fa-qrcode fa-lg margin-right-5 pointer" data-load="{:url('index')}?action=qrc&code={$vo.code}" data-time="false"></i>
+                {$vo.name|default=''}
+            </td>
+            <td class='text-left nowrap'>
+                {$vo.create_at|format_datetime}
+            </td>
+            <td class='text-left nowrap'>
+                {eq name='vo.status' value='0'}<span class="layui-badge">已停止</span>{else}<span class="layui-badge layui-bg-green">进行中</span>{/eq}
+            </td>
             <td class='text-left nowrap'>
                 <!--{if auth("edit")}-->
                 <a class="layui-btn layui-btn-xs" data-title="编辑活动" data-open='{:url("edit")}?code={$vo.code}'>编 辑</a>
                 <!--{/if}-->
-
                 <!--{if $vo.status eq 1 and auth("state")}-->
                 <a class="layui-btn layui-btn-xs layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">停 止</a>
                 <!--{/if}-->
-
                 <!--{if $vo.status eq 0 and auth("state")}-->
                 <a class="layui-btn layui-btn-xs layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">进 行</a>
                 <!--{/if}-->
-
                 <!--{if auth("remove")}-->
                 <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要删除该活动吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}">删 除</a>
                 <!--{/if}-->
diff --git a/app/data/view/luckdraw_prize/index.html b/app/data/view/luckdraw_prize/index.html
index 4256dded6..023d850ea 100644
--- a/app/data/view/luckdraw_prize/index.html
+++ b/app/data/view/luckdraw_prize/index.html
@@ -4,7 +4,6 @@
 <!--{if auth("add")}-->
 <button data-modal='{:url("add")}' data-title="添加奖品" class='layui-btn layui-btn-sm layui-btn-primary'>添加奖品</button>
 <!--{/if}-->
-
 <!--{if auth("del")}-->
 <button data-action='{:url("del")}' data-rule="id#{key}" data-confirm="确定要删除这些奖品吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除奖品</button>
 <!--{/if}-->
diff --git a/app/data/view/luckdraw_record/index.html b/app/data/view/luckdraw_record/index.html
index d5625f011..e0c8008d1 100644
--- a/app/data/view/luckdraw_record/index.html
+++ b/app/data/view/luckdraw_record/index.html
@@ -1,6 +1,5 @@
 {extend name="../../admin/view/main"}
 
-
 {block name="content"}
 <div class="think-box-shadow table-block">
     {include file='luckdraw_record/index_search'}
@@ -36,12 +35,13 @@
                 {if $vo.prize_code neq ''}
                 <div>奖品编号：{$vo.prize_code|default=''}{$vo.prize_express ? "<span class='color-blue margin-left-5'>需要发货</span>":"<span class='color-desc margin-left-5'>无需发货</span>"}</div>
                 <div>奖品名称：{$vo.prize_name|default=''}<span class='color-blue margin-left-5'>{$vo.prize_level|default=''}</span></div>
-                {else}<span class="layui-badge layui-bg-gray">未中奖</span>{/if}
+                {else}<span class="color-desc">未中奖</span>{/if}
             </td>
             <td class='text-left nowrap'>
                 中奖时间：{$vo.create_at|format_datetime}<br>
-                核销状态：{if empty($vo.prize_express)}{$vo.uncode_datetime|default='未核销'}
+                核销状态：{if $vo.prize_code neq ''}{if empty($vo.prize_express)}{$vo.uncode_datetime|default='未核销'}
                 {else}{$vo.express_province|default=''}{$vo.express_city|default=''}{$vo.express_area|default=''}{$vo.express_address|default=''}{/if}
+                {else}<span class="color-desc">未中奖</span>{/if}
             </td>
         </tr>
         {/foreach}