edit

learn/active/database/info.php

@@ -2,8 +2,8 @@
 $status = array
 (
     1 => '全部可购',
-    2 => '代理商可购',
-    3 => '非代理商可购',
+    2 => '仅代理商可购',
+    //3 => '非代理商可购',
 );
 
 $act_status = array
@@ -17,16 +17,21 @@ $act_status = array
 
 $type = array
 (
-    1 => '商品预售',
+    //1 => '商品预售',
     2 => '活动门票',
 );
 
 $cost_type = array
 (
-    1 => '押金报名',
+    //1 => '押金报名',
     2 => '缴费报名',
 );
 
+$col_set = array
+(
+    'idcard' => '身份证号',
+);
+
 $role = function()
 {
     $array = array();
@@ -46,8 +51,8 @@ $list_button = array();
 if ($search_auth == 1) {
     $insert = true;
     $edit = true;
-    if (Dever::load('manage/auth')->checkFunc('active.info', 'editworld', '字段设置')) {
-        $list_button['list1'] = array('字段设置', '"info_field&search_option_active_id={id}&oper_table=info"');
+    if (Dever::load('manage/auth')->checkFunc('active.info', 'editworld', '自定义字段设置')) {
+        $list_button['list1'] = array('自定义字段设置', '"info_field&search_option_active_id={id}&oper_table=info"');
     }
 } else {
     if (Dever::load('manage/auth')->checkFunc('active.info', 'editOff', '核销活动')) {
@@ -66,7 +71,7 @@ $off = function() use($search_auth)
 };
 $col = Dever::input('col');
 if (!$col) {
-    $tab = array('基础设置', '活动设置', '购买限制', '价格设置');
+    $tab = array('基础设置', '时间设置', '购买限制', '其他设置');
 } else {
     $tab = '';
 }
@@ -209,7 +214,7 @@ return array
             // 'search'    => 'select',
             'list_name' => $search_auth == 2 ? '待核销数量' : false,
             'list'      => $search_auth == 2 ? "Dever::load('active/lib/manage.dOff',{id})" : false,
-            'tab'       => 1,
+            'tab'       => 2,
         ),
 
         'type'        => array
@@ -223,7 +228,7 @@ return array
             'option'    => $type,
             // 'search'    => 'select',
             'list'      => $search_auth == 1 ? true : false,
-            'tab'       => 1,
+            'tab'       => 2,
         ),
 
         'act_status'        => array
@@ -326,7 +331,7 @@ return array
             'update'    => 'text',
             'list'      => $search_auth == 1 ? true : false,
             'list_order' => '3',
-            'tab'       => 3,
+            'tab'       => 0,
         ),
 
         'cost_type'        => array
@@ -350,12 +355,24 @@ return array
             'default'   => '',
             'desc'      => '购买成功后的背景图',
             'match'     => 'option',
-            'update'    => 'image',
+            //'update'    => 'image',
             'key'       => '1',
             // 'place'     => '759*562',
             'tab'       => 3,
         ),
 
+        'col'        => array
+        (
+            'type'      => 'varchar-300',
+            'name'      => '字段设置',
+            'default'   => 'idcard',
+            'desc'      => '字段设置',
+            'match'     => 'is_string',
+            'update'    => 'checkbox',
+            'option'    => $col_set,
+            'tab'       => 3,
+        ),
+
         'mobile'      => array
         (
             'type'      => 'bigint-11',
@@ -390,7 +407,7 @@ return array
             'update'    => 'editor',
             //'search'    => 'fulltext',
             //'list'      => true,
-            'tab'       => 3,
+            'tab'       => 0,
         ),
 
         'off_id'      => array

learn/active/lib/Active.php

@@ -12,7 +12,6 @@ class Active
 		$data = Dever::db('active/info')->find($active_id);
 
 		$insert['active_id'] = $active_id;
