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

app/admin/controller/Sale.php

@@ -742,6 +742,8 @@ class Sale extends Base
                         "weight"=>$zxinfo['weight'],
                         "is_diff"=>$zxinfo['is_diff'],
                         "supply_area"=>$zxinfo['supply_area'],
+                        "pay_way"=>$zxinfo['pay_way'],
+                        "send_way"=>$zxinfo['send_way'],
                         "status"=>1,
                         "is_del"=>0,
                         "createrid"=>$rm,
@@ -1636,6 +1638,12 @@ class Sale extends Base
         }else{
             $einfo['use_order']='';
         }
+
+        $einfo['platform_name']='';
+        if($einfo['platform_id']!=0){
+            $plat=Db::name("platform")->where(['id'=>$einfo['platform_id']])->find();
+            $einfo['platform_name']=isset($plat['platform_name'])?$plat['platform_name']:"";
+        }
         $einfo['companyName'] = isset($in['companyName']) ? $in['companyName'] : "";
         $einfo['addrs'] = $addrs;
         $einfo['can'] = $int;
@@ -2951,6 +2959,11 @@ class Sale extends Base
         $order['unit'] = isset($unit['unit'])?$unit['unit']:'';
         $order['cat_info'] = made($order['cat_id'],[]);
         $order['noble_name']=isset($order['noble_metal'])&&$order['noble_metal']!=0?$this->noble[$order['noble_metal']] :"";
+        if($order['is_gold_price']==1){
+            $price=Db::name("gold_price1")->where(["type"=>$order['noble_metal'],"status"=>1,"is_del"=>0])->order("addtime desc")->find();
+
+        }
+        $order["gold_price"] = isset($price['price'])?$price['price']:0;
         return app_show(0,"获取成功",$order);
     }
 }