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

assets/style/in-activity.less

 .in-activity-wrap{
   position: relative;
-  width: 375px; height: auto; overflow: hidden;
+  width: 100%; height: auto; overflow: hidden;
   background: #F5663F;
 
   .ellipsis{

pages/activityPage.vue

@@ -141,6 +141,7 @@
               <li v-for="item in notInviteShowList">
                 <div class="add-btn" @click="eachDoctorClick">
                   <img src="../assets/img/stage-two/add-pic-icon.png" alt="">
+                  <p class="text">昵称</p>
                 </div>
               </li>
             </template>
@@ -806,7 +807,7 @@
           taskId: vm.eachInviteAward.taskId,
           activityId: vm.eachInviteAward.activityId
         };
-        // alert(JSON.stringify(obj))
+        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}`

service/activityMainpage.js

@@ -22,7 +22,6 @@ export const getBEServerTime = () => {
 	return request({
     url: `campaign/tims/getTodayDate`,
     method: 'get',
-    withCredentials: true,
   })
 }