edit

database/auth.php

@@ -9,10 +9,18 @@ $type = array
 
 $status = array
 (
-    1 => '已认证',
-    2 => '未认证',
+    1 => '审核中',
+    2 => '已认证',
+    3 => '认证失败',
 );
 
+$audit_status = array
+(
+    //1 => '审核中',
+    2 => '已审核',
+    3 => '审核失败',
+);
+$col = Dever::input('col');
 return array
 (
 	# 表名
@@ -21,8 +29,11 @@ return array
 	'lang' => '认证管理',
 	# 是否显示在后台菜单
 	'order' => 9,
-    'menu' => false,
-
+    'end' => array
+    (
+        'update' => 'user/lib/auth.manage_update',
+        'updatemul' => 'user/lib/auth.manage_update',
+    ),
 	# 数据结构
 	'struct' => array
 	(
@@ -65,54 +76,6 @@ return array
             'list'      => true,
         ),
 
-        'tel'      => array
-        (
-            'type'      => 'varchar-50',
-            'name'      => '联系电话',
-            'default'   => '',
-            'desc'      => '联系电话',
-            'match'     => 'is_string',
-            'update'    => 'text',
-            'search'    => 'fulltext',
-            'list'      => true,
-        ),
-
-        'email'      => array
-        (
-            'type'      => 'varchar-50',
-            'name'      => '联系邮箱',
-            'default'   => '',
-            'desc'      => '联系邮箱',
-            'match'     => 'option',
-            'update'    => 'text',
-            'search'    => 'fulltext',
-            'list'      => true,
-        ),
-
-        'area'       => array
-        (
-            'type'      => 'varchar-500',
-            'name'      => '城市地区',
-            'default'   => '',
-            'desc'      => '城市地区',
-            'match'     => 'option',
-            'search'    => 'linkage',
-            'update'    => 'linkage',
-            'option'    => Dever::url('api.get?level_total=3', 'area'),
-            'list'      => 'Dever::load("area/api.string", "{area}")',
-        ),
-
-        'address'       => array
-        (
-            'type'      => 'varchar-1000',
-            'name'      => '联系地址',
-            'default'   => '',
-            'desc'      => '联系地址',
-            'match'     => 'option',
-            'update'    => 'text',
-            'list'      => true,
-        ),
-
         'idcard'     => array
         (
             'type'      => 'varchar-150',
@@ -124,20 +87,6 @@ return array
             'list'      => true,
         ),
 
-        'type'        => array
-        (
-            'type'      => 'tinyint-1',
-            'name'      => '认证身份',
-            'default'   => '1',
-            'desc'      => '认证身份',
-            'match'     => 'is_numeric',
-            'update'    => 'radio',
-            'search'    => 'select',
-            'option'    => $type,
-            'control'	=> 'type',
-            'list'      => true,
-        ),
-
         'idcard_front'     => array
         (
             'type'      => 'varchar-150',
@@ -160,6 +109,20 @@ return array
             'key'       => '8',
         ),
 
+        'type'        => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '认证身份',
+            'default'   => '1',
+            'desc'      => '认证身份',
+            'match'     => 'is_numeric',
+            'update'    => 'radio',
+            'search'    => 'select',
+            'option'    => $type,
+            'control'   => 'type',
+            'list'      => true,
+        ),
+
         'company_license'     => array
         (
             'type'      => 'varchar-150',
@@ -169,7 +132,7 @@ return array
             'match'     => 'option',
             'update'    => 'image',
             'key'       => '8',
-            'show'		=> 'identity=2,3',
+            'show'      => 'identity=2,3',
         ),
 
         'company_name'      => array
@@ -194,6 +157,54 @@ return array
             'show'      => 'identity=2,3',
         ),
 
+        'tel'      => array
+        (
+            'type'      => 'varchar-50',
+            'name'      => '联系电话',
+            'default'   => '',
+            'desc'      => '联系电话',
+            'match'     => 'is_string',
+            'update'    => 'text',
+            //'search'    => 'fulltext',
+            //'list'      => true,
+        ),
+
+        'email'      => array
+        (
+            'type'      => 'varchar-50',
+            'name'      => '联系邮箱',
+            'default'   => '',
+            'desc'      => '联系邮箱',
+            'match'     => 'option',
+            'update'    => 'text',
+            //'search'    => 'fulltext',
+            //'list'      => true,
+        ),
+
+        'area'       => array
+        (
+            'type'      => 'varchar-500',
+            'name'      => '城市地区',
+            'default'   => '',
+            'desc'      => '城市地区',
+            'match'     => 'option',
+            'search'    => 'linkage',
+            'update'    => 'linkage',
+            'option'    => Dever::url('api.get?level_total=3', 'area'),
+            //'list'      => 'Dever::load("area/api.string", "{area}")',
+        ),
+
+        'address'       => array
+        (
+            'type'      => 'varchar-1000',
+            'name'      => '联系地址',
+            'default'   => '',
+            'desc'      => '联系地址',
+            'match'     => 'option',
+            'update'    => 'text',
+            //'list'      => true,
+        ),
+
         'status'        => array
         (
             'type'      => 'int-11',
@@ -201,10 +212,55 @@ return array
             'default'   => '1',
             'desc'      => '状态',
             'match'     => 'is_numeric',
-            'update'  => 'select',
+            'update'    => 'select',
             'option'    => $status,
             'search'    => 'select',
             'list'      => true,
+            //'edit'      => true,
+        ),
+
+        'audit_admin'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '审核人',
+            'default'   => '',
+            'match'     => 'is_numeric',
+            'desc'      => '审核人',
+            'list'      => '"{audit_admin}" > 0 ? Dever::load("manage/admin-find#username", {audit_admin}) : "-"',
+        ),
+
+        'audit_status'        => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '审核状态',
+            'default'   => '2',
+            'desc'      => '审核状态',
+            'match'     => 'is_numeric',
+            'option'    => $audit_status,
+            'update'    => $col ? 'radio' : false,
+            'control'   => 'audit_status',
+        ),
+
+        'audit_desc'        => array
+        (
+            'type'      => 'varchar-500',
+            'name'      => '审核备注',
+            'default'   => '',
+            'desc'      => '审核备注',
+            'match'     => 'is_string',
+            'update'    => $col ? 'textarea' : false,
+            'show'      => 'audit_status=2',
+            'list'      => '"{audit_desc}" ? "{audit_desc}" : "-"',
+        ),
+
+        'audit_date'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '审核时间',
+            'match'     => 'is_numeric',
+            'desc'      => '审核时间',
+            'default'   => '',
+            'list'      => '{audit_date} ? date("Y-m-d H:i:s", {audit_date}) : "-"',
         ),
 		
 		'state'		=> array
