lizhen_gitee 1 vuosi sitten
vanhempi
commit
d40b254adf

+ 6 - 10
application/admin/view/user/user/edit.html

@@ -297,21 +297,17 @@
                 {foreach name="jinyantypeList" item="vo"}
                 {foreach name="jinyantypeList" item="vo"}
                 <label for="row[jinyantype]-{$key}"><input id="row[jinyantype]-{$key}" name="row[jinyantype]" type="radio" value="{$key}" {in name="key" value="$row.jinyantype"}checked{/in} /> {$vo}</label>
                 <label for="row[jinyantype]-{$key}"><input id="row[jinyantype]-{$key}" name="row[jinyantype]" type="radio" value="{$key}" {in name="key" value="$row.jinyantype"}checked{/in} /> {$vo}</label>
                 {/foreach}
                 {/foreach}
-                <div data-favisible="jinyantype=1"></div>
-                <div data-favisible="jinyantype=2">
-                    <div class="form-group">
-                        <label class="control-label col-xs-12 col-sm-2">{:__('Jinyantime')}:</label>
-                        <div class="col-xs-12 col-sm-8">
-                            <input id="c-jinyantime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[jinyantime]" type="text" value="{:$row.jinyantime?datetime($row.jinyantime):''}">
-                        </div>
-                    </div>
-                </div>
-                <div data-favisible="jinyantype=3"></div>
             </div>
             </div>
 
 
         </div>
         </div>
     </div>
     </div>
 
 
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jinyantime')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-jinyantime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[jinyantime]" type="text" value="{:$row.jinyantime?datetime($row.jinyantime):''}">
+        </div>
+    </div>
 
 
     <div class="form-group layer-footer">
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <label class="control-label col-xs-12 col-sm-2"></label>

+ 1 - 3
application/common/library/Auth.php

@@ -58,6 +58,7 @@ class Auth
         'attribute',
         'attribute',
         'shoesize',
         'shoesize',
 
 
+        'jinyantype',
         'jinyantime',
         'jinyantime',
     ];
     ];
 
 
@@ -705,9 +706,6 @@ class Auth
         //用户权限
         //用户权限
         $userinfo['power'] = Db::name('user_power')->where('user_id',$this->id)->find();
         $userinfo['power'] = Db::name('user_power')->where('user_id',$this->id)->find();
 
 
-        //禁言时间,0不禁,>0封禁截止时间
-        $userinfo['is_jinyan'] = $userinfo['jinyantime'] > time() ? 1 : 0;
-
         return $userinfo;
         return $userinfo;
     }
     }