linwu 1 سال پیش
والد
کامیت
d365eac53d

+ 1 - 0
app/admin/controller/Vote.php

@@ -45,6 +45,7 @@ class Vote extends AdminBaseController
         return view('', [
             'info' => $info,
             'status_list' => VoteModel::STATUS,
+            'option' => empty($info['option']) ? '[]' : json_encode($info['option']),
         ]);
     }
 

+ 8 - 8
app/admin/view/navigation/navigation_form.html

@@ -6,13 +6,13 @@
                 <div class="layui-card-body" pad15>
 
                     <div class="layui-form layui-form-pane">
-                        <input type="hidden" name="id" value="{$info.id}">
+                        <input type="hidden" name="id" value="{:array_get($info,'id')}">
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>位置</label>
                             <div class="layui-input-block">
                                 <select name="tab">
                                     {volist name="tab_list" id="v"}
-                                    <option value="{$key}" {$info.tab==$key ?'selected' : '' }>{$v}</option>
+                                    <option value="{$key}" {eq name=":array_get($info,'tab',1)" value="$key" }selected{/eq}>{$v}</option>
                                     {/volist}
                                 </select>
                             </div>
@@ -20,7 +20,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>标题</label>
                             <div class="layui-input-block">
-                                <input type="text" name="title" value="{$info.title}" lay-verify="required"
+                                <input type="text" name="title" value="{:array_get($info,'title')}" lay-verify="required"
                                        placeholder="请输入标题"
                                        autocomplete="off" class="layui-input">
                             </div>
@@ -36,8 +36,8 @@
                                     <div class="layui-upload-list echo-attachment-image-list" id="image">
                                         {notempty name="info.image"}
                                         <div>
-                                            <input type="hidden" name="image" value="{$info.image}">
-                                            <img src="{$info.image}">
+                                            <input type="hidden" name="image" value="{:array_get($info,'image')}">
+                                            <img src="{:array_get($info,'image')}">
                                         </div>
                                         {/notempty}
                                     </div>
@@ -47,7 +47,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">跳转链接</label>
                             <div class="layui-input-block">
-                                <input type="text" name="url" value="{$info.url}"
+                                <input type="text" name="url" value="{:array_get($info,'url')}"
                                        placeholder="请输入跳转链接"
                                        autocomplete="off" class="layui-input">
                             </div>
@@ -56,14 +56,14 @@
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>状态</label>
                             <div class="layui-input-block">
                                 {volist name="status_list" id="v"}
-                                <input type="radio" name="status" value="{$key}" title="{$v}" {eq name="info.status|default=1" value="$key" }checked{/eq}>
+                                <input type="radio" name="status" value="{$key}" title="{$v}" {eq name=":array_get($info,'status',1)" value="$key" }checked{/eq}>
                                 {/volist}
                             </div>
                         </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>排序</label>
                             <div class="layui-input-block">
-                                <input type="text" name="priority" value="{$info.priority|default=255}"
+                                <input type="text" name="priority" value="{:array_get($info,'priority',255)}"
                                        lay-verify="required" placeholder="请输入排序值(倒序,值越大越靠前)"
                                        autocomplete="off" class="layui-input">
                                 <div class="layui-form-mid layui-word-aux">倒序,值越大越靠前</div>

+ 1 - 1
app/admin/view/notice/index.html

@@ -57,7 +57,7 @@
                     {field: 'priority', title: '排序', width: 160},
                     {field: 'content', title: '内容'},
                     {field: 'status_text', title: '状态', width: 80, align: 'center'},
-                    {field: 'update_time', title: '发布时间', width: 80, align: 'center'},
+                    {field: 'update_time', title: '发布时间', width: 160, align: 'center'},
                     {title: '操作', width: 150, align: 'center', fixed: 'right', toolbar: '#setTpl'}
                 ]
             ],

+ 5 - 5
app/admin/view/notice/notice_form.html

