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

learn/active/database/info.php

@@ -42,9 +42,9 @@ return array
             'default'   => '',
             'desc'      => '限购数量',
             'match'     => 'is_string',
-            'update'    => 'text',
+            // 'update'    => 'text',
             'search'    => 'fulltext',
-            'list'      => true,
+            // 'list'      => true,
         ),
 
         'price'      => array

learn/active/src/Api.php

@@ -30,9 +30,9 @@ Class Api extends Core {
 		$insert['num'] = $num;
 		$insert['price'] = $num * $data['price'];
 		$data = Dever::db('active/order')->getNum(array('mid'=>$this->uid,'active_id'=>$id));
-		if($data && $data['total'] && $data['tatal'] > $data['num']){
-			Dever::alert('您已超过限购数量');
-		}
+		// if($data && $data['total'] && $data['tatal'] > $data['num']){
+		// 	Dever::alert('您已超过限购数量');
+		// }
 		$insert['order_num'] = $this->getOrderId();
 		$ids = Dever::db('active/order')->insert($insert);