增加订单时间 已发版

pages/index/index.vue

@@ -93,17 +93,17 @@
               <image src="/static/home/jiantou.svg" style="width: 24rpx;height: 24rpx;" class="icon"></image>
             </view>
           </li>
-          <!-- <li @click="showCalendar">
-            <view class="left"><text class="font32 fontb">开始时间</text></view>
-            <view class="right font26 fontb"><text>{{ dayjs(state.startDate).format("YYYY/MM/DD") }}</text>
-              <image src="/static/home/jiantou.svg" style="width: 24rpx;height: 24rpx;" class="icon"></image>
-            </view>
-          </li> -->
           <li>
             <view class="left"><text class="font32 fontb">租金</text></view>
             <view class="right font26 fontb" :class="{textGary:!state.priceData?.price}"><text>{{ state.priceData?.price ? `￥ ${state.priceData?.price}` :
               '--'
-                }} </text>
+            }} </text>
+            </view>
+          </li>
+          <li @click="showCalendar">
+            <view class="left"><text class="font32 fontb">开始时间</text></view>
+            <view class="right font26 fontb"><text>{{ dayjs(state.startDate).format("YYYY/MM/DD") }}</text>
+              <image src="/static/home/jiantou.svg" style="width: 24rpx;height: 24rpx;" class="icon"></image>
             </view>
           </li>
           <li @click="goVaild">
@@ -428,16 +428,18 @@
 				</view>
 			</view>
 		</uv-popup>
-    <uv-calendars
+    <uv-calendar
-        customStyle="width: 710rpx; border-radius: 24rpx;"
         :safeAreaInsetBottom="false" :closeOnClickOverlay="false"
         ref="calendars"
-        :start-date="state.minDate"
+        :minDate="state.minDate"
         :date = "state.startDate"
-        confirmText="Confirm"
+        confirmText="确定"
-        cancelText="Cancel"
+        cancelText="取消"
-        :end-date="state.maxDate"
+        title="开始时间"
+        :maxDate="state.maxDate"
+        :showSubtitle="false"
         @confirm="calendarConfirm"
+        color="#FB322E"
       />
   </view>
 </template>
@@ -533,7 +535,7 @@ const showCalendar = () => {
   calendars.value.open();
 };
 const calendarConfirm = (e) => {
-  const fullDate = dayjs(e.fulldate); // 保持 dayjs 对象
+  const fullDate = dayjs(e[0]); // 保持 dayjs 对象
 
   if (state.value.zhuangxiuzhong) {
     const limitDate = dayjs(state.value.lockData.preSaleTime);
@@ -939,13 +941,17 @@ const getSiteDetail = () => {
           item.distanceNumber = number;
         });
         list.sort((a, b) => a.distanceNumber - b.distanceNumber);
+        // 优先冼村店
+        const xiancundian = list.find(item => item.id == "2030892603720994816")
         if (list[0]?.id) {
-          state.value.siteId = list[0]?.id
+          state.value.siteId =xiancundian?xiancundian.id:list[0]?.id
           reset();
           getUnitTypeBySiteId();
         }
       } else {
-        state.value.siteId = list[0]?.id
+         // 优先冼村店
+        const xiancundian = list.find(item => item.id == "2030892603720994816")
+        state.value.siteId = xiancundian?xiancundian.id:list[0]?.id
         reset();
         getUnitTypeBySiteId();
       }
@@ -1822,12 +1828,12 @@ function changeMove(event) {
   .bottom {
     display: flex;
     image {
-      margin-top: 4rpx;
     }
     .address {
       word-wrap: break-word;
     	word-break: break-all;
       flex: 1;
+      line-height: 32rpx;
     }
   }
 }

uni_modules/uv-calendar/components/uv-calendar/header.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="uv-calendar-header uv-border-bottom">
+	<view class="uv-calendar-header uv-border-bottom" style="padding: 20rpx;">
 		<text
 			class="uv-calendar-header__title"
 			v-if="showTitle"
@@ -9,13 +9,13 @@
 			v-if="showSubtitle"
 		>{{ subtitle }}</text>
 		<view class="uv-calendar-header__weekdays">
