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

app/admin/controller/Sale.php

@@ -3280,7 +3280,7 @@ class Sale extends Base
             $addr = Db::name("order_addr")->where(["id" => $value['addrid']])->find();
             if($addr){
                  $addinfo =$addr['addr_code']!=''?json_decode($addr['addr_code'],true)??$addr['addr_code']: '' ;
-                if(is_string($addinfo)){
+                if(is_string($addinfo) &&$addinfo!=''){
                     $addinfo=["provice_code"=>'',"city_code"=>'',"area_code"=>''];
                     list($addinfo['provice_code'],$addinfo['city_code'],$addinfo['area_code']) = explode(",",$addr['addr_code']);
                  }
@@ -3332,7 +3332,7 @@ class Sale extends Base
         $addr = Db::name("order_addr")->where(["id" => $codeinfo['addrid']])->find();
         if($addr){
                  $addinfo =$addr['addr_code']!=''?json_decode($addr['addr_code'],true)??$addr['addr_code']: '' ;
-                if(is_string($addinfo)){
+                if(is_string($addinfo)&&$addinfo!=''){
                     $addinfo=["provice_code"=>'',"city_code"=>'',"area_code"=>''];
                     list($addinfo['provice_code'],$addinfo['city_code'],$addinfo['area_code']) = explode(",",$addr['addr_code']);
                  }