added 新增用户状态修改和添加用户的功能

application/admin/controller/User.php

@@ -17,10 +17,17 @@ class User extends Base {
         $dataObj = \app\admin\model\User::all();
         foreach ( $dataObj as $value ){
             $userInfo = $value->toArray();
-            $userData = UserData::get(['uid' => $userInfo[$this->primaryKey]])->toArray();
+            $userData = UserData::get(['uid' => $userInfo[$this->primaryKey]]);
-            $userInfo['loginTimes'] = $userData['loginTimes'];
+            if( !is_null($userData) ){
-            $userInfo['lastLoginTime'] = $userData['lastLoginTime'];
+                $userData->toArray();
-            $userInfo['lastLoginIp'] = $userData['lastLoginIp'];
+                $userInfo['loginTimes'] = $userData['loginTimes'];
+                $userInfo['lastLoginTime'] = $userData['lastLoginTime'];
+                $userInfo['lastLoginIp'] = $userData['lastLoginIp'];
+            }else{
+                $userInfo['loginTimes'] = 0;
+                $userInfo['lastLoginTime'] = 0;
+                $userInfo['lastLoginIp'] = 0;
+            }
             $data[] = $userInfo;
         }
         $table = [
@@ -128,7 +135,7 @@ class User extends Base {
             }else{
                 $userObj->status = 1;
                 $userObj->save();
-                $this->success('操作成功', url($this->url));
+                $this->success('操作成功', url('User/index'));
             }
         }
     }
@@ -142,7 +149,7 @@ class User extends Base {
             }else{
                 $userObj->status = 0;
                 $userObj->save();
-                $this->success('操作成功', url($this->url));
+                $this->success('操作成功', url('User/index'));
             }
         }
     }
@@ -196,6 +203,63 @@ class User extends Base {
     }
 
     public function add(){
-
+        if( $this->request->isPost() ){
+            $menuModel = new \app\admin\model\User();
+            $result = $menuModel->allowField(true)->validate(
+                [
+                    'username' => 'require',
+                ],[
+                    'username.require' => '用户名不能为空',
+                ]
+            )->save($this->request->post());
+            if(false === $result){
+                $this->error($menuModel->getError());
+            }else{
+                $this->success('操作成功！', url('User/index'));
+            }
+        }else{
+            $form = [
+                'formTitle' => $this->menuInfo['name'],
+                'tempType' => 'add',
+                'formAttr' => [
+                    'target' => url('User/add'),
+                    'formId' => 'add-user-form',
+                    'backUrl' => url('User/index'),
+                ],
+                'formList' => [
+                    [
+                        'module' => 'text',
+                        'description' => '',
+                        'info' => '用户名称：',
+                        'attr' => [
+                            'name' => 'username',
+                            'value' => '',
+                            'placeholder' => ''
+                        ]
+                    ],
+                    [
+                        'module' => 'text',
+                        'description' => '',
+                        'info' => '用户昵称：',
+                        'attr' => [
+                            'name' => 'nickname',
+                            'value' => '',
+                            'placeholder' => ''
+                        ]
+                    ],
+                    [
+                        'module' => 'password',
+                        'description' => '',
+                        'info' => '用户密码[默认：123123]：',
+                        'attr' => [
+                            'name' => 'password',
+                            'value' => '123123',
+                            'placeholder' => ''
+                        ]
+                    ]
+                ]
+            ];
+            $this->result($form, ReturnCode::GET_TEMPLATE_SUCCESS);
+        }
     }
 }

application/admin/view/public/base.html

@@ -148,6 +148,7 @@
         var STATIC_PATH = '__STATIC__';
         var IMG_PATH = '__IMG__';
         var PLUGIN_PATH = '__PLUGIN__';
+        var COMPANY_NAME = '{:config("COMPANY_NAME")}';
 
         /**
          * 自动适配面包屑导航

application/config.php

@@ -13,7 +13,7 @@ return [
     'PRODUCT_VERSION' => 'V0.9.0', //项目版本
     'PRODUCT_NAME'   => '7d-vision', //产品名称
     'WEBSITE_DOMAIN' => 'http://www.7d-vision.com', //官方网址
-    'COMPANY_NAME'   => '七维视觉科技有限公司', //公司名称
+    'COMPANY_NAME'   => '北京七维视觉科技有限公司', //公司名称
     'SQL_PRIMARY_KEY' => 'id',
 
     // +----------------------------------------------------------------------

public/admin/static/js/template/form.js

@@ -48,6 +48,9 @@
                 case 'checkbox':
                     formHtml += buildCheckbox(value);
                     break;
+                case 'password':
+                    formHtml += buildPassword(value);
+                    break;
             }
         });
         formHtml += '</div><div class="box-footer">';
@@ -56,6 +59,28 @@
         return formHtml;
     }
 
+    /**
+     * 创建文本框
+     * @param inputObj
+     * @returns {string}
+     */
+    function buildPassword( inputObj ) {
+        var formHtml = '<div><div class="col-xs-8 form-group"><label>'+ inputObj.info +'</label>';
+        var placeholder = '', value = '';
+        if( inputObj.attr.placeholder){
+            placeholder = 'placeholder="'+ inputObj.attr.placeholder +'"';
+        }
+        if( inputObj.attr.value){
+            value = 'value="'+ inputObj.attr.value +'"';
+        }
+        formHtml += '<input type="password" class="form-control" '+ placeholder +' '+ value +' name="'+ inputObj.attr.name +'"></div>';
+        if( inputObj.description && inputObj.description.length ){
+            formHtml += ' <div class="col-xs-4 form-group" style="margin-top: 30px"><span class="label label-info">'+ inputObj.description +'</span></div>';
+        }
+        formHtml += '</div>';
+        return formHtml;
+    }
+
     /**
      * 创建多选框
      * @param checkboxObj

public/admin/static/js/template/table.js

@@ -197,7 +197,7 @@
         emptyHtml += '<td colspan="'+spanNum+'" class="builder-data-empty">';
         emptyHtml += '<div class="am-text-center no-data" >';
         emptyHtml += '<i class="fa fa-cogs"></i> 暂时没有数据<br>';
-        emptyHtml += '<small> 本系统由<b> 七维视觉科技有限公司 </b>开发维护</small>';
+        emptyHtml += '<small> 本系统由<b> '+ COMPANY_NAME +' </b>开发维护</small>';
         emptyHtml += '</div></td></tr>';
         return emptyHtml;
     }