Merge remote-tracking branch 'origin/master'

one_stop_public/Table/ZdyTable.jsx

@@ -837,7 +837,7 @@ export default class ZdyTable extends Component {
                         <table
                           style={{
                             overflow: 'auto',
-                            margin: max * width > 550 ? 'auto' : '',
+                            margin: max * width > 550 ? '1px auto' : '', // 禅道 27868
                             marginBottom: isWebPrint ? (isWebPrintEnd ? '5px' : 0) : '1px',
                             ...style,
                           }}

one_stop_public/utils/cookie.js

@@ -5,14 +5,14 @@
  * @param day cookie的过期时间
  */
 export const setCookie = function(name, value, day) {
-	if (day !== 0) {
-		//当设置的时间等于0时，不设置expires属性，cookie在浏览器关闭后删除
-		const expires = day * 24 * 60 * 60 * 1000;
-		const date = new Date(+new Date() + expires);
-		document.cookie = name + '=' + escape(value) + ';expires=' + date.toUTCString();
-	} else {
-		document.cookie = name + '=' + escape(value);
-	}
+  if (day !== 0) {
+    //当设置的时间等于0时，不设置expires属性，cookie在浏览器关闭后删除
+    const expires = day * 24 * 60 * 60 * 1000;
+    const date = new Date(+new Date() + expires);
+    document.cookie = name + '=' + escape(value) + ';expires=' + date.toUTCString() + ';path=/';
+  } else {
+    document.cookie = name + '=' + escape(value) + ';path=/';
+  }
 };
 
 /**
@@ -21,11 +21,11 @@ export const setCookie = function(name, value, day) {
  * @returns {null} 不存在时，返回null
  */
 export const getCookie = function(name) {
-	let arr;
-	const reg = new RegExp('(^| )' + name + '=([^;]*)(;|$)');
-	arr = document.cookie.match(reg);
-	if (!!arr) return unescape(arr[2]);
-	else return null;
+  let arr;
+  const reg = new RegExp('(^| )' + name + '=([^;]*)(;|$)');
+  arr = document.cookie.match(reg);
+  if (!!arr) return unescape(arr[2]);
+  else return null;
 };
 
 /**
@@ -33,5 +33,5 @@ export const getCookie = function(name) {
  * @param name cookie的名称
  */
 export const delCookie = function(name) {
-	setCookie(name, ' ', -1);
+  setCookie(name, ' ', -1);
 };

one_stop_public/utils/token.js

@@ -3,9 +3,11 @@
  * */
 import { isJSON } from '@/webPublic/one_stop_public/copy';
 import { getOneStopMyInfo } from '@/webPublic/one_stop_public/utils/utils';
+import { setCookie } from '@/webPublic/one_stop_public/utils/cookie';
 
 export function setToken(value, time) {
   if (getToken() !== value) {
+    setCookie('token', value);
     localStorage.setItem('antd-pro-token-onestop', value);
     localStorage.setItem('antd-pro-token', value);
     localStorage.setItem('wisdom-school-token', value);

zyd_public/request/request.js

@@ -148,8 +148,8 @@ export default function request(
   }
 
   const defaultOptions = {
-    credentials: 'omit',
-    // credentials: 'include',
+    // credentials: 'omit',
+    credentials: 'include',
     mode: 'cors',
   };
   let newOptions = { ...defaultOptions, ...options };