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/index.less

@@ -202,11 +202,12 @@
     background-size: 100% 100%;
     margin-bottom: -.5px;
     .invite-info{
+      padding-top: 20px;
       img{
         width: 50px;
         height: 50px;
         display: block;
-        padding-top: 20px;
+        border-radius: 50%;
         margin: 0 auto;
       }
       .title1{

pages/activityPage.vue

@@ -527,6 +527,7 @@
         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

@@ -77,6 +77,12 @@
 		},
 		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;
+
 			const { id, taskId, activityId } = parsed;
 			let avatarImageUrl = '', name = '', captchaImg = '', captchaToken = '';
 			const res = await getInviteInfo(id);
@@ -91,12 +97,17 @@
         captchaToken = resCapt.data.token;
     	}
     	return { 
-    		avatarImageUrl, name, id, taskId, activityId, captchaImg, captchaToken, parsed
+    		avatarImageUrl, name, id, taskId, activityId, captchaImg, captchaToken, parsed, testQuery, testObj, testKeys,testParse
     	}
 		},
 		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)
   		document.querySelector('body').setAttribute('style', 'background: #FE9A51;');
-  		document.querySelector('body').setAttribute('style', 'overflow-x: hidden;');
+  		// document.querySelector('body').setAttribute('style', 'overflow-x: hidden;');
   		this.checkCache();
   		// 微信分享
 	    this.shareObj.shareUrl = window.location.href;

pages/shareResult.vue

@@ -69,7 +69,7 @@
 		},
 		mounted(){
   		document.querySelector('body').setAttribute('style', 'background: "";');
-  		document.querySelector('body').setAttribute('style', 'overflow-x: hidden;');
+  		// document.querySelector('body').setAttribute('style', 'overflow-x: hidden;');
   		// 微信分享
 	   	this.shareObj.shareUrl = window.location.href;
 	    this.$picaWxShare({
@@ -108,7 +108,10 @@
 		        component_tag: `310#310002`
 		      });
 				}
-				window.location.href = 'https://android.myapp.com/myapp/detail.htm?apkName=com.picahealth.yunque&ADTAG=mobile';
+				// 延迟跳转以防埋点未发送成功页面就跳转了
+				setTimeout(()=>{
+					window.location.href = 'https://android.myapp.com/myapp/detail.htm?apkName=com.picahealth.yunque&ADTAG=mobile';
+				}, 800);
 			},
 			goLink(id){
 				let link = '';
@@ -133,7 +136,10 @@
 		        component_tag: `310#310006`
 		      });
 				}
-				window.location.href = link;
+				// 延迟跳转以防埋点未发送成功页面就跳转了
+				setTimeout(()=>{
+					window.location.href = link;
+				}, 800);
 			}
 		}
 	}

pages/yesterday-prize/index.vue

@@ -15,9 +15,9 @@
             <p class="name">{{item.name}}</p>
             <p class="grade">昨日勤奋分:<span>{{item.score}}</span></p>
           </div>
-          <p class="awards" v-if="index==0">{{firstAwards}}</p>
-          <p class="awards" v-if="1<=index&&index<=2">血压计</p>
-          <p class="awards" v-if="index>2">体温计</p>
+          <p class="awards" v-if="index==0">{{firstAwards}}*1台</p>
+          <p class="awards" v-if="1<=index&&index<=2">血压计*1支</p>
+          <p class="awards" v-if="index>2">体温计*1支</p>
         </div>
       </div>
     </div>