活动主页面合并解决

components/h5header/index.vue

@@ -19,6 +19,10 @@
 	export default {
     name: 'h5header',
     props: {
+      isOpacity: { // 是否需要透明背景
+        type: Boolean,
+        default: true
+      },
     	scrollVal: { // 实际滚动的距离
     		type: Number,
     		default: 25
@@ -60,6 +64,7 @@
     	}
     },
     mounted(){
+      this.isScroll = !this.isOpacity;
   		this.setHeaderHeight();
   		if(!this.setedScroll){
   			this.scrollHandleOwn();
@@ -68,7 +73,13 @@
     watch: {
     	scrollVal(val){
     		this.setScrollHandle(val);
-    	}
+    	},
+      isScroll(val){
+        if(val){
+          this.leftIcon = leftimg2;
+          this.rightIcon = rightimg2;
+        }
+      }
     },
     methods: {
     	// 从APP获取电池栏高度并设置高度
@@ -83,6 +94,7 @@
 	        	this.bgColor = '#ccc';
 	          this.statusBarHeight = res.statusBarHeight / dpr;
 	        }
+          this.$emit('getHeaderHeight', this.statusBarHeight + 44);
 	    	})
     	},
     	goBack(){

pages/hospital-ranking/index.vue

@@ -23,8 +23,8 @@
           </div>
         </div>
         <div class="not-join" v-else>
-          <div class="con main-name">您还未参加活动</div>
-          <div class="con details">赶快参与活动赢每日奖品</div>
+          <div class="con main-name">{{hospitalRanking.name}}</div>
+          <div class="con details">您的机构还未参与活动</div>
         </div>
       </div>
       <div class="info info-doctor" v-else>

pages/in-activity.vue

 <template>
-  <div class="in-activity-wrap">
+  <div class="in-activity-wrap" :style="{paddingTop: padTop + 'px'}">
     <h5header 
       v-if="!isWeb" 
       title="云鹊奖2019" 
-      :baseShowHeight="25" 
+      :baseShowHeight="0" 
+      :isOpacity="false"
       :shareObj="shareObj"
       :isCheckAuth="true" 
       @checkAuth="handleLoginCheck"
+      @getHeaderHeight="getHeaderHeight"
     />
     <!-- 顶部的四个阶段 进度条 -->
     <ul class="top-process-bar">
@@ -284,7 +286,8 @@
           id: '',
         },
         isWeb: false,
-        shareObj: {}
+        shareObj: {},
+        padTop: 0
       }
     },
     components: {
@@ -449,8 +452,8 @@
       },
       getUserActivityInfo() {  // 获取用户及参加活动的具体信息
         getUserScoreInfo().then(res => {
-          alert('获取用户及分数信息。。。');
-          alert(JSON.stringify(res));
+          // alert('获取用户及分数信息。。。');
+          // alert(JSON.stringify(res));
           vm.doctorInfo = res.data;
         });
       },
@@ -851,6 +854,7 @@
         }
         return text;
       },
+<<<<<<< HEAD
 
       async jumpPage(url, id) {
         const _this = this;
@@ -926,6 +930,11 @@
         }
       },
 
+=======
+      getHeaderHeight(val){
+        this.padTop = val;
+      },
+>>>>>>> c333d6d43d0751c36d403ffb7f9896282838b121
     },  
   }
 </script>>

pages/person-detail/index.vue

@@ -6,7 +6,7 @@
     </normal-header>
     <div class="info-container" :style="{ marginTop: `${44+statusBarHeight}Px`}">
       <div class="info">
-        <img src="https://file.yunqueyi.com/jpg/2019/01/30/1548836156602-019ADC3F.jpg" alt="">
+        <img :src="avatarImageUrl" alt="">
         <div class="content">
           <p class="item">
             <span class="label">累计排名</span>
@@ -31,7 +31,7 @@
       <div class="detail-list" v-if="personDetails.length" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="10">
         <div class="item" v-for="item in personDetails">
           <div class="left">
-            <img :src="detailTaskIcon(item.taskName)" alt="">
+            <img :src="detailTaskIcon(item.resourceType)" alt="">
           </div>
           <div class="right">
             <div class="r-left">
@@ -77,7 +77,8 @@
         busy: true, //分页参数--start
         pageNo: 0,
         noMore: false,//分页参数--end