@@ -219,26 +275,34 @@ return array
 		'cdate'		=> array
 		(
 			'type' 		=> 'int-11',
-			'name' 		=> '录入时间',
+			'name' 		=> '申请时间',
 			'match' 	=> array('is_numeric', time()),
 			'desc' 		=> '',
 			# 只有insert时才生效
-			'insert'	=> true,
-			//'search'	=> 'date',
-			//'list'		=> 'date("Y-m-d H:i:s", {cdate})',
+			//'insert'	=> true,
+			'search'	=> 'date',
+			'list'		=> 'date("Y-m-d H:i:s", {cdate})',
 		),
 	),
 
+    'index' => array
+    (
+        1 => array (
+            'uid' => 'uid',
+        ),
+        'version' => 1,
+    ),
+
     'manage' => array
     (
         'delete' => false,
-        //'edit' => false,
+        'edit' => false,
         'insert' => false,
 
         # 列表
         'list_button' => array
         (
-            //'fast_add' => array('账户操作', 'push&project=account&uid={id}'),
+            'edit' => array('审核', 'audit_status,audit_desc', '{audit_status} == 2'),
         ),
     ),
 );

database/info.php

@@ -43,7 +43,7 @@ return array
 	'lang' => '用户管理',
 	'order' => 10,
 	# 用户id从100w开始
-	'auto' => 1000000,
+	'auto' => 100000000,
 	'set' => array
 	(
 		'system_source' => $system_source,

database/invoice.php

@@ -9,9 +9,10 @@ $type = array
 $title_type = array
 (
     1 => '企业单位',
-    2 => '个人',
+    2 => '个人/非企业',
 );
-
+$source_table = Dever::input('search_option_source_table');
+$source_id = Dever::input('search_option_source_id');
 return array
 (
     # 表名
@@ -19,6 +20,7 @@ return array
     # 显示给用户看的名称
     'lang' => '用户发票库',
     'menu' => false,
+    'title_type' => $title_type,
     # 数据结构
     'struct' => array
     (
@@ -35,22 +37,33 @@ return array
             //'list'        => true,
         ),
 
-        'uid'       => array
+        'source_table'      => array
+        (
+            'type'      => 'varchar-100',
+            'name'      => '来源表名',
+            'default'   => '',
+            'desc'      => '来源表名',
+            'match'     => 'is_numeric',
+            'update'    => 'hidden',
+            'value'     => $source_table,
+        ),
+
+        'source_id'     => array
         (
             'type'      => 'int-11',
             'name'      => '用户名',
             'default'   => '0',
             'desc'      => '请选择用户',
             'match'     => 'is_numeric',
-            'update'    => 'text',
-            //'search'  => 'select',
-            'search'    => array
+            'update'    => 'hidden',
+            'search'    => $source_table ? array
             (
-                'api' => 'user/info-like',
+                'api' => $source_table . '-like',
                 'col' => 'search',
                 'result' => 'id',
-            ),
-            'list'      => 'Dever::load("user/lib/info.get#name", {uid})',
+            ) : false,
+            'value'     => $source_id,
+            'list'       => 'Dever::load("user/lib/invoice.getSource#name", "{source_table}", "{source_id}")',
         ),
 
         'type'      => array
@@ -61,8 +74,9 @@ return array
             'desc'      => '类型',
             'match'     => 'is_numeric',
             'option'    => $type,
-            'update'    => 'select',
-            //'list'        => true,
+            'update'    => 'hidden',
+            'value'     => Dever::input('type', 2),
+            'list'      => true,
         ),
 
         'title_type'      => array
@@ -74,53 +88,55 @@ return array
             'match'     => 'is_numeric',
             'option'    => $title_type,
             'update'    => 'radio',
