2023-12-1

uni_modules/loading-state/components/loading-state/loading-state.vue

@@ -12,6 +12,12 @@
 		<view v-if="state != 0 && state != 1">
 			<slot></slot>
 		</view>
+		
+		<!-- 无数据 -->
+		<z-paging-empty-view v-if="state === 100" emptyViewText="没有数据哦~" 
+			:emptyViewImg="notDataImg" @reload="reload">
+		</z-paging-empty-view>
+		
 	</view>
 </template>
 <script>
@@ -25,6 +31,9 @@
 		computed: {
 			errorImg() {
 				return zStatic.base64Error
+			},
+			notDataImg() {
+				return zStatic.base64Empty
 			}
 		},
 		methods: {

uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue

@@ -14,7 +14,8 @@
 				'uni-calendar-item--disable':weeks.disable,
 				}">
 			<text v-if="selected && weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
-			<text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text>
+			<text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text"
+			v-if="weeks.year!=null">{{weeks.date}}</text>
 		</view>
 		<view :class="{'uni-calendar-item--today': weeks.isToday}"></view>
 	</view>

uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue

@@ -266,6 +266,7 @@
 				this.cale.setStartDate(val)
 				this.cale.setDate(this.nowDate.fullDate)
 				this.weeks = this.cale.weeks
+				console.log("this.weeks11 ",this.weeks )
 			},
 			endDate(val) {
 				// 字节小程序 watch 早于 created
@@ -275,6 +276,7 @@
 				this.cale.setEndDate(val)
 				this.cale.setDate(this.nowDate.fullDate)
 				this.weeks = this.cale.weeks
+				console.log("this.weeks22 ",this.weeks )
 			},
 			selected(newVal) {
 				// 字节小程序 watch 早于 created
@@ -283,6 +285,7 @@
 				}
 				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
 				this.weeks = this.cale.weeks
+				console.log("this.weeks33 ",this.weeks )
 			},
 			pleStatus: {
 				immediate: true,
@@ -318,9 +321,11 @@
 							if (which === 'left' && before) {
 								this.setDate(before)
 								this.weeks = this.cale.weeks
+								console.log("this.weeks44 ",this.weeks )
 							} else if(after) {
 								this.setDate(after)
 								this.weeks = this.cale.weeks
+								console.log("this.weeks55 ",this.weeks )
 							}
 							this.cale.lastHover = true
 						}
@@ -410,6 +415,7 @@
 				// 设置范围选
 				this.cale.setHoverMultiple(this.calendar.fullDate)
 				this.weeks = this.cale.weeks
+				console.log("this.weeks66 ",this.weeks )
 				// hover时，进入一个日历，更新另一个
 				if (this.firstEnter) {
 					this.$emit('firstEnterCale', this.cale.multipleStatus)
@@ -583,6 +589,7 @@
 				// 设置多选
 				this.cale.setMultiple(this.calendar.fullDate, true)
 				this.weeks = this.cale.weeks
+				console.log("this.weeks77 ",this.weeks )
 				this.tempSingleDate = this.calendar.fullDate
 				const beforeDate = new Date(this.cale.multipleStatus.before).getTime()
 				const afterDate = new Date(this.cale.multipleStatus.after).getTime()
@@ -611,8 +618,11 @@
 			 * @param {Object} date
 			 */
 			setDate(date) {
+					console.log("this.weeks88 ",date )
 				this.cale.setDate(date)
+				console.log("this.weeks88 ",this.cale )
 				this.weeks = this.cale.weeks
+				console.log("this.weeks88 ",this.weeks )
 				this.nowDate = this.cale.getInfo(date)
 			}
 		}