From 3ff35d7eb6886e6c7e1df6b42a7c79f2d7647c1a Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Fri, 13 Dec 2024 14:19:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 3 +-- pages/index/index.vue | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) 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 ad8f481..07f8fde 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -48,7 +48,7 @@ + @tap="goPage(item)"> @@ -733,14 +733,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({ From f0edf9f4193ed9d3d6400062da644b776c223a9c Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Fri, 13 Dec 2024 15:26:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E5=89=A7=E6=97=B6h5=E8=B7=B3=E8=BD=AC=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=20=E5=A2=9E=E5=8A=A0ios=20=E8=87=AA=E5=B8=A6?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E5=BF=AB=E6=8D=B7=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 12 ++++++++++-- me/detail/detail.vue | 7 +++++-- pages/pays/pays.vue | 6 ------ static/favicon.png | Bin 0 -> 2996 bytes template.html | 29 +++++++++++++++++++++++++++++ 5 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 static/favicon.png create mode 100644 template.html diff --git a/manifest.json b/manifest.json index 3a9e019..04e37bb 100644 --- a/manifest.json +++ b/manifest.json @@ -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..9e0e61a 100644 --- a/me/detail/detail.vue +++ b/me/detail/detail.vue @@ -1202,12 +1202,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/pays/pays.vue b/pages/pays/pays.vue index 8f42f77..7fdfe8b 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对象 diff --git a/static/favicon.png b/static/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..4f52111b128d20fb7de0c14cf7238f6a68be2836 GIT binary patch literal 2996 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 q + + + + + + + <%= htmlWebpackPlugin.options.title %> + + + + + + + + + + + + +
+ + + \ No newline at end of file From b344413b2aac36fd80cb5c52b71d66dd0b9595f2 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Fri, 13 Dec 2024 16:46:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 6 +++--- me/detail/detail.vue | 10 ++++++++++ pages/pays/pays.vue | 8 ++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index 04e37bb..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打包配置 */ diff --git a/me/detail/detail.vue b/me/detail/detail.vue index 9e0e61a..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) { diff --git a/pages/pays/pays.vue b/pages/pays/pays.vue index 7fdfe8b..a8fc15b 100644 --- a/pages/pays/pays.vue +++ b/pages/pays/pays.vue @@ -51,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)