@@ -5,11 +5,11 @@
                 <div class="layui-card-header">系统通知信息</div>
                 <div class="layui-card-body" pad15>
                     <div class="layui-form layui-form-pane" lay-filter="{$lay_table}">
-                        <input type="hidden" name="id" value="{$info.id}">
+                        <input type="hidden" name="id" value="{:array_get($info,'id')}">
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>标题</label>
                             <div class="layui-input-block">
-                                <input type="text" name="title" value="{$info.title}" lay-verify="required"
+                                <input type="text" name="title" value="{:array_get($info,'title')}" lay-verify="required"
                                        placeholder="请输入标题" autocomplete="off"
                                        class="layui-input">
                             </div>
@@ -20,14 +20,14 @@
 								<textarea class="layui-textarea" name="content" id="content" placeholder="请输入内容"
                                           style="display: none"
                                           lay-verify="editcontent">
-										{$info.content}
+                                    {:array_get($info,'content')}
 								</textarea>
                             </div>
                         </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>排序</label>
                             <div class="layui-input-block">
-                                <input type="text" name="priority" value="{$info.priority|default=255}"
+                                <input type="text" name="priority" value="{:array_get($info,'priority',255)}"
                                        lay-verify="required|number" placeholder="请输入排序"
                                        autocomplete="off" class="layui-input">
                                 <div class="layui-form-mid layui-word-aux">倒序,值越大越靠前</div>
@@ -37,7 +37,7 @@
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>状态</label>
                             <div class="layui-input-block">
                                 {volist name="status_list" id="v"}
-                                <input type="radio" name="status" value="{$key}" title="{$v}" {eq name="info.status|default=1" value="$key" }checked{/eq}>
+                                <input type="radio" name="status" value="{$key}" title="{$v}" {eq name=":array_get($info,'status',1)" value="$key" }checked{/eq}>
                                 {/volist}
                             </div>
                         </div>

+ 8 - 8
app/admin/view/setting/sms.html

@@ -18,7 +18,7 @@
                                         <div class="layui-input-block">
                                             <input type="text" placeholder="请输入 AccessKey ID"
                                                    name="sms_chuanglan_appkey"
-                                                   value="{$sms['sms_chuanglan_appkey']|default=''}"
+                                                   value="{:array_get($sms,'sms_chuanglan_appkey')}"
                                                    lay-verify="required"
                                                    class="layui-input">
                                             <div class="layui-form-mid layui-word-aux">访问创蓝API的密钥:app key</div>
@@ -29,7 +29,7 @@
                                         <div class="layui-input-block">
                                             <input type="text" placeholder="请输入 AccessKey Secret"
                                                    name="sms_chuanglan_secret"
-                                                   value="{$sms['sms_chuanglan_secret']|default=''}"
+                                                   value="{:array_get($sms,'sms_chuanglan_secret')}"
                                                    lay-verify="required"
                                                    class="layui-input">
                                             <div class="layui-form-mid layui-word-aux">访问创蓝API的密钥:secret key</div>
@@ -56,7 +56,7 @@
                                             <input type="text" placeholder="请输入 AccessKey ID"
                                                    name="sms_ali_accesskeyid"
                                                    lay-verify="required"
-                                                   value="{$sms['sms_ali_accesskeyid']|default=''}"
+                                                   value="{:array_get($sms,'sms_ali_accesskeyid')}"
                                                    class="layui-input">
                                             <div class="layui-form-mid layui-word-aux">访问阿里云API的密钥:AccessKey ID</div>
                                         </div>
@@ -67,7 +67,7 @@
                                             <input type="text" placeholder="请输入 AccessKey Secret"
                                                    name="sms_ali_accesskeysecret"
                                                    lay-verify="required"
-                                                   value="{$sms['sms_ali_accesskeysecret']|default=''}"
+                                                   value="{:array_get($sms,'sms_ali_accesskeysecret')}"
                                                    class="layui-input">
                                             <div class="layui-form-mid layui-word-aux">访问阿里云API的密钥:AccessKey Secret
                                             </div>
