Merge remote-tracking branch 'origin/dev-stage2-20191125' into dev-stage2-20191125

assets/style/common.less

 html,body{
   width: 100%;
-  overflow-x: hidden;
-  overflow-y: scroll;
+  /*overflow-x: hidden;
+  overflow-y: scroll;*/
 }
 img{
   -webkit-user-select:none;

pages/activityPage.vue

@@ -478,16 +478,26 @@
         };
         return status;
       },
+      setCookieFun(cookieKey, cookieVal) {
+        let expireMsec = new Date(), expires = '';
+        expireMsec.setTime(expireMsec.getTime() + (7 * 24 * 60 * 60 * 1000));
+        expires = expireMsec.toUTCString();
+
+        cookies.set(cookieKey, cookieVal, { path: '/', domain: '.yunqueyi.com', expires: expires });
+      },
+      removeCookieFun(cookieKey) {
+        cookies.remove(cookieKey, { path: '/', domain: '.yunqueyi.com' });
+      },
       // 判断用户是否登录？
       getUserInfo() {
-        // cookies.remove('token');  // 部分手机这个cookie会存两次，所以先移除
+        vm.removeCookieFun('token');  // 部分手机这个cookie会存两次，所以先移除
 
         vm.$rocNative 
         .getUserInfo()
         .then(params => {
           // _seft.userToken = params.userToken;  // 存到store里
           if(params && params.userToken){
-            cookies.set('token', params.userToken);
+            vm.setCookieFun('token', params.userToken);
             vm.token = params.userToken;
           }
           // alert(JSON.stringify(params));
@@ -1086,12 +1096,16 @@
           //鉴权 自己调用token
           // cookies.remove('token');
           // cookies.remove('headToken');
+          vm.removeCookieFun('token');
+          vm.removeCookieFun('headToken');
           this.$rocNative.getToken().then(res => {
             const { userToken } = res;
             // setCookie('token', userToken);
             // setCookie('headToken', userToken);
-            cookies.set('token', userToken);
-            cookies.set('headToken', userToken);
+            // cookies.set('token', userToken);
+            // cookies.set('headToken', userToken);
+            vm.setCookieFun('token', userToken);
+            vm.setCookieFun('headToken', params.userToken);
           });
         } else {
           const paramList = setEventByModuleCode(

pages/invite-details/index.vue

@@ -25,13 +25,21 @@
               <i class="l"></i>
               <b class="l"></b>
               <p class="text">输入手机号领取课程</p>
-              <p class="awards">+20勤奋分 +20云鹊豆</p>
+              <p class="awards">
+                <span v-for="item in dealJsonData(this.node1)">
+                  +{{item.rewardQuantity}}{{changeAwardsName(item.rewardType)}}
+                </span>
+              </p>
             </div>
             <div class="bubble_diailog marginTop20">
               <i class="l"></i>
               <b class="l"></b>
               <p class="text">使用手机号登录云鹊APP</p>
-              <p class="awards">+80勤奋分 +80云鹊豆</p>
+              <p class="awards">
+                <span v-for="item in dealJsonData(this.node2)">
+                  +{{item.rewardQuantity}}{{changeAwardsName(item.rewardType)}}
+                </span>
+              </p>
             </div>
           </div>
         </div>
@@ -91,7 +99,7 @@
 <script>
   import NormalHeader from '@/components/normal-header';
   import FooterButton from '@/components/footer-button';
-  import { getOneInviteDetails,getTwoInviteDetails } from '@/service/detailsAndRanking';
+  import { getOneInviteDetails,getTwoInviteDetails,getInviteDetailAward } from '@/service/detailsAndRanking';
   import { wxShare } from '@/configs/wxShare';
   import { getShareUrl } from '@/utils/index';
   import { Base64 } from 'js-base64';
@@ -113,7 +121,9 @@
         pageSize: 10,
         noMore: false,//分页参数--end
         btnText: '去邀请',
-        btnType: false
+        btnType: false,
+        node1: '',
+        node2: ''
       };
     },
     async asyncData ({query}) {
@@ -126,6 +136,7 @@
     mounted() {
       this.pageNo++
       this.getOneInviteDetails();
+      this.getInviteDetailAward();
 
       window.addEventListener('scroll', function (e) {
         let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
@@ -138,19 +149,34 @@
         let headDivHeight = headDiv.offsetHeight;
         //获取窗口高度
         const lastHeight = window.innerHeight;
-        console.log('recordDetailsHeight',recordDetailsHeight);
-        console.log('headDivHeight',headDivHeight);
+        /*console.log('recordDetailsHeight',recordDetailsHeight);
+        console.log('headDivHeight',headDivHeight);*/
        const tabNab=document.getElementsByClassName('tab-nav')[0];
         if(recordDetailsHeight<=headDivHeight) {
           tabNab.setAttribute('style',`position:fixed;top: ${44}px;`);
         } else {
-         console.log('sdd')
           tabNab.removeAttribute('style');
         }
 
       });
     },
     methods: {
+      getInviteDetailAward() {
+         getInviteDetailAward({
+          activityId: this.activityId,
+          taskId: this.taskId
+        }).then(res => {
+          const node1 = res.data.filter(item => {
+            return item.resourceId == "1"
+          });
+          const node2 = res.data.filter(item => {
+            return item.resourceId == "2"
+          })
+          this.node1 = node1[0].rewardJsonInfo;
+          this.node2 = node2[0].rewardJsonInfo;
+          console.log(this.node1,this.node2)
+        })
+      },
       goInvite() { // 去分享
         let shareObj = wxShare;
         //处理分享链接需要的参数

service/detailsAndRanking.js

@@ -70,4 +70,12 @@ export const getYesterdayRanking = (data) => {
     data: data,
     withCredentials: true
   })
+}
+// 邀请明细页节点奖励
+export const getInviteDetailAward = (params) => {
+  return request({
+    url: `/campaign/inviteDetail/tims`,
+    params: params,
+    withCredentials: true
+  })
 }
\ No newline at end of file