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

@@ -351,12 +351,6 @@
       
     },
     mounted() {
-      // // 这里需要删掉！！！
-      // vm.getUserActivityInfo();
-      // vm.getTasks();
-      // console.log(Base64.encode('id=iRHw8t/pzgUM6TWi8UONRA==&taskId=1&activityId=1&'))
-      // console.log(Base64.decode(Base64.encode('id=iRHw8t/pzgUM6TWi8UONRA==&taskId=1&activityId=1&')));
-      // // 这里需要删掉！！！
       vm.isWeb = vm.$rocNative.isWeb;
 
        // 取服务器时间，切换不同时间段的显示
@@ -769,7 +763,7 @@
       },
       shareWxUrl() {
         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?${paramstr}`
         // return `${getShareUrl()}year_end_ssr/shareActive?id=${vm.encryptId}&taskId=${vm.eachInviteAward.taskId}&activityId=${vm.eachInviteAward.activityId}`
       },
       // 去邀请 按钮

pages/shareActive.vue

@@ -76,9 +76,7 @@
 			}
 		},
 		async asyncData({ query }){
-			// console.log(Base64.decode(Object.keys(query)[0]));
 			const parsed = queryString.parse(Base64.decode(Object.keys(query)[0]));
-			// console.log('parsedparsedparsedparsed',parsed);
 			const { id, taskId, activityId } = parsed;
 			let avatarImageUrl = '', name = '', captchaImg = '', captchaToken = '';
 			const res = await getInviteInfo(id);
@@ -97,7 +95,6 @@
     	}
 		},
 		mounted(){
-			console.log('this.parsed',this.parsed);
   		document.querySelector('body').setAttribute('style', 'background: #FE9A51;');
   		this.checkCache();
   		// 微信分享
@@ -116,7 +113,7 @@
 	    },(wx)=>{
 	      const title = this.shareObj.title1;
 	      const desc = this.shareObj.title2;
-	      const link = this.shareObj.shareUrl;
+	      const link = window.localStorage.getItem('shareUrl') || window.location.href;
 	      const imgUrl = this.shareObj.shareImageUrl;
 	       // 分享给朋友
 	      wx.onMenuShareAppMessage({

pages/shareResult.vue

@@ -70,7 +70,7 @@
 		mounted(){
   		document.querySelector('body').setAttribute('style', 'background: "";');
   		// 微信分享
-	   	this.shareObj.shareUrl = window.localStorage.getItem('shareUrl') || window.location.href;
+	   	this.shareObj.shareUrl = window.location.href;
 	    this.$picaWxShare({
 	      // baseUrl: BASE_URL[process.env.NUXT_ENV_APP],
 	      baseUrl: 'https://test1-sc.yunqueyi.com',
@@ -84,7 +84,7 @@
 	    },(wx)=>{
 	      const title = this.shareObj.title1;
 	      const desc = this.shareObj.title2;
-	      const link = this.shareObj.shareUrl;
+	      const link = window.localStorage.getItem('shareUrl') || window.location.href;
 	      const imgUrl = this.shareObj.shareImageUrl;
 	       // 分享给朋友
 	      wx.onMenuShareAppMessage({