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

@@ -480,7 +480,7 @@
       },
       // 判断用户是否登录？
       getUserInfo() {
-        cookies.remove('token');  // 部分手机这个cookie会存两次，所以先移除
+        // cookies.remove('token');  // 部分手机这个cookie会存两次，所以先移除
 
         vm.$rocNative 
         .getUserInfo()
@@ -788,6 +788,12 @@
       },
 
       shareWxUrl() {
+        let obj = {
+          encryptId: vm.encryptId,
+          taskId: vm.eachInviteAward.taskId,
+          activityId: vm.eachInviteAward.activityId
+        };
+        alert(JSON.stringify(obj))
         const paramstr = Base64.encode(`id=${vm.encryptId}&taskId=${vm.eachInviteAward.taskId}&activityId=${vm.eachInviteAward.activityId}&`)
         return `${getShareUrl()}year_end_ssr/shareActive?${paramstr}`
         // return `${getShareUrl()}year_end_ssr/shareActive?id=${vm.encryptId}&taskId=${vm.eachInviteAward.taskId}&activityId=${vm.eachInviteAward.activityId}`
@@ -1078,8 +1084,8 @@
         if (itemData.code == 'M301') {
           itemData.code = 'M300';
           //鉴权 自己调用token
-          cookies.remove('token');
-          cookies.remove('headToken');
+          // cookies.remove('token');
+          // cookies.remove('headToken');
           this.$rocNative.getToken().then(res => {
             const { userToken } = res;
             // setCookie('token', userToken);