From fad95e39d854f9d0b575e577c09d181e77677b61 Mon Sep 17 00:00:00 2001
From: "DESKTOP-A1SENDA\\HUzy" <472860318@qq.com>
Date: Thu, 1 Jul 2021 18:07:47 +0800
Subject: [PATCH] =?UTF-8?q?--=E7=83=AD=E9=97=A8=E5=9F=8E=E5=B8=82=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96--?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/city-change/README.md  |  5 ++---
 components/city-change/index.js   | 10 +++++++---
 components/city-change/index.wxml |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/components/city-change/README.md b/components/city-change/README.md
index 54e4b1c..2090839 100644
--- a/components/city-change/README.md
+++ b/components/city-change/README.md
@@ -7,8 +7,7 @@
 
   2.在index.js中可以添加以下方法以便于获取回调
     cityTap(e){
-    console.log('fasdfsdfsdfds');
-    console.log(e);
-    const cityName=e.detail.cityname;
+    const cityName=e.detail.cityname;//城市名
+    const cityId=e.detail.cityId;//城市行政编号
     wx.navigateBack();
   },
\ No newline at end of file
diff --git a/components/city-change/index.js b/components/city-change/index.js
index 22a7869..e929ce9 100644
--- a/components/city-change/index.js
+++ b/components/city-change/index.js
@@ -20,7 +20,7 @@ Component({
     //下面是城市列表信息，这里只是模拟数据
     citylist:region2,
     //下面是热门城市数据，模拟数据
-    newcity: ['北京', '上海', '广州', '深圳', '成都', '杭州'],
+    newcity: [{"id":110100,"cityName":"北京"}, {"id":310100,"cityName":"上海"}, {"id":440100,"cityName":"广州"},{"id":440300,"cityName":"深圳"}],//若还需要添加则在region2中查找
     // citySel: '全国',
     locateCity: '',
     touchEndy:0,
@@ -47,6 +47,7 @@ Component({
         Index = e.currentTarget.dataset.index || '',
         that = this;
       let city = this.data.citySel;
+      let cityId=''
       switch (types) {
         case 'locate':
           //定位内容
@@ -58,11 +59,13 @@ Component({
           break;
         case 'new':
           //热门城市
-          city = val;
+          city = val.cityName;
+          cityId=val.id
           break;
         case 'list':
           //城市列表
           city = val.cityName;
+          cityId=val.id
           break;
       }
       if (city) {
@@ -71,7 +74,8 @@ Component({
           data: city
         }) //点击后给父组件可以通过bindcitytap事件，获取到cityname的值，这是子组件给父组件传值和触发事件的方法
         this.triggerEvent('citytap', {
-          cityname: city
+          cityname: city,
+          cityId:cityId
         });
       } else {
         console.log('还没有');
diff --git a/components/city-change/index.wxml b/components/city-change/index.wxml
index 9136cbb..61e405d 100644
--- a/components/city-change/index.wxml
+++ b/components/city-change/index.wxml
@@ -9,7 +9,7 @@
                 <view class='new_city_title'>热门城市</view>
                 <view class='new_city_box'>
                     <text class='new_city_text' wx:for='{{newcity}}' wx:key='this' data-types='new' catchtap='cityTap'
-                        data-val='{{item}}'>{{item}}</text>
+                        data-val='{{item}}'>{{item.cityName}}</text>
                 </view>
             </view>
             <view class='city_list_box'>