2021-8-31

pages.json

@@ -196,9 +196,13 @@
 			{
 				"path": "pages/order/order",
 				"style": {
-					"navigationBarTitleText": "我的订单",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "transparent",
 					"app-plus": {
-						"bounce": "none"
+						"titleNView": {
+								"type": "float",
+								"titleText": "我的订单"
+							}
 					}
 				}
 			},

pages/order/order.vue

@@ -84,7 +84,7 @@ export default {
 			navList: [
 				{
 					state: 0,
-					text: '待付款',
+					text: '全部',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
@@ -92,7 +92,7 @@ export default {
 				},
 				{
 					state: 1,
-					text: '待发货',
+					text: '待付款',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
@@ -100,7 +100,7 @@ export default {
 				},
 				{
 					state: 2,
-					text: '待收货',
+					text: '待发货',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
@@ -108,7 +108,7 @@ export default {
 				},
 				{
 					state: 3,
-					text: '待评价',
+					text: '待收货',
 					loadingType: 'more',
 					orderList: [],
 					page: 1, //当前页数
@@ -301,16 +301,16 @@ export default {
 				stateTipColor = '#fa436a';
 			switch (+state) {
 				case 0:
-					stateTip = '待付款';
+					stateTip = '全部';
 					break;
 				case 1:
-					stateTip = '待发货';
+					stateTip = '待付款';
 					break;
 				case 2:
-					stateTip = '待收货';
+					stateTip = '待发货';
 					break;
 				case 3:
-					stateTip = '待评价';
+					stateTip = '待收货';
 					break;
 				case 4:
 					stateTip = '已完成';
@@ -346,7 +346,6 @@ page,
 .navbar {
 	display: flex;
 	height: 40px;
-	padding: 0 5px;
 	background: #fff;
 	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
 	position: relative;
@@ -359,7 +358,10 @@ page,
 		height: 100%;
 		font-size: 15px;
 		color: $font-color-dark;
-		position: relative;
+		position: relative;
+		margin-top: 80rpx;
+		background-color: #fff;
+		border-top: 1rpx solid #F8F6F6;
 		&.current {
 			color: $base-color;
 			&:after {

pages/user/user.vue

@@ -22,25 +22,25 @@
 			</view>
 			<!-- 我的订单 -->
 			<view class="order-box">
-				<view class="my-order">
+				<view class="my-order" @click="nav('/pages/order/order')">
 					<view class="order">我的订单</view>
 					<image src="../../static/img/xiangxia.png" mode="scaleToFill"></image>
 				</view>
 				<!-- 订单栏 -->
 				<view class="order-section">
-					<view class="order-item">
+					<view class="order-item" @click="nav('/pages/order/')">
 						<image src="../../static/img/img19.png" mode="scaleToFill"></image>
 						<view class="text">待付款</view>
 					</view>
-					<view class="order-item">
+					<view class="order-item" @click="nav('/pages/order/')">
 						<image src="../../static/img/img20.png" mode="scaleToFill"></image>
 						<view class="text">待发货</view>
 					</view>
-					<view class="order-item">
+					<view class="order-item" @click="nav('/pages/order/')">
 						<image src="../../static/img/img21.png" mode="scaleToFill"></image>
 						<view class="text">待收货</view>
 					</view>
-					<view class="order-item">
+					<view class="order-item" @click="nav('/pages/order/')">
 						<image src="../../static/img/img22.png" mode="scaleToFill"></image>
 						<view class="text">已完成</view>
 					</view>