完成

pages/index/index.vue

@@ -503,8 +503,8 @@
 				// if (enableNum >= 1) {
 				uni.navigateTo({
 					url: "/pages/order_room/order_room?roomTypeId=" + id + "&enableStartTime=" + _self.startDate + "&enableEndTime=" + _self.endDate +
-						"&startTime=" + _self.startTime + "&endTime=" + _self.endTime + "&ruzhu_num=" + _self.ruzhu_num + "&typeName=" + typeName +
-						"&freeRoom=" + enableNum + "&price=" + price
+						"&startWeek=" + _self.startWeek + "&endWeek=" + _self.endWeek + "&startTime=" + _self.startTime + "&endTime=" + _self.endTime +
+						"&ruzhu_num=" + _self.ruzhu_num + "&typeName=" + typeName + "&freeRoom=" + enableNum + "&price=" + price
 				});
 				// }
 				// this.getRoomType()
@@ -721,15 +721,15 @@
 						});
 						return;
 					}
+					this.endWeek = '周' + e.lunar.ncWeek.substring(2, 3);
 					if ((new Date(after).getTime()) < (new Date(before).getTime())) {
 						var temp = before;
 						before = after;
 						after = temp;
+						var tmp = this.startWeek;
+						this.startWeek = this.endWeek;
+						this.endWeek = tmp;
 					}
-					this.endWeek = '周' + e.lunar.ncWeek.substring(2, 3);
-					var tmp = this.startWeek;
-					this.startWeek = this.endWeek;
-					this.endWeek = tmp;
 					this.startTime = before.substring(5, 7) + '月' + before.substring(8, 10) + '日';
 					this.endTime = after.substring(5, 7) + '月' + after.substring(8, 10) + '日';
 					this.startDate = before + ' 14:00:00';

pages/order_room/order_room.vue

@@ -58,8 +58,7 @@
 		</view>
 		<!-- 提交订单时弹框 -->
 		<uni-popup ref="popup_order" type="dialog">
-			<uni-popup-dialog :type="msgType" cancelText="关闭" confirmText="确定" :content="order_txt" @confirm="dialogConfirm"
-				></uni-popup-dialog>
+			<uni-popup-dialog :type="msgType" cancelText="关闭" confirmText="确定" :content="order_txt" @confirm="dialogConfirm"></uni-popup-dialog>
 		</uni-popup>
 	</view>
 </template>
@@ -121,8 +120,10 @@
 			this.endTime = option.endTime //离店日期
 			this.startDate = option.enableStartTime.substring(0, 11) + "12:00:00" //默认到店日期接口数据
 			this.endDate = option.enableEndTime.substring(0, 11) + "14:00:00" //默认离店日期接口数据
-			this.startWeek = this.$utils.getweekday(this.startDate) // 默认入店日
-			this.endWeek = this.$utils.getweekday(this.endDate) // 默认离店
+			// this.startWeek = this.$utils.getweekday(this.startDate) // 默认入店日
+			// this.endWeek = this.$utils.getweekday(this.endDate) // 默认离店
+			this.startWeek = option.startWeek
+			this.endWeek = option.endWeek
 			this.mayTime = this.startDate.substring(0, 11) + "18:00:00" // 预计到店时间
 			// console.log(this.$utils.getweekday(this.startDate))
 		},
@@ -321,12 +322,15 @@
 						});
 						return;
 					}
+					this.endWeek = '周' + e.lunar.ncWeek.substring(2, 3);
 					if ((new Date(after).getTime()) < (new Date(before).getTime())) {
 						var temp = before;
 						before = after;
 						after = temp;
+						var tmp = this.startWeek;
+						this.startWeek = this.endWeek;
+						this.endWeek = tmp;
 					}
-					this.endWeek = '周' + e.lunar.ncWeek.substring(2, 3)
 					this.startTime = before.substring(5, 7) + '月' + before.substring(8, 10) + '日'
 					this.endTime = after.substring(5, 7) + '月' + after.substring(8, 10) + '日'
 					this.startDate = before + ' 14:00:00'