Merge branch 'dev-stage2-20191125' of...

Merge branch 'dev-stage2-20191125' of http://192.168.110.53/com.pica.cloud.foundation.frontend/year-end-activitiy into dev-stage2-20191125

pages/activityPage.vue

@@ -225,6 +225,7 @@
   import { wxShare } from '@/configs/wxShare';
   const cookies = require('cookie-universal')();
   import { Base64 } from 'js-base64';
+  import { setCookie, getCookie, delCookie } from '@/utils/cookieFun';
 
   let vm = null;
   export default {
@@ -481,13 +482,14 @@
       // 判断用户是否登录？
       getUserInfo() {
         // cookies.remove('token');  // 部分手机这个cookie会存两次，所以先移除
+        delCookie('token');
 
         vm.$rocNative 
         .getUserInfo()
         .then(params => {
           // _seft.userToken = params.userToken;  // 存到store里
           if(params && params.userToken){
-            cookies.set('token', params.userToken);
+            setCookie('token', params.userToken);
             vm.token = params.userToken;
           }
           // alert(JSON.stringify(params));
@@ -1084,14 +1086,13 @@
         if (itemData.code == 'M301') {
           itemData.code = 'M300';
           //鉴权 自己调用token
-          // cookies.remove('token');
-          // cookies.remove('headToken');
+          delCookie('token');
+          delCookie('headToken');
+
           this.$rocNative.getToken().then(res => {
             const { userToken } = res;
-            // setCookie('token', userToken);
-            // setCookie('headToken', userToken);
-            cookies.set('token', userToken);
-            cookies.set('headToken', userToken);
+            setCookie('token', userToken);
+            setCookie('headToken', userToken);
           });
         } else {
           const paramList = setEventByModuleCode(

service/api.js

@@ -3,7 +3,8 @@ import { Toast } from 'vant';
 import { API_CONFIG, REPONSE_CODE } from '@/utils/enumerate';
 
 const { VUE_ENV } = process.env; // server or client
-const cookies = require('cookie-universal')();
+import { getCookie } from '@/utils/cookieFun';
+
 
 Axios.interceptors.request.use(
   config => {
@@ -14,7 +15,7 @@ Axios.interceptors.request.use(
     const method = config.method.toLocaleLowerCase();
     if (method === 'post' || method === 'put' || method === 'delete') {}
     if (config.withCredentials) {
-      config.headers.token = cookies.get('token') || sessionStorage.getItem('token');
+      config.headers.token = getCookie('token') || sessionStorage.getItem('token');
     }
     return config;
   },

utils/cookieFun.js

+const { NUXT_ENV_APP } = process.env;
+
+export const setCookie = (cname,cvalue, exdays = 7, domain = '.yunqueyi.com') => { //yunqueyi.com
+  let d = new Date(), expires = '';
+  
+  if (NUXT_ENV_APP === 'dev') {
+    domain = window.location.hostname;  
+  }
+  d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
+  expires = `expires=${d.toUTCString()}`;
+  
+  document.cookie = `${cname}=${cvalue};path=/;${expires};domain=${domain}`;
+}
+
+export const getCookie = (cname) => {
+  const reg = new RegExp('(^| )' + cname + '=([^;]*)(;|$)');
+  const arr = document.cookie.match(reg);
+
+  return arr ? unescape(arr[2]) : null;
+}
+
+export const delCookie = (cname) => {
+  var exp = new Date();
+        exp.setTime(exp.getTime() - 1);
+        var cval = getCookie(cname);
+        
+        if(cval!=null){
+            document.cookie = 'token=; path=/; expires=' + new Date(0).toUTCString();
+            document.cookie = 'token=; path=/; domain=.yunqueyi.com; expires=' + new Date(0).toUTCString();
+            //document.cookie= name + "="+cval+";path=/;expires="+exp.toGMTString() + ";domain=" + domain;
+        } 
+}