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'] == 1 || (isset($data['act_start']) && $data['act_start'] && time() < $data['sign_start'])) {
+		// 	Dever::alert('活动还未开始报名');
+		// }
 		if ($data['act_status'] >=3 || (isset($data['sign_end']) && $data['sign_end'] && time()>$data['sign_end'])){
 			Dever::alert('活动报名已结束');
 		}
@@ -47,22 +50,27 @@ class Active
 				Dever::alert('本活动只能是代理商报名');
 			}
 		}
-		
-		if ($member) {
+		if ($title && $member && $member['title_id']) {
 			foreach ($title as $k => $v) {
-				if($v['id'] == $member['role']) {
+				$title_id = explode(',',$member['title_id']);
+				if($title_id && in_array($v['id'],$title_id)) {
+					if ($v['num'] > 0 && $num > $v['num']) {
+						Dever::alert('您已超过限购数量');
+					}
 					if ($order && $order['total']  && $v['num'] > 0 && $order['total'] > $v['num']) {
 						Dever::alert('您已超过限购数量');
 					}
 				}
 			}
+		} else {
+			if ($order && $order['total'] && $order['total'] >= $data['num']) {
+				Dever::alert('您已超过限购数量');
+			}
+			if ($num > $data['num'] ) {
+				Dever::alert('您已超过限购数量');
+			}
 		}
-		if ($order && $order['total'] && $order['total'] >= $data['num']) {
-			Dever::alert('您已超过限购数量');
-		}
-		if ($num > $data['num'] ) {
-			Dever::alert('您已超过限购数量');
-		}
+		
 		$insert['order_num'] = $this->getOrderId();
 		$ids = Dever::db('active/order')->insert($insert);
 		$url = Dever::url();

learn/active/src/Home.php

@@ -111,7 +111,7 @@ Class Home extends Core
 		}
 		$remark = Dever::input('remark');
 		$path = Dever::input('path');
-
+		
 		$result += Dever::load('active/lib/active')->action($uid, $id, $num, $path, $remark);
 		return $result;
 	}

learn/active/src/Off.php

@@ -101,6 +101,9 @@ Class Off extends Coreoff
 		$data = Dever::db('active/code')->find($code_id);
 		if ($data) {
 			$active = Dever::db('active/info')->find($data['active_id']);
+			// if (time() < $active['act_start']){
+			// 	Dever::alert('活动未开始');
+			// }
 			if ($active['status'] == 5 || time() >= $active['act_end']) {
 				Dever::alert('活动已结束');
 			}

learn/active/src/User.php

@@ -343,8 +343,8 @@ Class User extends Core
 			$where['state'] = 2;
 			$ids = Dever::db('active/order')->update($where);
 			if ($ids) {
-				$data = Dever::db('active/order')->find($ids);
-				return $data;
+				
+				return 'ok';
 			} else {
 				Dever::alert('取消失败');
 			}

service/agent/lib/User.php

@@ -16,11 +16,17 @@ class User
         $info = Dever::db('agent/user_bind')->one($id);
         $status = Dever::db('agent/user_bind')->config['status'];
         $audit_date='';
-        if(isset($info['aduit_date']) && $info['aduit_date']){
+        if (isset($info['aduit_date']) && $info['aduit_date']) {
             $audit_date = date('Y-m-d H:i', $info['audit_date']);
-        }else{
-            $audit_date = '-';
+        } else {
+            $audit_date = date('Y-m-d H:i',$info['cdate']);
         }
+        if ($info['admin'] && $info['admin'] > 0) {
+            $admin_name = Dever::load("manage/admin-find#username", $info['admin']);
+        } else {
+            $admin_name = '';
+        }
+        
         /*
         $idcard_pic = '<a href="'.$info['idcard_front'].'" target="_blank"><img src="'.$info['idcard_front'].'" width="150" /></a>';
         if ($info['idcard_back']) {
@@ -56,7 +62,7 @@ class User
             (
                 array('状态', $status[$info['status']]),
                 array('时间', $audit_date),
-                array('审核人', Dever::load("manage/admin-find#username", $info['admin'])),
+                array('审核人',$admin_name),
                 array('审核备注', $info['audit_desc']),
             ),
         );