解决合并冲突

pages/in-activity.vue

@@ -202,7 +202,7 @@
     </div>
 
     <!-- 活动结束 弹窗-->
-    <div v-if="activityEndVisible" class="toast-wrap" @touchmove.prevent>
+    <div v-if="!awardModalShow && activityEndVisible" class="toast-wrap" @touchmove.prevent>
       <div class="full-screen-mask"></div>
       <div class="content-wrap activity-end">
         <p class="content-text">本次活动已结束，感谢您的参与，最终获奖排名将于12月30日10点公布，届时查看</p>
@@ -223,7 +223,7 @@
   import { getShareUrl } from '@/utils/index';
   import { Toast } from 'vant';
   import { setEventByModuleCode, getFirstAwards } from '@/utils';
-
+  import { ENV_CONFIG } from '@/utils/enumerate';
   const cookies = require('cookie-universal')();
 
 
@@ -302,7 +302,7 @@
         },
         isWeb: false,
         shareObj: {
-          // shareUrl: `https://${location.host}/year_end_ssr/shareActive?id=iRHw8t/pzgUM6TWi8UONRA==&taskId=1&activityId=1`,
+          shareUrl: `${ENV_CONFIG[process.env.NUXT_ENV_APP].shareUrl}year_end_ssr/shareActive?id=iRHw8t/pzgUM6TWi8UONRA==&taskId=1&activityId=1`,
           title1: '分享title分享title',
           title2: '分享desc分享desc',
           shareImageUrl: 'https://file.yunqueyi.com/h5/nzhd19/share.png'
@@ -351,12 +351,11 @@
     },
     created() {
       vm = this;
-      
     },
     mounted() {
       // 这里需要删掉！！！
-      // vm.getTasks();
       vm.getUserActivityInfo();
+      vm.getTasks();
       // 这里需要删掉！！！
       vm.isWeb = vm.$rocNative.isWeb;