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

app/admin/controller/Consult.php

@@ -1784,15 +1784,25 @@ class Consult extends Base
                     ->find();
             }
             //产地
-            if($value['origin_place']!=''){
-                $code = explode(",",$value['origin_place']);
-                $temp=[];
-                $temp['provice_code']=isset($code[0])?$code[0]:"";
-                $temp['city_code']=isset($code[1])?$code[1]:"";
-                $temp['area_code']=isset($code[2])?$code[2]:"";
-                $addr= GetAddr(json_encode($temp));
-                $value['origin_addr'] = $addr;
+            $place = ["provice_code"=>"","city_code"=>"","area_code"=>""];
+            if($value['delivery_place']!=""){
+                list($place['provice_code'],$place['city_code'],$place['area_code'])=explode(",",$value['delivery_place']);
             }
+            $value['delivery_place_cn']=GetAddr(json_encode($place));
+            $place = ["provice_code"=>"","city_code"=>"","area_code"=>""];
+            if($value['origin_place']!=""){
+                list($place['provice_code'],$place['city_code'],$place['area_code'])=explode(",",$value['origin_place']);
+            }
+            $value['origin_addr']=GetAddr(json_encode($place));
+//            if($value['origin_place']!=''){
+//                $code = explode(",",$value['origin_place']);
+//                $temp=[];
+//                $temp['provice_code']=isset($code[0])?$code[0]:"";
+//                $temp['city_code']=isset($code[1])?$code[1]:"";
+//                $temp['area_code']=isset($code[2])?$code[2]:"";
+//                $addr= GetAddr(json_encode($temp));
+//                $value['origin_addr'] = $addr;
+//            }
             $data[] = $value;
         }
         return app_show(0,"获取成功",['count'=>$count,'list'=>$data]);