@@ -77,7 +77,7 @@
                                         <label class="layui-form-label">签名名称</label>
                                         <div class="layui-input-block">
                                             <input type="text" name="sms_ali_signname"
-                                                   value="{$sms['sms_ali_signname']|default=''}" class="layui-input">
+                                                   value="{:array_get($sms,'sms_ali_signname')}" class="layui-input">
                                             <div class="layui-form-mid layui-word-aux"></div>
                                         </div>
                                     </div>
@@ -85,7 +85,7 @@
                                         <label class="layui-form-label">注册验证</label>
                                         <div class="layui-input-block">
                                             <input type="text" name="sms_ali_register"
-                                                   value="{$sms['sms_ali_register']|default=''}" class="layui-input">
+                                                   value="{:array_get($sms,'sms_ali_register')}" class="layui-input">
                                             <div class="layui-form-mid layui-word-aux">注册验证模版CODE,验证码变量名称:code</div>
                                         </div>
                                     </div>
@@ -93,7 +93,7 @@
                                         <label class="layui-form-label">密码重置</label>
                                         <div class="layui-input-block">
                                             <input type="text" name="sms_ali_getpassword"
-                                                   value="{$sms['sms_ali_getpassword']|default=''}" class="layui-input">
+                                                   value="{:array_get($sms,'sms_ali_getpassword')}" class="layui-input">
                                             <div class="layui-form-mid layui-word-aux">密码重置模版CODE,验证码变量名称:code</div>
                                         </div>
                                     </div>
@@ -101,7 +101,7 @@
                                         <label class="layui-form-label">登录验证</label>
                                         <div class="layui-input-block">
                                             <input type="text" name="sms_ali_mobilelogin"
-                                                   value="{$sms['sms_ali_mobilelogin']|default=''}" class="layui-input">
+                                                   value="{:array_get($sms,'sms_ali_mobilelogin')}" class="layui-input">
                                             <div class="layui-form-mid layui-word-aux">登录验证模版CODE,验证码变量名称:code</div>
                                         </div>
                                     </div>

+ 1 - 1
app/admin/view/setting/system.html

@@ -17,7 +17,7 @@
                                         <div class="layui-input-block">
                                             <input type="text" placeholder="请输入网站名称"
                                                    name="site_name"
-                                                   value="{$system['site_name']|default=''}"
+                                                   value="{:array_get($system,'site_name')}"
                                                    lay-verify="required"
                                                    class="layui-input">
                                         </div>

+ 8 - 8
app/admin/view/slide/slide_form.html

@@ -6,13 +6,13 @@
                 <div class="layui-card-body" pad15>
 
                     <div class="layui-form layui-form-pane">
-                        <input type="hidden" name="id" value="{$info.id}">
+                        <input type="hidden" name="id" value="{:array_get($info,'id')}">
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>位置</label>
                             <div class="layui-input-block">
                                 <select name="tab">
                                     {volist name="tab_list" id="v"}
-                                    <option value="{$key}" {$info.tab==$key ?'selected' : '' }>{$v}</option>
+                                    <option value="{$key}" {eq name=":array_get($info,'tab',1)" value="$key" }checked{/eq}>{$v}</option>
                                     {/volist}
                                 </select>
                             </div>
@@ -20,7 +20,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>标题</label>
                             <div class="layui-input-block">
-                                <input type="text" name="title" value="{$info.title}" lay-verify="required"
+                                <input type="text" name="title" value="{:array_get($info,'title')}" lay-verify="required"
                                        placeholder="请输入标题"
                                        autocomplete="off" class="layui-input">
                             </div>
@@ -36,8 +36,8 @@
                                     <div class="layui-upload-list echo-attachment-image-list" id="image">
                                         {notempty name="info.image"}
                                         <div>
-                                            <input type="hidden" name="image" value="{$info.image}">
-                                            <img src="{$info.image}">
+                                            <input type="hidden" name="image" value="{:array_get($info,'image')}">
+                                            <img src="{:array_get($info,'image')}">
                                         </div>
                                         {/notempty}
                                     </div>
