diff --git a/common/config.js b/common/config.js index 73a8e9c..d614bd8 100644 --- a/common/config.js +++ b/common/config.js @@ -1,10 +1,10 @@ -// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; // -// const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名 -// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 +const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; // +const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名 +const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 -const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; // -const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名 -const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 +// const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; // +// const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名 +// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 module.exports = { APIHOST: ROOTPATH, diff --git a/me/choujiang/choujiang.vue b/me/choujiang/choujiang.vue index ccc8215..56de1af 100644 --- a/me/choujiang/choujiang.vue +++ b/me/choujiang/choujiang.vue @@ -421,7 +421,7 @@ console.warn('###当前处于模拟的请求接口,并返回了中奖信息###') const res = await this.$Request.getT('app/discSpinning/draw') this.freeNum-- - this.getCount() + // this.getCount() console.log(res); if (res.code != 0) { return uni.showToast({ @@ -531,7 +531,7 @@ } }, lingquClose(){ - this.getCount() + // this.getCount() this.getRedPack() }, showLingPop(data){ diff --git a/me/detail/detail.nvue b/me/detail/detail.nvue index 8dc048b..ba0bae2 100644 --- a/me/detail/detail.nvue +++ b/me/detail/detail.nvue @@ -552,7 +552,6 @@ }, //播放进度变化回掉 timeupdate(e) { - if (e.detail.currentTime > e.detail.duration*0.9) { if ( this.playFlag) { this.playFlag = false @@ -568,6 +567,7 @@ }, appear(e, index) { + this.courseDetailsId = e this.current = index this.showControls = true this.isShowVideo = e @@ -586,10 +586,15 @@ this.videoContext.stop(); this.videoContext = null; } - let numIdCurr = this.videoList[index-1].courseDetailsId; - if (this.videoList[index-1].videoUrl) { //已经购买可直接播放 + if ( this.current > index) { + index = index+1 + } else { + index = index-1 + } + let numIdCurr = this.videoList[index].courseDetailsId; + if (this.videoList[index].videoUrl) { //已经购买可直接播放 // 播放时记录当前播放的id - this.appear(numIdCurr,index-1) + this.appear(numIdCurr,index) this.videoContextId = 'myVideo' + numIdCurr; this.videoContext = uni.createVideoContext(this.videoContextId, this); console.log('走更新了') @@ -1234,18 +1239,19 @@ this.goListPosition(this.videoList[indexs].courseDetailsId) } console.log('this.noBuyVideoIndex',this.noBuyVideoIndex) - if(this.noBuyVideoIndex!==null){ - uni.navigateTo({ - url:'/me/choujiang/choujiang' - }) - } + if (this.videoList[indexss].videoUrl) { //有播放权限 + let numIdCurr = this.videoList[indexss].courseDetailsId; this.videoContextId = 'myVideo' + numIdCurr; this.videoContext = uni.createVideoContext(this .videoContextId, this); - if(this.noBuyVideoIndex!=null){ + if(this.noBuyVideoIndex!=null&&this.videoList[this.noBuyVideoIndex].videoUrl){ + this.videoContext.stop(); + uni.navigateTo({ + url:'/me/choujiang/choujiang' + }) this.noBuyVideoIndex=null }else{ this.videoContext.play(); diff --git a/me/detail/detailIOS.nvue b/me/detail/detailIOS.nvue index 48fdfe3..13d506b 100644 --- a/me/detail/detailIOS.nvue +++ b/me/detail/detailIOS.nvue @@ -352,7 +352,7 @@ zongPrice: 0, //整部价格 countPrice: 0, //单集价格 wallCurr: 0, - wallet: [], + wallet: [],· productId: '', //默认苹果内购商品ID productIds: ['sixzuan', 'shierzuan'], //苹果内购商品 openLists: [], diff --git a/pages/me/index.vue b/pages/me/index.vue index 57b1c6b..af30138 100644 --- a/pages/me/index.vue +++ b/pages/me/index.vue @@ -92,9 +92,9 @@ 金币余额 - + @@ -265,7 +265,7 @@ backgroundImage: 'linear-gradient(to right, #FFE5EA 0%, #E4F5FB 49%, #FFF0EE 100%)' }, kami: '', //卡密 - isShoMoney: false, //是否显示余额 + isShoMoney: true, //是否显示余额 avatar: '../../static/images/logo.png', img: '../../static/images/me/huiyuan.png', swiperList: [{