Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/new_app into gaohao

components/my-video-list/my-video-list.vue

@@ -0,0 +1,20 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"my-video-list",
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

http/http.js

@@ -82,7 +82,7 @@ function commonsProcess(showLoading, httpReqCallback) {
         });
       }
       // 构造请求成功的响应数据
-      return Promise.resolve(bodyData.data || bodyData.page);
+      return Promise.resolve(bodyData.data || bodyData.page|| bodyData);
     })
     .catch((res) => {
       console.log(res);

pages.json

@@ -21,7 +21,15 @@
 				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
-		}, {
+		},
+		{
+			"path": "pages/video/detail",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		}, 
+		{
 			"path": "pages/task/index",
 			"style": {
 				"navigationBarTitleText": "",

pages/video/detail.nvue

@@ -0,0 +1,23 @@
+<template>
+	<view class="min-page">
+		<my-video-list></my-video-list>
+	</view>
+</template>
+
+<script setup>
+	import {onLoad,onShow} from '@dcloudio/uni-app'
+	onLoad((opt)=>{
+		
+	})
+	onShow(()=>{
+		
+	})
+</script>
+
+<style lang="scss" scoped>
+	.min-page{
+		height: 100vh;
+		background-color: #000;
+		overflow: hidden;
+	}
+</style>

pages/video/index.vue

@@ -1,11 +1,15 @@
 <template>
 	<view>
-		
+		<up-button @click="toDetail">toDetail</up-button>
 	</view>
 </template>
 
 <script setup>
-
+function toDetail(){
+	uni.navigateTo({
+		url:'/pages/video/detail'
+	})
+}
 </script>
 
 <style>