Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Consult.php

@@ -2064,6 +2064,9 @@ class Consult extends Base
                 $kh=Db::name("customer_info")->where(['companyNo'=>$value['khNo']])->find();
                 $value['khname']= isset($kh['companyName'])?$kh['companyName']:"";
             }
+            $consult =Db::name("consult_bids")->where(["infoNo"=>$value['infoNo'],"createrid"=>$this->uid,"is_del"=>0])
+                ->find();
+            $value['is_feed'] =$consult==false?0:1;
             $value['metal_name']=isset($value['metal_id'])&& $value['metal_id']!=0?$this->noble[$value['metal_id']]:"";
             $data[]=$value;
         }

app/admin/controller/Purch.php

@@ -857,8 +857,7 @@ class Purch extends Base
 
         if (empty($data)) return error_show(1004, "未找到该采购单数据");
         if ($data['status'] != 0) return error_show(1005, '该状态下不允许修改实时金价');
-        $sale_price =  round($data['demo_fee'] / $data['good_num'] + $data['open_fee'] / $data['good_num'] +
-            $data['weight']  * $param["gold_price"] + $data['teach_fee'] *  $data['weight']  +
+        $sale_price =  round($data['demo_fee'] / $data['good_num'] + $data['open_fee'] / $data['good_num'] +$data['weight']  * $param["gold_price"] + $data['teach_fee'] *  $data['weight']  +
             $data['pakge_fee'] +  $data['mark_fee'] + $data['cert_fee'] +$data['nake_fee'] + $data['delivery_fee'],2);
         $total_price = round($data['good_num']*$sale_price,2);