-            //'list'        => true,
+            'list'      => true,
+            'control'   => 'title_type',
         ),
 
         'title'       => array
         (
-            'type'      => 'varchar-100',
-            'name'      => '抬头名称',
+            'type'      => 'varchar-150',
+            'name'      => '抬头名称-企业单位为公司名称',
             'default'   => '',
             'desc'      => '抬头名称',
             'match'     => 'option',
             'search'    => 'fulltext',
-            //'update'  => 'text',
-            //'list'        => true,
+            'update'  => 'text',
+            'list'        => true,
         ),
 
         'email'        => array
         (
-            'type'      => 'varchar-100',
-            'name'      => '邮箱',
+            'type'      => 'varchar-150',
+            'name'      => '电子邮箱',
             'default'   => '',
-            'desc'      => '邮箱',
+            'desc'      => '电子邮箱',
             'match'     => 'option',
             'search'    => 'fulltext',
-            //'update'  => 'text',
-            //'list'        => true,
+            'update'    => 'text',
+            'list'      => true,
         ),
 
         'mobile'        => array
         (
-            'type'      => 'varchar-100',
+            'type'      => 'varchar-11',
             'name'      => '手机号',
             'default'   => '',
             'desc'      => '手机号',
             'match'     => 'option',
             'search'    => 'fulltext',
-            //'update'  => 'text',
-            //'list'        => true,
+            'update'    => 'text',
+            'list'      => true,
         ),
 
         'number'       => array
         (
-            'type'      => 'varchar-100',
+            'type'      => 'varchar-150',
             'name'      => '公司税号',
             'default'   => '',
             'desc'      => '公司税号',
             'match'     => 'option',
-            //'update'  => 'text',
+            'update'    => 'text',
+            'show'      => 1,
         ),
 
         'phone'       => array
@@ -130,7 +146,8 @@ return array
             'default'   => '',
             'desc'      => '公司电话',
             'match'     => 'option',
-            //'update'  => 'text',
+            'update'    => 'text',
+            'show'      => 1,
         ),
 
         'address'       => array
@@ -140,8 +157,8 @@ return array
             'default'   => '',
             'desc'      => '注册地址',
             'match'     => 'option',
-            //'update'  => 'text',
-            //'list'        => true,
+            'update'    => 'text',
+            'show'      => 1,
         ),
 
         'bank'       => array
@@ -151,8 +168,8 @@ return array
             'default'   => '',
             'desc'      => '开户银行',
             'match'     => 'option',
-            //'update'  => 'text',
-            //'list'        => true,
+            'update'    => 'text',
+            'show'      => 1,
         ),
 
         'bank_number'       => array
@@ -162,8 +179,8 @@ return array
             'default'   => '',
             'desc'      => '银行账号',
             'match'     => 'option',
-            //'update'  => 'text',
-            //'list'        => true,
+            'update'    => 'text',
+            'show'      => 1,
         ),
 
         'state'     => array
@@ -178,16 +195,27 @@ return array
         'cdate'     => array
         (
             'type'      => 'int-11',
-            'name'      => '操作时间',
+            'name'      => '录入时间',
             'match'     => array('is_numeric', time()),
             'desc'      => '',
             # 只有insert时才生效
-            //'insert'    => true,
+            'insert'    => true,
             'search'    => 'date',
             'list'      => 'date("Y-m-d H:i:s", {cdate})',
         ),
     ),
 
+    'index' => array
+    (
+        1 => array
+        (
+            'source' => 'source_table,source_id,type',
+        ),
+        
+        # 版本号 更改版本号会更新当前表的索引
+        'version' => 1,
+    ),
+
     'manage' => array
     (
         

index.php

@@ -5,9 +5,5 @@ define('DEVER_APP_LANG', '用户管理');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 define('DEVER_MANAGE_ORDER', -10);
 define('DEVER_MANAGE_ICON', 'glyphicon glyphicon-user layui-icon-username');
-if (!defined('DEVER_GROUP_NAME')) {
-	define('DEVER_GROUP_ORDER', -10);
-	define('DEVER_GROUP_NAME', '社区管理');
-}
 
 include(DEVER_APP_PATH . '../boot.php');

lib/Address.php

@@ -45,7 +45,53 @@ class Address
         }
     }
 
