Accept Merge Request #1: (ymf -> test)

Merge Request: 合并代码

Created By: @巩奕杰
Accepted By: @巩奕杰
URL: https://g-cphe0354.coding.net/p/duanju/d/video_app/git/merge/1?initial=true

manifest.json

@@ -14,7 +14,7 @@
         },
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
+        "compilerVersion" : 4,
         "splashscreen" : {
             "alwaysShowBeforeRender" : true,
             "waiting" : true,
@@ -57,8 +57,8 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "minSdkVersion" : 26,
+                "minSdkVersion" : 28,
-                "targetSdkVersion" : 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"
     }
 }
+// 版本号，更新版本号可以清除缓存
+

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
+				// #ifdef APP
-				// window.location.href  = data.h5Url
 				uni.navigateTo({
 					url: '/pages/pays/pays?ordersId=' + data.ordersId + '&url=' + data.h5Url
 				});
 				// #endif
+				// #ifdef H5
+				window.location.href  = data.h5Url
+				// #endif
+				
 			},
 			//自组件关闭的回调
 			closeMoney(data) {

pages.json

@@ -6,10 +6,9 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "小剧场",
+				"navigationBarTitleText": "斯耀短剧",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
-
 			}
 		},
 		{

pages/index/index.vue

@@ -49,7 +49,7 @@
 						<swiper class="swipers-box" :indicator-dots="false" :autoplay="true" interval="5000"
 							duration="500" :circular="true">
 							<swiper-item class="swipers-box" v-for="(item,index) in swiperList" :key='index'
-								@tap="goPage(item.url)">
+								@tap="goPage(item)">
 								<image :src="item.imageUrl" mode="aspectFill" style="width: 100%;height:100%;"></image>
 							</swiper-item>
 						</swiper>
@@ -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({
+							if(jumpType==1){
-								url
+								console.log(url);
-							});
+								uni.navigateTo({
+									url
+								});
+							}else{
+								uni.navigateTo({
+									url: '/pages/index/webView?url=' + url
+								});
+							}
+							
 						} else {
 							//#ifndef H5
 							uni.navigateTo({

pages/pays/pays.vue

@@ -1,7 +1,6 @@
 <template>
 	<view style="width: 100%;">
 		<web-view id="webview" :src="url" style="width: 100%;"></web-view>
-
 	</view>
 </template>
 
@@ -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)

template.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="apple-mobile-web-app-title" content="斯耀短剧">
+		<title>
+			<%= htmlWebpackPlugin.options.title %>
+		</title>
+		<!-- Open Graph data -->
+		<!-- <meta property="og:title" content="Title Here" /> -->
+		<!-- <meta property="og:url" content="http://www.example.com/" /> -->
+		<!-- <meta property="og:image" content="http://example.com/image.jpg" /> -->
+		<!-- <meta property="og:description" content="Description Here" /> -->
+		<script>
+			var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+			document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+		</script>
+		<link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
+		<link rel="apple-touch-icon" href="/static/favicon.png">
+	</head>
+	<body>
+		<noscript>
+			<strong>Please enable JavaScript to continue.</strong>
+		</noscript>
+		<div id="app"></div>
+		<!-- built files will be auto injected -->
+	</body>
+</html>