Merge branch 'temp'

Tevin

2022-02-21 fdb9390232516a207d8d063fc55c613ca5c49ce0

Merge branch 'temp'

 forms/chinaArea/CChinaArea.vue

@@ -149,9 +149,9 @@
            const codes = [];
            const provice = locationTree[detail[0]];
            codes[0] = provice.value;
            const city = provice.children[detail[1]];
            const city = provice.children[detail[1]] || [];
            codes[1] = city.value;
            const area = city.children[detail[2]];
            const area = city.children[detail[2]] || [];
            codes[2] = area.value;
            this.itemRes.onChange(codes);
        },

 forms/chinaArea/ChinaLocations.js

@@ -50,6 +50,9 @@
        let address = '';
        let tempLocationData = ChinaLocationData;
        regions.forEach((code) => {
            if (!code || !tempLocationData[code]) {
                return;
            }
            if (typeof tempLocationData[code].name === 'string') {
                address += tempLocationData[code].name;
            } else {
@@ -70,7 +73,7 @@
        let address = [];
        let tempLocationData = ChinaLocationData;
        regions.forEach((code) => {
            if (!tempLocationData[code]) {
            if (!code || !tempLocationData[code]) {
                return;
            }
            if (typeof tempLocationData[code].name === 'string') {
@@ -103,7 +106,7 @@
                            if (provinceChildren[cityCode].name === regions[1]) {
                                codes[1] = cityCode;
                                // 区
                                const areaChildren = provinceChildren[cityCode].children;
                                const areaChildren = provinceChildren[cityCode].children || [];
                                for (let areaCode in areaChildren) {
                                    if (areaChildren.hasOwnProperty(areaCode)) {
                                        if (areaChildren[areaCode] === regions[2]) {

 forms/chinaArea/ChinaLocations.weapp.js

@@ -74,6 +74,9 @@
        let address = '';
        let tempLocationData = ChinaLocationData;
        regions.forEach((code) => {
            if (!code || !tempLocationData[code]) {
                return;
            }
            if (typeof tempLocationData[code].name === 'string') {
                address += tempLocationData[code].name;
            } else {
@@ -94,7 +97,7 @@
        let address = [];
        let tempLocationData = ChinaLocationData;
        regions.forEach((code) => {
            if (!tempLocationData[code]) {
            if (!code || !tempLocationData[code]) {
                return;
            }
            if (typeof tempLocationData[code].name === 'string') {
@@ -128,7 +131,7 @@
                            if (provinceChildren[cityCode].name === regions[1]) {
                                codes[1] = cityCode;
                                // 区
                                const areaChildren = provinceChildren[cityCode].children;
                                const areaChildren = provinceChildren[cityCode].children || [];
                                for (let areaCode in areaChildren) {
                                    if (areaChildren.hasOwnProperty(areaCode)) {
                                        if (areaChildren[areaCode] === regions[2]) {