Merge remote-tracking branch 'origin/dev-stage2-20191125' into dev-stage2-20191125

pages/activityPage.vue

@@ -255,7 +255,7 @@
           { date: '12月16至19日', beginDate: '2019/12/16 00:00:00', endDate: '2019/12/19 23:59:59', title: '高血压学习', award: '小米电视' },
           { date: '12月20至23日', beginDate: '2019/12/20 00:00:00', endDate: '2019/12/23 23:59:59', title: '糖尿病学习', award: '米家洗衣机' },
           { date: '12月24至26日', beginDate: '2019/12/24 00:00:00', endDate: '2019/12/26 23:59:59', title: '中医学习', award: '米家两门冰箱' },
-          { date: '12月27至29日', beginDate: '2019/12/27 00:00:00', endDate: '2019/12/29 23:59:59', title: '全科学习', award: '荣耀Play3手机' },
+          { date: '12月27至29日', beginDate: '2019/12/27 00:00:00', endDate: '2019/12/29 23:59:59', title: '全科学习', award: '荣耀手机' },
         ],
         awardList: {
           No1: '',
@@ -351,7 +351,7 @@
       vm.getServerTime();
       // 请求接口获取activityId (经与后端产品确认，默认没传id的话，就取接口；默认有的话就不取接口)
       vm.handleGetActivityId();
-      vm.returnScoreAwardTips();   //返回 个人信息模块下面的提示文案
+      // vm.returnScoreAwardTips();   //返回 个人信息模块下面的提示文案
 
       vm.$rocNative.appInit();
       vm.getUserInfo();   // 判断是否登录

pages/person-ranking/index.vue

@@ -130,9 +130,9 @@
         } else if(rankData.targetRank == 1) {
           this.rankAwards = `再获${rankData.targetRequiredScore}分即可上升到第1名并可获得${getFirstAwards(firstTime)}`;
         } else if(rankData.targetRank == 3) {
-          this.rankAwards = `再获${rankData.targetRequiredScore}分即可上升到第3名并可获得血压计`;
+          this.rankAwards = `再获${rankData.targetRequiredScore}分即可上升到第3名并可获得欧姆龙血压计`;
         } else if(rankData.targetRank == 10) {
-          this.rankAwards = `再获${rankData.targetRequiredScore}分即可上升到第10名并可获得体温计`;
+          this.rankAwards = `再获${rankData.targetRequiredScore}分即可上升到第10名并可获得欧姆龙体温计`;
         }
       },
       getTodayRankingList() {

pages/yesterday-prize/index.vue

@@ -15,9 +15,9 @@
             <p class="name">{{item.name}}</p>
             <p class="grade">昨日勤奋分:<span>{{item.score}}</span></p>
           </div>
-          <p class="awards" v-if="index==0">{{firstAwards}}1台</p>
-          <p class="awards" v-if="1<=index&&index<=2">血压计1支</p>
-          <p class="awards" v-if="index>2">体温计1支</p>
+          <p class="awards" v-if="index==0">{{firstAwards}}*1台</p>
+          <p class="awards" v-if="1<=index&&index<=2">血压计*1支</p>
+          <p class="awards" v-if="index>2">体温计*1支</p>
         </div>
       </div>
     </div>

service/activityMainpage.js

@@ -28,7 +28,7 @@ export const getBEServerTime = () => {
 // 获取已邀请的医生列表
 export const getInviteList = () => {
 	return request({
-    url: `campaign/inviteDetail/oneList?pageNo=1&pageSize=4`,
+    url: `campaign/inviteDetail/initList?pageNo=1&pageSize=4`,   // new
     method: 'get',
     withCredentials: true,
     // headers: {

utils/index.js

@@ -193,7 +193,7 @@ export const getFirstAwards = (awardsDate) => {
   } else if (Date.parse(new Date(('2019-12-24 00:00:00').replace(/-/g, "/")))<=awardsTime&&Date.parse(new Date(('2019-12-26 23:59:59').replace(/-/g, "/")))>=awardsTime) {
     return '米家两门冰箱';
   } else if (Date.parse(new Date(('2019-12-27 00:00:00').replace(/-/g, "/")))<=awardsTime/*&&Date.parse(new Date('2019-12-29 23:59:59'))>=awardsTime*/) {
-    return '荣耀play3手机';
+    return '荣耀手机';
   };
 }