Browse Source

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

wugg 3 years ago
parent
commit
36cc513b47
1 changed files with 4 additions and 0 deletions
  1. 4 0
      app/admin/controller/Project.php

+ 4 - 0
app/admin/controller/Project.php

@@ -346,7 +346,9 @@ class Project extends Base
                 $nake =Db::name("good_nake")->where(["spuCode"=>$good['spuCode'],"is_del"=>0])->where([["min_num","<=",$value['num']]])
                     ->order("min_num desc")->find();
                 $good['origin_price']=$nake['nake_total'];
+                $good['work_day']=$good['lead_time'];
                 $good_img = $good['good_thumb_img'];
+
             }else{
                 $good=Db::name("consult_bids")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
                 $good['specinfo'] = isset($good['specinfo'])&&$good['specinfo']!=""?json_decode($good['specinfo'],
@@ -390,6 +392,8 @@ class Project extends Base
             $value["unit_name"]=isset($unit['unit'])?$unit['unit']:"";
             $value['cost_desc'] = isset($good['cost_desc'])?$good['cost_desc']:"";
             $value['work_day'] = isset($good['work_day'])?$good['work_day']:"";
+            $value['delivery_day'] = isset($good['delivery_day'])?$good['delivery_day']:"";
+            $value['expire_day'] = isset($good['expire_day'])?$good['expire_day']:"0";
             $value['good_img'] = $good_img;
             $value['expire_day'] = isset($good['expire_day'])?$good['expire_day']:"";
             $value['origin_place'] = isset($good['origin_place'])?$good['origin_place']:"";