Merge branch 'dev' of wugg/fivechang into master

application/Home/controller/Order.php

@@ -241,6 +241,14 @@ class Order extends Base
         $stock = Db::name("account_stock")->where(["accountid"=>$this->userinfo['id'],'is_del'=>0])->find();
         $data=[];
         $data['stock'] = isset($stock['stock_balance']) ? $stock['stock_balance']:0;
+        $unit = Db::name('unit')->where(['is_del'=>0,'status'=>1])->field("id,name,weight,limit_num")->select();
+        $limit=[];
+        foreach ($unit as $value){
+            $num = intval($data['stock']/$value['weight']);
+            $value['limit_num'] = $value['limit_num']==0 ||$value['limit_num']>$num  ? $num : $value['limit_num'];
+            $limit[]=$value;
+        }
+        $data['limit']=$limit;
         return app_show(0,"获取成功",$data);
     }
 }