@@ -47,7 +47,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">跳转链接</label>
                             <div class="layui-input-block">
-                                <input type="text" name="url" value="{$info.url}"
+                                <input type="text" name="url" value="{:array_get($info,'url')}"
                                        placeholder="请输入跳转链接"
                                        autocomplete="off" class="layui-input">
                             </div>
@@ -56,14 +56,14 @@
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>状态</label>
                             <div class="layui-input-block">
                                 {volist name="status_list" id="v"}
-                                <input type="radio" name="status" value="{$key}" title="{$v}" {eq name="info.status|default=1" value="$key" }checked{/eq}>
+                                <input type="radio" name="status" value="{$key}" title="{$v}" {eq name=":array_get($info,'status',1)" value="$key" }checked{/eq}>
                                 {/volist}
                             </div>
                         </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>排序</label>
                             <div class="layui-input-block">
-                                <input type="text" name="priority" value="{$info.priority|default=255}"
+                                <input type="text" name="priority" value="{:array_get($info,'priority',255)}"
                                        lay-verify="required" placeholder="请输入排序值(倒序,值越大越靠前)"
                                        autocomplete="off" class="layui-input">
                                 <div class="layui-form-mid layui-word-aux">倒序,值越大越靠前</div>

+ 11 - 11
app/admin/view/user/user_form.html

@@ -5,11 +5,11 @@
                 <div class="layui-card-header">用户信息</div>
                 <div class="layui-card-body" pad15>
                     <div class="layui-form layui-form-pane" lay-filter="{$lay_table}">
-                        <input type="hidden" name="id" value="{$info.id}" />
+                        <input type="hidden" name="id" value="{:array_get($info,'id')}" />
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>用户名</label>
                             <div class="layui-input-block">
-                                <input type="text" name="account" value="{$info.account}" lay-verify="required" placeholder="请输入用户名"
+                                <input type="text" name="account" value="{:array_get($info,'account')}" lay-verify="required" placeholder="请输入用户名"
                                        autocomplete="off" class="layui-input">
                             </div>
                         </div>
@@ -28,8 +28,8 @@
                                     <div class="layui-upload-list echo-attachment-image-list" id="avatar">
                                         {notempty name="info.avatar"}
                                         <div>
-                                            <input type="hidden" name="avatar" value="{$info.avatar}">
-                                            <img src="{$info.avatar}">
+                                            <input type="hidden" name="avatar" value="{:array_get($info,'avatar')}">
+                                            <img src="{:array_get($info,'avatar')}">
                                         </div>
                                         {/notempty}
                                     </div>
@@ -39,7 +39,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>昵称</label>
                             <div class="layui-input-block">
-                                <input type="text" name="nickname" value="{$info.nickname}" lay-verify="required" placeholder="请输入用户昵称"
+                                <input type="text" name="nickname" value="{:array_get($info,'nickname')}" lay-verify="required" placeholder="请输入用户昵称"
                                        autocomplete="off" class="layui-input">
                             </div>
                         </div>
@@ -47,28 +47,28 @@
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>性别</label>
                             <div class="layui-input-block">
                                 {volist name="gender_list" id="v"}
-                                <input type="radio" name="gender" lay-filter="type" value="{$key}" title="{$v}" {eq name="info.gender|default=1" value="$key" }checked{/eq}>
+                                <input type="radio" name="gender" lay-filter="type" value="{$key}" title="{$v}" {eq name=":array_get($info,'gender',1)" value="$key" }checked{/eq}>
                                 {/volist}
                             </div>
                         </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>手机号</label>
                             <div class="layui-input-block">
-                                <input type="text" name="mobile" value="{$info.mobile}" lay-verify="required|phone" placeholder="请输入手机号"
+                                <input type="text" name="mobile" value="{:array_get($info,'mobile')}" lay-verify="required|phone" placeholder="请输入手机号"
                                        autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">真实姓名</label>
                             <div class="layui-input-block">
