重建user

application/admin/controller/user/User.php

@@ -28,6 +28,7 @@ class User extends Backend
         $this->view->assign("genderList", $this->model->getGenderList());
         $this->view->assign("statusList", $this->model->getStatusList());
         $this->view->assign("idcardStatusList", $this->model->getIdcardStatusList());
+        $this->view->assign("comefromList", $this->model->getComefromList());
     }
 
 

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

@@ -35,5 +35,10 @@ return [
     'Idcard_status 1'  => '审核通过',
     'Idcard_status 2'  => '审核驳回',
     'Wechat_openid'    => '微信openid',
+    'Tv_userid'        => '电视盒子用户ID',
+    'Tv_mobile'        => '电视盒子用户手机号',
+    'Comefrom'         => '来源',
+    'Comefrom 1'       => 'app',
+    'Comefrom 2'       => '盒子',
     'Wallet.money'     => '余额'
 ];

application/admin/model/User.php

@@ -30,7 +30,8 @@ class User extends Model
         'logintime_text',
         'jointime_text',
         'status_text',
-        'idcard_status_text'
+        'idcard_status_text',
+        'comefrom_text'
     ];
     
 
@@ -50,6 +51,11 @@ class User extends Model
         return ['-1' => __('Idcard_status -1'), '0' => __('Idcard_status 0'), '1' => __('Idcard_status 1'), '2' => __('Idcard_status 2')];
     }
 
+    public function getComefromList()
+    {
+        return ['1' => __('Comefrom 1'), '2' => __('Comefrom 2')];
+    }
+
 
     public function getGenderTextAttr($value, $data)
     {
@@ -95,6 +101,14 @@ class User extends Model
         return isset($list[$value]) ? $list[$value] : '';
     }
 
+
+    public function getComefromTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['comefrom']) ? $data['comefrom'] : '');
+        $list = $this->getComefromList();
+        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

@@ -140,6 +140,30 @@
             <input id="c-wechat_openid" class="form-control" name="row[wechat_openid]" type="text">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Tv_userid')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-tv_userid" class="form-control" name="row[tv_userid]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Tv_mobile')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-tv_mobile" class="form-control" name="row[tv_mobile]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Comefrom')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-comefrom" data-rule="required" class="form-control selectpicker" name="row[comefrom]">
+                {foreach name="comefromList" 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

@@ -140,6 +140,30 @@
             <input id="c-wechat_openid" class="form-control" name="row[wechat_openid]" type="text" value="{$row.wechat_openid|htmlentities}">
         </div>
     </div>-->
+    <!--<div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Tv_userid')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-tv_userid" class="form-control" name="row[tv_userid]" type="number" value="{$row.tv_userid|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Tv_mobile')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-tv_mobile" class="form-control" name="row[tv_mobile]" type="text" value="{$row.tv_mobile|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Comefrom')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-comefrom" data-rule="required" class="form-control selectpicker" name="row[comefrom]">
+                {foreach name="comefromList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.comefrom"}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">

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

@@ -49,6 +49,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0'),"-1":__('Status -1')}, formatter: Table.api.formatter.status},
                         {field: 'idcard_status', title: __('Idcard_status'), searchList: {"-1":__('Idcard_status -1'),"0":__('Idcard_status 0'),"1":__('Idcard_status 1'),"2":__('Idcard_status 2')}, formatter: Table.api.formatter.status},
 //                        {field: 'wechat_openid', title: __('Wechat_openid'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'tv_userid', title: __('Tv_userid')},
+                        {field: 'tv_mobile', title: __('Tv_mobile'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'comefrom', title: __('Comefrom'), searchList: {"1":__('Comefrom 1'),"2":__('Comefrom 2')}, formatter: Table.api.formatter.normal},
                         {field: 'wallet.money', title: __('Wallet.money'), operate:'BETWEEN'},
                         {field: 'operate', title: __('Operate'), table: table,
                             buttons:[