新增物流查询页面

pages.json

@@ -526,6 +526,21 @@
 					}
 				}
 			}
+		},
+		{
+			"path": "pages/my-order/my-order",
+			"style": {
+				"app-plus": {
+					"titleNView": {
+						"titleAlign": "left",
+						"titleColor": "#333",
+						"titleSize": "17px",
+						"backgroundColor": "#fff",
+						"titleText": "我的订单",
+						"autoBackButton": true
+					}
+				}
+			}
 		}
 	],
 	"globalStyle": {

pages/logistics/logistics.nvue

@@ -14,14 +14,17 @@
 							<view class="steps__row-line steps__row-line--after steps__row-line--active"></view>
 						</view>
 						<view class="steps__row-line-item">
-							<view class="steps__row-line steps__row-line--before" :class="{'steps__row-line--active':deliveryListBeforeLineShow}"></view>
+							<view class="steps__row-line steps__row-line--before"
+								:class="{'steps__row-line--active':deliveryListBeforeLineShow}"></view>
 							<view class="steps__row-check steps__row-circle">
 								<i class="icon-dot" :class="{'icon-dot-active':deliveryListBeforeLineShow}"></i>
 							</view>
-							<view class="steps__row-line steps__row-line--after" :class="{'steps__row-line--active':deliveryListAfterLineShow}"></view>
+							<view class="steps__row-line steps__row-line--after"
+								:class="{'steps__row-line--active':deliveryListBeforeLineShow}"></view>
 						</view>
 						<view class="steps__row-line-item">
-							<view class="steps__row-line steps__row-line--before" :class="{'steps__row-line--active':deliveryCheckLineShow}"></view>
+							<view class="steps__row-line steps__row-line--before"
+								:class="{'steps__row-line--active':deliveryCheckLineShow}"></view>
 							<view class="steps__row-check steps__row-circle">
 								<i class="icon-dot " :class="{'icon-dot-active':deliveryCheckLineShow}"></i>
 							</view>
@@ -30,15 +33,15 @@
 					</view>
 					<view class="steps__row-text-container">
 						<view class="steps__row-text">
-							<text class="steps__row-title">装车</text>
+							<text class="steps__row-title steps__row-title--active">装车</text>
 							<text class="steps__row-desc">2021.7.21 9:00</text>
 						</view>
 						<view class="steps__row-text">
-							<text class="steps__row-title">起运</text>
+							<text class="steps__row-title" :class="{'steps__row-title--active':deliveryListAfterLineShow}">起运</text>
 							<text class="steps__row-desc">预计 2021.7.21 9:00</text>
 						</view>
 						<view class="steps__row-text">
-							<text class="steps__row-title">到达宣化中转仓</text>
+							<text class="steps__row-title" :class="{'steps__row-title--active':deliveryCheckLineShow}">到达宣化中转仓</text>
 							<text class="steps__row-desc">预计 2021.7.21 9:00</text>
 						</view>
 					</view>
@@ -53,9 +56,20 @@
 	} from 'vuex'
 	export default {
 		data() {
-			return {}
+			return {
+				deliveryStatus: 'doing'
+			}
 		},
 		computed: {
+			deliveryListBeforeLineShow() {
+				return this.deliveryStatus === 'doing'
+			},
+			deliveryListAfterLineShow() {
+				return this.deliveryStatus === 'doing'
+			},
+			deliveryCheckLineShow() {
+				return this.deliveryStatus === 'end'
+			},
 			...mapState(['sysinfo'])
 		},
 		onLoad() {
@@ -93,7 +107,7 @@
 		padding: 26rpx 32rpx;
 	}
 
-	.title{
+	.title {
 		font-size: 32rpx;
 		color: $text-base-color;
 		font-weight: 500;
@@ -122,14 +136,14 @@
 		line-height: 16px;
 		text-align: center;
 		color: $text-base-color;
-		margin-bottom: 4rpx;
+		margin-bottom: 6rpx;
 	}
 
-	.steps__row-title--active{
+	.steps__row-title--active {
 		color: #F62C29;
 	}
 
-	.steps__row-desc{
+	.steps__row-desc {
 		font-size: 30rpx;
 		color: #999;
 	}
@@ -145,30 +159,24 @@
 		flex-direction: column;
 	}
 
-	.steps__row-line--before {
-		transform: translateX(-1px);
-	}
-	
 	.steps__row-line {
 		height: 80rpx;
 		background-color: #999;
 	}
 
 	.icon-dot {
-		width: 40rpx;
-		height: 40rpx;
+		width: 16rpx;
+		height: 16rpx;
 		background: #E5E5E5;
 		border-radius: 50%;
 	}
 
 	.icon-dot-active {
+		width: 40rpx;
+		height: 40rpx;
 		background: #ff1d32;
 	}
 	
-	.steps__row-line--after {
-		transform: translateX(1px);
-	}
-	
 	.steps__row-line {
 		width: 1px;
 		height: 80rpx;
@@ -180,12 +188,7 @@
 		border-radius: 1px;
 	}
 
-	.steps__row-circle {
-		background: #E5E5E5;
-	}
-	
 	.steps__row-line--hide {
 		background-color: transparent;
 	}
-
 </style>

pages/usercenter/usercenter.nvue

@@ -58,7 +58,7 @@
 				<text class="entry-bill-text">我的要货</text>
 			</view>
 			
-			<view class="entry-block">
+			<view class="entry-block" @click="goPage('my-order')">
 				<view class="entry-bill">
 					<image class="entry-bill-icon" src="@/static/image/uc_company@3x.png" mode=""></image>
 				</view>