Merge branch 'dev_wf' of wufeng/fuse into version1.5

app/common.php

@@ -304,6 +304,15 @@ if (!function_exists('get_addr_name')) {
         return implode('', $rs);
     }
 }
+//根据省市区编码获取省市区名称,返回数组
+if (!function_exists('get_addr_name_array')) {
+    function get_addr_name_array(string $addr_code = ''): array
+    {
+        return \think\facade\Db::name('area')
+            ->whereIn('code', $addr_code)
+            ->column('name');
+    }
+}
 
 /**
  * 获取微信操作对象（单例模式）

app/mobile/logic/AddrLogic.php

@@ -24,7 +24,7 @@ class AddrLogic extends BaseLogic
             ->withAttr('addr_code', function ($val) {
                 return explode(',', $val);
             })->withAttr('addr_name', function ($val, $da) {
-                return get_addr_name($da['addr_code']);
+                return get_addr_name_array($da['addr_code']);
             })
             ->order('id', 'desc')
             ->select()
@@ -58,7 +58,7 @@ class AddrLogic extends BaseLogic
             ->withAttr('addr_code', function ($val) {
                 return explode(',', $val);
             })->withAttr('addr_name', function ($val, $da) {
-                return get_addr_name($da['addr_code']);
+                return get_addr_name_array($da['addr_code']);
             })
             ->findOrEmpty()
             ->toArray();