Merge branch 'develop' into test

miniprogram/pages/components/AreaSelect/AreaSelect.js

@@ -116,11 +116,11 @@ Component({
             }
             else {
                 this.setData({
-                    selected: this.data.range[value].id,
+                    selected: this.data.filterList[value].id,
                     selectedIndex: value,
                 });
             }
         },
     },
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXJlYVNlbGVjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkFyZWFTZWxlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSw0Q0FBNEM7QUFHNUMsU0FBUyxDQUFDO0lBQ1IsVUFBVSxFQUFFO1FBQ1YsV0FBVyxFQUFFO1lBQ1gsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsS0FBSztTQUNiO1FBQ0QsS0FBSyxFQUFFO1lBQ0wsSUFBSSxFQUFFLEtBQUs7WUFDWCxLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztZQUN2QyxDQUFDO1NBQ0Y7UUFDRCxRQUFRLEVBQUU7WUFDUixJQUFJLEVBQUUsTUFBTTtZQUNaLEtBQUssRUFBRSxLQUFLO1NBQ2I7UUFDRCxLQUFLLEVBQUU7WUFDTCxJQUFJLEVBQUUsTUFBTTtZQUNaLEtBQUssRUFBRSxFQUFFO1lBQ1QsUUFBUSxZQUFDLE1BQU07Z0JBQ2IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztnQkFDcEIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1lBQ3JDLENBQUM7U0FDRjtRQUNELElBQUksRUFBRTtZQUNKLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLFVBQVU7U0FDbEI7UUFDRCxVQUFVLEVBQUU7WUFDVixJQUFJLEVBQUUsTUFBTTtZQUNaLEtBQUssRUFBRSxFQUFFO1NBQ1Y7UUFDRCxRQUFRLEVBQUU7WUFDUixJQUFJLEVBQUUsTUFBTTtZQUNaLEtBQUssRUFBRSxFQUFFO1lBQ1QsUUFBUSxZQUFDLEdBQUc7Z0JBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLEVBQUUsR0FBRyxDQUFDLENBQUM7WUFDbEMsQ0FBQztTQUNGO0tBQ0Y7SUFDRCxJQUFJLEVBQUU7UUFD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QUFRLEVBQUUsRUFBRTtvQkFDWixhQUFhLEVBQUUsRUFBRTtpQkFDbEIsQ0FBQyxDQUFDO1lBQ0wsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNOLElBQUksQ0FBQyxPQUFPLENBQUM7b0JBQ1gsUUFBUSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUU7b0JBQ25DLGFBQWEsRUFBRSxLQUFLO2lCQUNyQixDQUFDLENBQUM7WUFDTCxDQUFDO1FBQ0gsQ0FBQztLQUNGO0NBQ0YsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZGVsYXkgfSBmcm9tIFwiLi4vLi4vLi4vdXRpbHMvdXRpbFwiO1xuXG4vLyBwYWdlcy9jb21wb25lbnRzL0FyZWFTZWxlY3QvQXJlYVNlbGVjdC5qc1xuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIHBsYWNlaG9sZGVyOiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJ+ivt+mAieaLqScsXG4gICAgfSxcbiAgICByYW5nZToge1xuICAgICAgdHlwZTogQXJyYXksXG4gICAgICB2YWx1ZTogW10sXG4gICAgICBvYnNlcnZlcihuZXdWYWwpIHtcbiAgICAgICAgdGhpcy5zZXREYXRhKHsgZmlsdGVyTGlzdDogbmV3VmFsIH0pO1xuICAgICAgfSxcbiAgICB9LFxuICAgIHJhbmdlS2V5OiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJ2tleScsXG4gICAgfSxcbiAgICB2YWx1ZToge1xuICAgICAgdHlwZTogU3RyaW5nLFxuICAgICAgdmFsdWU6ICcnLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIGNvbnNvbGUubG9nKG5ld1ZhbCk7XG4gICAgICAgIHRoaXMuc2V0RGF0YSh7IHNlbGVjdGVkOiBuZXdWYWwgfSk7XG4gICAgICB9LFxuICAgIH0sXG4gICAgbW9kZToge1xuICAgICAgdHlwZTogU3RyaW5nLFxuICAgICAgdmFsdWU6ICdzZWxlY3RvcicsXG4gICAgfSxcbiAgICBtZXRob2ROYW1lOiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJycsXG4gICAgfSxcbiAgICBzaG93VGV4dDoge1xuICAgICAgdHlwZTogU3RyaW5nLFxuICAgICAgdmFsdWU6ICcnLFxuICAgICAgb2JzZXJ2ZXIodmFsKSB7XG4gICAgICAgIGNvbnNvbGUubG9nKCdpbiBzaG93VGV4dCcsIHZhbCk7XG4gICAgICB9LFxuICAgIH0sXG4gIH0sXG4gIGRhdGE6IHtcbiAgICBzaG93UGlja2VyVmlldzogZmFsc2UsXG4gICAgc2VsZWN0ZWQ6ICcnLFxuICAgIHNlbGVjdGVkSW5kZXg6ICcnLFxuICAgIGZpbHRlckxpc3Q6IFtdLFxuICB9LFxuICBtZXRob2RzOiB7XG4gICAgaW5wdXRDbGlja0hhbmRsZSgpIHtcbiAgICAgIGlmICh0aGlzLmRhdGEubW9kZSA9PT0gJ3BhZ2UnKSB7XG4gICAgICAgIHd4Lm5hdmlnYXRlVG8oe1xuICAgICAgICAgIHVybDogYC9wYWdlcy9hcmVhU2VsZWN0L2FyZWFTZWxlY3Q/bWV0aG9kTmFtZT0ke3RoaXMuZGF0YS5tZXRob2ROYW1lfSZ2YWx1ZT0ke3RoaXMuZGF0YS52YWx1ZX1gLFxuICAgICAgICB9KTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICAgIHNob3dQaWNrZXJWaWV3OiAhdGhpcy5kYXRhLnNob3dQaWNrZXJWaWV3LFxuICAgICAgICB9KTtcbiAgICAgIH1cbiAgICB9LFxuICAgIGlubmVyQ2xpY2tIYW5kbGUoZSkge1xuICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH0sXG4gICAgbWFza0NsaWNrSGFuZGxlKGUpIHtcbiAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgIHNob3dQaWNrZXJWaWV3OiBmYWxzZSxcbiAgICAgIH0pO1xuICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH0sXG4gICAgaW5wdXRIYW5kbGUoZSkge1xuICAgICAgY29uc3QgeyB2YWx1ZSB9ID0gZS5kZXRhaWw7XG4gICAgICBjb25zb2xlLmxvZyhlLCB2YWx1ZSk7XG4gICAgICBkZWxheSgoKSA9PiB7XG4gICAgICAgIHRoaXMuZ2V0RmlsdGVyTGlzdEJ5TmFtZSh2YWx1ZSk7XG4gICAgICB9LCA1MDApO1xuICAgIH0sXG4gICAgY29uZmlybUhhbmRsZShlKSB7XG4gICAgICBjb25zdCB7IHZhbHVlIH0gPSBlLmRldGFpbDtcbiAgICAgIGNvbnNvbGUubG9nKGUsIHZhbHVlKTtcbiAgICAgIHRoaXMuZ2V0RmlsdGVyTGlzdEJ5TmFtZSh2YWx1ZSk7XG4gICAgfSxcbiAgICBnZXRGaWx0ZXJMaXN0QnlOYW1lKG5hbWU6IHN0cmluZykge1xuICAgICAgbGV0IGZpbHRlckxpc3QgPSBbXTtcbiAgICAgIGlmIChuYW1lKSB7XG4gICAgICAgIGZpbHRlckxpc3QgPSB0aGlzLmRhdGEucmFuZ2UuZmlsdGVyKGl0ZW0gPT5cbiAgICAgICAgICBpdGVtW3RoaXMuZGF0YS5yYW5nZUtleV0uaW5jbHVkZXMobmFtZSksXG4gICAgICAgICk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICBmaWx0ZXJMaXN0ID0gdGhpcy5kYXRhLnJhbmdlO1xuICAgICAgfVxuICAgICAgdGhpcy5zZXREYXRhKHtcbiAgICAgICAgZmlsdGVyTGlzdCxcbiAgICAgIH0pO1xuICAgIH0sXG4gICAgYmluZFBpY2tlckNoYW5nZSgpIHtcbiAgICAgIGxldCB2YWx1ZSA9IHRoaXMuZGF0YS5zZWxlY3RlZDtcbiAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICBzaG93UGlja2VyVmlldzogZmFsc2UsXG4gICAgICB9KTtcbiAgICAgIHRoaXMudHJpZ2dlckV2ZW50KCdjaGFuZ2UnLCB7IHZhbHVlIH0sIHt9KTtcbiAgICB9LFxuICAgIHNlbGVjdGVkSGFuZGxlKGUpIHtcbiAgICAgIGNvbnN0IHsgdmFsdWUgfSA9IGUuY3VycmVudFRhcmdldC5kYXRhc2V0O1xuICAgICAgY29uc29sZS5sb2coZSwgdmFsdWUpO1xuICAgICAgaWYgKHRoaXMuZGF0YS5zZWxlY3RlZEluZGV4ID09PSB2YWx1ZSkge1xuICAgICAgICB0aGlzLnNldERhdGEoe1xuICAgICAgICAgIHNlbGVjdGVkOiAnJyxcbiAgICAgICAgICBzZWxlY3RlZEluZGV4OiAnJyxcbiAgICAgICAgfSk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICB0aGlzLnNldERhdGEoe1xuICAgICAgICAgIHNlbGVjdGVkOiB0aGlzLmRhdGEucmFuZ2VbdmFsdWVdLmlkLFxuICAgICAgICAgIHNlbGVjdGVkSW5kZXg6IHZhbHVlLFxuICAgICAgICB9KTtcbiAgICAgIH1cbiAgICB9LFxuICB9LFxufSk7XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXJlYVNlbGVjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkFyZWFTZWxlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSw0Q0FBNEM7QUFHNUMsU0FBUyxDQUFDO0lBQ1IsVUFBVSxFQUFFO1FBQ1YsV0FBVyxFQUFFO1lBQ1gsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsS0FBSztTQUNiO1FBQ0QsS0FBSyxFQUFFO1lBQ0wsSUFBSSxFQUFFLEtBQUs7WUFDWCxLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztZQUN2QyxDQUFDO1NBQ0Y7UUFDRCxRQUFRLEVBQUU7WUFDUixJQUFJLEVBQUUsTUFBTTtZQUNaLEtBQUssRUFBRSxLQUFLO1NBQ2I7UUFDRCxLQUFLLEVBQUU7WUFDTCxJQUFJLEVBQUUsTUFBTTtZQUNaLEtBQUssRUFBRSxFQUFFO1lBQ1QsUUFBUSxZQUFDLE1BQU07Z0JBQ2IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztnQkFDcEIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUFDO1lBQ3JDLENBQUM7U0FDRjtRQUNELElBQUksRUFBRTtZQUNKLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLFVBQVU7U0FDbEI7UUFDRCxVQUFVLEVBQUU7WUFDVixJQUFJLEVBQUUsTUFBTTtZQUNaLEtBQUssRUFBRSxFQUFFO1NBQ1Y7UUFDRCxRQUFRLEVBQUU7WUFDUixJQUFJLEVBQUUsTUFBTTtZQUNaLEtBQUssRUFBRSxFQUFFO1lBQ1QsUUFBUSxZQUFDLEdBQUc7Z0JBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLEVBQUUsR0FBRyxDQUFDLENBQUM7WUFDbEMsQ0FBQztTQUNGO0tBQ0Y7SUFDRCxJQUFJLEVBQUU7UUFD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QUFRLEVBQUUsRUFBRTtvQkFDWixhQUFhLEVBQUUsRUFBRTtpQkFDbEIsQ0FBQyxDQUFDO1lBQ0wsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNOLElBQUksQ0FBQyxPQUFPLENBQUM7b0JBQ1gsUUFBUSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUU7b0JBQ3hDLGFBQWEsRUFBRSxLQUFLO2lCQUNyQixDQUFDLENBQUM7WUFDTCxDQUFDO1FBQ0gsQ0FBQztLQUNGO0NBQ0YsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZGVsYXkgfSBmcm9tIFwiLi4vLi4vLi4vdXRpbHMvdXRpbFwiO1xuXG4vLyBwYWdlcy9jb21wb25lbnRzL0FyZWFTZWxlY3QvQXJlYVNlbGVjdC5qc1xuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIHBsYWNlaG9sZGVyOiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJ+ivt+mAieaLqScsXG4gICAgfSxcbiAgICByYW5nZToge1xuICAgICAgdHlwZTogQXJyYXksXG4gICAgICB2YWx1ZTogW10sXG4gICAgICBvYnNlcnZlcihuZXdWYWwpIHtcbiAgICAgICAgdGhpcy5zZXREYXRhKHsgZmlsdGVyTGlzdDogbmV3VmFsIH0pO1xuICAgICAgfSxcbiAgICB9LFxuICAgIHJhbmdlS2V5OiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJ2tleScsXG4gICAgfSxcbiAgICB2YWx1ZToge1xuICAgICAgdHlwZTogU3RyaW5nLFxuICAgICAgdmFsdWU6ICcnLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIGNvbnNvbGUubG9nKG5ld1ZhbCk7XG4gICAgICAgIHRoaXMuc2V0RGF0YSh7IHNlbGVjdGVkOiBuZXdWYWwgfSk7XG4gICAgICB9LFxuICAgIH0sXG4gICAgbW9kZToge1xuICAgICAgdHlwZTogU3RyaW5nLFxuICAgICAgdmFsdWU6ICdzZWxlY3RvcicsXG4gICAgfSxcbiAgICBtZXRob2ROYW1lOiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJycsXG4gICAgfSxcbiAgICBzaG93VGV4dDoge1xuICAgICAgdHlwZTogU3RyaW5nLFxuICAgICAgdmFsdWU6ICcnLFxuICAgICAgb2JzZXJ2ZXIodmFsKSB7XG4gICAgICAgIGNvbnNvbGUubG9nKCdpbiBzaG93VGV4dCcsIHZhbCk7XG4gICAgICB9LFxuICAgIH0sXG4gIH0sXG4gIGRhdGE6IHtcbiAgICBzaG93UGlja2VyVmlldzogZmFsc2UsXG4gICAgc2VsZWN0ZWQ6ICcnLFxuICAgIHNlbGVjdGVkSW5kZXg6ICcnLFxuICAgIGZpbHRlckxpc3Q6IFtdLFxuICB9LFxuICBtZXRob2RzOiB7XG4gICAgaW5wdXRDbGlja0hhbmRsZSgpIHtcbiAgICAgIGlmICh0aGlzLmRhdGEubW9kZSA9PT0gJ3BhZ2UnKSB7XG4gICAgICAgIHd4Lm5hdmlnYXRlVG8oe1xuICAgICAgICAgIHVybDogYC9wYWdlcy9hcmVhU2VsZWN0L2FyZWFTZWxlY3Q/bWV0aG9kTmFtZT0ke3RoaXMuZGF0YS5tZXRob2ROYW1lfSZ2YWx1ZT0ke3RoaXMuZGF0YS52YWx1ZX1gLFxuICAgICAgICB9KTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICAgIHNob3dQaWNrZXJWaWV3OiAhdGhpcy5kYXRhLnNob3dQaWNrZXJWaWV3LFxuICAgICAgICB9KTtcbiAgICAgIH1cbiAgICB9LFxuICAgIGlubmVyQ2xpY2tIYW5kbGUoZSkge1xuICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH0sXG4gICAgbWFza0NsaWNrSGFuZGxlKGUpIHtcbiAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgIHNob3dQaWNrZXJWaWV3OiBmYWxzZSxcbiAgICAgIH0pO1xuICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH0sXG4gICAgaW5wdXRIYW5kbGUoZSkge1xuICAgICAgY29uc3QgeyB2YWx1ZSB9ID0gZS5kZXRhaWw7XG4gICAgICBjb25zb2xlLmxvZyhlLCB2YWx1ZSk7XG4gICAgICBkZWxheSgoKSA9PiB7XG4gICAgICAgIHRoaXMuZ2V0RmlsdGVyTGlzdEJ5TmFtZSh2YWx1ZSk7XG4gICAgICB9LCA1MDApO1xuICAgIH0sXG4gICAgY29uZmlybUhhbmRsZShlKSB7XG4gICAgICBjb25zdCB7IHZhbHVlIH0gPSBlLmRldGFpbDtcbiAgICAgIGNvbnNvbGUubG9nKGUsIHZhbHVlKTtcbiAgICAgIHRoaXMuZ2V0RmlsdGVyTGlzdEJ5TmFtZSh2YWx1ZSk7XG4gICAgfSxcbiAgICBnZXRGaWx0ZXJMaXN0QnlOYW1lKG5hbWU6IHN0cmluZykge1xuICAgICAgbGV0IGZpbHRlckxpc3QgPSBbXTtcbiAgICAgIGlmIChuYW1lKSB7XG4gICAgICAgIGZpbHRlckxpc3QgPSB0aGlzLmRhdGEucmFuZ2UuZmlsdGVyKGl0ZW0gPT5cbiAgICAgICAgICBpdGVtW3RoaXMuZGF0YS5yYW5nZUtleV0uaW5jbHVkZXMobmFtZSksXG4gICAgICAgICk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICBmaWx0ZXJMaXN0ID0gdGhpcy5kYXRhLnJhbmdlO1xuICAgICAgfVxuICAgICAgdGhpcy5zZXREYXRhKHtcbiAgICAgICAgZmlsdGVyTGlzdCxcbiAgICAgIH0pO1xuICAgIH0sXG4gICAgYmluZFBpY2tlckNoYW5nZSgpIHtcbiAgICAgIGxldCB2YWx1ZSA9IHRoaXMuZGF0YS5zZWxlY3RlZDtcbiAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICBzaG93UGlja2VyVmlldzogZmFsc2UsXG4gICAgICB9KTtcbiAgICAgIHRoaXMudHJpZ2dlckV2ZW50KCdjaGFuZ2UnLCB7IHZhbHVlIH0sIHt9KTtcbiAgICB9LFxuICAgIHNlbGVjdGVkSGFuZGxlKGUpIHtcbiAgICAgIGNvbnN0IHsgdmFsdWUgfSA9IGUuY3VycmVudFRhcmdldC5kYXRhc2V0O1xuICAgICAgY29uc29sZS5sb2coZSwgdmFsdWUpO1xuICAgICAgaWYgKHRoaXMuZGF0YS5zZWxlY3RlZEluZGV4ID09PSB2YWx1ZSkge1xuICAgICAgICB0aGlzLnNldERhdGEoe1xuICAgICAgICAgIHNlbGVjdGVkOiAnJyxcbiAgICAgICAgICBzZWxlY3RlZEluZGV4OiAnJyxcbiAgICAgICAgfSk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICB0aGlzLnNldERhdGEoe1xuICAgICAgICAgIHNlbGVjdGVkOiB0aGlzLmRhdGEuZmlsdGVyTGlzdFt2YWx1ZV0uaWQsXG4gICAgICAgICAgc2VsZWN0ZWRJbmRleDogdmFsdWUsXG4gICAgICAgIH0pO1xuICAgICAgfVxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file

miniprogram/pages/components/AreaSelect/AreaSelect.ts

@@ -111,7 +111,7 @@ Component({
         });
       } else {
         this.setData({
-          selected: this.data.range[value].id,
+          selected: this.data.filterList[value].id,
           selectedIndex: value,
         });
       }

miniprogram/pages/components/AreaSelect/AreaSelect.wxml

@@ -5,7 +5,7 @@
   <!-- </picker> -->
   <view class="areaselect-picker" bindtap="inputClickHandle">
     <view wx:if="{{mode === 'page' && selected}}" class="select-value">{{showText}}</view>
-    <view wx:elif="{{selected}}" class="select-value">{{range[selectedIndex][rangeKey]}}</view>
+    <view wx:elif="{{selected}}" class="select-value">{{filterList[selectedIndex][rangeKey]}}</view>
     <view wx:else class="select-placeholder">{{placeholder}}</view>
     <image class="select-icon" src="../../../images/btn_xiala@2x.png" mode="aspectFill" />
   </view>