用户禁言

application/admin/controller/user/User.php

@@ -31,6 +31,7 @@ class User extends Backend
         $this->view->assign("hideIsFinishinfoList", $this->model->getHideIsFinishinfoList());
         $this->view->assign("isActiveList", $this->model->getIsActiveList());
         $this->view->assign("isTuijianList", $this->model->getIsTuijianList());
+        $this->view->assign("jinyantypeList", $this->model->getJinyantypeList());
     }
 
     public function import()

application/admin/lang/zh-cn/user/user.php

@@ -58,4 +58,11 @@ return [
     'Is_tuijian 0'         => '否',
     'plat_unique_id'       => '设备唯一ID',
     'jinyantime'           => '禁言截止时间',
+    'Ios_user_id'          => '苹果用户ID',
+    'Plat_unique_id'       => '设备唯一ID',
+    'Jinyantime'           => '禁言截止时间',
+    'Jinyantype'           => '禁言状态',
+    'Jinyantype 1'         => '不禁',
+    'Jinyantype 2'         => '限制时间',
+    'Jinyantype 3'         => '永久'
 ];

application/admin/model/User.php

@@ -30,11 +30,12 @@ class User extends Model
         'prevtime_text',
         'logintime_text',
         'jointime_text',
-        'jinyantime_text',
         'status_text',
         'hide_is_finishinfo_text',
         'is_active_text',
-        'is_tuijian_text'
+        'is_tuijian_text',
+        'jinyantime_text',
+        'jinyantype_text'
     ];
     
 
@@ -138,6 +139,11 @@ class User extends Model
         return ['1' => __('Is_tuijian 1'), '0' => __('Is_tuijian 0')];
     }
 
+    public function getJinyantypeList()
+    {
+        return ['1' => __('Jinyantype 1'), '2' => __('Jinyantype 2'), '3' => __('Jinyantype 3')];
+    }
+
 
     public function getGenderTextAttr($value, $data)
     {
@@ -176,13 +182,6 @@ class User extends Model
     }
 
 
-    public function getJinyantimeTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['jinyantime']) ? $data['jinyantime'] : '');
-        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
-    }
-
-
     public function getStatusTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
@@ -214,6 +213,21 @@ class User extends Model
         return isset($list[$value]) ? $list[$value] : '';
     }
 
+
+    public function getJinyantimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['jinyantime']) ? $data['jinyantime'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+
+    public function getJinyantypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['jinyantype']) ? $data['jinyantype'] : '');
+        $list = $this->getJinyantypeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
     protected function setPrevtimeAttr($value)
     {
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);

application/admin/view/user/user/add.html

@@ -274,6 +274,36 @@
 
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Ios_user_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-ios_user_id" data-rule="required" data-source="ios/user/index" class="form-control selectpage" name="row[ios_user_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_unique_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-plat_unique_id" data-rule="required" data-source="plat/unique/index" class="form-control selectpage" name="row[plat_unique_id]" type="text" value="">
+        </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" 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="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jinyantype')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-jinyantype" data-rule="required" class="form-control selectpicker" name="row[jinyantype]">
+                {foreach name="jinyantypeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/user/user/edit.html

@@ -264,12 +264,7 @@
             <input id="c-shoesize" class="form-control" name="row[shoesize]" type="text" value="{$row.shoesize|htmlentities}">
         </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">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_tuijian')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -282,6 +277,42 @@
 
         </div>
     </div>
+    <!--<div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Ios_user_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-ios_user_id" data-rule="required" data-source="ios/user/index" class="form-control selectpage" name="row[ios_user_id]" type="text" value="{$row.ios_user_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_unique_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-plat_unique_id" data-rule="required" data-source="plat/unique/index" class="form-control selectpage" name="row[plat_unique_id]" type="text" value="{$row.plat_unique_id|htmlentities}">
+        </div>
+    </div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jinyantype')}:</label>
+        <div class="col-xs-12 col-sm-8">
+
+            <div class="radio">
+                {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>
+                {/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 class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/user/user/index.html

@@ -25,8 +25,8 @@
                         <div class="dropdown btn-group {:$auth->check('user/user/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_tuijian=1"><i class="fa fa-eye"></i>首页推�</a></li>
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_tuijian=0"><i class="fa fa-eye-slash"></i>�首页推�</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_tuijian=1"><i class="fa fa-eye"></i>Ê×Ò³ÍƼö</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_tuijian=0"><i class="fa fa-eye-slash"></i>·ÇÊ×Ò³ÍƼö</a></li>
                             </ul>
                         </div>
 

public/assets/js/backend/user/user.js

@@ -64,9 +64,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {field: 'is_active', title: __('Is_active'), searchList: {"1":__('Is_active 1'),"0":__('Is_active 0')}, formatter: Table.api.formatter.normal},
                         {field: 'attribute', title: __('Attribute'), operate: 'LIKE'},
                         {field: 'shoesize', title: __('Shoesize'), operate: 'LIKE'},
-                        {field: 'plat_unique_id', title: __('plat_unique_id'),sortable:true, operate: 'LIKE'},
-                        {field: 'jinyantime', title: __('jinyantime'), operate:false, addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'is_tuijian', title: __('Is_tuijian'), searchList: {"1":__('Is_tuijian 1'),"0":__('Is_tuijian 0')}, formatter: Table.api.formatter.normal},
+//                        {field: 'ios_user_id', title: __('Ios_user_id'), operate: 'LIKE'},
+//                        {field: 'plat_unique_id', title: __('Plat_unique_id'), operate: 'LIKE'},
+                        {field: 'jinyantype', title: __('Jinyantype'), searchList: {"1":__('Jinyantype 1'),"2":__('Jinyantype 2'),"3":__('Jinyantype 3')}, formatter: Table.api.formatter.normal},
+                        {field: 'jinyantime', title: __('Jinyantime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]