zhangjing/sgy-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge..

Browse Source
This commit is contained in:
张冬雪
2023-11-17 16:11:55 +08:00
parent e594b340e5
commit 9051ddace1
5 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/request.js
View File

@@ -11,9 +11,8 @@ import {updToken} from './updateToken'
// https://shuitest.shuiganying.com/api //测试地址 // https://shuitest.shuiganying.com/api //测试地址
// wx6bd4fcc040bfa025 水感应 正式appid // wx6bd4fcc040bfa025 水感应 正式appid
// wx9ae0c63d0c58caeb 测试appid 三猿 // wx9ae0c63d0c58caeb 测试appid 三猿
// wx3056ec23196eaf02 水感应 测试 const api = "https://api.shui.shuiganying.com/api/" // 正式环境
// const api = "https://api.shui.shuiganying.com/api/" // 正式环境 // const api = "https://shuitest.shuiganying.com/api/" // 测试环境
const api = "https://shuitest.shuiganying.com/api/" // 测试环境
const header = { const header = {
"Accept" : "application/json" "Accept" : "application/json"
} }

25
pages/beautify/coach.js
View File

@@ -105,7 +105,7 @@ Page({
stepsCount: 0, // 默认分几个步骤 stepsCount: 0, // 默认分几个步骤
currentSteps: 0, // 当前默认是第几步 currentSteps: 0, // 当前默认是第几步
currentTime: 0, // 当前总时长 currentTime: 0, // 当前总时长
remainingTime: 0, // 播放时间 remainingTime: '00', // 播放时间
}, },
videoContext: null, videoContext: null,
seeAllVideo: true, seeAllVideo: true,
@@ -135,22 +135,21 @@ Page({
let selectVideoItem = this.data.selectVideoItem let selectVideoItem = this.data.selectVideoItem
let currentTimeEnd = selectVideoItem.steps[selectVideoItem.currentSteps].endTime let currentTimeEnd = selectVideoItem.steps[selectVideoItem.currentSteps].endTime
let { let {
currentTime currentTime,duration
} = e.detail } = e.detail
if (currentTime > currentTimeEnd && selectVideoItem.currentSteps < selectVideoItem.stepsCount) { if (currentTime > currentTimeEnd && selectVideoItem.currentSteps < selectVideoItem.stepsCount) {
selectVideoItem.currentSteps++ selectVideoItem.currentSteps++
this.videoContext.pause()
// 倒计时且有提醒
setTimeout(() => {
this.videoContext.play()
}, 3000);
} }
// 第一次初始化
// let startCountDown = selectVideoItem.steps[selectVideoItem.currentSteps].startCountDown let remainingTime = parseInt(duration - currentTime) >= 10 ? parseInt(duration - currentTime) : '0' + parseInt(duration - currentTime)
// if(!selectVideoItem.remainingTime &&selectVideoItem.currentSteps!=this.data.selectVideoItem.currentSteps){ selectVideoItem.remainingTime = remainingTime
// 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
// }
this.setData({ this.setData({
selectVideoItem: selectVideoItem selectVideoItem: selectVideoItem
}) })

5
pages/found/index.js
View File

@@ -61,6 +61,11 @@ Page({
mask :true, mask :true,
duration:2000 duration:2000
}) })
setTimeout(()=>{
this.setData({
loading:false
})
},3000)
}) })
}, },
onPullDownRefresh(){ onPullDownRefresh(){

8
pages/found/index.wxss
View File

@@ -62,8 +62,8 @@ page {
margin-right: 20rpx; margin-right: 20rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
width: calc(100vw/3 - 20px); width: calc(100vw/3 - 34px);
height: calc(100vw/3 - 20px); height: calc(100vw/3 - 34px);
} }
.cont-img-list2{ .cont-img-list2{
@@ -78,8 +78,8 @@ page {
margin-right: 20rpx; margin-right: 20rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
width: calc(100vw/2.2 - 20px); width: calc(100vw/2.2 - 30px);
height: calc(100vw/2.2 - 20px); height: calc(100vw/2.2 - 30px);
} }
.cont-video{ .cont-video{

2
project.config.json
View File

@@ -48,5 +48,5 @@
"ignore": [], "ignore": [],
"include": [] "include": []
}, },
"appid": "wx9ae0c63d0c58caeb" "appid": "wx6bd4fcc040bfa025"
} }