From e2371220e3ded67f0623ce8550cdf1570f96bff4 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Mon, 21 Mar 2022 14:17:15 +0800
Subject: [PATCH] 实现第二版页面间通讯机制
---
forms/chinaArea/ChinaLocations.weapp.js | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/forms/chinaArea/ChinaLocations.weapp.js b/forms/chinaArea/ChinaLocations.weapp.js
index b8d80ca..c9fa3c0 100644
--- a/forms/chinaArea/ChinaLocations.weapp.js
+++ b/forms/chinaArea/ChinaLocations.weapp.js
@@ -57,7 +57,7 @@
export default {
onReady(callback) {
- if (ChinaLocationData.length > 0) {
+ if (locationTree.length > 0) {
callback();
} else {
readyCallback = callback;
@@ -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