JavaScriptExample
diff --git a/‎components/uni-calendar/uni-calendar.vue‎
Lines changed: 25 additions & 20 deletions b/‎components/uni-calendar/uni-calendar.vue‎
Lines changed: 25 additions & 20 deletions
diff --git a/‎pages/extUI/calendar/calendar.vue‎
Lines changed: 48 additions & 3 deletions b/‎pages/extUI/calendar/calendar.vue‎
Lines changed: 48 additions & 3 deletions
@@ -225,25 +225,6 @@
 				let after = this.getWeek(this.getDate(afteryear, +1, 'month'));
 				this.selectDay = canlender.month + '月' + canlender.date + '日';
 				this.canlender = canlender;
-				if (this.isSilde) {
-					let isClick = '';
-					if (this.isClick) {
-						isClick = 'to-click';
-						this.isClick = false;
-					} else {
-						isClick = 'change';
-					}
-					this.$emit(isClick, {
-						year: canlender.year,
-						month: canlender.month,
-						date: canlender.date,
-						lunar: canlender.lunar,
-						clockinfo: canlender.clockinfo || {},
-						fulldate: canlender.year + '-' + canlender.month + '-' + canlender.date
-					});
-					this.isSilde = false;
-				}
-
 				if (this.slide === 'none') {
 					// console.log(before);
 					this.duration = 0;
@@ -264,8 +245,12 @@
 					}
 					this.selectDay = canlender.month + '月' + canlender.date + '日';
 					this.hold = false;
+					// console.log(this.canlender)
+					this.setEmit(this.canlender);
 					return;
 				}
+				this.setEmit(canlender);
+
 				this.currentIndex = index;
 
 				if (first && index === 1) {
@@ -293,6 +278,26 @@
 					return;
 				}
 			},
+			setEmit(canlender) {
+				if (this.isSilde) {
+					let isClick = '';
+					if (this.isClick) {
+						isClick = 'to-click';
+						this.isClick = false;
+					} else {
+						isClick = 'change';
+					}
+					this.$emit(isClick, {
+						year: canlender.year,
+						month: canlender.month,
+						date: canlender.date,
+						lunar: canlender.lunar,
+						clockinfo: canlender.clockinfo || {},
+						fulldate: canlender.year + '-' + canlender.month + '-' + canlender.date
+					});
+					this.isSilde = false;
+				}
+			},
 			/**
 			 * 计算阴历日期显示
 			 */
@@ -616,7 +621,7 @@
 						setTimeout(() => this.getQueryDom(1), 50);
 						return;
 					}
-					console.log(e[0][index])
+					// console.log(e[0][index])
 					if (e[0][index]) {
 						this.domHeihgt = e[0][index].height;
 					}
 
@@ -9,10 +9,34 @@
 			</view>
 		</view>
 		<button class="calendar-button" type="button" @click="open">打开日历</button>
-
+		<text v-if="timeData.lunar" class="calendar-title">已选日期</text>
+		<view v-if="timeData.lunar" class="calendar-info">
+			<view>当前选择时间 : {{timeData.fulldate}}</view>
+			<view v-if="tags['lunar'].checked">农历日期 : {{timeData.year +
+									'年' +
+									timeData.month +
+									'月' +
+									timeData.date +
+									'日 （' +
+									timeData.lunar.astro +
+									')'}}</view>
+			<view v-if="tags['lunar'].checked"> {{
+					timeData.lunar.gzYear +
+						'年' +
+						timeData.lunar.gzMonth +
+						'月' +
+						timeData.lunar.gzDay +
+						'日 (' +
+						timeData.lunar.Animal +
+						'年)'
+				}}
+				{{ timeData.lunar.IMonthCn + timeData.lunar.IDayCn }}
+				{{ timeData.lunar.isTerm ? timeData.lunar.Term : '' }}</view>
+		</view>
 		<view v-if="show" class="calendar-mask" @click="closeMask">
 			<view class="calendar-box" @click.stop="">
-				<uni-calendar :lunar="tags['lunar'].checked" :fixedHeihgt="tags['fixedHeihgt'].checked" :slide="slide" :disableBefore="tags['disableBefore'].checked" :start-date="startDate" :end-date="endDate" :date="date" />
+				<uni-calendar :lunar="tags['lunar'].checked" :fixedHeihgt="tags['fixedHeihgt'].checked" :slide="slide" :disableBefore="tags['disableBefore'].checked" :start-date="startDate" :end-date="endDate" :date="date" @change="change" @to-click="toClick" />
+				<button class="calendar-button-confirm" @click="confirm">确认选择日期</button>
 			</view>
 		</view>
 	</view>
@@ -75,7 +99,8 @@
 				slide: 'none',
 				date: '',
 				startDate: '',
-				endDate: ''
+				endDate: '',
+				timeData: {}
 			};
 		},
 		onLoad() {},
@@ -118,6 +143,17 @@
 					this.date = '';
 				}
 				this.show = true;
+			},
+			change(e) {
+				console.log('change 返回:', e.fulldate);
+				this.timeData = e;
+			},
+			toClick(e) {
+				console.log('点击事件', e.fulldate);
+				this.timeData = e;
+			},
+			confirm() {
+				this.show = false;
 			}
 		}
 	};
@@ -211,6 +247,10 @@
 		margin: 10upx 20upx;
 	}
 
+	.calendar-info {
+		padding: 0 20upx;
+	}
+
 	.calendar-mask {
 		position: fixed;
 		top: 0;
@@ -227,5 +267,10 @@
 		border-radius: 10upx;
 		width: 100%;
 		overflow: hidden;
+		background: #fff;
+	}
+
+	.calendar-button-confirm {
+		margin: 10upx;
 	}
 </style>