diff --git a/api/request.js b/api/request.js index 950802d..cd94f29 100644 --- a/api/request.js +++ b/api/request.js @@ -11,9 +11,8 @@ import {updToken} from './updateToken' // https://shuitest.shuiganying.com/api //测试地址 // wx6bd4fcc040bfa025 水感应 正式appid // wx9ae0c63d0c58caeb 测试appid 三猿 -// wx3056ec23196eaf02 水感应 测试 -// const api = "https://api.shui.shuiganying.com/api/" // 正式环境 -const api = "https://shuitest.shuiganying.com/api/" // 测试环境 +const api = "https://api.shui.shuiganying.com/api/" // 正式环境 +// const api = "https://shuitest.shuiganying.com/api/" // 测试环境 const header = { "Accept" : "application/json" } diff --git a/pages/beautify/coach.js b/pages/beautify/coach.js index be1108b..0beff44 100644 --- a/pages/beautify/coach.js +++ b/pages/beautify/coach.js @@ -105,7 +105,7 @@ Page({ stepsCount: 0, // 默认分几个步骤 currentSteps: 0, // 当前默认是第几步 currentTime: 0, // 当前总时长 - remainingTime: 0, // 播放时间 + remainingTime: '00', // 播放时间 }, videoContext: null, seeAllVideo: true, @@ -135,22 +135,21 @@ Page({ let selectVideoItem = this.data.selectVideoItem let currentTimeEnd = selectVideoItem.steps[selectVideoItem.currentSteps].endTime let { - currentTime + currentTime,duration } = e.detail if (currentTime > currentTimeEnd && selectVideoItem.currentSteps < selectVideoItem.stepsCount) { selectVideoItem.currentSteps++ + + this.videoContext.pause() + // 倒计时且有提醒 + setTimeout(() => { + this.videoContext.play() + }, 3000); } - // 第一次初始化 - // let startCountDown = selectVideoItem.steps[selectVideoItem.currentSteps].startCountDown - // if(!selectVideoItem.remainingTime &&selectVideoItem.currentSteps!=this.data.selectVideoItem.currentSteps){ - // let remainingTime=parseInt(currentTimeEnd - startCountDown) >=10 ? parseInt(currentTimeEnd -startCountDown):'0' + parseInt(currentTimeEnd -startCountDown) - // selectVideoItem.remainingTime = remainingTime - // } - // 递减 - // if (currentTime >= startCountDown) { - let remainingTime = parseInt(currentTimeEnd - currentTime) >= 10 ? parseInt(currentTimeEnd - currentTime) : '0' + parseInt(currentTimeEnd - currentTime) - selectVideoItem.remainingTime = remainingTime - // } + + let remainingTime = parseInt(duration - currentTime) >= 10 ? parseInt(duration - currentTime) : '0' + parseInt(duration - currentTime) + selectVideoItem.remainingTime = remainingTime + this.setData({ selectVideoItem: selectVideoItem }) diff --git a/pages/found/index.js b/pages/found/index.js index 217c6de..d8b310c 100644 --- a/pages/found/index.js +++ b/pages/found/index.js @@ -61,6 +61,11 @@ Page({ mask :true, duration:2000 }) + setTimeout(()=>{ + this.setData({ + loading:false + }) + },3000) }) }, onPullDownRefresh(){ diff --git a/pages/found/index.wxss b/pages/found/index.wxss index df96940..ac3d650 100644 --- a/pages/found/index.wxss +++ b/pages/found/index.wxss @@ -62,8 +62,8 @@ page { margin-right: 20rpx; margin-bottom: 20rpx; border-radius: 10rpx; - width: calc(100vw/3 - 20px); - height: calc(100vw/3 - 20px); + width: calc(100vw/3 - 34px); + height: calc(100vw/3 - 34px); } .cont-img-list2{ @@ -78,8 +78,8 @@ page { margin-right: 20rpx; margin-bottom: 20rpx; border-radius: 10rpx; - width: calc(100vw/2.2 - 20px); - height: calc(100vw/2.2 - 20px); + width: calc(100vw/2.2 - 30px); + height: calc(100vw/2.2 - 30px); } .cont-video{ diff --git a/project.config.json b/project.config.json index 67c8bdf..8f1fe4c 100644 --- a/project.config.json +++ b/project.config.json @@ -48,5 +48,5 @@ "ignore": [], "include": [] }, - "appid": "wx9ae0c63d0c58caeb" + "appid": "wx6bd4fcc040bfa025" } \ No newline at end of file