Merge branch 'dev-stage2-20191125' into release

pages/invite-details/index.vue

@@ -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)}}
@@ -48,11 +48,11 @@
       <div class="record-details" :style="{marginBottom: `${50+homeIndicatorHeight}Px`}">
         <div class="tab-nav">
           <div class="item left-item" :class="{activeItem:recordType==1}" @click="changeRecordType">
-            领取记录
+            领取课程的好友
             <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>