-		$insert['mid'] = $user['mid'];
 		$insert['num'] = $num;
 		$insert['price'] = $num * $data['price'];
 		if ($remark) {
@@ -39,9 +38,7 @@ class Active
 		}
 		$order = Dever::db('active/order')->getNum(array('uid'=>$uid,'active_id'=>$active_id));
 		if ($data['status'] == 2) {
-			if ($user['mid'] > 0) {
-				$member = Dever::db('agent/member')->find(array('id'=>$user['mid'],'status'=>2));
-			}
+			$member = Dever::load('active/lib/user')->agent($user);
 			if (!$member) {
 				Dever::alert('本活动只能是代理商报名');
 			}

learn/active/lib/Cron.php

@@ -94,34 +94,21 @@ Class Cron{
         $data = Dever::db('active/order')->state();
         foreach ($data as $k => $v) {
             if ($v['mid'] && $v['mid'] > 0) {
-                $member = Dever::db('agent/member')->find($v['mid']);
+                $member = Dever::load('active/lib/user')->agent($v, 'mid');
                 if ($member && $member['mobile']) {
                     $user = Dever::db('active/user')->find(array('mobile'=>$member['mobile']));
                     if (!$user) {
-                        $insert['mid'] = $v['mid'];
                         $insert['name'] = $member['name'];
                         $insert['mobile'] = $member['mobile'];
                         $insert['idcard'] = $member['idcard'];
                         $insert['pass'] = $member['password'];
                         $insert['old_pwd'] = $member['old_pwd'];
                         $insert['old_salt'] = $member['old_salt'];
-                        Dever::db('active/user')->insert($insert);
+                        $uid = Dever::db('active/user')->insert($insert);
+                        Dever::db('active/order')->update(array('where_id' => $v['id'], 'uid' => $uid));
                     }
                 } 
             }
         }
     }
-    #更新订单表
-    public function setUSer_api()
-    {
-        $data = Dever::db('active/order')->state();
-        foreach ($data as $k => $v) {
-            $user = Dever::db('active/user')->find(array('mid'=>$v['mid']));
-            if ($user) {
-                $where['where_id'] = $v['id'];
-                $where['uid'] = $user['id'];
-                Dever::db('active/order')->update($where);
-            }
-        }
-    }
 }

learn/active/lib/Excel.php

