Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into zhy

pageE/setting/Index.vue

@@ -16,6 +16,7 @@
 		</view>
 		<u-action-sheet v-model="sheetStatus" :list="list" :tips="tips" :border-radius="20" @click="choiceOption">
 		</u-action-sheet>
+		<u-modal v-model="show" show-confirm-button show-cancel-button :content="content" @confirm="loginOut"></u-modal>
 	</view>
 </template>
 <script>
@@ -67,7 +68,9 @@
 						title: '帮助与反馈',
 						link: './feedback'
 					},
-				]
+				],
+				content: "是否退出登录！",
+				show: false
 			}
 		},
 		methods: {
@@ -76,13 +79,19 @@
 			choiceOption(index) {
 				console.log(index);
 				if (index == 1) {
-					this.logout();
+					this.show = true;
 				}
 			},
 			toNextPage(url, ...params) {
 				uni.navigateTo({
 					url: url
 				});
+			},
+			loginOut() {
+				this.logout();
+				uni.redirectTo({
+					url: "../../pageA/login/login",
+				})
 			}
 		},
 	};