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

learn/active/lib/Active.php

@@ -60,8 +60,10 @@ class Active
 					if ($v['num'] > 0 && $num > $v['num']) {
 						Dever::alert('您已超过限购数量');
 					}
-					if ($order && $order['total']  && $v['num'] > 0 && $order['total'] > $v['num']) {
-						Dever::alert('您已超过限购数量');
+					if ($order) {
+						if ($order['total']  && $v['num'] > 0 && ($order['total']+$num) > $v['num']) {
+							Dever::alert('您已超过限购数量');
+						}
 					}
 				}
 			}