@@ -9,7 +9,7 @@ Class Excel {
 		$header = array('订单单号', '姓名', '手机号', '活动名称', '购买数量', '金额', '支付状态', '支付类型','购买时间');
         $body = array();
         foreach ($data as $k => $v){
-        	$member = Dever::db('agent/member')->find($v['mid']);
+        	$member = Dever::load('active/lib/user')->agent($v);
         	$active = Dever::db('active/info')->find($v['active_id']);
         	$member_name = '';
         	$member_mobile = '';

learn/active/lib/Manage.php

@@ -266,7 +266,7 @@ Class Manage
         $no_code = $info['num'] - $use_code;
         if ($info['mid'] && $info['mid'] > 0) {
             $user = Dever::db('active/user')->find($info['mid']);
-            $member = Dever::db('agent/member')->find($info['mid']);
+            $member = Dever::load('active/lib/user')->agent($info);
             if ($member) { 
                 $role = Dever::db('setting/role')->find($member['role']);
                 if (isset($role) && $role && isset($role['name']) && $role['name']) {

learn/active/src/Auth.php

@@ -20,12 +20,11 @@ Class Auth
 			$data = Dever::load('passport/reg')->getSign($user['id']);
             return $data;
 		} else {
-			$member = Dever::db('agent/member')->find(array('mobile'=>$mobile));
+			$member = Dever::load('active/lib/user')->agent(array('mobile' => $mobile));
 			if ($member) {
 				if($pass && $member['pass'] != sha1($pass) && $member['old_pwd'] != md5($pass. $member['old_salt'])) {
 					Dever::alert('密码不正确');
 				}
-				$insert['mid'] = $member['id'];
 				$insert['name'] = $member['name'];
 				$insert['mobile'] = $member['mobile'];
 				$insert['idcard'] = $member['idcard'];
@@ -36,7 +35,7 @@ Class Auth
 			} else {
 				$where['mobile'] = $mobile;
 				$where['name'] = substr($mobile, 0, 3).'****'.substr($mobile, 7);
-				$ids = Dever::db('active/user') -> insert($where);
+				$ids = Dever::db('active/user')->insert($where);
 			}
 			if ($ids) {
 				$data = Dever::load('passport/reg')->getSign($ids);

learn/active/src/Home.php

@@ -42,9 +42,7 @@ Class Home extends Core
 				$this->data['info']['field'][$k]['value_name'] = '';
 			}
 		}
-		if ($uid > 0) {
-			$this->data['user'] = Dever::db('active/user')->find($uid);
-		}
+		$this->data['user'] = $this->user;
 		return $this->data;
 	}
 

learn/active/src/Off.php

@@ -49,10 +49,9 @@ Class Off extends Coreoff
 			$parent_user = Dever::db('active/user')->find($data['buy_uid']);
 			$res['info']['parent_name'] = $parent_user['name'];
 			$res['info']['parent_mobile'] = $parent_user['mobile'];
-			$res['info']['avatar'] = $user['avatar'];
 			$res['info']['role_name'] = '';
 			$res['info']['title_name'] = '';
-			$member = Dever::db('agent/member')->find(array('mobile'=>$user['mobile']));
+			$member = Dever::load('active/lib/user')->agent($user);
 			if ($member) {
 				$role = Dever::db('setting/role')->find($member['role']);
 				$title = Dever::db('setting/title')->find($member['title_id']);
@@ -71,6 +70,9 @@ Class Off extends Coreoff
     				$res['info']['avatar'] = $member['avatar'];
     			}
 			}
+			if ($user['avatar']) {
+				$res['info']['avatar'] = $user['avatar'];
+			}
 		} else {
 			Dever::alert('手机号不正确或核销码已核销');
 		}

learn/active/src/User.php

@@ -12,16 +12,12 @@ Class User extends Core
     	$active_id = Dever::input('active_id');
     	$order_id = Dever::input('id');
     	$info = Dever::db('active/info')->find($active_id);    	
-    	$member = Dever::db('agent/member')->find(array('mobile'=>$user['mobile']));
-    	if ($info['status']  == 2) {
+    	if ($info['status'] == 2) {
+    		$member = Dever::load('active/lib/user')->agent($user);
     		if (!$member) {
-    			Dever::alert('仅限代理商购买');
-    		}
-    	} elseif ($info['status'] == 3) {
-    		if ($member) {
-    			Dever::alert('代理商不可购买');
-    		}
-    	} 
+				Dever::alert('仅限代理商领取');
+			}
+    	}
     	$code = Dever::db('active/code')->state(array('order_id'=>$order_id));
     	$data = Dever::db('active/order')->find($order_id);
     	if ($data['status'] < 2) {
@@ -174,7 +170,7 @@ Class User extends Core
             if ($data['user']['birthday']) {
                 $data['user']['birthday'] = date('Y-m-d',$data['user']['birthday']);
             }
-    		$member = Dever::db('agent/member')->find(array('mobile'=>$data['user']['mobile']));
+            $member = Dever::load('active/lib/user')->agent($data['user']);
     		if ($member) {
     			$role = Dever::db('setting/role')->find($member['role']);
     			$title = Dever::db('setting/title')->find($member['title_id']);
@@ -189,7 +185,12 @@ Class User extends Core
     			if ($title  && $title['name']) {
     				$data['user']['title_name'] = $title['name'];
     			}
+
+    			if (!$data['user']['avatar']) {
+    				$data['user']['avatar'] = $member['avatar'];
+    			}
     		}
+    		
     	} else {
     		$data['user']['name'] = '匿名用户';
     	}