Bladeren bron

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

wufeng 2 jaren geleden
bovenliggende
commit
b5111cd51a
1 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 4 4
      app/admin/controller/Consult.php

+ 4 - 4
app/admin/controller/Consult.php

@@ -201,7 +201,7 @@ class Consult extends Base
                         "brand_id"=>$value['brand_id'],
                         "arrival_time"=>$value['arrival_time'],
                         "specinfo"=>empty($specinfo)?"" : json_encode($specinfo),
-                        "cost_desc"=>$value['cost_desc'],
+                        "cost_desc" => isset($value['cost_desc']) ? $value['cost_desc'] : '',
                         "is_addrs"=>$value['is_addrs'],
                         "is_custom"=>$value['is_custom'],
                         "metal_id"=>$value['metal_id'],
@@ -359,9 +359,9 @@ class Consult extends Base
             return error_show(1003,"参数specinfo不能为空");
         }
         $cost_desc= isset($this->post['cost_desc'])&&$this->post['cost_desc']!=""?trim($this->post['cost_desc']):"";
-        if($cost_desc==""){
-            return error_show(1003,"参数cost_desc不能为空");
-        }
+//        if($cost_desc==""){
+//            return error_show(1003,"参数cost_desc不能为空");
+//        }
         $is_addrs= isset($this->post['is_addrs'])&&$this->post['is_addrs']!==""?intval($this->post['is_addrs']):"";
         if($is_addrs===""){
             return error_show(1003,"参数is_addrs不能为空");