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/invite-details/index.vue

@@ -56,8 +56,13 @@
             <p class="active-line" v-if="recordType==2"></p>
           </div>
         </div>
-        <div class="record-list" v-if="inviteList.length" >
-          <p class="sum">共{{recordTotal}}人</p>
+        <div class="record-list" >
+          <div class="no-data" v-if="!inviteList.length" >
+            <img src="~/assets/img/icon-nodata.png" alt="">
+            <p v-if="recordType==1">提醒您的医生好友领取课程您将获得奖励哦！</p>
+            <p v-if="recordType==2" class="text-get">提醒您的医生好友领取课程后登录云鹊医APP您将再获得奖励哦！</p>
+          </div>
+          <p class="sum" v-if="inviteList.length">共{{recordTotal}}人</p>
           <div class="loadMore" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy"
                infinite-scroll-distance="10">
             <div class="record-item" v-if="inviteList.length" v-for="item in inviteList">
@@ -81,11 +86,7 @@
           </div>
 
         </div>
-        <div class="no-data" v-if="!inviteList.length" >
-          <img src="~/assets/img/icon-nodata.png" alt="">
-          <p v-if="recordType==1">提醒您的医生好友领取课程您将获得奖励哦！</p>
-          <p v-if="recordType==2" class="text-get">提醒您的医生好友领取课程后登录云鹊医APP您将再获得奖励哦！</p>
-        </div>
+
       </div>
     </div>
     <footer-button

utils/index.js

@@ -186,7 +186,7 @@ function getUrlParmByCode(paramList, token) {
 
 export const getFirstAwards = (awardsDate) => {
   const awardsTime = Date.parse(new Date(awardsDate.replace(/-/g, "/")))
-  if (/*Date.parse(new Date('2019-12-16 00:00:00'))<=awardsTime&&*/Date.parse(new Date(('2019-12-19 23:59:59').replace(/-/g, "/")))>=awardsTime) {
+  if (Date.parse(new Date(('2019-12-16 00:00:00').replace(/-/g, "/")))<=awardsTime&&Date.parse(new Date(('2019-12-19 23:59:59').replace(/-/g, "/")))>=awardsTime) {
     return '小米电视';
   } else if (Date.parse(new Date(('2019-12-20 00:00:00').replace(/-/g, "/")))<=awardsTime&&Date.parse(new Date(('2019-12-23 23:59:59').replace(/-/g, "/")))>=awardsTime) {
     return '米家洗衣机';