Merge branch 'master' of http://git.huxiukeji.com/zhangxiaobin/ggyuyin

application/admin/controller/user/User.php

@@ -25,6 +25,12 @@ class User extends Backend
     {
         parent::_initialize();
         $this->model = model('User');
+        $typeList = [
+            'isCoolList' => $this->model->getIsCoolList(),
+            'isManagerList' => $this->model->getIsManagerList(),
+        ];
+        $this->view->assign($typeList);
+        $this->assignconfig($typeList);
     }
 
     /**

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

@@ -39,5 +39,12 @@ return [
     'Updatetime'                                  => '更新时间',
     'Token'                                       => 'Token',
     'Status'                                      => '状态',
+    'Is_cool'                                     => '靓号',
+    'Is_cool 0'                                   => '否',
+    'Is_cool 1'                                   => '是',
+    'Is_manager'                                  => '管理员',
+    'Is_manager 0'                                => '否',
+    'Is_manager 1'                                => '是',
+    'Status'                                      => '状态',
     'Leave password blank if dont want to change' => '不修改密码请留空',
 ];

application/admin/model/User.php

@@ -17,7 +17,9 @@ class User extends Model
     protected $updateTime = 'updatetime';
     // 追加属性
     protected $append = [
-        'logintime_text'
+        'logintime_text',
+        'is_cool_text',
+        'is_manager_text',
     ];
 
     public function getOriginData()
@@ -100,6 +102,30 @@ class User extends Model
         return $value ? $value : null;
     }
 
+    public function getIsCoolList()
+    {
+        return ['0' =>__('Is_cool 0'), '1' =>__('Is_cool 1')];
+    }
+
+    public function getIsCoolTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['is_cool']) ? $data['is_cool'] : '');
+        $list = $this->getIsCoolList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+    public function getIsManagerList()
+    {
+        return ['0' =>__('Is_manager 0'), '1' =>__('Is_manager 1')];
+    }
+
+    public function getIsManagerTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['is_manager']) ? $data['is_manager'] : '');
+        $list = $this->getIsManagerList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
     public function noble()
     {
         return $this->belongsTo('app\admin\model\noble\Level', 'noble', 'id', [], 'LEFT')->setEagerlyType(0);

application/admin/view/banner/add.html

@@ -20,12 +20,12 @@
             <ul class="row list-inline faupload-preview" id="p-image"></ul>
         </div>
     </div>
-    <!--<div class="form-group">
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-url" data-rule="" class="form-control" name="row[url]" type="text" value="">
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/banner/edit.html

@@ -20,12 +20,12 @@
             <ul class="row list-inline faupload-preview" id="p-image"></ul>
         </div>
     </div>
-    <!--<div class="form-group">
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Url')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-url" data-rule="" class="form-control" name="row[url]" type="text" value="{$row.url|htmlentities}">
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">

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

@@ -34,6 +34,26 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_cool')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <select id="c-is_cool" data-rule="required" class="form-control selectpicker" name="row[is_cool]">
+                {foreach name="isCoolList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_cool"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_manager')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <select id="c-is_manager" data-rule="required" class="form-control selectpicker" name="row[is_manager]">
+                {foreach name="isManagerList" item="vo"}
+                <option value="{$key}" {in name="key" value="$row.is_manager"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+        </div>
+    </div>
+    <div class="form-group">
         <label for="c-gender" class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>
         <div class="col-xs-12 col-sm-8">
             {:build_radios('row[gender]', ['1'=>__('Male'), '0'=>__('Female')], $row['gender'])}

public/assets/js/backend/banner.js

@@ -28,7 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'id', title: __('Id')},
                         {field: 'title', title: __('Title'), operate: 'LIKE'},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        //{field: 'url', title: __('Url'), operate: 'LIKE', formatter: Table.api.formatter.url},
+                        {field: 'url', title: __('Url'), operate: false, formatter: Table.api.formatter.url},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status},
                         {field: 'weigh', title: __('Weigh'), operate: false},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},

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

@@ -57,6 +57,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         // {field: 'noble_duetime', title: __('NobleDuetime'), formatter: Table.api.formatter.datetime, operate: 'RANGE'},
                         {field: 'age.name', title: __('Age_id'), operate: false},
                         {field: 'constellation.name', title: __('Constellation_id'), operate: false},
+                        {field: 'is_cool', title: __('Is_cool'), searchList:Config.isCoolList, formatter: Table.api.formatter.status},
+                        {field: 'is_manager', title: __('Is_manager'), searchList:Config.isManagerList, formatter: Table.api.formatter.status},
                         {field: 'logintime', title: __('Logintime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                         {field: 'loginip', title: __('Loginip'), formatter: Table.api.formatter.search},
                         {field: 'createtime', title: __('Jointime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},