From 6317f81f3664e10de5063b73183e945e52727baf Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Sat, 25 Jun 2022 15:03:46 +0800
Subject: [PATCH] 优化请求模块,优化App请求解析能力

---
 forms/chinaArea/ChinaLocations.weapp.js |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/forms/chinaArea/ChinaLocations.weapp.js b/forms/chinaArea/ChinaLocations.weapp.js
index 974ac5f..8a92430 100644
--- a/forms/chinaArea/ChinaLocations.weapp.js
+++ b/forms/chinaArea/ChinaLocations.weapp.js
@@ -4,15 +4,15 @@
  */
 
 import Taro from '@tarojs/taro';
-import { Fetcher } from '@components/bases/Fetcher';
 import project from '@project';
+import { $hostBoot } from '@components/bases/HostBoot';
 
 const locationTree = [];
 let ChinaLocationData = {};
 let readyCallback = () => { };
 
 Taro.request({
-    url: Fetcher.host + project.host.assetsPath + '/datas/ChinaLocation.json',
+    url: $hostBoot.getHost() + project.host.assetsPath + '/datas/ChinaLocation.json',
     header: {
         'X-Requested-With': 'XMLHttpRequest',
         'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
@@ -75,14 +75,16 @@
         let tempLocationData = ChinaLocationData;
         regions.forEach((code) => {
             if (!code || !tempLocationData[code]) {
-                return;
-            }
-            if (typeof tempLocationData[code].name === 'string') {
-                address += tempLocationData[code].name;
+                address.push('');
+                tempLocationData = [];
             } else {
-                address += tempLocationData[code];
+                if (typeof tempLocationData[code].name === 'string') {
+                    address += tempLocationData[code].name;
+                } else {
+                    address += tempLocationData[code];
+                }
+                tempLocationData = tempLocationData[code].children;
             }
-            tempLocationData = tempLocationData[code].children;
         });
         return address;
     },
@@ -98,14 +100,16 @@
         let tempLocationData = ChinaLocationData;
         regions.forEach((code) => {
             if (!code || !tempLocationData[code]) {
-                return;
-            }
-            if (typeof tempLocationData[code].name === 'string') {
-                address.push(tempLocationData[code].name);
+                address.push('');
+                tempLocationData = [];
             } else {
-                address.push(tempLocationData[code]);
+                if (typeof tempLocationData[code].name === 'string') {
+                    address.push(tempLocationData[code].name);
+                } else {
+                    address.push(tempLocationData[code]);
+                }
+                tempLocationData = tempLocationData[code].children;
             }
-            tempLocationData = tempLocationData[code].children;
         });
         return address;
 

--
Gitblit v1.9.1