From 99825c9e990af2e676ce3d04c7c30a3da386b323 Mon Sep 17 00:00:00 2001
From: wangkesi <wangkesi@3ncto.com>
Date: Tue, 30 Oct 2018 10:34:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/popup-picker.vue | 53 +++++++++++++++++++++++++++++++++
 src/router/index.js             |  4 +++
 src/view/home.vue               |  4 ++-
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 src/components/popup-picker.vue

diff --git a/src/components/popup-picker.vue b/src/components/popup-picker.vue
new file mode 100644
index 0000000..565c3d5
--- /dev/null
+++ b/src/components/popup-picker.vue
@@ -0,0 +1,53 @@
+<template>
+    <popup>
+        <div class="picke-address">
+            <div class="status-btn">
+                <a class="cel-btn">取消</a>
+                <a class="complete-btn">完成</a>
+            </div>
+            <picker :data='dataList' :columns=3 v-model="valueList"></picker>
+        </div>
+    </popup>
+</template>
+<script>
+import { Popup, Picker } from "vux";
+export default {
+    components: {
+        Popup,
+        Picker
+    },
+    props: {
+        dataList: {
+            type: Array,
+            default: []
+        },
+        value: {
+            type: Array,
+            default: []
+        }
+    },
+    data() {
+        return {
+            valueList: this.value
+        };
+    },
+    computed: {},
+    methods: {}
+};
+</script>
+<style lang="scss" scoped>
+.picke-address .status-btn {
+    display: flex;
+    height: 0.8rem;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 0.3rem;
+}
+.picke-address .status-btn a {
+    padding: 0.3rem;
+    color: #888;
+}
+.picke-address .status-btn a.complete-btn {
+    color: #1aad19;
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 78d552b..65445b4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -84,6 +84,10 @@ let router = new Router({
             path: "/service-card-list",
             component: resolve =>
                 require(["@/view/service-card-list.vue"], resolve)
+        },
+        {
+            path: "/picker",
+            component: resolve => require(["@/components/popup-picker.vue"], resolve)
         }
     ]
 });
diff --git a/src/view/home.vue b/src/view/home.vue
index 56edf6b..a53a551 100644
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -361,7 +361,9 @@ export default {
                             if (data.userAddress.type == 1) {
                                 this.address =
                                     data.userAddress.cityName +
-                                    data.userAddress.districtName;
+                                    data.userAddress.districtName
+                                        ? data.userAddress.districtName
+                                        : "";
                                 this.alertShow = true;
                             } else if (data.userAddress.type == 2) {
                                 this.$vux.confirm.show({