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

learn/active/database/info.php

@@ -76,7 +76,7 @@ return array
             'name'      => '购买成功后的背景图',
             'default'   => '',
             'desc'      => '购买成功后的背景图',
-            'match'     => 'is_string',
+            'match'     => 'option',
             'update'    => 'image',
             'key'       => '1',
             // 'place'     => '759*562',

learn/active/src/Api.php

@@ -30,7 +30,7 @@ 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'] > 10){
+		if($data && $data['total'] && $data['tatal'] > $data['num']){
 			Dever::alert('您已超过限购数量');
 		}
 		$insert['order_num'] = $this->getOrderId();