Merge remote-tracking branch 'origin/release' into release

pages/activityPage.vue

@@ -92,7 +92,7 @@
         <img src="../assets/img/stage-two/invite-btn.png" alt="" class="invite-btn">
         <p @click="handleInviteClick" class="text">去邀请</p>
       </div>
-      <div class="login-tips">被邀请好友登录APP，收益X9倍</div>
+      <div class="login-tips">被邀请好友登录APP并参与活动，收益X9倍</div>
     </div>
 
     <!-- 每日任务 -->
@@ -241,7 +241,7 @@
         showAwadModal: true, // 根据活动时间是否展示中奖弹层以及查看昨日榜单逻辑
         yestodayAwards: '', // 昨日可获得
         token: '',
-        activityId: '',    // 上线前等产品通知修改默认值
+        activityId: '1',    // 上线前等产品通知修改默认值
         scoreAwardTips: '',
         encryptId: '',    // 加密后的id，（分享传参用）
         serverTime: '',

pages/invite-details/index.vue

@@ -24,7 +24,7 @@
             <div class="bubble_diailog marginTop16">
               <i class="l"></i>
               <b class="l"></b>
-              <p class="text">输入手机号领取课程</p>
+              <p class="text">医生好友输入手机号领取课程</p>
               <p class="awards">
                 <span v-for="(item, index) in dealJsonData(this.node1)" :key="index">
                   +{{item.rewardQuantity}}{{changeAwardsName(item.rewardType)}}
@@ -34,7 +34,7 @@
             <div class="bubble_diailog marginTop20">
               <i class="l"></i>
               <b class="l"></b>
-              <p class="text">使用手机号登录云鹊医APP</p>
+              <p class="text">医生好友登录云鹊医APP并参与活动</p>
               <p class="awards">
                 <span v-for="(item, index) in dealJsonData(this.node2)" :key="index">
                   +{{item.rewardQuantity}}{{changeAwardsName(item.rewardType)}}
@@ -52,7 +52,7 @@
             <p class="active-line" v-if="recordType==1"></p>
           </div>
           <div class="item right-item" :class="{activeItem:recordType==2}" @click="changeRecordType">
-            登录APP的好友
+            参与活动的好友
             <p class="active-line" v-if="recordType==2"></p>
           </div>
         </div>
@@ -60,7 +60,7 @@
           <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>
+            <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"
@@ -116,7 +116,7 @@
         title: '邀请明细',
         inviteList: [],
         recordTotal: 0,
-        recordType: 1,
+        recordType: 1,//1课程，2登录
         busy: true, //分页参数--start
         pageNo: 0,
         pageSize: 10,