-                                <input type="text" name="realname" value="{$info.realname}" placeholder="请输入真实姓名"
+                                <input type="text" name="realname" value="{:array_get($info,'realname')}" placeholder="请输入真实姓名"
                                        autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">出生日期</label>
                             <div class="layui-input-block">
-                                <input type="text" name="birthday" id="birthday" value="{$info.birthday}" placeholder="请选择出生日期" autocomplete="off"
+                                <input type="text" name="birthday" id="birthday" value="{:array_get($info,'birthday')}" placeholder="请选择出生日期" autocomplete="off"
                                        class="layui-input">
                             </div>
                         </div>
@@ -76,14 +76,14 @@
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>状态</label>
                             <div class="layui-input-block">
                                 {volist name="status_list" id="v"}
-                                <input type="radio" name="status" lay-filter="type" value="{$key}" title="{$v}" {eq name="info.status|default=1" value="$key" }checked{/eq}>
+                                <input type="radio" name="status" lay-filter="type" value="{$key}" title="{$v}" {eq name=":array_get($info,'status',1)" value="$key" }checked{/eq}>
                                 {/volist}
                             </div>
                         </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">审核备注</label>
                             <div class="layui-input-block">
-                                <textarea name="remark" placeholder="请输入审核备注" class="layui-textarea">{$info.remark}</textarea>
+                                <textarea name="remark" placeholder="请输入审核备注" class="layui-textarea">{:array_get($info,'remark')}</textarea>
                             </div>
                         </div>
                         <div class="layui-form-item">

+ 7 - 7
app/admin/view/vote/vote_form.html

@@ -5,11 +5,11 @@
                 <div class="layui-card-header">活动信息</div>
                 <div class="layui-card-body" pad15>
                     <div class="layui-form layui-form-pane" lay-filter="{$lay_table}">
-                        <input type="hidden" name="id" value="{$info.id}">
+                        <input type="hidden" name="id" value="{:array_get($info,'id')}">
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>标题</label>
                             <div class="layui-input-block">
-                                <input type="text" name="title" value="{$info.title}" lay-verify="required"
+                                <input type="text" name="title" value="{:array_get($info,'title')}" lay-verify="required"
                                        placeholder="请输入标题" autocomplete="off"
                                        class="layui-input">
                             </div>
@@ -28,7 +28,7 @@
 								<textarea class="layui-textarea" name="content" id="content" placeholder="请输入介绍"
                                           style="display: none"
                                           lay-verify="editcontent">
-										{$info.content}
+                                    {:array_get($info,'content')}
 								</textarea>
                             </div>
                         </div>
@@ -36,21 +36,21 @@
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>状态</label>
                             <div class="layui-input-block">
                                 {volist name="status_list" id="v"}
-                                <input type="radio" name="status" value="{$key}" title="{$v}" {eq name="info.status|default=1" value="$key" }checked{/eq}>
+                                <input type="radio" name="status" value="{$key}" title="{$v}" {eq name=":array_get($info,'status',1)" value="$key" }checked{/eq}>
                                 {/volist}
                             </div>
                         </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>开始时间</label>
                             <div class="layui-input-block">
-                                <input type="text" name="start_time" id="start_time" value="{$info.start_time}" lay-verify="required"
+                                <input type="text" name="start_time" id="start_time" value="{:array_get($info,'start_time')}" lay-verify="required"
                                        placeholder="请选择..." autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>结束时间</label>
                             <div class="layui-input-block">
-                                <input type="text" name="end_time" id="end_time" value="{$info.end_time}" lay-verify="required"
+                                <input type="text" name="end_time" id="end_time" value="{:array_get($info,'end_time')}" lay-verify="required"
                                        placeholder="请选择..." autocomplete="off" class="layui-input">
                             </div>
                         </div>
@@ -88,7 +88,7 @@
         inputTags.render({
             elem: '#inputTags',
             name: 'option',
-            content: {:json_encode($info.option)} == null ? [] : {:json_encode($info.option)},
+            content: {$option},
             aldaBtn: true,
             count: 6,
             done: function(value) {}