-			<text class="uv-calendar-header__weekdays__weekday">Sun</text>
+			<text class="uv-calendar-header__weekdays__weekday">一</text>
-			<text class="uv-calendar-header__weekdays__weekday">Mon</text>
+			<text class="uv-calendar-header__weekdays__weekday">二</text>
-			<text class="uv-calendar-header__weekdays__weekday">Tue</text>
+			<text class="uv-calendar-header__weekdays__weekday">三</text>
-			<text class="uv-calendar-header__weekdays__weekday">Wed</text>
+			<text class="uv-calendar-header__weekdays__weekday">四</text>
-			<text class="uv-calendar-header__weekdays__weekday">Thu</text>
+			<text class="uv-calendar-header__weekdays__weekday">五</text>
-			<text class="uv-calendar-header__weekdays__weekday">Fri</text>
+			<text class="uv-calendar-header__weekdays__weekday">六</text>
-			<text class="uv-calendar-header__weekdays__weekday">Sat</text>
+			<text class="uv-calendar-header__weekdays__weekday">日</text>
 		</view>
 	</view>
 </template>
@@ -71,9 +71,9 @@
 		padding-bottom: 4px;
 
 		&__title {
-			font-size: 16px;
+			font-size: 36rpx;
+			font-weight: bold;
 			color: $uv-main-color;
-			text-align: center;
 			height: 42px;
 			line-height: 42px;
 			font-weight: bold;
@@ -91,6 +91,7 @@
 		&__weekdays {
 			@include flex;
 			justify-content: space-between;
+			font-weight: 600;
 
 			&__weekday {
 				font-size: 13px;

uni_modules/uv-calendar/components/uv-calendar/month.vue

@@ -481,11 +481,12 @@
 	.uv-calendar-month {
 
 		&__title {
-			font-size: 14px;
+			font-size: 28rpx;
 			line-height: 42px;
 			height: 42px;
 			color: $uv-main-color;
-			text-align: center;
+			// text-align: center;
+			padding-left: 20rpx;
 			font-weight: bold;
 		}
 
@@ -493,6 +494,7 @@
 			position: relative;
 			@include flex;
 			flex-wrap: wrap;
+			font-weight: 600;
 
 			&__month-mark-wrapper {
 				position: absolute;

uni_modules/uv-calendar/components/uv-calendar/uv-calendar.vue

@@ -3,9 +3,9 @@
 		ref="calendarPopup"
 		mode="bottom"
 		closeable
-		:round="round"
 		:closeOnClickOverlay="closeOnClickOverlay"
 		@change="popupChange"
+		width="750rpx" zIndex="999" round="24px"
 	>
 		<view class="uv-calendar">
 			<uvHeader
@@ -20,6 +20,8 @@
 				@scroll="onScroll"
 				:scroll-top="scrollTop"
 				:scrollIntoView="scrollIntoView"
+				style="background-color: #F8F9FB;box-sizing: border-box;padding: 0 20rpx;"
+			
 			>
 				<uvMonth
 					:color="color"
@@ -50,6 +52,12 @@
 					<uv-button
 						shape="circle"
 						:text="buttonDisabled ? confirmDisabledText : confirmText"
+						:customStyle="{
+						height: '86rpx',
+						color: '#fff',
+						fontSize: '32rpx',
+						width: '500rpx',
+					}"
 						:color="color"
 						@click="confirm"
 						:disabled="buttonDisabled"
@@ -382,9 +390,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::deep(.uv-popup__content){
+	border-radius: 24rpx;
+}
 .uv-calendar {
 	&__confirm {
-		padding: 7px 18px;
+		display: flex;
+		justify-content: center;
+		padding:20rpx;
+		padding-bottom: 40rpx;
 	}
 }
 </style>

uni_modules/uv-popup/components/uv-popup/uv-popup.vue

@@ -45,8 +45,8 @@
 					>
 						<uv-icon
 							name="close"
-							color="#909399"
+							color="#000000"
-							size="18"
+							size="32rpx"
 							bold
 						></uv-icon>
 					</view>
@@ -499,7 +499,7 @@
 			}
 			&__close {
 				position: absolute;
-
+				margin-top: 12rpx;
 				&--hover {
 					opacity: 0.4;
 				}