Merge branch 'dev-coupon-1020' into release

* dev-coupon-1020:
  将token统一
  获取cmeToken的方式问题
  但没有用户信息，则获取用户信息
  获取cookies的函数问题
  解决分享问题
  但没有用户信息，则获取用户信息
  要跳转到新的购买页面

# Conflicts:
#	src/views/I-credit-detail.vue
#	src/views/merge-detail.vue

src/store/modules/user.js

@@ -3,11 +3,11 @@ import fetch from '@/utils/fetch';
 import { getBaseUrl } from '@/utils/index'
 import { preLoadImg } from '@/utils/index';
 import { envConfig } from '@/utils/env-config'
-import { setCookie, delCookie } from '@/utils/index';
+import { setCookie, getCookie, delCookie } from '@/utils/index';
 
 const user = {
   state: {
-    token: localStorage.getItem('token') || '',
+    token: localStorage.getItem('couponToken') || getCookie('couponToken') || '',
     info: {}, // 用户信息
   },
   mutations: {
@@ -21,9 +21,12 @@ const user = {
   actions: {
     // 外部登陆返回设置token
     setToken({ commit, dispatch }, params) {
+      if( typeof(params) == 'object') {
+        params = params.join("");
+      }      
       commit('SET_TOKEN', params);
-      localStorage.setItem('token', params);
-      setCookie('token', params)
+      localStorage.setItem('couponToken', params);
+      setCookie('couponToken', params)
       dispatch('getUserInfo');
     },
     // 获取用户信息
@@ -74,8 +77,8 @@ const user = {
     logout({ state, commit }) {
       commit('SET_TOKEN', '');
       commit('SET_USER_INFO_2', {});
-      localStorage.removeItem('token');
-      delCookie('token')
+      localStorage.removeItem('couponToken');
+      delCookie('couponToken')
     },
   },
 }

src/utils/mixins.js

@@ -210,7 +210,8 @@ module.exports = {
         // 通用token校验
         commonCheckToken(noLoggedCallback) {
             let param = {
-                token: this.token,
+                // token: this.token,
+                token: this.token || this.$store.state.user.token || this.$store.state.coop.userInfo.userToken || localStorage.getItem("couponToken") || getCookie("couponToken"),
                 setEntry: true
             };
             this.GET("campaign/admin/task/checkToken", param).then(res => {

src/views/merge-detail.vue

@@ -698,6 +698,38 @@ export default {
     // 新购买方法
     confirm() {
       console.log('new confirm');
+      this.$sendBuriedData({
+        component_tag: `885#8852`
+      });
+      let projectId = this.project.projectId;
+      let pageUrl = getWebPageUrl(
+        `/cme/#/coop?id=${projectId}&cmeProjectId=${projectId}`
+      );
+
+      let courseUrl = encodeURIComponent(pageUrl);
+      let paramPageUrl = getWebPageUrl(`profexam/#/goods-detail?goodsId=${this.cardInfo.id}&projectId=${projectId}&courseUrl=${courseUrl}`);
+      let paramList = [
+        {
+          key: "pageUrl",
+          value: paramPageUrl,
+          type: 4,
+          seqNo: 1
+        }      
+      ]
+      rocNative.dispatchEventByModuleCode({
+        modeCode: "M300",
+        jsonString: paramList
+      });
+    },
+
+    // 跳转到原生的购买页面
+    confirmNew() {
+      let appVersion = this.userInfo.appVersion || "";
+      let appVersionNum = appVersion.split(".").join("");
+      if (appVersionNum < 341) {
+        Toast("请您下载新版本App");
+        return;
+      }
       this.$sendBuriedData({
         component_tag: `882#88203`
       });

src/views/share-merge-detail.vue

@@ -422,11 +422,12 @@ export default {
     localStorage.setItem('returnUrl', this.shareUrl);
 
     const { token, info } = this.$store.state.user;
-    this.token = getCookie("token") || token;
+    this.token = token || localStorage.getItem('couponToken') || getCookie("couponToken");
     // 如果有token，但没有用户信息，则获取用户信息
     if (this.token && !info.id) {
-      this.$store.dispatch("setToken", this.token);
-      // this.$store.dispatch('getUserInfo');
+      this.commonCheckToken(() => {
+        this.$store.dispatch("getUserInfo");
+      });
     }
     this.queryByUuid(this.uuid);