代码冲突

src/pages.json

@@ -15,13 +15,7 @@
 			"style": {
 				"navigationBarTitleText": "订单"
 			}
-		},
-		// {
-		// 	"path": "pages/order/orderItem",
-		// 	"style": {
-		// 		"navigationBarTitleText": "订单详情"
-		// 	}
-		// },
+		},
 		{
 			"path": "pages/order/complete",
 			"style": {
@@ -173,6 +167,15 @@
 				"enablePullDownRefresh": false
 			}
 		}
+        ,{
+			// 订单详情页
+            "path" : "pages/order/detail",
+            "style" :                                                                                    
+            {
+				"navigationStyle": "custom"// 隐藏系统导航栏
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -226,8 +229,8 @@
 				"query": ""
 			},
 			{
-				"name": "基本信息", //模式名称
-				"path": "pages/settle/base", //启动页面，必选
+				"name": "订单详情", //模式名称
+				"path": "pages/order/detail", //启动页面，必选
 				"query": "" //启动参数，在页面的onLoad函数里面得到
 			},
 			{
@@ -250,10 +253,10 @@
 				"path": "pages/settle/file", //启动页面，必选
 				"query": "" //启动参数，在页面的onLoad函数里面得到
 			},
-			{
-				"name": "缴纳保证金", //模式名称
-				"path": "pages/settle/pay-ensure", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
+			{
+				"name": "缴纳保证金", //模式名称
+				"path": "pages/settle/pay-ensure", //启动页面，必选
+				"query": "" //启动参数，在页面的onLoad函数里面得到
 			},
 			{
 				"name": "签约页面", //模式名称

src/pages/order/detail.vue

+<template>
+	<view class="order-wrap">
+		<u-navbar back-icon-color="#FFFFFF" :background="background" :border-bottom="false"></u-navbar>
+		<view class="header">
+			<view class="title">订单信息</view>
+			<view class="button" @click="rejectOrder">拒单</view>
+		</view>
+		<view class="content"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				background: {
+					backgroundColor: 'none',
+					// 导航栏背景图
+					// background: 'url(https://cdn.uviewui.com/uview/swiper/1.jpg) no-repeat',
+					// 还可以设置背景图size属性
+					// backgroundSize: 'cover',
+					// 渐变色
+				}
+			};
+		},
+		methods: {
+			/**
+			 * 拒单
+			 */
+			rejectOrder() {
+				console.log("点击拒单")
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+.order-wrap {
+	width: 750rpx;
+	height: 100vh;
+	overflow: auto;
+	// height: 1600rpx;
+	// background: linear-gradient(360deg, #F4F5F7 0%, #2272FF 100%);
+	background-color: #F4F5F7;
+	background-image: linear-gradient(to top, #F4F5F7 , #2272FF);
+	background-size: 750rpx 600rpx;
+	background-repeat: no-repeat;
+	.header {
+		padding: 12rpx 30rpx 40rpx 30rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		.title {
+			font-size: 40rpx;
+			font-weight: bold;
+			color: #FFFFFF;
+		}
+		.button {
+			text-align: center;
+			width: 106rpx;
+			height: 52rpx;
+			background: #FFFFFF;
+			border-radius: 40rpx;
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #2272FF;
+			line-height: 52rpx;
+		}
+	}
+	.content{
+		height: 2000rpx;
+	}
+}
+</style>