Merge branch 'dev' of wugg/fivechang into master

application/Home/controller/Order.php

@@ -112,8 +112,10 @@ class Order extends Base
           // var_dump(Db::name('order_log')->getLastSql());
 
             if($zl+$num>$kg['limit_num']){
-                return error_show(1004,"购买数量超过限额");
+                $jf = $kg['limit_num']>=$zl ?$kg['limit_num']-$zl :0;
+                return error_show(1004,"购买数量超过限额,可购数量{$jf}{$kg['name']}");
             }
+
         }
 
         $addrid = isset($this->post['addrid'])&&$this->post['addrid']!="" ? intval($this->post['addrid']):"";