Merge commit '6f413499'

@@ -34,9 +34,15 @@ function h5LoginAuto() {
   }
   }
 }
 }
 
 
-
-
-
+function logout() {
+  return request({
+    url: '/logout',
+    method: 'post'
+  }).then(() => {
+    uni.removeStorageSync('token')
+    uni.removeStorageSync('userName')
+  })
+}
 
 
 function getCodeImg() {
 function getCodeImg() {
   return request({
   return request({
@@ -126,5 +132,6 @@ export {
   h5LoginAuto,
   h5LoginAuto,
   loginByPhone,
   loginByPhone,
   groupMemberRegister,
   groupMemberRegister,
-	getMyOwnMemberInfo
+  getMyOwnMemberInfo,
+  logout
 }
 }

@@ -5,6 +5,7 @@
 // staging
 // staging
 // const baseUrl_api = "http://22yidpjzjifv.ngrok.xiaomiqiu123.top/stage-api/";
 // const baseUrl_api = "http://22yidpjzjifv.ngrok.xiaomiqiu123.top/stage-api/";
 const baseUrl_api = "http://182.92.233.247/stage-api/";
 const baseUrl_api = "http://182.92.233.247/stage-api/";
+// const baseUrl_api = 'http://192.168.1.97:8787'
 
 
 export default {
 export default {
   baseUrl_api
   baseUrl_api

@@ -177,15 +177,15 @@
 			content: `确认退出吗？`,
 			content: `确认退出吗？`,
 			success: function(res) {
 			success: function(res) {
 				if (res.confirm) {
 				if (res.confirm) {
+					loginServer.logout().then(()=>{
 						let path = '/pages/index/login';
 						let path = '/pages/index/login';
 						uni.reLaunch({
 						uni.reLaunch({
 							url: path
 							url: path
 						});
 						});
+					})
 				}
 				}
 			}
 			}
 		})
 		})
-
-
 	}
 	}
 
 
 	function goPath(path) {
 	function goPath(path) {