Your Name 3 vuotta sitten
vanhempi
commit
1026f872e9
2 muutettua tiedostoa jossa 11 lisäystä ja 5 poistoa
  1. 9 3
      learn/active/lib/Active.php
  2. 2 2
      learn/active/src/User.php

+ 9 - 3
learn/active/lib/Active.php

@@ -51,16 +51,22 @@ class Active
 			}
 		}
 		
-		if ($member) {
+		if ($title && $member) {
 			foreach ($title as $k => $v) {
 				if($v['id'] == $member['role']) {
-					if (($order && $order['total']  && $v['num'] > 0 && $order['total'] > $v['num']) || ($v['num'] > 0 && $num > $v['num']) ) {
+					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']) || ($num > $data['num'])) {
+			if ($order && $order['total'] && $order['total'] >= $data['num']) {
+				Dever::alert('您已超过限购数量');
+			}
+			if ($num > $data['num'] ) {
 				Dever::alert('您已超过限购数量');
 			}
 		}

+ 2 - 2
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('取消失败');
 			}