From 01461a43268071d4d0fa270443ae8086f546c123 Mon Sep 17 00:00:00 2001
From: hejason <szhejason@gmail.com>
Date: Thu, 21 Feb 2019 20:54:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(Modal):=20=E4=BF=AE=E5=A4=8D=20android=20?=
 =?UTF-8?q?=E6=9C=BA=E7=9A=84=20=E5=B0=8F=E9=BB=91=E7=82=B9=20close=20#410?=
 =?UTF-8?q?=20close=20#404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/action/modal/index.js | 38 ++++++++++++++++++++++++++-------
 src/style/components/modal.scss |  1 -
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/pages/action/modal/index.js b/src/pages/action/modal/index.js
index 52c2bca81..b4257f980 100644
--- a/src/pages/action/modal/index.js
+++ b/src/pages/action/modal/index.js
@@ -6,8 +6,13 @@ import {
   AtModalHeader,
   AtModalContent,
   AtModalAction,
+  AtIndexes
 } from 'taro-ui'
+
 import DocsHeader from '../../components/doc-header'
+
+import mockData from '../../navigation/indexes/mock-data'
+
 import './index.scss'
 
 export default class ModalPage extends Taro.Component {
@@ -21,7 +26,8 @@ export default class ModalPage extends Taro.Component {
       isOpened1: false,
       isOpened2: false,
       isOpened3: false,
-      isOpened4: false
+      isOpened4: false,
+      isOpened5: false
     }
   }
 
@@ -55,7 +61,7 @@ export default class ModalPage extends Taro.Component {
   }
 
   render () {
-    const { isOpened1, isOpened2, isOpened3, isOpened4 } = this.state
+    const { isOpened1, isOpened2, isOpened3, isOpened4, isOpened5 } = this.state
 
     return (
       <View className='page'>
@@ -109,6 +115,18 @@ export default class ModalPage extends Taro.Component {
               </View>
             </View>
           </View>
+
+          {/* 城市索引 */}
+          <View className='panel'>
+            <View className='panel__title'>城市索引</View>
+            <View className='panel__content'>
+              <View className='example-item'>
+                <AtButton onClick={this.handleClick.bind(this, 5)}>
+                  打开城市索引
+                </AtButton>
+              </View>
+            </View>
+          </View>
         </View>
 
         {/* 基础模态框 */}
@@ -128,9 +146,7 @@ export default class ModalPage extends Taro.Component {
             <Button onClick={this.closeModal.bind(this, 1, '点击了取消')}>
               取消
             </Button>
-            <Button
-              onClick={this.closeModal.bind(this, 1, '点击了确定')}
-            >
+            <Button onClick={this.closeModal.bind(this, 1, '点击了确定')}>
               确定
             </Button>
           </AtModalAction>
@@ -170,9 +186,7 @@ export default class ModalPage extends Taro.Component {
             <Button onClick={this.closeModal.bind(this, 3, '点击了取消')}>
               取消
             </Button>
-            <Button
-              onClick={this.closeModal.bind(this, 3, '点击了确定')}
-            >
+            <Button onClick={this.closeModal.bind(this, 3, '点击了确定')}>
               确定
             </Button>
           </AtModalAction>
@@ -189,6 +203,14 @@ export default class ModalPage extends Taro.Component {
           onCancel={this.closeModal.bind(this, 4, '点击了取消')}
           onConfirm={this.closeModalConfirm.bind(this, 4, '点击了确认')}
         />
+
+        <AtModal isOpened={isOpened5}>
+          <AtModalContent>
+            <AtIndexes list={mockData} topKey='Top'>
+              <View className='custom-area'>用户自定义内容</View>
+            </AtIndexes>
+          </AtModalContent>
+        </AtModal>
       </View>
     )
   }
diff --git a/src/style/components/modal.scss b/src/style/components/modal.scss
index 7a8ffa3da..0d595cf87 100644
--- a/src/style/components/modal.scss
+++ b/src/style/components/modal.scss
@@ -47,7 +47,6 @@ $at-modal-duration: 200ms;
     padding: $spacing-h-xl $spacing-h-lg;
     min-height: 180px;
     max-height: 840px;
-    overflow-y: scroll;
     color: $at-modal-content-text-color;
     font-size: $font-size-base;
     box-sizing: border-box;