diff --git a/src/subpages/basicReality/components/selectStreet/selectStreet.scss b/src/subpages/basicReality/components/selectStreet/selectStreet.scss index 492e980..a3fc770 100644 --- a/src/subpages/basicReality/components/selectStreet/selectStreet.scss +++ b/src/subpages/basicReality/components/selectStreet/selectStreet.scss @@ -16,7 +16,8 @@ background: #f6f8f8; border-radius: 28rpx; position: relative; - min-width: 250rpx; + // min-width: 250rpx; + min-width: 150rpx; height: 56rpx; } diff --git a/src/subpages/basicReality/components/selectStreet/selectStreet.ts b/src/subpages/basicReality/components/selectStreet/selectStreet.ts index 6fc713a..1cf5ba5 100644 --- a/src/subpages/basicReality/components/selectStreet/selectStreet.ts +++ b/src/subpages/basicReality/components/selectStreet/selectStreet.ts @@ -13,17 +13,11 @@ Component({ data: { streetVisible: false, timeVisible: false, - streetList: [ - { - select: true, - title: '全部', - id: '', - } - ], + streetList: [], choosedStreet: { - title: '全部', - // @ts-ignore - id: '' + // title: '全部', + // // @ts-ignore + // id: '' }, date: (utils.formatTimestamp(new Date())).substr(0, 10), timeList: [ @@ -55,12 +49,21 @@ Component({ let streetList = []; try { let res: any = await getStreetList() - res.data.forEach((item: any, index: any) => { + res.data.forEach((item: any) => { this.data.streetList.push({ + // @ts-ignore select: false, + // @ts-ignore title: item.deptName, + // @ts-ignore id: item.deptId, }) + this.setData({ // 2020.9.11 去掉全部只保留瑜山街道 + // @ts-ignore + 'choosedStreet.title': item.deptName, + // @ts-ignore + 'choosedStreet.id': item.deptId + }) }) this.setData({ // @ts-ignore diff --git a/src/subpages/basicReality/components/selectStreet/selectStreet.wxml b/src/subpages/basicReality/components/selectStreet/selectStreet.wxml index f1be9e3..eae4826 100644 --- a/src/subpages/basicReality/components/selectStreet/selectStreet.wxml +++ b/src/subpages/basicReality/components/selectStreet/selectStreet.wxml @@ -1,12 +1,13 @@ - + + {{choosedStreet.title}} - +