提交 f1a45fff 编写于 作者: Yuanzhao.dai's avatar Yuanzhao.dai

Merge branch 'dev-stage2-20191125' into release

...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<div class="bubble_diailog marginTop16"> <div class="bubble_diailog marginTop16">
<i class="l"></i> <i class="l"></i>
<b class="l"></b> <b class="l"></b>
<p class="text">输入手机号领取课程</p> <p class="text">医生好友输入手机号领取课程</p>
<p class="awards"> <p class="awards">
<span v-for="(item, index) in dealJsonData(this.node1)" :key="index"> <span v-for="(item, index) in dealJsonData(this.node1)" :key="index">
+{{item.rewardQuantity}}{{changeAwardsName(item.rewardType)}} +{{item.rewardQuantity}}{{changeAwardsName(item.rewardType)}}
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<div class="bubble_diailog marginTop20"> <div class="bubble_diailog marginTop20">
<i class="l"></i> <i class="l"></i>
<b class="l"></b> <b class="l"></b>
<p class="text">使用手机号登录云鹊医APP</p> <p class="text">医生好友登录云鹊医APP并参与活动</p>
<p class="awards"> <p class="awards">
<span v-for="(item, index) in dealJsonData(this.node2)" :key="index"> <span v-for="(item, index) in dealJsonData(this.node2)" :key="index">
+{{item.rewardQuantity}}{{changeAwardsName(item.rewardType)}} +{{item.rewardQuantity}}{{changeAwardsName(item.rewardType)}}
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<p class="active-line" v-if="recordType==1"></p> <p class="active-line" v-if="recordType==1"></p>
</div> </div>
<div class="item right-item" :class="{activeItem:recordType==2}" @click="changeRecordType"> <div class="item right-item" :class="{activeItem:recordType==2}" @click="changeRecordType">
登录APP的好友 参与活动的好友
<p class="active-line" v-if="recordType==2"></p> <p class="active-line" v-if="recordType==2"></p>
</div> </div>
</div> </div>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<div class="no-data" v-if="!inviteList.length" > <div class="no-data" v-if="!inviteList.length" >
<img src="~/assets/img/icon-nodata.png" alt=""> <img src="~/assets/img/icon-nodata.png" alt="">
<p v-if="recordType==1">提醒您的医生好友领取课程您将获得奖励哦!</p> <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> </div>
<p class="sum" v-if="inviteList.length">{{recordTotal}}</p> <p class="sum" v-if="inviteList.length">{{recordTotal}}</p>
<div class="loadMore" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" <div class="loadMore" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy"
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
title: '邀请明细', title: '邀请明细',
inviteList: [], inviteList: [],
recordTotal: 0, recordTotal: 0,
recordType: 1, recordType: 1,//1课程,2登录
busy: true, //分页参数--start busy: true, //分页参数--start
pageNo: 0, pageNo: 0,
pageSize: 10, pageSize: 10,
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册