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/in-activity.vue

 <template>
   <div class="in-activity-wrap">
-    <div :style="{width: '375px',height: padTop + 'px'}"></div>
+    <div :style="{width: '375px',height: padTop + 'px', background: '#fff'}"></div>
     <h5header 
       v-if="!isWeb" 
       title="云鹊奖2019"