Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_brand_20200608

app/Http/Controllers/OrderController.php

@@ -2084,7 +2084,7 @@ Class OrderController extends Controller
             $tmp['orderNum']        = $info['order_temp_info']['erp_sn'];
             $tmp['orderNum']        = $info['order_temp_info']['erp_sn'];
             $tmp['goods']           = $value['goods_name'];
             $tmp['goods']           = $value['goods_name'];
             $tmp['purchasingPrice'] = $value['goods_price'];//采购价
             $tmp['purchasingPrice'] = $value['goods_price'];//采购价
-            $tmp['unitPrice']       = $value['goods_price'];//单价
+            $tmp['unitPrice']       = $value['single_pre_price'];//均摊单价
             $tmp['brand']           = $value['brand_name'];
             $tmp['brand']           = $value['brand_name'];
             $tmp['nums']            = $value['goods_number'];
             $tmp['nums']            = $value['goods_number'];
             $tmp['currency']        = $info['order_info']['currency'] == 1?'人民币':'美元';
             $tmp['currency']        = $info['order_info']['currency'] == 1?'人民币':'美元';