-        userRank: null
+        userRank: null,
+        avatarImageUrl: ''
       };
     },
     computed: {
@@ -91,16 +92,16 @@
       goInActivity() {
         this.$router.push('/in-activity')
       },
-      detailTaskIcon(taskName) {
-        if(taskName == 'SMO') {
+      detailTaskIcon(taskType) {
+        if(taskType == 4) { //smo
           return require('../../assets/img/task-icon/smo-icon.png')
-        } else if(taskName == '课程') {
+        } else if(taskType == 1) { //课程
           return require('../../assets/img/task-icon/lesson-icon.png')
-        } else if(taskName == '打卡') {
+        } else if(taskType == 6) { //打卡
           return require('../../assets/img/task-icon/daily-clock-icon.png')
-        } else if(taskName == '邀请') {
+        } else if(taskType == 7) { //邀请
           return require('../../assets/img/task-icon/invite-icon.png')
-        } else if(taskName == '邀请') {
+        } else if(taskType == 0) { //机构
           return require('../../assets/img/task-icon/ranking-icon.png')
         }
       },
@@ -123,7 +124,8 @@
         }).then(res => {
           console.log(res)
           if(res.code == '000000') {
-            this.userRank = res.data.userRank
+            this.userRank = res.data.userRank;
+            this.avatarImageUrl = res.data.avatarImageUrl;
             if(res.data.personDetails) {
               if(this.pageNo ==1) {
                 this.personDetails = res.data.personalDetails

pages/person-ranking/index.vue

@@ -26,7 +26,7 @@
             <div class="con main-name">您还未参加活动</div>
             <div class="con details">赶快参与活动赢每日奖品</div>
           </div>
-          <p class="text" v-if="activeBtnType&&rankData.score">再获得{{rankData.targetRequiredScore}}分即可上升到前{{rankData.targetRank}}名并可获得iPhone手机</p>
+          <p class="text" v-if="activeBtnType&&rankData.score">再获得{{rankData.targetRequiredScore}}分即可上升到前{{rankData.targetRank}}名并可获得{{firstAwards}}</p>
         </div>
       </div>
     </div>
@@ -59,6 +59,7 @@
   import FooterButton from '@/components/footer-button';
 
   import { getTodayUserRanking, getAllUserRanking} from '@/service/detailsAndRanking'
+  import { getFirstAwards } from '@/utils'
   export default {
     name: 'person-ranking',
     components: {
@@ -70,14 +71,16 @@
         showPop: false,
         title: '个人明细',
         rankData: {},
-        rightBtn: '昨日获奖',
+        rightBtn: '',
         headBtn: {
           leftName: '今日排行榜',
           rightName: '累计排行榜'
         },
         activeBtnType: true, //true今日，false累计
         btnText: '获得更多勤奋分',
-        btnType: true
+        btnType: true,
+        firstAwards: '',
+        todayDate: ''
       };
     },
     computed: {
@@ -86,6 +89,15 @@
     mounted() {
       this.getData();
     },
+    watch: {
+      todayDate(val) {
+        if(Date.parse(new Date(val))<=Date.parse(new Date('2019-12-16 23:59:59'))) {
+          this.rightBtn = ''
+        } else {
+          this.rightBtn = '昨日获奖'
+        }
+      }
+    },
     methods: {
       changeRanking() {
         this.activeBtnType = !this.activeBtnType
@@ -116,6 +128,8 @@
         getTodayUserRanking().then(res => {
           if(res.code == '000000') {
             this.rankData = res.data;
+            this.firstAwards = getFirstAwards(res.data.todayDate);
+            this.todayDate = res.data.todayDate;
             if(this.rankData.score) {
               this.btnText = '获得更多勤奋分'
             } else {

pages/yesterday-prize/index.vue

@@ -15,7 +15,9 @@
             <p class="name">{{item.name}}</p>
             <p class="grade">昨日勤奋分:<span>{{item.score}}</span></p>
           </div>
-          <p class="awards">{{index==0?'小米电视机1台':'温度计'}}</p>
+          <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>
         </div>
       </div>
     </div>
@@ -31,6 +33,8 @@
   import FooterButton from '@/components/footer-button';
 
   import { getYesterdayRanking } from '@/service/detailsAndRanking'
+
+  import { getFirstAwards } from '@/utils'
   export default {
     name: "index",
     components: {
@@ -44,11 +48,14 @@
         rightText: '如何领奖',
         rewardsList: [],
         btnText: '今日我要拿奖',
-        btnType: true
+        btnType: true,
+        yesterdayDate: '',
+        firstAwards: ''
       };
     },
     mounted() {
       this.getRewardList();
+
     },
     methods: {
       dealRankIcon(index) {
@@ -64,6 +71,8 @@
         getYesterdayRanking().then(res => {
           if(res.code == '000000') {
             this.rewardsList = res.data.topRankList;
+            this.yesterdayDate = res.data.yesterdayDate;
+            this.firstAwards = getFirstAwards(this.yesterdayDate);
           }
         })
       }

utils/index.js

@@ -184,6 +184,19 @@ function getUrlParmByCode(paramList, token) {
   return `${str}token=${token}`;
 }
 
+export const getFirstAwards = (awardsDate) => {
+  const awardsTime = Date.parse(new Date(awardsDate))
+  if (/*Date.parse(new Date('2019-12-16 00:00:00'))<=awardsTime&&*/Date.parse(new Date('2019-12-19 23:59:59'))>=awardsTime) {
+    return '小米电视';
+  } else if (Date.parse(new Date('2019-12-20 00:00:00'))<=awardsTime&&Date.parse(new Date('2019-12-23 23:59:59'))>=awardsTime) {
+    return '米家洗衣机';
+  } else if (Date.parse(new Date('2019-12-24 00:00:00'))<=awardsTime&&Date.parse(new Date('2019-12-26 23:59:59'))>=awardsTime) {
+    return '米家两门冰箱';
+  } else if (Date.parse(new Date('2019-12-27 00:00:00'))<=awardsTime/*&&Date.parse(new Date('2019-12-29 23:59:59'))>=awardsTime*/) {
+    return '荣耀play3';
+  };
+}
+
 // 根据不同环境获取topic的URL
 // export function getTopicUrl() {
 //   return getConfigByEvtType('topicUrl')