From 1b4e2a30146f402a308afab51a820bcac88ae62b Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Sat, 12 Sep 2020 11:32:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=89=889.12=E8=A1=97=E9=81=93?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/selectStreet/selectStreet.scss |  3 ++-
 .../components/selectStreet/selectStreet.ts   | 25 +++++++++++--------
 .../components/selectStreet/selectStreet.wxml |  5 ++--
 3 files changed, 19 insertions(+), 14 deletions(-)

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 @@
 <view class="select-item">
-  <view class="select-street" bindtap="showStreet">
+<!--bindtap="showStreet" -->
+  <view class="select-street">
     <view class="street-info" id="streetInfo">
       <view class="image-and-text">
         <image src="https://epdc-shibei.elinkservice.cn/epdcFile/M00/02/B3/rBAAM16XtbeAaJoJAAAJJL-Rd40945.png"></image>
         <text class="street-name">{{choosedStreet.title}}</text>
       </view>
 
-      <image class="{{ streetVisible ? '_reverse' : 'reverse'}}" src="../../images/xiala.png"></image>
+      <!--<image class="{{ streetVisible ? '_reverse' : 'reverse'}}" src="../../images/xiala.png"></image>-->
     </view>
     <view class="option-list" style="height: {{streetVisible ? '240rpx': '0'}}">
       <view bindtap="onChnageStreet" data-id="{{item.id}}" class="list-item" wx:for="{{streetList}}" wx:key="index" wx:for-index="index">