From 520a753ec1ab0903390b0044efcaac441337156c Mon Sep 17 00:00:00 2001
From: xiongwengang <xwg2015@icloud.com>
Date: Thu, 7 Jun 2018 17:03:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dcityselect=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=97=A7=E6=95=B0=E6=8D=AE=E4=BF=9D=E7=95=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BB=A5=E5=8F=8A=E6=96=B0=E5=A2=9E=E7=A1=AE=E5=AE=9A?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/cityselect/src/cityselect.vue | 12 +++++++++++-
 src/styles/components/cityselect.less        | 15 +++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/components/cityselect/src/cityselect.vue b/src/components/cityselect/src/cityselect.vue
index 686eba3c..49e3a12c 100644
--- a/src/components/cityselect/src/cityselect.vue
+++ b/src/components/cityselect/src/cityselect.vue
@@ -3,7 +3,10 @@
         <yd-mask v-model="show" @click.native="close" ref="mask" :opacity="maskerOpacity"></yd-mask>
         <div class="yd-cityselect" :class="show ? 'yd-cityselect-active' : ''">
             <div class="yd-cityselect-header">
-                <p class="yd-cityselect-title" @touchstart.stop.prevent="">{{title}}</p>
+                <p class="yd-cityselect-title">
+                    <span class="yd-cityselect-title-text">{{title}}</span>
+                    <a href="javascript:;" class="yd-cityselect-title-btn" @click="this.returnValue">确定</a>
+                </p>
                 <div v-show="ready" class="yd-cityselect-nav">
                     <a href="javascript:;"
                        :key="key"
@@ -168,6 +171,13 @@
                 this.navIndex = index;
             },
             itemEvent(index, name, value, children) {
+                // bugfix 每次点击第某列的时候 把之前点击保存某列之后的数据清空
+                for (var i = this.columnNum; i >= index; i--) {
+                    this.active["itemValue" + i] = ""
+                    this.active["itemName" + i] = ""
+                    this.active["txt" + i] = ""
+                }
+
                 this.active['itemValue' + index] = value;
                 this.active['itemName' + index] = name;
                 this.nav['txt' + index] = name;
diff --git a/src/styles/components/cityselect.less b/src/styles/components/cityselect.less
index b30e6404..cb39d680 100644
--- a/src/styles/components/cityselect.less
+++ b/src/styles/components/cityselect.less
@@ -49,6 +49,21 @@
     }
   }
 
+  &-cityselect-title-btn {
+    position: absolute;
+    top: 9px;
+    right: 9px;
+    line-height: 25px;
+    font-size: 13px;
+    display: inline-block;
+    padding: 0 10px;
+    text-align: center;
+    border-radius: 3px;
+    background-color: #f23030;
+    color: #fff;
+    border: 1px solid #f23030;
+  }
+
   &-cityselect-nav {
     width: 100%;
     padding-left: 10px;

From 44d971253849c2a8c56f667d8cea64d0df7b0527 Mon Sep 17 00:00:00 2001
From: xiongwengang <xwg2015@icloud.com>
Date: Thu, 7 Jun 2018 17:08:05 +0800
Subject: [PATCH 2/2] refs comments

---
 src/components/cityselect/src/cityselect.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/cityselect/src/cityselect.vue b/src/components/cityselect/src/cityselect.vue
index 49e3a12c..61a9f716 100644
--- a/src/components/cityselect/src/cityselect.vue
+++ b/src/components/cityselect/src/cityselect.vue
@@ -5,6 +5,7 @@
             <div class="yd-cityselect-header">
                 <p class="yd-cityselect-title">
                     <span class="yd-cityselect-title-text">{{title}}</span>
+                    <!-- feature 新增确定按钮，增加筛选灵活性 -->
                     <a href="javascript:;" class="yd-cityselect-title-btn" @click="this.returnValue">确定</a>
                 </p>
                 <div v-show="ready" class="yd-cityselect-nav">