细节优化

pages/cleanManage/cleanManage.vue

@@ -121,10 +121,10 @@ import moment from "@/common/moment";
 					6:'已下架'
 				},
 				colorEnum:{
-					0:"#6fc544",
-					1:"#e7a646",
-					2:"#4aa3ff",
-					3:"#ff494e",
+					0:"#02F6FF",
+					1:"#e51771",
+					2:"#aaaaaa",
+					3:"#EE8A1A",
 					4:"#ff49ef",
 					5:"#ff0000",
 					6:"#999999",
@@ -133,22 +133,22 @@ import moment from "@/common/moment";
 					{
 						label:"空闲中",
 						status:0,
-						color:"#6fc544"
+						color:"#02F6FF"
 					},
 					{
 						label:"使用中",
 						status:1,
-						color:"#e7a646"
+						color:"#e51771"
 					},
 					{
 						label:"维护中",
 						status:2,
-						color:"#4aa3ff"
+						color:"#aaaaaa"
 					},
 					{
 						label:"待保洁",
 						status:3,
-						color:"#ff49ef"
+						color:"#EE8A1A"
 					},
 					{
 						label:"保洁中",

pages/index/index.vue

@@ -229,7 +229,7 @@
 		</uni-popup>
 
 
-		<LoginPop ref="loginPop" />
+		<!-- <LoginPop ref="loginPop" /> -->
 		<f-tabbar></f-tabbar>
 	</view>
 </template>
@@ -237,7 +237,7 @@
 <script>
 	import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 	import fNavbar from '@/components/module/f-navbar/f-navbar';
-	import LoginPop from "@/components/login/login"
+	// import LoginPop from "@/components/login/login"
 	import {
 		login,
 		dictList,
@@ -261,7 +261,7 @@
 			fTabbar,
 			fNavbar,
 			ToolBox,
-			LoginPop
+			// LoginPop
 		},
 		data() {
 			return {
@@ -367,7 +367,7 @@
 			this.onSetShowPoint();
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
-			this.$refs.loginPop.open();
+			// this.$refs.loginPop.open();
 		},
 		methods: {
 			onStoreChage(id) {

pages/orderResult/orderResult.vue

@@ -355,7 +355,7 @@
 				listSortDistance({
 					storeId: this.orderInfo.storeId,
 					roomId: this.orderInfo.roomId,
-					day: this.orderInfo.endDate,
+					day: this.orderInfo.status ==1 ? this.orderInfo.endDate: moment().format("YYYY-MM-DD"),
 					orderType:2,
 					orderId: this.orderInfo.id
 				}).then(res=>{