diff --git a/src/api/public/login/index.js b/src/api/public/login/index.js
index 9e5247d..668cfec 100644
--- a/src/api/public/login/index.js
+++ b/src/api/public/login/index.js
@@ -16,4 +16,27 @@ export function loginTel(params) {
 		data: params,
 	})
 }
-// 退出登录
\ No newline at end of file
+// 退出登录
+export function quit(params) {
+	return httpService({
+		url: `/user/quit`,
+		method: 'post',
+		data: params,
+	})
+}
+// 省市区
+export function allCity(params) {
+	return httpService({
+		url: `/city/allCity`,
+		method: 'get',
+		params: params,
+	})
+}
+// 查找所有小区
+export function findcommunity(params) {
+	return httpService({
+		url: `/community/findAll`,
+		method: 'get',
+		params: params,
+	})
+}
\ No newline at end of file
diff --git a/src/utils/util.js b/src/utils/util.js
index 21d0dfb..31872ab 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -1,6 +1,11 @@
 import store from '@/store'
+import axios from 'axios'
+import qs from 'qs'
 export default {
 	install: function (Vue) {
+		//axios
+		Vue.prototype.$axios = axios
+		Vue.prototype.qs = qs
 		// 上传
 		Vue.prototype.$upload = process.env.VUE_APP_URL + store.getters.getCommunityCode + '/manage/user/upload/uploadImg'
 		// 静态地址
diff --git a/src/views/Basic/Authority/depend/permissions.vue b/src/views/Basic/Authority/depend/permissions.vue
index f168514..3e2b098 100644
--- a/src/views/Basic/Authority/depend/permissions.vue
+++ b/src/views/Basic/Authority/depend/permissions.vue
@@ -17,7 +17,7 @@
                   type="link"
                   icon="form"
                   slot="extra"
-                  @click="editRole(item.id)"
+                  @click.stop="editRole(item.id)"
                 >
                 </a-button>
                 <a-button
@@ -25,7 +25,7 @@
                   slot="extra"
                   style="color: #ff4d4f"
                   icon="delete"
-                  @click="delRole(item.id)"
+                  @click.stop="delRole(item.id)"
                 ></a-button>
             <div
               v-for="(rolechild, indexs) in item.childrenList"
diff --git a/src/views/Basic/Authority/index.vue b/src/views/Basic/Authority/index.vue
index 1eb175b..76e01e8 100644
--- a/src/views/Basic/Authority/index.vue
+++ b/src/views/Basic/Authority/index.vue
@@ -22,7 +22,7 @@
                   type="link"
                   icon="form"
                   slot="extra"
-                  @click="editRole(item.id)"
+                  @click.stop="editRole(item.id)"
                 >
                 </a-button>
                 <a-button
@@ -30,7 +30,7 @@
                   slot="extra"
                   style="color: #ff4d4f"
                   icon="delete"
-                  @click="delRole(item.id)"
+                  @click.stop="delRole(item.id)"
                 ></a-button>
                 <div
                   v-for="(rolechild, indexs) in item.childrenList"
diff --git a/src/views/Layout/index.vue b/src/views/Layout/index.vue
index c373f09..2abfbaf 100644
--- a/src/views/Layout/index.vue
+++ b/src/views/Layout/index.vue
@@ -39,6 +39,7 @@
 </template>
 <script>
 import yMenu from "./yMenu";
+import { quit } from "@/api/public/login"
 export default {
 	components: {
 		yMenu,
@@ -100,9 +101,14 @@ export default {
 			this.tagActive = n;
 			sessionStorage.setItem('index',n)
 		},
-		logout(){
-			this.$router.push({name:'Login'})
-			this.setToken(null);
+		async logout(){
+			let res = await quit()
+			if(res.code === 200){
+				this.$message.success(res.msg)
+				this.$router.push({name:'Login'});
+			}else{
+				this.$message.error(res.msg)
+			}
 		}
 	},
 };
diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue
index 51058ad..cf7dd33 100644
--- a/src/views/Login/index.vue
+++ b/src/views/Login/index.vue
@@ -47,19 +47,19 @@
             </a-row>
           </div>
           <div class="login-input" v-else-if="activeName === '2'">
-             <a-select
-              placeholder="请选择小区"
-              v-model="communityCode"
-            >
-              <a-select-option value="123456">华西村</a-select-option>
-              <a-select-option value="1234">地球村</a-select-option>
-            </a-select>
-            <a-input placeholder="请输入手机号码" v-model="form.tel"></a-input>
-            <a-input
-              placeholder="请输入验证码"
-              v-model="form.code"
-              style="width: 60%"
-            ></a-input>
+            <a-cascader :options="cityList" placeholder="请选择城市" v-model='cityvalue' :show-search="{ filter }" @change="onChange" :field-names="{ label: 'name', value: 'id', children: 'cityList' }"/>
+            
+            <span class="form">
+              <a-select v-model="communityCode" notFoundContent='该城市无可选择小区' :disabled='cityvalue.length===0' placeholder="请选择小区">
+                <a-select-option v-for="item in communityList" :key='item.id' :value='item.code'>{{item.name}}</a-select-option>
+              </a-select>
+              <a-input placeholder="请输入手机号码" v-model="form.tel"></a-input>
+              <a-input
+                placeholder="请输入验证码"
+                v-model="form.code"
+                style="width: 60%"
+              ></a-input>
+            </span>
             <a-button type="primary" @click="getCode">获取验证码</a-button>
             <a-row>
               <a-col :span="12" style="margin-left: 23px"
@@ -194,7 +194,7 @@
 </template>
 
 <script>
-import { loginTel, sendTelCode } from "../../api/public/login";
+import { loginTel, sendTelCode, allCity, findcommunity } from "../../api/public/login";
 export default {
 	name: "Login",
 	data() {
@@ -234,10 +234,14 @@ export default {
 					},
 				],
 			},
+			cityList:[],//城市列表
+			cityvalue:[], //省市区级联绑定值
+			communityList:[] //小区列表
 		};
 	},
 	created() {
 		this.keyupEnter();
+		this.getCity()
 	},
 	watch: {
 		communityCode:{
@@ -247,6 +251,30 @@ export default {
 		}
 	},
 	methods: {
+		async getCity(){
+			let res = await allCity()
+			this.cityList = res.data
+		},
+		getCommunity(cityId){
+			this.$axios({
+				method:'get',
+				url:process.env.VUE_APP_URL+'manage/community/findAll',
+				params:{    //这里是发送给后台的数据
+					cityId:cityId
+				}
+			}).then((response) =>{          //这里使用了ES6的语法
+				this.communityList = response.data.data
+			}).catch((error) =>{
+				console.log(error)       //请求失败返回的数据
+			})
+            
+		},
+		onChange(data){
+			this.getCommunity(data[2])
+		},
+		filter(inputValue, path) {
+			return path.some(cityList => cityList.name.toLowerCase().indexOf(inputValue.toLowerCase()) > -1);
+		},
 		// 绑定enter事件
 		keyupEnter() {
 			document.onkeydown = (e) => {
@@ -367,7 +395,7 @@ export default {
 /deep/.ant-form-item {
   margin-top: -10px;
 }
-.login-input {
+.login-input .form{
   text-align: left;
   margin-top: 20px;
   /deep/.ant-input {
@@ -375,7 +403,8 @@ export default {
     border-bottom: 1px solid #f4eded;
     border-radius: 0;
     width: 90%;
-    margin: 25px;
+    margin-left: 25px;
+    margin-bottom: 20px;
   }
   /deep/.ant-select {
     border: 0px;
@@ -383,7 +412,16 @@ export default {
     border-radius: 0;
     width: 90%;
     margin-left: 25px;
-    margin-bottom: 10px;
+    margin-top: 15px;
+    margin-bottom: 15px;
   }
 }
+/deep/.ant-cascader-picker{
+  text-align: left;
+  margin-top: 20px;
+  margin-left: 25px;
+  width:90%;
+  overflow-y:hidden;
+  overflow-x:hidden;
+}
 </style>