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

components/ranking-header.vue

@@ -108,6 +108,7 @@
         height: 25px;
         position: absolute;
         left: 13px;
+        top: 10px;
       }
       .head-btn {
         width: 193px;

pages/activityPage.vue

@@ -528,7 +528,6 @@
         vm.goToCheckJoin();
         getEncryptId().then(res => {
           if( res && res.code && res.code == '000000' ){
-            alert('接口获取encryptId===>'+res.data)
             vm.encryptId = res.data;
           }else{
             vm.$toast(res.message);

pages/shareActive.vue

@@ -76,12 +76,11 @@
 			}
 		},
 		async asyncData({ query }){
-			const parsed = queryString.parse(Base64.decode(Object.keys(query)[0]));
-
-			const testParse = parsed;
-			const testKeys = Object.keys(query)[0];
-			const testObj = Base64.decode(Object.keys(query)[0]);
-			const testQuery = query;
+			// 注释中间的代码请注意：
+			// queryString 这个npm会把字符串中的 + 变成空格，因此这里需要手动转一下 !!!
+			let parsed = queryString.parse(Base64.decode(Object.keys(query)[0]));
+			parsed.id = parsed.id.replace(' ', '+');
+			// 如果还有问题，可能需要换一个qs的包代替 queryString !!!
 
 			const { id, taskId, activityId } = parsed;
 			let avatarImageUrl = '', name = '', captchaImg = '', captchaToken = '';
@@ -97,15 +96,11 @@
         captchaToken = resCapt.data.token;
     	}
     	return { 
-    		avatarImageUrl, name, id, taskId, activityId, captchaImg, captchaToken, parsed, testQuery, testObj, testKeys,testParse
+    		avatarImageUrl, name, id, taskId, activityId, captchaImg, captchaToken,parsed
     	}
 		},
 		mounted(){
-			// alert(JSON.stringify(this.testKeys));
-			// alert(JSON.stringify(this.testQuery))
-			alert('testObj===>'+JSON.stringify(this.testObj));
-			alert('testParse===>'+JSON.stringify(this.testParse))
-			alert('id===>'+this.id)
+			alert(JSON.stringify(this.parsed))
   		document.querySelector('body').setAttribute('style', 'background: #FE9A51;');
   		// document.querySelector('body').setAttribute('style', 'overflow-x: hidden;');
   		this.checkCache();

service/index.js

@@ -55,7 +55,6 @@ export const checkToken = async (token) => {
 
 // 获取邀请人的头像和名字信息
 export const getInviteInfo = async (id) => {
-  alert('获取邀请人的头像和名字信息==doctorId=》'+id)
   return request({
     url: `campaign/inviteOne/info?id=${id}`,
     method: 'get'