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/shareActive.vue

@@ -55,6 +55,7 @@
 <script>
 	import { getInviteInfo, getCourseById, getCaptchaGet, getAuthCode } from '@/service';
 	import { wxShare } from '@/configs/wxShare';
+	import { BASE_URL } from '@/utils/enumerate';
 	import { Base64 } from 'js-base64';
 	const queryString = require('query-string');
 	const TIMEALL = 60000; // 倒计时常量 60 秒
@@ -101,7 +102,6 @@
 		},
 		mounted(){
   		document.querySelector('body').setAttribute('style', 'background: #FE9A51;');
-  		// document.querySelector('body').setAttribute('style', 'overflow-x: hidden;');
   		this.checkCache();
   		// 微信分享
 	    this.shareObj.shareUrl = window.location.href;

pages/shareResult.vue

@@ -54,14 +54,8 @@
 
 <script>
 	import { wxShare } from '@/configs/wxShare';
+	import { BASE_URL } from '@/utils/enumerate';
 	export default {
-		// asyncData({ query }){
-		// 	const { status } = query; // 上个页面传递过来领取结果， false 为已领取， true 为领取成功
-		// 	const statusTxt = (status=='true') ? '领取成功' : '您已领取';
-		// 	return {
-		// 		statusTxt
-		// 	}
-		// },
 		data(){
 			return {
 				shareObj: wxShare,
@@ -69,13 +63,8 @@
 			}
 		},
 		mounted(){
-			if(this.$route.query.status.toString()=='true'){
-				this.statusTxt = '领取成功';
-			}else{
-				this.statusTxt = '您已领取';
-			}
+			this.statusTxt = (this.$route.query.status.toString()=='true') ? '领取成功' : '您已领取';
   		document.querySelector('body').setAttribute('style', 'background: "";');
-  		// document.querySelector('body').setAttribute('style', 'overflow-x: hidden;');
   		// 微信分享
 	   	this.shareObj.shareUrl = window.location.href;
 	    this.$picaWxShare({