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

learn/active/src/Home.php

@@ -81,6 +81,13 @@ Class Home extends Core
 
 		$uid = $this->uid;
 		if ($this->uid <= 0) {
+			if (!$data['mobile']) {
+				Dever::alert('手机号不存在');
+			}
+			if (!$data['name']) {
+				Dever::alert('姓名不存在');
+			}
+			Dever::load('active/lib/manage')->checkMcode($data['mobile']);
 			$user = Dever::db('active/user')->find(array('mobile'=>$data['mobile']));
 			if ($user) {
 				$uid = $user['id'];
@@ -111,7 +118,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;
 	}
@@ -126,7 +133,7 @@ Class Home extends Core
     	if (!$w['mobile']){
     		Dever::alert('手机号不存在');
     	}
-    	// Dever::load('active/lib/manage')->checkMcode($w['mobile']);
+    	Dever::load('active/lib/manage')->checkMcode($w['mobile']);
     	$user = Dever::db('active/user')->find(array('mobile'=>$w['mobile']));
     	if ($user) {
 			$uid = $user['id'];

learn/active/src/User.php

@@ -340,7 +340,7 @@ Class User extends Core
 		$data = Dever::db('active/order')->find(array('uid'=>$this->uid,'id'=>$order_id));
 		if ($data) {
 			$where['where_id'] = $data['id'];
-			$where['state'] = 2;
+			$where['status'] = 3;
 			$ids = Dever::db('active/order')->update($where);
 			if ($ids) {