Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

learn/active/lib/Active.php

@@ -10,6 +10,9 @@ class Active
     	$user = Dever::db('active/user')->find($uid);
 		// print_R(json_decode('[{"id":"1","value":"文本"},{"id":"2","value":"文本"},{"id":"3","value":"1"}]'));die;
 		$data = Dever::db('active/info')->find($active_id);
+		if ($data['act_status'] >=3 || (isset($data['sign_end']) && $data['sign_end'] && time()>$data['sign_end'])){
+			Dever::alert('活动报名已结束');
+		}
 
 		$insert['active_id'] = $active_id;
 		$insert['num'] = $num;

learn/active/src/Off.php

@@ -98,6 +98,9 @@ Class Off extends Coreoff
 		}
 		$data = Dever::db('active/code')->find($code_id);
 		if ($data) {
+			if ($data['status'] == 2) {
+				Dever::alert('当前核销码已核销');
+			}
 			$where['where_id'] = $code_id;
 			$where['status'] = 2;
 			$where['time'] = time();

learn/active/src/User.php

@@ -187,6 +187,7 @@ Class User extends Core
 			}
            
 			$data['info']['mobile'] = $active['mobile'];
+            $data['info']['idcard'] = $data['user']['idcard'];
             $data['info']['field'] = array();
             if ($data['info']['path']) {
                 $data['info']['field'] = json_decode($data['info']['path']);