Merge branch 'master' of http://git.dever.cc:3000/dever-package/passport

database/user.php

@@ -86,7 +86,7 @@ return array
 			'exist'		=> array
 			(
 				'yes' => '有值',
-				'no' => '没有值',
+				//'no' => '没有值',
 			),
 			'list'		=> true,
 		),
@@ -114,6 +114,7 @@ return array
 			'callback'	=> 'sha1',
 		),
 		
+		//search_exist_avatar=yes
 		'avatar'		=> array
 		(
 			'type' 		=> 'varchar-150',
@@ -124,6 +125,48 @@ return array
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',
+			'list'		=> '"{avatar}" ? "<img src=\'{avatar}\' width=\'150\'>": ""',
+		),
+
+		'country'		=> array
+		(
+			'type' 		=> 'varchar-100',
+			'name' 		=> '国家',
+			'default' 	=> '',
+			'desc' 		=> '国家',
+			'match' 	=> 'option',
+			//'update'	=> 'text',
+		),
+
+		'province'		=> array
+		(
+			'type' 		=> 'varchar-100',
+			'name' 		=> '省份',
+			'default' 	=> '',
+			'desc' 		=> '省份',
+			'match' 	=> 'option',
+			//'update'	=> 'text',
+		),
+
+		'city'		=> array
+		(
+			'type' 		=> 'varchar-100',
+			'name' 		=> '城市',
+			'default' 	=> '',
+			'desc' 		=> '城市',
+			'match' 	=> 'option',
+			//'update'	=> 'text',
+		),
+
+		'area'		=> array
+		(
+			'type' 		=> 'varchar-800',
+			'name' 		=> '地区',
+			'default' 	=> '',
+			'desc' 		=> '地区',
+			'match' 	=> 'option',
+			//'update'	=> 'text',
+			'list'		=> true,
 		),
 		
 		'info'		=> array
@@ -215,6 +258,11 @@ return array
 		),
 	),
 
+	'manage' => array
+	(
+		'excel' => true,
+	),
+
 	# 更新表结构
 	/*
 	'alter' => array

index.php

@@ -4,5 +4,5 @@ define('DEVER_APP_NAME', 'passport');
 define('DEVER_APP_LANG', '用户管理');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 define('DEVER_MANAGE_ORDER', -10);
-define('DEVER_MANAGE_ICON', 'glyphicon glyphicon-user');
+define('DEVER_MANAGE_ICON', 'glyphicon glyphicon-user layui-icon-username');
 include(DEVER_APP_PATH . '../boot.php');

src/Applet.php

@@ -22,7 +22,17 @@ class Applet extends Base
      */
     public function bind()
     {
-        $applet = Dever::config('base', 'project')->applet;
+        $token = Dever::project('token');
+        $applet = array();
+        if ($token) {
+            $applet = Dever::db('token/project')->one(Dever::input('appid', 1));
+        }
+
+        if (!$applet) {
+            $applet = Dever::config('base', 'project')->applet;
+        }
+        
+
         $appid = $applet['appid'];
         $secret = $applet['secret'];
         $url = $applet['url'];
@@ -258,11 +268,15 @@ class Applet extends Base
               	$update['set_avatar'] = $pic;
             }
             
-            //$update['set_city'] = $city;
+            $update['set_city'] = $city;
             //$update['set_mobile'] = $mobile;
-            //$update['set_province'] = $province;
-            //$update['set_country'] = $country;
+            $update['set_province'] = $province;
+            $update['set_country'] = $country;
             $update['where_id'] = $uid;
+
+            if ($country && $province && $city) {
+                $update['set_area'] = $country . ',' . $province . ',' . $city;
+            }
             if (isset($update) && $update) {
                 Dever::load('passport/user-update', $update);
             }