diff --git a/manifest.json b/manifest.json index 3a9e019..7a934ef 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ }, "usingComponents" : true, "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, + "compilerVersion" : 4, "splashscreen" : { "alwaysShowBeforeRender" : true, "waiting" : true, @@ -57,8 +57,8 @@ "" ], "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], - "minSdkVersion" : 26, - "targetSdkVersion" : 28, + "minSdkVersion" : 28, + "targetSdkVersion" : 33, "schemes" : "com.hnsiyao.duanju" }, /* ios打包配置 */ @@ -165,10 +165,18 @@ "title" : "斯耀短剧", "domain" : "https://jiaoyu.xianmxkj.com", "router" : { - "mode" : "history" - } + "mode" : "history", + "cache" : { + "use" : true, + "maxAge" : "86400000", + "version" : "1.0.4" + } + }, + "template" : "template.html" }, "mp-kuaishou" : { "appid" : "ks699465318929951101" } } +// 版本号,更新版本号可以清除缓存 + diff --git a/me/detail/detail.vue b/me/detail/detail.vue index 669214a..31897ea 100644 --- a/me/detail/detail.vue +++ b/me/detail/detail.vue @@ -618,6 +618,16 @@ // #endif }, onShow() { + console.log('onSHow video'); + //当应用从后台进入前台时自动播放 + if (this.videoContext) { + this.videoContext.play() + } + const noBuyVideoIndex= uni.getStorageSync('noBuyVideoIndex') + if(noBuyVideoIndex!==null&&noBuyVideoIndex!==undefined){ + this.noBuyVideoIndex=noBuyVideoIndex + } + try { this.playType = Number(uni.getStorageSync('playType')) } catch (e) { @@ -1202,12 +1212,15 @@ // data.h5Url 跳转地址 this.showMoney = false //显示充值弹窗 // this.payOrder(this.ordersId, this.payMoney) - // #ifdef H5 - // window.location.href = data.h5Url + // #ifdef APP uni.navigateTo({ url: '/pages/pays/pays?ordersId=' + data.ordersId + '&url=' + data.h5Url }); // #endif + // #ifdef H5 + window.location.href = data.h5Url + // #endif + }, //自组件关闭的回调 closeMoney(data) { diff --git a/pages.json b/pages.json index e6ae901..e84b8be 100644 --- a/pages.json +++ b/pages.json @@ -6,10 +6,9 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "小剧场", + "navigationBarTitleText": "斯耀短剧", "enablePullDownRefresh": true, "navigationStyle": "custom" - } }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index 8563b70..4a27757 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -49,7 +49,7 @@ + @tap="goPage(item)"> @@ -752,14 +752,23 @@ } }, //轮播图跳转 - goPage(url) { + goPage(item) { let token = uni.getStorageSync('token') + const {url,jumpType}=item if (token) { if (url) { if (url.indexOf('/pages/') !== -1 || url.indexOf('/me/') !== -1) { - uni.navigateTo({ - url - }); + if(jumpType==1){ + console.log(url); + uni.navigateTo({ + url + }); + }else{ + uni.navigateTo({ + url: '/pages/index/webView?url=' + url + }); + } + } else { //#ifndef H5 uni.navigateTo({ diff --git a/pages/pays/pays.vue b/pages/pays/pays.vue index 8f42f77..a8fc15b 100644 --- a/pages/pays/pays.vue +++ b/pages/pays/pays.vue @@ -1,7 +1,6 @@ @@ -24,11 +23,6 @@ } }, onReady() { - uni.setNavigationBarTitle({ - title:'预览' - }) - let viewview = uni.createWebviewContext("webview",) - console.log("viewview===",viewview) // #ifdef APP-PLUS // console.log('App plus2') // var currentWebview = this.$mp.page.$getAppWebview() //获取当前页面的webview对象 @@ -57,16 +51,20 @@ uni.navigateBack() },500) }else{ - + // #ifdef APP uni.showLoading({ title:'支付中' }) - + // #endif } }); }, onHide() { clearInterval(this.timer) + uni.hideLoading() + }, + onUnload() { + uni.hideLoading() }, onLoad: function(option) { console.log(option) diff --git a/static/favicon.png b/static/favicon.png new file mode 100644 index 0000000..4f52111 Binary files /dev/null and b/static/favicon.png differ diff --git a/template.html b/template.html new file mode 100644 index 0000000..52045d7 --- /dev/null +++ b/template.html @@ -0,0 +1,29 @@ + + + + + + + + <%= htmlWebpackPlugin.options.title %> + + + + + + + + + + + + +
+ + + \ No newline at end of file