订单相关

components/tabbar/tabbar.vue

@@ -51,7 +51,7 @@ export default {
                     iconPath: "/static/images/tabbar/new_order_gray.png",
                     text: "订单",
                     selectedIconPath: "/static/images/tabbar/new_order.png",
-                    pagePath: "/pages/order/all-orders"
+                    pagePath: "/pages/order/userorder-list"
                 },
                 {
                     iconPath: "/static/images/tabbar/new_message_gray.png",

pages.json

@@ -1048,7 +1048,7 @@
 				"iconPath": "/static/images/tabbar/new_order_gray.png",
 				"text": "订单",
 				"selectedIconPath": "/static/images/tabbar/new_order.png",
-				"pagePath": "pages/order/all-orders"
+				"pagePath": "pages/order/userorder-list"
 			},
 			{
 				"iconPath": "/static/images/tabbar/new_message_gray.png",

pages/home/components/orderCard2.vue

@@ -171,6 +171,7 @@
 			},
 			emitStart() {
 				this.$emit("start");
+				
 			},
 			emitDone() {
 				this.$emit("done");
@@ -181,8 +182,8 @@
 
 <style scoped lang="less">
 	.order-card {
-		padding: 20rpx 30rpx 20rpx 30rpx;
-		margin: 0rpx 30rpx 20rpx 30rpx;
+		padding: 24rpx 20rpx 24rpx 20rpx;
+		margin: 0;
 		background-color: #fff;
 		border-radius: 12px;
 		/* box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); */