From a2f842b6f42084c0c586e1e5b2bc21cb0a152d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 18 Jan 2020 10:46:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js            | 13 ++++---------
 public/react/src/modules/wxcode/index.js |  9 +++------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index b33935b13..a16d2243f 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -110,10 +110,9 @@ export function initAxiosInterceptors(props) {
 	     //proxy="http://192.168.2.63:3001"
 	try {
 		var u = navigator.userAgent;
-		var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;
-		if(isAndroid){
-		}else{
-			//苹果走
+		var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+		if (isIOS) {
+      //苹果走
 			const  str =window.location.pathname;
 			if(str.indexOf("/wxcode") !== -1){
 				// console.log("开始重写cookis");
@@ -127,7 +126,6 @@ export function initAxiosInterceptors(props) {
 						if(_arr[0]==='_educoder_session'){
 							cookie.save('_educoder_session',_arr[1],{ path: '/' });
 							cookie.save('_educoder_session',_arr[1], { domain: '.educoder.net', path: '/'});
-							// setCookie(_arr[1]);
 						}else{
 							cookie.save('autologin_trustie',_arr[1],{ path: '/' });
 							cookie.save('autologin_trustie',_arr[1], { domain: '.educoder.net', path: '/'});
@@ -135,12 +133,9 @@ export function initAxiosInterceptors(props) {
 					});
 				}
 			}
+		}else{
 
 		}
-
-
-
-
 	}catch (e) {
 
 	}
diff --git a/public/react/src/modules/wxcode/index.js b/public/react/src/modules/wxcode/index.js
index 7f47452bc..d214a2c72 100644
--- a/public/react/src/modules/wxcode/index.js
+++ b/public/react/src/modules/wxcode/index.js
@@ -47,8 +47,9 @@ const App = (props) => {
 	const _params = window.location.search;
   const setCookier = () => {
 		var u = navigator.userAgent;
-		var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;
-		if(isAndroid){
+		var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+		if (isIOS) {
+		}else{
 			if (_params) {
 				let _cookie = '';
 				let _search = _params.split('?')[1];
@@ -56,9 +57,7 @@ const App = (props) => {
 					_cookie = _search.split('=')[1];
 					cookie.save('_educoder_session', _cookie);
 				}
-				console.log(_cookie);
 				_search.split('&').forEach(item => {
-					console.log(item);
 					const _arr = item.split('=');
 					cookie.save(_arr[0], _arr[1], {
 						path: '/',
@@ -66,8 +65,6 @@ const App = (props) => {
 					});
 				});
 			}
-		}else{
-
 		}
   }