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

@@ -396,7 +396,7 @@
               vm.scoreAwardTips = '';
               let userDayRank = vm.doctorInfo.userDayRank;
               if( userDayRank == 0 ){
-                vm.scoreAwardTips = '';
+                vm.scoreAwardTips = `再获${vm.doctorInfo.targetRequiredScore}分即可上升到第${vm.doctorInfo.targetRank}名并可获得${vm.awardList.No10}`;
               }else if( userDayRank == 1 ){
                 vm.scoreAwardTips = `今日保持第1名，即可获得${vm.awardList.No1}`;
               }else{

pages/prehot.vue

@@ -152,7 +152,7 @@ export default {
     // 微信分享
     this.$picaWxShare({
       type: (process.env.NUXT_ENV_APP != 'prod') ? 15 : '',
-      authUrl: wxShare.shareUrl
+      authUrl: this.shareObj.shareUrl
     },(wx)=>{
       const title = this.shareObj.title1;
       const desc = this.shareObj.title2;