edit

learn/active/database/info.php

@@ -55,9 +55,10 @@ if ($search_auth == 1) {
         $list_button['list1'] = array('自定义字段设置', '"info_field&search_option_active_id={id}&oper_table=info"');
     }
 } else {
-    if (Dever::load('manage/auth')->checkFunc('active.info_1', 'editOff', '核销活动')) {
-        $button['核销活动'] = array('fast',1,'info_code');
-    }
+    // if (Dever::load('manage/auth')->checkFunc('active.info_1', 'editOff', '核销活动')) {
+        // $button['核销活动'] = array('fast',1,'info_code');
+        $list_button['fast_add'] = array('核销活动', 'info_code&search_option_active_id={id}');
+    // }
 }
 $off = function() use($search_auth)
 {

learn/active/database/info_code.php

@@ -36,11 +36,12 @@ return array
         'code'      => array
         (
             'type'      => 'varchar-200',
-            'name'      => '核销码',
+            'name'      => '核销码/手机号',
             'default'   => '',
             'desc'      => '核销码',
             'match'     => 'is_string',
             'update'    => 'text',
+            'value'     => '',
             // 'search'    => 'fulltext',
             // 'list'      => true,
             'bind'        => array('onblur', 'loading', array('url' => Dever::url("active/lib/manage.search"))),

learn/active/lib/Manage.php

@@ -137,10 +137,29 @@ Class Manage
     {
         $value = Dever::input('value');
         if (!$value) {
-            return '核销码不存在';
+            return '核销码或手机号不存在';
         }
+        $active_id = Dever::input('search_option_active_id');
         if ($value) {
             $data = Dever::db('active/code')->one(array('write_code' => $value,'state' =>1));
+            if (!$data) {
+                if (strlen($value) != 11){
+                    return '核销码或手机号不正确';
+                } else {
+                    $tell = preg_match("/^1[3456789]\d{9}$/",$value);
+                    if ($tell) {
+                        $user = Dever::db('active/user')->find(array('mobile'=>$value));
+                        if ($user) {
+                            $data = Dever::db('active/code')->find(array('join_uid'=>$user['id'],'active_id'=>1,'status' => 1));
+                            if (!$data) {
+                                return '核销码或手机号不正确或已核销';
+                            }
+                        } else {
+                            return '核销码或手机号不正确';
+                        }
+                    }
+                }
+            }
             $table = array();
             if ($data) {
                 $user = Dever::db('active/user')->find(array('id'=>$data['join_uid']));

learn/active/src/Off.php

@@ -40,7 +40,7 @@ Class Off extends Coreoff
 					if ($tell) {
 						$user = Dever::db('active/user')->find(array('mobile'=>$code));
 						if ($user) {
-							$data = Dever::db('active/code')->find(array('join_id'=>$user['id']));
+							$data = Dever::db('active/code')->find(array('join_uid'=>$user['id']));
 						} else {
 							Dever::alert('手机号或核销码不正确');
 						}
@@ -85,6 +85,9 @@ Class Off extends Coreoff
 			}
 			if ($user['avatar']) {
 				$res['info']['avatar'] = $user['avatar'];
+			} else {
+				$config = Dever::db('deploy/base-one');
+				$res['info']['avatar'] = $config['avatar'];
 			}
 		} else {
 			Dever::alert('手机号不正确或核销码已核销');

learn/active/src/User.php

@@ -285,6 +285,7 @@ Class User extends Core
             }
             $data['user']['mid'] = -1;
             $member = Dever::load('active/lib/user')->agent($data['user']);
+            $config = Dever::db('deploy/base-one');
     		if ($member) {
     			$data['user']['mid'] = $member['id'];
     			$role = Dever::db('setting/role')->find($member['role']);
@@ -303,13 +304,15 @@ Class User extends Core
 
     			if (!$data['user']['avatar']) {
     				$data['user']['avatar'] = $member['avatar'];
-    			}
+    			} else {
+                    $data['user']['avatar'] = $config['avatar'];
+                }
     		}
     		
     	} else {
     		$data['user']['name'] = '匿名用户';
+            $data['user']['avatar'] = $config['avatar'];
     	}
-    	$config = Dever::db('deploy/base-one');
     	$data['config']['phone'] = $config['phone'];
     	return $data;
     }

learn/deploy/database/base.php

@@ -37,6 +37,18 @@ return array
             'match'     => 'option',
             'update'    => 'text',
         ),
+        
+        'avatar'        => array
+        (
+            'type'      => 'varchar-150',
+            'name'      => '默认头像',
+            'default'   => '',
+            'desc'      => '请选择头像',
+            'match'     => 'is_string',
+            'update'    => 'image',
+            'key'       => '1',
+            //'place'       => '150',
+        ),
 		
         'state'     => array
         (