add

app/admin/controller/Brand.php

@@ -90,7 +90,7 @@ class Brand extends BaseController
         $count = Db::name('brand') ->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
-        $list = Db::name('brand')->where($where)->page($page,$size)->order("addtime desc")->select();
+        $list = Db::name('brand')->where($where)->page($page,$size)->order("addtime desc,id desc")->select();
         return app_show(0,"获取成功",['list'=>$list,'count'=>$count]);
     }
     public function edit(){

app/admin/controller/Project.php

@@ -289,6 +289,45 @@ class Project extends Base
         $data=[];
         foreach ($list as $value){
             $value['can']=isset($value['cat_id'])&&$value['cat_id']!=""?made($value['cat_id']):"";
+            if($value['data_source']==1){
+                $good=Db::name("good_platform")->alias("a")->leftJoin("good b","a.spuCode=b.spuCode")->where
+                (["a.skuCode"=>$value['skuCode'],"a.is_del"=>0])->select()->toArray();
+                $good['unit_id'] = isset($good['good_unit'])?$good['good_unit']:"";
+                $good['cost_desc'] = isset($good['craft_desc'])?$good['craft_desc']:"";
+                $good['pakge_fee'] = isset($good['packing_fee'])?$good['packing_fee']:"0";
+                $good['nake_fee'] = isset($good['nake_price'])?$good['nake_price']:"0";
+                $good['metal_id'] = isset($good['noble_metal'])?$good['noble_metal']:"0";
+            }else{
+                $good=Db::name("consult_bids")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->select()->toArray();
+            }
+            $value['good_name'] = iseet($good['good_name'])?$good['good_name']:"";
+            $value['brand_id'] = iseet($good['brand_id'])?$good['brand_id']:"";
+            $value['specinfo'] = iseet($good['specinfo'])?$good['specinfo']:"";
+            $value['unit_id'] = iseet($good['unit_id'])?$good['unit_id']:"";
+            $value['cost_desc'] = iseet($good['cost_desc'])?$good['cost_desc']:"";
+            $value['work_day'] = iseet($good['work_day'])?$good['work_day']:"";
+            $value['good_img'] = iseet($good['good_img'])?$good['good_img']:"";
+            $value['expire_day'] = iseet($good['expire_day'])?$good['expire_day']:"";
+            $value['origin_place'] = iseet($good['origin_place'])?$good['origin_place']:"";
+            $value['supplierNo'] = iseet($good['supplierNo'])?$good['supplierNo']:"";
+            $value['pay_way'] = iseet($good['pay_way'])?$good['pay_way']:"";
+            $value['tax'] = iseet($good['tax'])?$good['tax']:"";
+            $value['send_way'] = iseet($good['send_way'])?$good['send_way']:"";
+            $value['metal_id'] = iseet($good['metal_id'])?$good['metal_id']:"";
+            $value['is_gold_price'] = iseet($good['is_gold_price'])?$good['is_gold_price']:"";
+            $value['config'] = iseet($good['config'])?$good['config']:"";
+            $value['weight'] = iseet($good['weight'])?$good['weight']:"";
+            $value['is_diff'] = iseet($good['is_diff'])?$good['is_diff']:"0";
+            $value['demo_fee'] = iseet($good['demo_fee'])?$good['demo_fee']:"0";
+            $value['deivery_fee'] = iseet($good['deivery_fee'])?$good['deivery_fee']:"0";
+            $value['open_fee'] = iseet($good['open_fee'])?$good['open_fee']:"0";
+            $value['pakge_fee'] = iseet($good['pakge_fee'])?$good['pakge_fee']:"0";
+            $value['nake_fee'] = iseet($good['nake_fee'])?$good['nake_fee']:"0";
+            $value['mark_fee'] = iseet($good['mark_fee'])?$good['mark_fee']:"0";
+            $value['cert_fee'] = iseet($good['cert_fee'])?$good['cert_fee']:"0";
+            $value['cost_fee'] = iseet($good['cost_fee'])?$good['cost_fee']:"0";
+            //$value['total_fee'] = iseet($good['total_fee'])?$good['total_fee']:"0";
+            $value['supply_area'] = iseet($good['supply_area'])?$good['supply_area']:"";
             $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);