diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index a814c8a..576f2b0 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,7 +2,7 @@ "version" : "1.0", "configurations" : [ { - "playground" : "standard", + "playground" : "custom", "type" : "uni-app:app-android" }, { diff --git a/commons/config.js b/commons/config.js index e11ef6d..bf78f27 100644 --- a/commons/config.js +++ b/commons/config.js @@ -1,6 +1,6 @@ //打包时修改env的值即可 -const env='test' //test , production,local +const env='production' //test , production,local export const encryptKey='1234567890123456' // http数据加解密的key diff --git a/manifest.json b/manifest.json index e0574b7..57905e9 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "斯耀短剧", "appid" : "__UNI__E0B05B1", "description" : "", - "versionName" : "1.2.5", - "versionCode" : 125, + "versionName" : "1.2.6", + "versionCode" : 126, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/video/detail.nvue b/pages/video/detail.nvue index 05f2911..797e43f 100644 --- a/pages/video/detail.nvue +++ b/pages/video/detail.nvue @@ -40,20 +40,25 @@ title: '' }) const refVideoList = ref(null) + async function getDetail(){ + const res = await Api.getVideoDetail(options) + isFirstLoad = false + Object.assign(state, res) + state.list = res.list + } + async function init() { /** * 如果是安卓則不做操作,如果是ios判斷是否審核,不審核不套裝 */ // 是否审核,是否ios if ($common.isIosExamine) { - const res = await Api.getVideoDetail(options) - isFirstLoad = false - Object.assign(state, res) - state.list = res.list + getDetail() } else { // ios是否登錄 ? console.log(uni.getStorageSync('tokenTwo'),'提送hi') if (uni.getStorageSync('tokenTwo')) { + console.log('--------') const res = await Api.getVideoDetail({...options,token:uni.getStorageSync('tokenTwo')}) isFirstLoad = false Object.assign(state, res) @@ -64,7 +69,7 @@ phone: '18681817128' }) uni.setStorageSync('tokenTwo', res.token) - init() + getDetail() } @@ -108,19 +113,22 @@ }) {} onShow(async () => { + console.log(isFirstLoad) if (!isFirstLoad) { - await init() + await getDetail() refVideoList.value.videoListUpdata() const drawRes = await Api.getDrawCount() console.log(drawRes); const nobuyCourseId = uni.getStorageSync('nobuyCourseId') - const item = state.list.find(v => v.courseId == nobuyCourseId) + const item = state.list.find(v => v.courseDetailsId == nobuyCourseId) + console.log(item) uni.removeStorageSync('nobuyCourseId') if (item) { if (drawRes.count * 1 > 0 && nobuyCourseId !== null && nobuyCourseId !== undefined && item .videoUrl) { + console.log('跳转抽奖') uni.navigateTo({ - url: '/pages/me/prizeDraw' + url: '/pages/index/prizeDraw/kevy-luckydraw' }) } }