-    public function getInfo($data)
+    # 按照类型获取地址
+    public function getData($source_id, $source_table = 'user/info', $type = 2)
+    {
+        $where['source_table'] = $source_table;
+        $where['source_id'] = $source_id;
+        $where['type'] = $type;
+        $data = Dever::db('user/address')->one($where);
+
+        if ($data && Dever::project('area')) {
+            $data = $this->info($data);
+        }
+        
+        return $data;
+    }
+
+    # 获取某个收货地址
+    public function getInfo($source_id, $id, $source_table = 'user/info')
+    {
+        $where['source_table'] = $source_table;
+        $where['source_id'] = $source_id;
+        $where['id'] = $id;
+        $data = Dever::db('user/address')->one($where);
+
+        if ($data && Dever::project('area')) {
+            $data = $this->info($data);
+        }
+
+        return $data;
+    }
+
+    # 获取地址列表
+    public function getList($source_id, $source_table = 'user/info')
+    {
+        $where['source_table'] = $source_table;
+        $where['source_id'] = $source_id;
+        $data = Dever::db('user/address')->getList($where);
+
+        if ($data && Dever::project('area')) {
+            foreach ($data as $k => $v) {
+                $data[$k] = $this->info($v);
+            }
+        }
+
+        return $data;
+    }
+
+    public function info($data)
     {
         if (is_array($data['area'])) {
             $data['area'] = implode(',', $data['area']);
@@ -158,6 +204,21 @@ class Address
         return $id;
     }
 
+    # 删除和恢复
+    public function delete($source_id, $id, $state = 2, $source_table = 'user/info')
+    {
+        $info = $this->getInfo($source_id, $id, $source_table);
+        if ($info) {
+            $update['where_id'] = $info['id'];
+            $update['state'] = $state;
+            Dever::db('user/address')->update($update);
+        } else {
+            Dever::alert('更新失败');
+        }
+
+        return 'ok';
+    }
+
     public function getSource($source_table, $source_id)
     {
         $info = Dever::db($source_table)->one($source_id);

lib/Auth.php

@@ -0,0 +1,96 @@
+<?php
+namespace User\Lib;
+
+use Dever;
+
+class Auth
+{
+	# 获取是否认证
+	public function status($uid)
+    {
+        $info = $this->getInfo();
+        if (!$info) {
+        	# 未提交资料
+        	return -1;
+        }
+        return $info['status'];
+    }
+
+    # 获取认证信息
+    public function getInfo($uid)
+    {
+    	return Dever::db('user/auth')->find(array('uid' => $uid));
+    }
+
+    # 更新
+    public function update($id, $uid, $name, $idcard, $idcard_front, $idcard_back, $type = 1, $tel = '', $email = '', $area = '', $address = '')
+    {
+        if ($name) {
+            $update['name'] = $name;
+        } else {
+            Dever::alert('请输入真实姓名');
+        }
+
+        if ($idcard) {
+            $update['idcard'] = $idcard;
+        } else {
+            Dever::alert('请输入身份证号');
+        }
+
+        if ($idcard_front) {
+            $update['idcard_front'] = $city;
+        } else {
+            Dever::alert('请上传身份证正面');
+        }
+
+        if ($idcard_back) {
+            $update['idcard_back'] = $county;
+        } else {
+            Dever::alert('请上传身份证背面');
+        }
+
+        if ($tel) {
+            $update['tel'] = $tel;
+        }
+        
+        if ($email) {
+            $update['email'] = $email;
+        }
+
+        if ($area) {
+            $update['area'] = $area;
+        }
+
+        if ($address) {
+            $update['address'] = $address;
+        }
+        $update['type'] = $type;
+        $update['status'] = 1;
+
+        if ($id) {
+            $update['where_id'] = $id;
+            Dever::db('user/auth')->update($update);
+        } else {
+            $update['uid'] = $uid;
+            $id = Dever::db('user/auth')->insert($update);
+        }
+
+        return $id;
+    }
+
+    public function manage_update($id, $name, $param)
+    {
+        $area = Dever::param('area', $param);
+        $audit_status = Dever::param('audit_status', $param);
+        if ($audit_status) {
+        	$admin = Dever::load('manage/auth.info');
+        	$update['where_id'] = $id;
+        	$update['status'] = $audit_status;
+            $update['audit_date'] = time();
+        	if ($admin) {
+        		$update['audit_admin'] = $admin['id'];
+        	}
+            Dever::db('user/auth')->update($update);
+        }
+    }
+}

lib/Core.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace User\Lib;
+
+use Dever;
+
+class Core
+{
+    protected $uid = -1;
+    protected $login = true;
+    public $data = array();
+
+    public function __construct()
+    {
+        $this->uid = Dever::load('user/lib/info')->check();
+        if ($this->uid <= 0) {
+            $this->uid = 1;
+        }
+        $this->user = Dever::db('user/lib/info')->get($this->uid);
+
+        if ($this->user) {
+            $this->user['uid'] = $this->user['id'];
+        }
+        if ($this->login) {
+        	$this->checkLogin();
+        }
+    }
+
+    public function checkLogin()
+    {
+        if (!$this->uid || $this->uid <= 0) {
+            Dever::alert('请先登录', -2);
+        }
+    }
+}

lib/Info.php

@@ -55,7 +55,7 @@ class Info
     public function get($uid)
     {
         $info = array();
-        if ($uid < 1000000) {
+        if ($uid < 100000000) {
             $info = Dever::db('manage/admin')->find($uid);
             if ($info) {
                 $info['name'] = $info['username'];
@@ -125,4 +125,24 @@ class Info
         }
         return -1;
     }
+
+    # 更新
+    public function update($uid, $name, $avatar, $sex)
+    {
+        $info = Dever::db('user/info')->find($uid);
+        if ($info) {
+            $update['username'] = $name;
+            $update['avatar'] = $avatar;
+            $update['sex'] = $sex;
+            $update['where_id'] = $uid;
+            Dever::db('user/info')->update($update);
+        } else {
+            Dever::alert('无效的用户id,请重新登录');
+        }
+
+        $result = Dever::db('user/info')->one(array('id' => $uid, 'clear' => true));
+       
+        return $this->getSign($uid, $result);
+
+    }
 }

lib/Invoice.php

@@ -0,0 +1,145 @@
+<?php
+namespace User\Lib;
+
+use Dever;
+
+class Invoice
+{
+    # 获取默认发票
+    public function getData($source_id, $source_table = 'user/info', $type = 2)
+    {
+        $where['source_table'] = $source_table;
+        $where['source_id'] = $source_id;
+        $where['type'] = $type;
+        $data = Dever::db('user/invoice')->one($where);
+
+        if ($data) {
+            $data = $this->info($data);
+        }
+        
+        return $data;
+    }
+
+    # 获取某个发票
+    public function getInfo($source_id, $id, $source_table = 'user/info')
+    {
+        $where['source_table'] = $source_table;
+        $where['source_id'] = $source_id;
+        $where['id'] = $id;
+        $data = Dever::db('user/invoice')->one($where);
+
+        if ($data) {
+            $data = $this->info($data);
+        }
+
+        return $data;
+    }
+
+    # 获取发票列表
+    public function getList($source_id, $source_table = 'user/info')
+    {
+        $where['source_table'] = $source_table;
+        $where['source_id'] = $source_id;
+        $data = Dever::db('user/invoice')->getList($where);
+
+        if ($data) {
+            foreach ($data as $k => $v) {
+                $data[$k] = $this->info($v);
+            }
+        }
+
+        return $data;
+    }
+
+    public function info($data)
+    {
+        $data['title_type_name'] = Dever::db('user/invoice')->config['title_type'][$data['title_type']];
+
+        return $data;
+    }
+
+    # 更新
+    public function update($id, $source_id, $source_table, $type = 2, $title_type = 1, $title = '', $email = '', $mobile = '', $number = '', $phone = '', $address = '', $bank = '', $bank_number = '')
+    {
+        $update['title_type'] = $title_type;
+        if ($title_type == 1) {
+            if (!$number) {
+                Dever::alert('公司税号不能为空');
+            }
+            $update['number'] = $number;
+        }
+
+        $update['type'] = $type;
+        $update['title'] = $title;
+
+        if (!$title) {
+            Dever::alert('发票抬头不能为空');
+        }
+
+        if ($email) {
+            $update['email'] = $email;
+        }
+        if ($mobile) {
+            $update['mobile'] = $mobile;
+        }
+        if ($phone) {
+            $update['phone'] = $phone;
+        }
+        if ($address) {
+            $update['address'] = $address;
+        }
+        if ($bank) {
+            $update['bank'] = $bank;
+        }
+        if ($bank_number) {
+            $update['bank_number'] = $bank_number;
+        }
+
+        if ($type == 2) {
+            Dever::db('user/invoice')->updateType(array('where_type' => 2, 'set_type' => 1));
+        }
+        
+        if ($id) {
+            $update['where_id'] = $id;
+            Dever::db('user/invoice')->update($update);
+        } else {
+            $update['source_id'] = $source_id;
+            $update['source_table'] = $source_table;
+            $id = Dever::db('user/invoice')->insert($update);
+        }
+
+        return $id;
+    }
+
+    # 删除和恢复
+    public function delete($source_id, $id, $state = 2, $source_table = 'user/info')
+    {
+        $info = $this->getInfo($source_id, $id, $source_table);
+        if ($info) {
+            $update['where_id'] = $info['id'];
+            $update['state'] = $state;
+            Dever::db('user/invoice')->update($update);
+        } else {
+            Dever::alert('更新失败');
+        }
+
+        return 'ok';
+    }
+
+    public function getSource($source_table, $source_id)
+    {
+        $info = Dever::db($source_table)->one($source_id);
+        return $info;
+    }
+
+    public function getManageUrl($source_table, $source_id, $type)
+    {
+        $info = Dever::db('user/invoice')->one(array('source_table' => $source_table, 'source_id' => $source_id));
+        $url = Dever::url('project/database/update?project=user&table=invoice&search_option_source_table=' . $source_table . '&search_option_source_id=' . $source_id, 'manage');
+
+        if ($info) {
+            $url .= '&where_id=' . $info['id'];
+        }
+        return $url;
+    }
+}

src/Address.php

@@ -2,75 +2,46 @@
 namespace User\Src;
 
 use Dever;
-
-class Address
+use User\Lib\Core;
+class Address extends Core
 {
     # 获取默认地址
-    public function getData($source_id, $source_table = 'user/info', $type = 2)
+    public function getData()
     {
-        $where['source_table'] = $source_table;
-        $where['source_id'] = $source_id;
-        $where['type'] = $type;
-        $data = Dever::db('user/address')->one($where);
-
-        if ($data && Dever::project('area')) {
-            $data = Dever::load('user/lib/address')->getInfo($data);
-        }
-        
-        return $data;
+        return Dever::load('user/lib/address')->getData($this->uid);
     }
 
     # 获取某个收货地址
-    public function getInfo($source_id, $id, $source_table = 'user/info')
+    public function getInfo()
     {
-        $where['source_table'] = $source_table;
-        $where['source_id'] = $source_id;
-        $where['id'] = $id;
-        $data = Dever::db('user/address')->one($where);
-
-        if ($data && Dever::project('area')) {
-            $data = Dever::load('user/lib/address')->getInfo($data);
+        $id = Dever::input('id');
+        if (!$id) {
+            Dever::alert('请选择收货地址id');
         }
-
-        return $data;
+        return Dever::load('user/lib/address')->getInfo($this->uid, $id);
     }
 
     # 获取地址列表
-    public function getList($source_id, $source_table = 'user/info')
+    public function getList()
     {
-        $where['source_table'] = $source_table;
-        $where['source_id'] = $source_id;
-        $data = Dever::db('user/address')->getList($where);
-
-        if ($data && Dever::project('area')) {
-            foreach ($data as $k => $v) {
-                $data[$k] = Dever::load('user/lib/address')->getInfo($v);
-            }
-        }
-
-        return $data;
+        return Dever::load('user/lib/address')->getList($this->uid);
     }
 
 
     # 删除和恢复
-    public function delete($source_id, $id, $state = 2, $source_table = 'user/info')
+    public function delete()
     {
-        $info = $this->getOne($source_id, $id, $source_table);
-        if ($info) {
-            $update['where_id'] = $info['id'];
-            $update['state'] = $state;
-            Dever::db('user/address')->update($update);
-        } else {
-            Dever::alert('更新失败');
+        $id = Dever::input('id');
+        if (!$id) {
+            Dever::alert('请选择收货地址id');
         }
-
-        return 'ok';
+        return Dever::load('user/lib/address')->getList($this->uid, $id, 2);
     }
 
     # 添加或者更新地址接口
     public function update()
     {
-        $source_id = $this->check();
+        $source_id = $this->uid;
         $source_table = 'user/info';
         $id = Dever::input('id');
         $type = Dever::input('type', 2);

src/Auth.php

@@ -0,0 +1,30 @@
+<?php
+namespace User\Src;
+use Dever;
+use User\Lib\Core;
+class Auth extends Core 
+{
+	# 获取认证信息
+    public function getInfo()
+    {
+        return Dever::load('user/lib/auth')->getInfo($this->uid);
+    }
+
+    # 提交认证信息
+    public function update()
+    {
+        $uid = $this->uid;
+        $id = Dever::input('id');
+        $name = Dever::input('name');
+        $idcard = Dever::input('idcard');
+        $idcard_front = Dever::input('idcard_front');
+        $idcard_back = Dever::input('idcard_back');
+        $type = Dever::input('type', 1);
+        $tel = Dever::input('tel');
+        $email = Dever::input('email');
+        $area = Dever::input('area');
+        $address = Dever::input('address');
+
+        return Dever::load('user/lib/auth')->update($id, $uid, $name, $idcard, $idcard_front, $idcard_back, $type, $tel, $email, $area, $address);
+    }
+}

src/Info.php

@@ -1,180 +1,52 @@
 <?php
 namespace User\Src;
-
 use Dever;
-class Info
+use User\Lib\Core;
+class Info extends Core 
 {
-	/**
-     * 获取验证码
-     * @return mixed
-     */
-    public function getCode()
+    # 获取基本信息
+    public function get()
     {
-        return Dever::load('sms/api.sendCode', 'code', $this->getMobile());
-    }
-
-    /**
-     * 检测验证码
-     * @return mixed
-     */
-    private function checkCode()
-    {
-        return Dever::load('sms/api.checkCode', 'code', $this->getMobile(), Dever::input('code'), 1);
-    }
-
-    /**
-     * 获取手机号
-     * @return mixed
-     */
-    private function getMobile()
-    {
-        $rule = Dever::rule('mobile');
-
-        $mobile = Dever::input('mobile');
-
-        if (!$mobile) {
-            Dever::alert('手机号不能为空');
+        $this->data['user'] = $this->user;
+        if (Dever::project('set')) {
+            $this->data['config'] = Dever::load('set/lib/config')->getInfo();
         }
-        if (!preg_match($rule, $mobile)) {
-            Dever::alert('请填写正确的手机号');
+        if (Dever::project('score')) {
+            $this->data['score'] = Dever::load('score/lib/core')->getUserScore($this->uid);
         }
-
-        return $mobile;
-    }
-
-    /**
-     * 登录以及注册
-     * @return mixed
-     */
-    public function login()
-    {
-    	$password = Dever::input('password');
-    	if ($password) {
-    		$password = sha1($password);
-    		$param['mobile'] = $this->getMobile();
-    	} else {
-    		$param['mobile'] = $this->checkCode();
-    	}
-    	$param['project_id'] = Dever::input('project_id', 1);
-    	$info = Dever::db('passport/user')->one($param);
-    	if ($info) {
-    		if ($password != $info['password']) {
-    			Dever::alert('您的账号或密码错误');
-    		}
-    		$uid = $info['id'];
-    	} else {
-    		$param['system_source'] = Dever::input('system_source', 1);
-	    	$param['username'] = Dever::input('username');
-        	if (!$param['username']) {
-        		$param['username'] = Dever::hide($param['mobile']);
-        	}
-        	if ($password) {
-        		$param['password'] = $password;
-        	}
-        	$uid = Dever::db('passport/user')->insert($param);
-        	if ($uid) {
-        		Dever::score($uid, 'reg', '账号注册');
-        		if (Dever::project('message')) {
-        			$project = Dever::db('user/project')->find($param['project_id']);
-	                $content = '亲爱的' . $param['username'] . '，欢迎来到' . $project['name'];
-	                Dever::load('message/lib/data')->push(-1, $uid, '欢迎语', $content, 1);
-	            }
-	            $invite = Dever::input('invite');
-		        if ($invite && Dever::project('invite')) {
-		            Dever::load('invite/api')->setRelation($uid, false, $invite);
-		        }
-        	}
-    	}
-
-        # 记录登录日志
-        $log['uid'] = $uid;
-        $log['project_id'] = $param['project_id'];
-        $log['system_source'] = $param['system_source'];
-        Dever::db('user/login')->insert($log);
-
-        Dever::load('user/lib/info')->setProject($uid, $param['project_id']);
-        return Dever::load('user/lib/info')->getSign($uid);
+        if (Dever::project('account')) {
+            $this->data['account'] = Dever::load('account/lib/info')->getInfo($this->uid);
+        }
+        
+        return $this->data;
     }
 
-    /**
-     * 更新用户信息
-     *
-     * @return mixed
-     */
+    # 更新用户信息
     public function update()
     {
-        $uid = Dever::load('user/lib/info')->check();
+        $uid = $this->uid;
         $name = Dever::input('username');
         $avatar = Dever::input('avatar');
         $sex = Dever::input('sex');
-        $province = Dever::input('province');
-        $city = Dever::input('city');
-        $country = Dever::input('country');
-
-        $info = Dever::load('passport/user-one', $uid);
-        if ($info) {
-            $update['username'] = $name;
-            $update['avatar'] = $avatar;
-            $update['sex'] = $sex;
-            $update['province'] = $province;
-            $update['country'] = $country;
-            $update['city'] = $city;
-            if ($country && $province && $city) {
-            	$update['area'] = $country . ',' . $province . ',' . $city;
-            }
-            
-            $update['where_id'] = $uid;
-            Dever::load('passport/user-update', $update);
-        } else {
-            Dever::alert('无效的用户id,请重新登录');
-        }
+        //$province = Dever::input('province');
+        //$city = Dever::input('city');
+        //$country = Dever::input('country');
 
-        $result = Dever::db('passport/user')->one(array('id' => $uid, 'clear' => true));
-       
-        return Dever::load('user/lib/info')->getSign($uid, $result);
+        return Dever::load('user/lib/info')->update($uid, $name, $avatar, $sex);
     }
 
-    /**
-     * 修改手机号
-     *
-     * @return mixed
-     */
+    # 修改手机号
     public function updateMobile()
     {
-        $uid = $this->check();
-        $mobile = $this->checkCode();
+        $uid = $this->uid;
+        $mobile = Dever::load('user/info')->checkCode();
 
-        $info = Dever::load('passport/user-one', $uid);
+        $info = Dever::db('user/info')->find($uid);
 
         if ($info) {
             $update['mobile'] = $mobile;
             $update['where_id'] = $uid;
-            Dever::load('passport/user-update', $update);
-        } else {
-            Dever::alert('更新失败');
-        }
-
-        $result = Dever::load('user/lib/info')->getSign($uid);
-
-        return $result;
-    }
-
-    /**
-     * 修改头像
-     *
-     * @return mixed
-     */
-    public function updateAvatar()
-    {
-        $uid = $this->check();
-        $avatar = Dever::input('avatar');
-
-        $info = Dever::load('passport/user-one', $uid);
-
-        if ($info) {
-            $update['avatar'] = $avatar;
-            $update['where_id'] = $uid;
-            Dever::load('passport/user-update', $update);
+            Dever::db('user/info')->update($update);
         } else {
             Dever::alert('更新失败');
         }
@@ -184,14 +56,10 @@ class Info
         return $result;
     }
 
-    /**
-     * 修改密码
-     *
-     * @return mixed
-     */
+    # 修改密码
     public function updatePassword()
     {
-        $uid = $this->check();
+        $uid = $this->uid;
         $old_password = Dever::input('old_password');
         $password = Dever::input('password');
         if ($old_password == $password) {
@@ -202,11 +70,11 @@ class Info
         	Dever::alert('新密码与确认密码不同');
         }
 
-        $info = Dever::load('passport/user-one', $uid);
+        $info = Dever::db('user/info')->find($uid);
         if ($info) {
             $update['password'] = sha1($password);
             $update['where_id'] = $uid;
-            Dever::load('passport/user-update', $update);
+            Dever::db('user/info')->update($update);
         } else {
             Dever::alert('更新失败');
         }

src/Invoice.php

@@ -1,66 +1,47 @@
 <?php
 namespace User\Src;
 
-use Dever;
-
-class Invoice
+use User\Lib\Core;
+class Invoice extends Core
 {
     # 获取默认地址
-    public function getDefault($uid)
+    public function getData()
     {
-        $where['uid'] = $uid;
-        $where['type'] = 2;
-        $data = Dever::db('user/invoice')->find($where);
-
-        return $data;
+        return Dever::load('user/lib/invoice')->getData($this->uid);
     }
 
-    # 获取某个收货地址
-    public function getOne($uid, $id)
+    # 获取某个发票
+    public function getInfo()
     {
-        $where['uid'] = $uid;
-        $where['id'] = $id;
-        $data = Dever::db('user/invoice')->find($where);
-
-        if ($data) {
-            if ($data['title_type'] == 1) {
-                $data['title_type_name'] = '企业单位';
-            } else {
-                $data['title_type_name'] = '个人';
-            }
+        $id = Dever::input('id');
+        if (!$id) {
+            Dever::alert('请选择发票id');
         }
-
-        return $data;
+        return Dever::load('user/lib/invoice')->getInfo($this->uid, $id);
     }
 
     # 获取地址列表
-    public function get($uid)
+    public function getList()
     {
-        $where['uid'] = $uid;
-        $data = Dever::db('user/invoice')->getList($where);
-
-        return $data;
+        return Dever::load('user/lib/invoice')->getList($this->uid);
     }
 
+
     # 删除和恢复
-    public function del($uid, $id, $state = 2)
+    public function delete()
     {
-        $info = $this->getOne($uid, $id);
-        if ($info) {
-            $update['where_id'] = $info['id'];
-            $update['state'] = $state;
-            Dever::db('user/invoice')->update($update);
-        } else {
-            Dever::alert('更新失败');
+        $id = Dever::input('id');
+        if (!$id) {
+            Dever::alert('请选择发票id');
         }
-
-        return 'ok';
+        return Dever::load('user/lib/invoice')->getList($this->uid, $id, 2);
     }
 
     # 添加或者更新地址接口
     public function up()
     {
-        $uid = $this->check();
+        $source_id = $this->uid;
+        $source_table = 'user/info';
         $id = Dever::input('id');
         $type = Dever::input('type', 2);
         $title_type = Dever::input('title_type');
@@ -73,58 +54,6 @@ class Invoice
         $bank = Dever::input('bank');
         $bank_number = Dever::input('bank_number');
 
-        return $this->update($id, $uid, $type, $title_type, $title, $email, $mobile, $number, $phone, $address, $bank, $bank_number);
-    }
-
-    # 添加或者更新地址
-    public function update($id, $uid, $type = 2, $title_type = 1, $title = '', $email = '', $mobile = '', $number = '', $phone = '', $address = '', $bank = '', $bank_number = '')
-    {
-        $update['title_type'] = $title_type;
-        if ($title_type == 1) {
-            if (!$number) {
-                Dever::alert('公司税号不能为空');
-            }
-            $update['number'] = $number;
-        }
-
-        $update['type'] = $type;
-        $update['title'] = $title;
-
-        if (!$title) {
-            Dever::alert('发票抬头不能为空');
-        }
-
-        if ($email) {
-            $update['email'] = $email;
-        }
-        if ($mobile) {
-            $update['mobile'] = $mobile;
-        }
-        if ($phone) {
-            $update['phone'] = $phone;
-        }
-        if ($address) {
-            $update['address'] = $address;
-        }
-        if ($bank) {
-            $update['bank'] = $bank;
-        }
-        if ($bank_number) {
-            $update['bank_number'] = $bank_number;
-        }
-
-        if ($type == 2) {
-            Dever::db('user/invoice')->updateType(array('where_type' => 2, 'set_type' => 1));
-        }
-        
-        if ($id) {
-            $update['where_id'] = $id;
-            Dever::db('user/invoice')->update($update);
-        } else {
-            $update['uid'] = $uid;
-            $id = Dever::db('user/invoice')->insert($update);
-        }
-
-        return $id;
+        return Dever::load('user/lib/invoice')->update($id, $source_id, $source_table, $type, $title_type, $title, $email, $mobile, $number, $phone, $address, $bank, $bank_number);
     }
 }

src/Main.php

@@ -0,0 +1,98 @@
+<?php
+namespace User\Src;
+
+use Dever;
+class Main
+{
+	/**
+     * 获取验证码
+     * @return mixed
+     */
+    public function getCode()
+    {
+        return Dever::load('sms/api.sendCode', 'code', $this->getMobile());
+    }
+
+    /**
+     * 检测验证码
+     * @return mixed
+     */
+    private function checkCode()
+    {
+        return Dever::load('sms/api.checkCode', 'code', $this->getMobile(), Dever::input('code'), 1);
+    }
+
+    /**
+     * 获取手机号
+     * @return mixed
+     */
+    private function getMobile()
+    {
+        $rule = Dever::rule('mobile');
+
+        $mobile = Dever::input('mobile');
+
+        if (!$mobile) {
+            Dever::alert('手机号不能为空');
+        }
+        if (!preg_match($rule, $mobile)) {
+            Dever::alert('请填写正确的手机号');
+        }
+
+        return $mobile;
+    }
+
+    /**
+     * 登录以及注册
+     * @return mixed
+     */
+    public function login()
+    {
+    	$password = Dever::input('password');
+    	if ($password) {
+    		$password = sha1($password);
+    		$param['mobile'] = $this->getMobile();
+    	} else {
+    		$param['mobile'] = $this->checkCode();
+    	}
+    	$param['project_id'] = Dever::input('project_id', 1);
+    	$info = Dever::db('passport/user')->one($param);
+    	if ($info) {
+    		if ($password != $info['password']) {
+    			Dever::alert('您的账号或密码错误');
+    		}
+    		$uid = $info['id'];
+    	} else {
+    		$param['system_source'] = Dever::input('system_source', 1);
+	    	$param['username'] = Dever::input('username');
+        	if (!$param['username']) {
+        		$param['username'] = Dever::hide($param['mobile']);
+        	}
+        	if ($password) {
+        		$param['password'] = $password;
+        	}
+        	$uid = Dever::db('passport/user')->insert($param);
+        	if ($uid) {
+        		Dever::score($uid, 'reg', '账号注册');
+        		if (Dever::project('message')) {
+        			$project = Dever::db('user/project')->find($param['project_id']);
+	                $content = '亲爱的' . $param['username'] . '，欢迎来到' . $project['name'];
+	                Dever::load('message/lib/data')->push(-1, $uid, '欢迎语', $content, 1);
+	            }
+	            $invite = Dever::input('invite');
+		        if ($invite && Dever::project('invite')) {
+		            Dever::load('invite/api')->setRelation($uid, false, $invite);
+		        }
+        	}
+    	}
+
+        # 记录登录日志
+        $log['uid'] = $uid;
+        $log['project_id'] = $param['project_id'];
+        $log['system_source'] = $param['system_source'];
+        Dever::db('user/login')->insert($log);
+
+        Dever::load('user/lib/info')->setProject($uid, $param['project_id']);
+        return Dever::load('user/lib/info')->getSign($uid);
+    }
+}