Merge branch 'dev-coursedetail-0817' of...

Merge branch 'dev-coursedetail-0817' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-professional-exam into dev-coursedetail-0817

src/components/business/cell-list-detail-share.vue

@@ -161,6 +161,15 @@ export default {
     // 跳转到考试或课程 type 1: 考试;  2: 课程
     // 如果是考试，将根据appVersion判断是新考试还是老考试，如果是301或之前的，都是老考试
     gotoExamOrCourse(item) {
+      if(!isWeiXin()) {
+        if(item.type == 1) {
+          Toast('请前往云鹊医APP参加考试');
+        } else if(item.type == 2){
+          Toast('请前往云鹊医APP学习课程');
+        }        
+        return;
+      }
+
       if(!this.logged) {
         if(item.type == 1) {
           Toast('请前往云鹊医APP参加考试');

src/store/modules/user.js

 import { Toast } from 'vant';
 import fetch from '@/utils/fetch';
 import { getBaseUrl } from '@/utils/index'
-import { preLoadImg } from '@/utils/index';
+import { setCookie, delCookie } from '@/utils/index';
 import { envConfig } from '@/utils/env-config'
 
 const user = {
@@ -22,6 +22,7 @@ const user = {
     setToken({ commit, dispatch }, params) {
       commit('SET_TOKEN', params);
       localStorage.setItem('token', params);
+      setCookie('token', params)
       dispatch('getUserInfo');
     },
     // 获取用户信息
@@ -73,6 +74,7 @@ const user = {
       commit('SET_TOKEN', '');
       commit('SET_USER_INFO', {});
       localStorage.removeItem('token');
+      delCookie('token')
     },
   },
 }

src/utils/index.js

@@ -2,6 +2,8 @@
  * Created by Anndy Yang on 19/02/28.
  */
 import { envConfig } from '@/utils/env-config'
+const { BUILD_ENV } = process.env;
+
 
 // 获取SC服务器域名地址
 export function getBaseUrl(url) {
@@ -201,4 +203,30 @@ export function isWeiXin() {
   } else {
     return false;
   }
+}
+
+export const setCookie = (cname, cvalue, exdays = 30, domain = '.yunqueyi.com') => { //yunqueyi.com
+  let d = new Date(), expires = '';
+  if (BUILD_ENV === '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();
+  }
 }
\ No newline at end of file

src/views/share-merge-detail.vue

@@ -210,6 +210,7 @@ import ChangeCard from "@/components/cme/change-card";
 import CourseCovers from "@/components/course/course-covers";
 import DownloadButton from "@/components/course/download-button";
 import PicaVideo from '@/components/course/pica-video';
+import { getCookie } from '@/utils/index';
 
 let cataOffsetTop = 0;
 let intorOffsetTop = 0;
@@ -355,9 +356,9 @@ export default {
     }
 
     const { token, info } = this.$store.state.user;
-    this.token = token;
+    this.token = getCookie('token') || token;
     // 如果有token，但没有用户信息，则获取用户信息
-    if (token && !info.id) {
+    if (this.token && !info.id) {
       this.$store.dispatch('getUserInfo');
     }
     this.queryByUuid(this.uuid);