diff --git a/me/invite/cashDetail.vue b/me/invite/cashDetail.vue
index 9fa9a51..d13fa0f 100644
--- a/me/invite/cashDetail.vue
+++ b/me/invite/cashDetail.vue
@@ -19,7 +19,7 @@
- 全部
+ 全部
@@ -38,7 +38,7 @@
-->
+ style="margin: 32upx;font-size: 18px;background: #ff7581;color: white;border-radius: 10px;height: 40px;line-height: 40px;">
提现
@@ -218,8 +218,11 @@
return;
}
let shouxufei = parseFloat(that.money * that.shouxufei).toFixed(2);
- if (parseFloat(that.mayMoney).toFixed(1) >= parseFloat(that.money) + shouxufei * 1) {
- if (parseFloat(that.money).toFixed(1) >= parseFloat(cashMoney)) {
+ console.log(parseFloat(that.mayMoney))
+ console.log(parseFloat(that.money))
+ if (parseFloat(that.mayMoney).toFixed(2) >= parseFloat(that.money)) {
+ // if (parseFloat(that.mayMoney).toFixed(1) >= parseFloat(that.money) + shouxufei * 1) {
+ if (parseFloat(that.money).toFixed(2) >= parseFloat(cashMoney)) {
if (that.shouxufei > 0) {
uni.showModal({
diff --git a/me/invite/moneyList.vue b/me/invite/moneyList.vue
index 50cec56..848fcb3 100644
--- a/me/invite/moneyList.vue
+++ b/me/invite/moneyList.vue
@@ -106,7 +106,7 @@
}
.tips {
font-size: 34rpx;
- color: #5074FF;
+ color: #999999;
margin-top: 20rpx;
}
.btn {
diff --git a/pages.json b/pages.json
index 9a2586b..e355832 100644
--- a/pages.json
+++ b/pages.json
@@ -339,7 +339,7 @@
{
"path": "invite/moneyList",
"style": {
- "navigationBarTitleText": "钱包明细",
+ "navigationBarTitleText": "红包明细",
"h5": {
"titleNView": {
"backgroundColor": "#FFFFFF"
diff --git a/pages/video/video.nvue b/pages/video/video.nvue
index e45592d..b9955ca 100644
--- a/pages/video/video.nvue
+++ b/pages/video/video.nvue
@@ -9,6 +9,8 @@
@@ -164,6 +166,8 @@
'width': '750rpx',
},
isShowVideo: '',
+ playFlag: false
+
};
},
onShow() {
@@ -204,6 +208,38 @@
this.$forceUpdate()
},
methods: {
+ //播放时的回掉
+ videoPlay(videoId,courseDetailsId) {
+ this.courseDetailsId = courseDetailsId
+ if ( !this.playFlag ) {
+ this.playFlag = true
+ httpsRequest.getT('app/course/viewCourse', {
+ courseId: this.courseId,
+ courseDetailsId: courseDetailsId,
+ type: 'start'
+ }).then(res => {
+ console.log('播放开始')
+ })
+ }
+
+ },
+ //播放进度变化回掉
+ timeupdate(e) {
+
+ if (e.detail.currentTime > e.detail.duration*0.9) {
+ if ( this.playFlag) {
+ this.playFlag = false
+ httpsRequest.getT('app/course/viewCourse', {
+ courseId: this.courseId,
+ courseDetailsId: this.courseDetailsId,
+ type: 'end'
+ }).then(res => {
+ console.log('播放结束')
+ })
+ }
+ }
+
+ },
appear(e, index) {
this.current = index
this.showControls = true
diff --git a/pages/video/video.vue b/pages/video/video.vue
index 4f3230a..e2fde9a 100644
--- a/pages/video/video.vue
+++ b/pages/video/video.vue
@@ -202,6 +202,8 @@
showControls: true, //是否显示控制中心
timerCon: null,
randomNum: 0,
+ playFlag: false,
+
};
},
computed: {
@@ -323,6 +325,7 @@
if (e.id) {
this.courseId = e.id
}
+ console.log(e)
if (e.courseDetailsId) {
this.courseDetailsId = e.courseDetailsId
}
@@ -485,6 +488,18 @@
// #ifdef H5
uni.hideLoading()
// #endif
+ if (e.detail.currentTime > e.detail.duration*0.9) {
+ if ( this.playFlag) {
+ this.playFlag = false
+ this.$Request.getT('app/course/viewCourse', {
+ courseId: this.courseId,
+ courseDetailsId: this.courseDetailsId,
+ type: 'end'
+ }).then(res => {
+ console.log('播放结束')
+ })
+ }
+ }
},
//缓冲中
waiting(e) {
@@ -681,6 +696,8 @@
}
if (this.page == 1) {
let numIdCurr = this.videoList[0].courseDetailsId;
+ this.courseId = this.videoList[0].courseId
+ this.courseDetailsId = this.videoList[0].courseDetailsId;
this.videoContextId = 'myVideo' + numIdCurr;
this.$nextTick(() => {
@@ -816,6 +833,8 @@
}
}
}
+ this.courseId = this.videoList[current].courseId
+ this.courseDetailsId = this.videoList[current].courseDetailsId
//获取当前播放的视频在菜单数组中的位置
let scrollIndex = this.meunList.findIndex(ite => ite.courseDetailsId == this.videoList[current]
.courseDetailsId);
@@ -860,7 +879,14 @@
},
//在播放时候的回调
videoPlay(videoId) {
-
+ this.$Request.getT('app/course/viewCourse', {
+ courseId: this.courseId,
+ courseDetailsId: this.courseDetailsId,
+ type: 'start'
+ }).then(res => {
+ this.playFlag = true
+ console.log('播放开始')
+ })
},
//监听视频播放完成
ended() {
diff --git a/pages/video/videoIOS.nvue b/pages/video/videoIOS.nvue
index 7007480..80f1350 100644
--- a/pages/video/videoIOS.nvue
+++ b/pages/video/videoIOS.nvue
@@ -8,6 +8,8 @@
@@ -154,7 +156,9 @@
page: 1,
pages: 1,
limit: 5,
- randomNum: 0
+ randomNum: 0,
+ playFlag: false
+
};
},
watch: {
@@ -200,6 +204,38 @@
}
},
methods: {
+ //播放时的回掉
+ videoPlay(videoId,courseDetailsId) {
+ this.courseDetailsId = courseDetailsId
+ if ( !this.playFlag ) {
+ this.playFlag = true
+ httpsRequest.getT('app/course/viewCourse', {
+ courseId: this.courseId,
+ courseDetailsId: courseDetailsId,
+ type: 'start'
+ }).then(res => {
+ console.log('播放开始')
+ })
+ }
+
+ },
+ //播放进度变化回掉
+ timeupdate(e) {
+
+ if (e.detail.currentTime > e.detail.duration*0.9) {
+ if ( this.playFlag) {
+ this.playFlag = false
+ httpsRequest.getT('app/course/viewCourse', {
+ courseId: this.courseId,
+ courseDetailsId: this.courseDetailsId,
+ type: 'end'
+ }).then(res => {
+ console.log('播放结束')
+ })
+ }
+ }
+
+ },
//显示/隐藏适配控制器的回调
controlstoggles(e) {
this.showControls = e.detail.show