Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-app

pages/public/login.vue

@@ -154,7 +154,7 @@
 				    plus.runtime.quit();
 				}
 			},
-			passlogin(e) {
+			passlogin(e) {debugger
 				var that = this
 				uni.showLoading({
 					title: '登录中',