修复部分bug 完成注册后流程

pages.json

@@ -227,7 +227,8 @@
 			"path": "pages/my/step",
 			"style": {
 				"navigationBarTitleText": "完善信息",
-				"navigationBarBackgroundColor": "#ffffff"
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/my/security",

pages/login/login.vue

@@ -102,7 +102,7 @@ export default {
 			},
 			mobile: '18899990000',
 			password: '111111',
-			code: '',
+			code: '123601',
 			captchaTime: 0,
 			push_token: '',
 			lat: '',

pages/my/editInfo.vue

@@ -96,7 +96,7 @@
 			</view>
 			<view class="list_info">
 				<view class="name">你的兴趣爱好是？</view>
-				<view class="desc">提示：最多选择10个兴趣爱好标签</view>
+				<view class="desc">提示：最多选择5个兴趣爱好标签</view>
 				<view class="item_tag">
 					<view @tap.stop="chkTag(item)" class="tag" :class="selTags(item) ? 'active' : ''"
 						v-for="(item, index) in list_tag" :key="index">
@@ -180,7 +180,7 @@ export default {
 	},
 	onLoad() {
 		let tagStr =
-			"看书、做弹弓玩、做木剑玩、做橡皮枪玩、积木、用麻将搭金字塔、拼图、拆装、扑克牌、小汽车、手表、鞋之类的、弹吉他、钢琴、萨克斯、葫芦丝、大号、小号、折纸、剪纸、品茶、涂鸦、英雄联盟、qq堂、cs、cf、地下城勇士、桌面游戏";
+			"老二次元了、coser、沉迷音乐、网游小达人、AJ控、白日梦想家、撸铁狂魔、古风汉服、爱画画、数码极客、盲盒玩家、三坑玩家、动漫达人、独立设计师、爱卡通、兜风去、爱夜跑、街头滑板、球类运动、lo娘、rapper、时尚达人、机甲狂潮、养宠物、风轻云淡、养多肉、热爱自然、赛博朋克、骨子里高冷、爱唠嗑、资深中二、天然呆、思想家、极度抽象、学院派、平平无奇、热情奔放、博古通今、labubu粉、玛特收藏家";
 		this.list_tag = tagStr.split("、");
 		this.getInfoData();
 	},
@@ -237,13 +237,13 @@ export default {
 					}
 				}
 				this.sel_tags = tmpTags;
-			} else {
-				if (this.sel_tags.length <= 9) {
+			} else { 
+				if (this.sel_tags.length <= 4) {
 					this.sel_tags.push(itm);
-				} else {
-					this.$refs['ToastW3'].showToast({
-						title: "最多选择10个标签",
-						animation: 0
+				} else { 
+					uni.showToast({
+						title: "最多选择5个标签",
+						icon: "none"
 					});
 				}
 			}
@@ -456,13 +456,12 @@ page {
 
 .popSel {
 	position: fixed;
-	z-index: 999999;
+	z-index: 101;
 	top: 0;
 	left: 0;
 	background-color: #f2f6f2;
 	width: 100vh;
-	height: 100vh;
-
+	min-height: 100vh; 
 	.headLabel {
 		width: 686rpx;
 		margin: 28rpx 32rpx;

pages/my/step copy.vue

@@ -4,11 +4,11 @@
 			<block v-if="step == 1">
 				<view class="name">请问你的性别是：</view>
 				<view class="itemSex">
-					<view class="sex2" :class="sex == 1?'active':''" style="margin-right: 10rpx;" @click="chkSex(1)">
+					<view class="sex2" :class="sex == 1 ? 'active' : ''" style="margin-right: 10rpx;" @click="chkSex(1)">
 						<image class="photo" src="../../static/me/sex_1.png" mode="widthFix" />
 						<text>男性</text>
 					</view>
-					<view class="sex2" :class="sex == 2?'active':''" style="margin-left: 10rpx;" @click="chkSex(2)">
+					<view class="sex2" :class="sex == 2 ? 'active' : ''" style="margin-left: 10rpx;" @click="chkSex(2)">
 						<image class="photo" src="../../static/me/sex_2.png" mode="widthFix" />
 						<text>女性</text>
 					</view>
@@ -74,8 +74,8 @@
 					<view class="right" @click="showPop = true;">添加+</view>
 				</view>
 				<view class="item_tag">
-					<view class="tag" v-for="(item,index) in sel_tags">
-						{{item}}
+					<view class="tag" v-for="(item, index) in sel_tags" :key="index">
+						{{ item }}
 						<image class="close" src="../../static/me/close.png" mode="widthFix" @click="delTag(item)" />
 					</view>
 				</view>
@@ -84,13 +84,13 @@
 			<view class="blankHeight"></view>
 		</view>
 
-		<view class="btn_submit" v-if="step == 1" @click="step ++;">下一步</view>
+		<view class="btn_submit" v-if="step == 1" @click="step++;">下一步</view>
 		<view class="btn_list" v-if="step == 2 || step == 3">
-			<view class="btn_submit1" @click="step --;">上一步</view>
-			<view class="btn_submit2" @click="step ++;">下一步</view>
+			<view class="btn_submit1" @click="step--;">上一步</view>
+			<view class="btn_submit2" @click="step++;">下一步</view>
 		</view>
 		<view class="btn_list" v-if="step == 4">
-			<view class="btn_submit1" @click="step --;">上一步</view>
+			<view class="btn_submit1" @click="step--;">上一步</view>
 			<view class="btn_submit2" @click="submitData()">完成</view>
 		</view>
 		<view class="popSel" v-if="showPop" @tap.stop="onPreview">
@@ -98,9 +98,9 @@
 				<view class="name">你的兴趣爱好是？</view>
 				<view class="desc">提示：最多选择10个兴趣爱好标签</view>
 				<view class="item_tag">
-					<view @tap.stop="chkTag(item)" class="tag" :class="selTags(item)?'active':''"
-						v-for="(item,index) in list_tag">
-						{{item}}
+					<view @tap.stop="chkTag(item)" class="tag" :class="selTags(item) ? 'active' : ''"
+						v-for="(item, index) in list_tag" :key="index">
+						{{ item }}
 					</view>
 				</view>
 			</view>
@@ -109,14 +109,9 @@
 
 		<view class="tag_all_select">
 			<view class="tag_items">
-				<view 
-					v-for="(item, index) in tagList" 
-					:key="index"
-					class="tag_item"
-					:class="[item.size, {'active': selectedTags.includes(index)}]"
-					@click="selectTag(index)"
-				>
-					{{item.name}}
+				<view v-for="(item, index) in tagList" :key="index" class="tag_item"
+					:class="[item.size, { 'active': selectedTags.includes(index) }]" @click="selectTag(index)">
+					{{ item.name }}
 				</view>
 			</view>
 		</view>
@@ -138,378 +133,378 @@
 </template>
 
 <script>
-	import {
-		requestAndroidPermission,
-		gotoAppPermissionSetting
-	} from '../index/permission.js'
-	export default {
-		components: {},
-		data() {
-			return {
-				showRights: false,
-				title: '',
-				step: 1,
-				sel: 1,
-				info: {},
-				showPop: false,
-				nickname: '',
-				wechat: '',
-				sex: 1,
-				age: 18,
-				height: 160,
-				weight: 50,
-				avator: '../../static/me/avator.png',
-				ziye: '',
-				qianmin: '',
+import {
+	requestAndroidPermission,
+	gotoAppPermissionSetting
+} from '../index/permission.js'
+export default {
+	components: {},
+	data() {
+		return {
+			showRights: false,
+			title: '',
+			step: 1,
+			sel: 1,
+			info: {},
+			showPop: false,
+			nickname: '',
+			wechat: '',
+			sex: 1,
+			age: 18,
+			height: 160,
+			weight: 50,
+			avator: '../../static/me/avator.png',
+			ziye: '',
+			qianmin: '',
 
-				xueli_sel: '',
-				xueli: ['初中', '初中', '中专', '高中', '专科', '本科', '研究生', '硕士', '博士'],
-				xinzuo_sel: '',
-				xinzuo: ['水瓶座', '双鱼座', '白羊座', '金牛座', '双子座', '巨蟹座', '狮子座', '处女座', '天秤座', '天蝎座', '射手座', '摩羯座'],
+			xueli_sel: '',
+			xueli: ['初中', '初中', '中专', '高中', '专科', '本科', '研究生', '硕士', '博士'],
+			xinzuo_sel: '',
+			xinzuo: ['水瓶座', '双鱼座', '白羊座', '金牛座', '双子座', '巨蟹座', '狮子座', '处女座', '天秤座', '天蝎座', '射手座', '摩羯座'],
 
-				list_tag: [
-					'篮球', '排球', '足球', '羽毛球', '健身达人', '美食达人'
-				],
-				sel_tags: [],
-				selectedTags: [],
-				tagList: [
-					{ name: '游戏', size: 'large' },
-					{ name: '音乐', size: 'medium' },
-					{ name: '盲盒', size: 'large' },
-					{ name: '小可爱', size: 'small' },
-					{ name: '娃娃人', size: 'medium' },
-					{ name: '纹身', size: 'large' },
-					{ name: '洛丽塔', size: 'small' },
-					{ name: '女装', size: 'medium' },
-					{ name: '萌球', size: 'small' }
-				]
+			list_tag: [
+				'篮球', '排球', '足球', '羽毛球', '健身达人', '美食达人'
+			],
+			sel_tags: [],
+			selectedTags: [],
+			tagList: [
+				{ name: '游戏', size: 'large' },
+				{ name: '音乐', size: 'medium' },
+				{ name: '盲盒', size: 'large' },
+				{ name: '小可爱', size: 'small' },
+				{ name: '娃娃人', size: 'medium' },
+				{ name: '纹身', size: 'large' },
+				{ name: '洛丽塔', size: 'small' },
+				{ name: '女装', size: 'medium' },
+				{ name: '萌球', size: 'small' }
+			]
+		}
+	},
+	onLoad() {
+		this.step = 1;
+		let tagStr =
+			"篮球、羽毛球、兵乓球、足球、滑板、滑旱冰、跑步、跳绳、举重、听音乐、看电影、绘画、写小说、看书、做弹弓玩、做木剑玩、做橡皮枪玩、积木、用麻将搭金字塔、拼图、拆装、扑克牌、小汽车、手表、鞋之类的、弹吉他、钢琴、萨克斯、葫芦丝、大号、小号、折纸、剪纸、品茶、涂鸦、英雄联盟、qq堂、cs、cf、地下城勇士、桌面游戏";
+		this.list_tag = tagStr.split("、");
+		this.getInfoData();
+	},
+	onShow() { },
+	methods: {
+		onBack() { },
+		chkSel() {
+			if (this.sel == 1) {
+				this.sel = 0;
+			} else {
+				this.sel = 1;
 			}
 		},
-		onLoad() {
-			this.step = 1;
-			let tagStr =
-				"篮球、羽毛球、兵乓球、足球、滑板、滑旱冰、跑步、跳绳、举重、听音乐、看电影、绘画、写小说、看书、做弹弓玩、做木剑玩、做橡皮枪玩、积木、用麻将搭金字塔、拼图、拆装、扑克牌、小汽车、手表、鞋之类的、弹吉他、钢琴、萨克斯、葫芦丝、大号、小号、折纸、剪纸、品茶、涂鸦、英雄联盟、qq堂、cs、cf、地下城勇士、桌面游戏";
-			this.list_tag = tagStr.split("、");
-			this.getInfoData();
+		chkSex(sex) {
+			this.sex = sex;
 		},
-		onShow() {},
-		methods: {
-			onBack() {},
-			chkSel() {
-				if (this.sel == 1) {
-					this.sel = 0;
-				} else {
-					this.sel = 1;
+		delTag(tg) {
+			let list_tag2 = [];
+			for (let i = 0; i < this.sel_tags.length; i++) {
+				if (this.sel_tags[i] != tg && this.sel_tags[i] != '') {
+					list_tag2.push(this.sel_tags[i]);
 				}
-			},
-			chkSex(sex) {
-				this.sex = sex;
-			},
-			delTag(tg) {
-				let list_tag2 = [];
-				for (let i = 0; i < this.sel_tags.length; i++) {
-					if (this.sel_tags[i] != tg && this.sel_tags[i] != '') {
-						list_tag2.push(this.sel_tags[i]);
-					}
+			}
+			this.sel_tags = list_tag2;
+		},
+		selTags(itm) {
+			let that = this;
+			let isIn = false;
+			for (let entry of this.sel_tags) {
+				// console.log(entry); // 1, "string", false
+				if (entry == itm) {
+					isIn = true;
+					break;
 				}
-				this.sel_tags = list_tag2;
-			},
-			selTags(itm) {
-				let that = this;
-				let isIn = false;
+			}
+			return isIn;
+		},
+		chkTag(itm) {
+			if (this.selTags(itm)) {
+				let tmpTags = [];
 				for (let entry of this.sel_tags) {
 					// console.log(entry); // 1, "string", false
-					if (entry == itm) {
-						isIn = true;
-						break;
+					if (entry != itm && entry != '') {
+						tmpTags.push(entry);
 					}
 				}
-				return isIn;
-			},
-			chkTag(itm) {
-				if (this.selTags(itm)) {
-					let tmpTags = [];
-					for (let entry of this.sel_tags) {
-						// console.log(entry); // 1, "string", false
-						if (entry != itm && entry != '') {
-							tmpTags.push(entry);
-						}
-					}
-					this.sel_tags = tmpTags;
-				} else {
-					if (this.sel_tags.length >= 10) {
-						this.$refs['ToastW3'].showToast({
-							title: "最多选择10个标签",
-							animation: 0
-						});
-						return;
-					}
-					this.sel_tags.push(itm);
+				this.sel_tags = tmpTags;
+			} else {
+				if (this.sel_tags.length >= 10) {
+					this.$refs['ToastW3'].showToast({
+						title: "最多选择10个标签",
+						animation: 0
+					});
+					return;
 				}
-			},
-			sliderChange1(e) {
-				this.age = e.detail.value;
-			},
-			sliderChange2(e) {
-				this.height = e.detail.value;
-			},
-			sliderChange3(e) {
-				this.weight = e.detail.value;
-			},
-			SetXueli() {
-				let that = this;
-				uni.showActionSheet({
-					itemColor: '#000000',
-					itemList: this.xueli,
-					success: function(res) {
-						that.xueli_sel = that.xueli[res.tapIndex];
-						// console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
-					},
-					fail: function(res) {
-						console.log(res.errMsg);
-					}
-				});
-			},
-			SetXinzuo() {
-				let that = this;
-				uni.showActionSheet({
-					itemColor: '#000000',
-					itemList: this.xinzuo,
-					success: function(res) {
-						that.xinzuo_sel = that.xinzuo[res.tapIndex];
-						// console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
-					},
-					fail: function(res) {
-						console.log(res.errMsg);
+				this.sel_tags.push(itm);
+			}
+		},
+		sliderChange1(e) {
+			this.age = e.detail.value;
+		},
+		sliderChange2(e) {
+			this.height = e.detail.value;
+		},
+		sliderChange3(e) {
+			this.weight = e.detail.value;
+		},
+		SetXueli() {
+			let that = this;
+			uni.showActionSheet({
+				itemColor: '#000000',
+				itemList: this.xueli,
+				success: function (res) {
+					that.xueli_sel = that.xueli[res.tapIndex];
+					// console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+				},
+				fail: function (res) {
+					console.log(res.errMsg);
+				}
+			});
+		},
+		SetXinzuo() {
+			let that = this;
+			uni.showActionSheet({
+				itemColor: '#000000',
+				itemList: this.xinzuo,
+				success: function (res) {
+					that.xinzuo_sel = that.xinzuo[res.tapIndex];
+					// console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+				},
+				fail: function (res) {
+					console.log(res.errMsg);
+				}
+			});
+		},
+		getInfoData() {
+			console.log(this.$apiHost + '/Member/getinfoData');
+			uni.request({
+				url: this.$apiHost + '/Member/getinfoData', //仅为示例，并非真实接口地址。
+				data: {
+					uuid: getApp().globalData.uuid
+				},
+				header: {
+					'content-type': 'application/json' //自定义请求头信息
+				},
+				success: (res) => {
+					console.log("res", res.data)
+					this.nickname = res.data.nickname;
+					this.wechat = res.data.wechat;
+					this.sex = res.data.sex || 2;
+					this.age = res.data.age || 18;
+					this.height = res.data.height || 160;
+					this.weight = res.data.weight || 50;
+					this.xueli_sel = res.data.xueli;
+					this.xinzuo_sel = res.data.xinzuo;
+					this.ziye = res.data.ziye;
+					this.qianmin = res.data.qianmin;
+					if (res.data.avator != "") {
+						this.avator = res.data.avator;
 					}
-				});
-			},
-			getInfoData() {
-				console.log(this.$apiHost + '/Member/getinfoData');
-				uni.request({
-					url: this.$apiHost + '/Member/getinfoData', //仅为示例，并非真实接口地址。
-					data: {
-						uuid: getApp().globalData.uuid
-					},
-					header: {
-						'content-type': 'application/json' //自定义请求头信息
-					},
-					success: (res) => {
-						console.log("res", res.data)
-						this.nickname = res.data.nickname;
-						this.wechat = res.data.wechat;
-						this.sex = res.data.sex || 2;
-						this.age = res.data.age || 18;
-						this.height = res.data.height || 160;
-						this.weight = res.data.weight || 50;
-						this.xueli_sel = res.data.xueli;
-						this.xinzuo_sel = res.data.xinzuo;
-						this.ziye = res.data.ziye;
-						this.qianmin = res.data.qianmin;
-						if (res.data.avator != "") {
-							this.avator = res.data.avator;
-						}
-						if (res.data.aihao != null && res.data.aihao != undefined) {
-							if (res.data.aihao.length > 0) {
-								this.sel_tags = res.data.aihao.split(",");
-							}
+					if (res.data.aihao != null && res.data.aihao != undefined) {
+						if (res.data.aihao.length > 0) {
+							this.sel_tags = res.data.aihao.split(",");
 						}
 					}
-				});
-			},
-
-			submitData() {
-				let aihao = this.sel_tags.join(',')
-				let obj2 = {
-					uuid: getApp().globalData.uuid,
-					avator: this.avator,
-					nickname: this.nickname,
-					wechat: this.wechat,
-					sex: this.sex,
-					age: this.age,
-					height: this.height,
-					weight: this.weight,
-					xueli: this.xueli_sel,
-					xinzuo: this.xinzuo_sel,
-					ziye: this.ziye,
-					qianmin: this.qianmin,
-					aihao: aihao
 				}
-				// console.log("obj2", obj2);
-				uni.request({
-					url: this.$apiHost + '/Member/setinfoData', //仅为示例，并非真实接口地址。
-					data: obj2,
-					method: 'POST',
-					header: {
-						'Content-Type': 'application/x-www-form-urlencoded',
-						'sign': getApp().globalData.headerSign
-					},
-					dataType: 'json',
-					// header: {
-					// 	'content-type': 'application/json', //自定义请求头信息
-					// 	'Access-Control-Allow-Origin': '*'
-					// },
-					success: (res) => {
-						console.log("res", res.data)
-						this.$refs['ToastW3'].showToast({
-							title: res.data.str,
-							animation: 0
+			});
+		},
+
+		submitData() {
+			let aihao = this.sel_tags.join(',')
+			let obj2 = {
+				uuid: getApp().globalData.uuid,
+				avator: this.avator,
+				nickname: this.nickname,
+				wechat: this.wechat,
+				sex: this.sex,
+				age: this.age,
+				height: this.height,
+				weight: this.weight,
+				xueli: this.xueli_sel,
+				xinzuo: this.xinzuo_sel,
+				ziye: this.ziye,
+				qianmin: this.qianmin,
+				aihao: aihao
+			}
+			// console.log("obj2", obj2);
+			uni.request({
+				url: this.$apiHost + '/Member/setinfoData', //仅为示例，并非真实接口地址。
+				data: obj2,
+				method: 'POST',
+				header: {
+					'Content-Type': 'application/x-www-form-urlencoded',
+					'sign': getApp().globalData.headerSign
+				},
+				dataType: 'json',
+				// header: {
+				// 	'content-type': 'application/json', //自定义请求头信息
+				// 	'Access-Control-Allow-Origin': '*'
+				// },
+				success: (res) => {
+					console.log("res", res.data)
+					this.$refs['ToastW3'].showToast({
+						title: res.data.str,
+						animation: 0
+					});
+					if (res.data.success == "yes") {
+						uni.switchTab({
+							url: "/pages/index/index",
 						});
-						if (res.data.success == "yes") {
-							uni.switchTab({
-								url: "/pages/index/index",
-							});
-						}
 					}
-				});
-			},
-			// upload() {
-			// 	let that = this;
-			// 	this.$refs['DialogBox'].confirm({
-			// 		title: '提示',
-			// 		content: '该权限用于获取设备拍摄或获取本地应用相册，进行头像的图片上传。',
-			// 		DialogType: 'inquiry',
-			// 		btn1: '拒绝',
-			// 		btn2: '同意',
-			// 		animation: 0
-			// 	}).then((res) => {
-			// 		that.upload2();
-			// 	})
-			// },
-			upload() {
-				this.checkRights();
-				console.log("----upload");
-				var _self = this;
-				uni.chooseImage({
-					count: 1,
-					sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
-					sourceType: ['album', 'camera'], //从相册、相机选择
-					extension: ['.png', '.jpeg', '.jpg'],
-					success: function(res) {
-						console.log('res:', res)
-						_self.imglocal = res.tempFilePaths[0]
-						const tempFilePaths = res.tempFilePaths[0];
-						console.log('tempFilePaths:', tempFilePaths);
-						// 图片上传
-						const uploadTask = uni.uploadFile({
-							url: _self.$apiHost + '/Xweb/upload_img?skey=' + _self.skey, // post请求地址
-							filePath: res.tempFilePaths[0],
-							name: 'file', // 待确认
-							success: function(uploadFileRes) {
-								let resdata = JSON.parse(uploadFileRes.data)
-								console.log('Success11:', uploadFileRes);
-								console.log('Success21:', resdata);
-								if (resdata.success == 'yes') {
-									_self.avator = resdata.url;
-								}
-							},
-							fail: function(uploadFileFail) {
-								console.log('Error:', uploadFileFail.data);
-							},
-							complete: () => {
-								console.log('Complete:');
+				}
+			});
+		},
+		// upload() {
+		// 	let that = this;
+		// 	this.$refs['DialogBox'].confirm({
+		// 		title: '提示',
+		// 		content: '该权限用于获取设备拍摄或获取本地应用相册，进行头像的图片上传。',
+		// 		DialogType: 'inquiry',
+		// 		btn1: '拒绝',
+		// 		btn2: '同意',
+		// 		animation: 0
+		// 	}).then((res) => {
+		// 		that.upload2();
+		// 	})
+		// },
+		upload() {
+			this.checkRights();
+			console.log("----upload");
+			var _self = this;
+			uni.chooseImage({
+				count: 1,
+				sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
+				sourceType: ['album', 'camera'], //从相册、相机选择
+				extension: ['.png', '.jpeg', '.jpg'],
+				success: function (res) {
+					console.log('res:', res)
+					_self.imglocal = res.tempFilePaths[0]
+					const tempFilePaths = res.tempFilePaths[0];
+					console.log('tempFilePaths:', tempFilePaths);
+					// 图片上传
+					const uploadTask = uni.uploadFile({
+						url: _self.$apiHost + '/Xweb/upload_img?skey=' + _self.skey, // post请求地址
+						filePath: res.tempFilePaths[0],
+						name: 'file', // 待确认
+						success: function (uploadFileRes) {
+							let resdata = JSON.parse(uploadFileRes.data)
+							console.log('Success11:', uploadFileRes);
+							console.log('Success21:', resdata);
+							if (resdata.success == 'yes') {
+								_self.avator = resdata.url;
 							}
-						});
-					},
-					error: function(e) {
-						console.log(e);
-					}
-				});
-			},
-			checkRights() {
-				let that = this;
-				that.showRights = true;
-				requestAndroidPermission('android.permission.CAMERA')
-					.then(result => {
-						that.showRights = false;
-						// 根据返回的结果进行处理
-						if (result === 1) {} else if (result === 0) {
-							console.log('权限被拒绝');
-						} else if (result === -1) {
-							console.log('权限被永久拒绝');
+						},
+						fail: function (uploadFileFail) {
+							console.log('Error:', uploadFileFail.data);
+						},
+						complete: () => {
+							console.log('Complete:');
 						}
-					})
-					.catch(error => {
-						that.showRights = true;
-						console.log('权限申请失败：', error);
 					});
-			},
-			selectTag(index) {
-				const tagIndex = this.selectedTags.indexOf(index);
-				if (tagIndex === -1) {
-					// 如果未选中，则添加到选中数组
-					this.selectedTags.push(index);
-				} else {
-					// 如果已选中，则从数组中移除
-					this.selectedTags.splice(tagIndex, 1);
+				},
+				error: function (e) {
+					console.log(e);
 				}
+			});
+		},
+		checkRights() {
+			let that = this;
+			that.showRights = true;
+			requestAndroidPermission('android.permission.CAMERA')
+				.then(result => {
+					that.showRights = false;
+					// 根据返回的结果进行处理
+					if (result === 1) { } else if (result === 0) {
+						console.log('权限被拒绝');
+					} else if (result === -1) {
+						console.log('权限被永久拒绝');
+					}
+				})
+				.catch(error => {
+					that.showRights = true;
+					console.log('权限申请失败：', error);
+				});
+		},
+		selectTag(index) {
+			const tagIndex = this.selectedTags.indexOf(index);
+			if (tagIndex === -1) {
+				// 如果未选中，则添加到选中数组
+				this.selectedTags.push(index);
+			} else {
+				// 如果已选中，则从数组中移除
+				this.selectedTags.splice(tagIndex, 1);
 			}
 		}
 	}
+}
 </script>
 
 <style scoped lang="scss">
-	@import 'normal.scss';
+@import 'normal.scss';
 
-	.popSel {
-		position: fixed;
-		z-index: 999999;
-		top: 0;
-		left: 0;
-		background-color: #121212;
-		width: 100vh;
-		height: 100vh;
-	}
+.popSel {
+	position: fixed;
+	z-index: 999999;
+	top: 0;
+	left: 0;
+	background-color: #121212;
+	width: 100vh;
+	height: 100vh;
+}
 
-	.tag_all_select {
-		padding: 20rpx;
-		
-		.tag_items {
+.tag_all_select {
+	padding: 20rpx;
+
+	.tag_items {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 30rpx;
+		justify-content: center;
+		align-items: center;
+
+		.tag_item {
 			display: flex;
-			flex-wrap: wrap;
-			gap: 30rpx;
-			justify-content: center;
 			align-items: center;
-			
-			.tag_item {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				border-radius: 50%;
-				background: rgba(255,255,255,0.1);
-				color: #fff;
-				font-size: 26rpx;
-				transition: all 0.3s ease;
-				cursor: pointer;
-				
-				&.small {
-					width: 120rpx;
-					height: 120rpx;
-				}
-				
-				&.medium {
-					width: 160rpx;
-					height: 160rpx;
-					font-size: 28rpx;
-				}
-				
-				&.large {
-					width: 200rpx;
-					height: 200rpx;
-					font-size: 32rpx;
-				}
-				
-				&.active {
-					transform: scale(1.2);
-					background: rgba(255,255,255,0.2);
-					box-shadow: 0 0 20rpx rgba(255,255,255,0.3);
-					z-index: 1;
-				}
-				
-				&:not(.active):hover {
-					transform: scale(1.05);
-				}
+			justify-content: center;
+			border-radius: 50%;
+			background: rgba(255, 255, 255, 0.1);
+			color: #fff;
+			font-size: 26rpx;
+			transition: all 0.3s ease;
+			cursor: pointer;
+
+			&.small {
+				width: 120rpx;
+				height: 120rpx;
+			}
+
+			&.medium {
+				width: 160rpx;
+				height: 160rpx;
+				font-size: 28rpx;
+			}
+
+			&.large {
+				width: 200rpx;
+				height: 200rpx;
+				font-size: 32rpx;
+			}
+
+			&.active {
+				transform: scale(1.2);
+				background: rgba(255, 255, 255, 0.2);
+				box-shadow: 0 0 20rpx rgba(255, 255, 255, 0.3);
+				z-index: 1;
+			}
+
+			&:not(.active):hover {
+				transform: scale(1.05);
 			}
 		}
 	}
+}
 </style>

pages/my/step.vue

@@ -1,243 +1,359 @@
 <template>
-	<view class="step-container">
-		<!-- 步骤指示器 -->
-		<view class="step-header">
-			<text class="step-title">STEP {{ currentStep }}</text>
-			<view class="step-progress">
-				<view class="progress-bar">
-					<view class="progress-inner" :style="{ width: currentStep === 1 ? '50%' : '100%' }"></view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 步骤1：个人信息 -->
-		<view v-if="currentStep === 1" class="step-content">
-			<view class="step-subtitle">定制个人信息</view>
-			
-			<!-- 头像上传 -->
-			<view class="avatar-section">
-				<view class="avatar-wrapper" @click="chooseAvatar">
-					<image v-if="userInfo.avatar" :src="userInfo.avatar" mode="aspectFill" class="avatar"></image>
-					<view v-else class="avatar-placeholder">
-						<image src="/static/icons/camera.png" mode="aspectFit" class="camera-icon"></image>
+  <view class="step-container">
+    <view class="reserveASeat"></view>
+    <!-- 步骤指示器 -->
+    <view class="step-header">
+      <text class="step-number">STEP {{ currentStep }}</text>
+      <view class="progress-container">
+        <view class="progress-bar">
+          <view
+            class="progress-inner"
+            :style="{ width: currentStep === 1 ? '50%' : '100%' }"
+          ></view>
+					</view>
 					</view>
 				</view>
-			</view>
 
-			<!-- 昵称输入 -->
-			<view class="input-section">
-				<view class="input-label">我的名字</view>
-				<view class="input-wrapper">
-					<input 
-						type="text" 
-						v-model="userInfo.nickname" 
-						placeholder="取一个独一无二的名字吧~"
-						placeholder-class="input-placeholder"
-					/>
-					<image 
-						v-if="userInfo.nickname" 
-						src="/static/icons/clear.png" 
-						mode="aspectFit" 
-						class="clear-icon"
-						@click="userInfo.nickname = ''"
-					></image>
+    <!-- 步骤1：个人信息 -->
+    <view v-if="currentStep === 1" class="step-content">
+      <view class="step-title">这里是 <text>·灵魂汇聚·</text> 的起点</view>
+      <!-- 头像上传 -->
+      <view class="avatar-section">
+        <view class="avatar-wrapper" @click="chooseAvatar">
+          <CircleAvatar
+            v-if="userInfo.avatar"
+            class="avator"
+            :src="userInfo.avatar"
+          ></CircleAvatar>
+          <view class="avatar-placeholder">
+            <image
+              src="/static/me/photo.png"
+              mode="aspectFit"
+              class="camera-icon"
+            ></image>
+				</view>
 				</view>
-			</view>
-
-			<!-- 性别选择 -->
-			<view class="gender-section">
-				<view class="input-label">性别</view>
-				<view class="gender-options">
-					<view 
-						class="gender-item" 
-						:class="{ active: userInfo.gender === 'male' }"
-						@click="userInfo.gender = 'male'"
-					>
-						<image src="/static/icons/male.png" mode="aspectFit" class="gender-icon"></image>
-						<text>男生</text>
-					</view>
-					<view 
-						class="gender-item" 
-						:class="{ active: userInfo.gender === 'female' }"
-						@click="userInfo.gender = 'female'"
-					>
-						<image src="/static/icons/female.png" mode="aspectFit" class="gender-icon"></image>
-						<text>女生</text>
-					</view>
-					<view 
-						class="gender-item" 
-						:class="{ active: userInfo.gender === 'other' }"
-						@click="userInfo.gender = 'other'"
-					>
-						<image src="/static/icons/other.png" mode="aspectFit" class="gender-icon"></image>
-						<text>其他</text>
 					</view>
+
+      <!-- 昵称输入 -->
+      <view class="input-section">
+        <view class="input-label">我的名字</view>
+        <view class="input-wrapper">
+          <input
+            type="text"
+            v-model="userInfo.nickname"
+            placeholder="取一个独一无二的名字吧~"
+            placeholder-class="input-placeholder"
+            maxlength="10"
+          />
+          <view class="input-actions">
+            <image
+              src="/static/me/step/dlzc_icon_suiji.png"
+              mode="aspectFit"
+              class="action-icon random"
+              @click="generateRandomNickname"
+            ></image>
+				</view>
+				</view>
 				</view>
-			</view>
 
-			<!-- 生日选择 -->
-			<view class="birthday-section">
-				<view class="input-label">我的生日</view>
-				<view class="birthday-picker" @click="showDatePicker = true">
-					<text :class="{ placeholder: !userInfo.birthday }">{{ userInfo.birthday || '告诉我你的生日吧' }}</text>
-					<image src="/static/icons/arrow-right.png" mode="aspectFit" class="arrow-icon"></image>
+      <!-- 性别选择 -->
+      <view class="gender-section">
+        <view class="input-label">性别</view>
+        <view class="gender-options">
+          <view
+            class="gender-item"
+            :class="{ active: userInfo.gender === '1' }"
+            @click="userInfo.gender = '1'"
+          >
+            <image
+              src="/static/me/step/dlzc_icon_nan.png"
+              mode="aspectFit"
+              class="gender-icon"
+            ></image>
+            <text>男生</text>
+				</view>
+          <view
+            class="gender-item"
+            :class="{ active: userInfo.gender === '2' }"
+            @click="userInfo.gender = '2'"
+          >
+            <image
+              src="/static/me/step/dlzc_icon_nv.png"
+              mode="aspectFit"
+              class="gender-icon"
+            ></image>
+            <text>女生</text>
+				</view>
+          <view
+            class="gender-item"
+            :class="{ active: userInfo.gender === '3' }"
+            @click="userInfo.gender = '3'"
+          >
+            <image
+              src="/static/me/step/dlzc_icon_qita.png"
+              mode="aspectFit"
+              class="gender-icon"
+            ></image>
+            <text>其它</text>
+				</view>
+				</view>
 				</view>
-			</view>
-		</view>
 
-		<!-- 步骤2：兴趣选择 -->
-		<view v-if="currentStep === 2" class="step-content">
-			<view class="step-subtitle">定制个人兴趣圈</view>
-			<view class="interest-section">
-				<text class="interest-tip">请选择</text>
-				<!-- 兴趣选择圆圈 -->
-				<view class="interest-circles">
-					<view 
-						v-for="(interest, index) in interests" 
-						:key="index"
-						class="interest-circle"
-						:class="{ active: selectedInterests.includes(interest.id) }"
-						@click="toggleInterest(interest.id)"
-					>
-						{{ interest.name }}
+      <!-- 生日选择 -->
+      <view class="birthday-section">
+        <view class="input-label">我的生日</view>
+        <view class="birthday-picker">
+          <picker
+            style="height: auto"
+            mode="date"
+            :value="userInfo.birthday"
+            :end="endDate"
+            @change="bindDateChange"
+          >
+            <view class="uni-input">
+              <text :class="{ placeholder: !userInfo.birthday }">{{
+                userInfo.birthday || "选择生日"
+              }}</text>
+              <text v-if="userInfo.birthday" class="constellation">{{
+                userInfo.xinzuo
+              }}</text>
+				</view>
+          </picker>
+          <image
+            src="/static/me/step/dlzc_icon_arrow.png"
+            mode="aspectFit"
+            class="arrow-icon"
+          ></image>
 					</view>
 				</view>
+    </view>
+
+    <!-- 步骤2：兴趣选择 -->
+    <view v-if="currentStep === 2" class="step-content">
+      <view class="step-title">亦是 <text>·奇思妙想·</text> 的原野</view>
+      <view class="interest-section">
+        <text class="interest-tip">请选择</text>
+        <view
+          class="interest-circles"
+          @touchstart="handleTouchStart"
+          @touchmove="handleTouchMove"
+          @touchend="handleTouchEnd"
+        >
+          <view class="interest-circles-container" :style="getContainerStyle()">
+            <view
+              v-for="(interest, index) in interests"
+              :key="index"
+              class="interest-circle-box"
+              :class="{ 
+                'active': selectedInterests.includes(interest.id),
+                'disabled': !selectedInterests.includes(interest.id) && isMaxSelected
+              }"
+              @click="toggleInterest(interest.id)"
+            >
+              <view class="interest-circle">
+                <view>{{ interest.name }}</view>
+              </view>
+            </view>
+          </view>
+		</view>
 
-				<!-- 添加兴趣爱好 -->
-				<view class="add-interests">
-					<text class="add-title">添加兴趣爱好</text>
-					<view class="interest-tags">
-						<view 
-							v-for="(tag, index) in interestTags" 
-							:key="index"
-							class="interest-tag"
-							:class="{ active: selectedTags.includes(tag.id) }"
-							@click="toggleTag(tag.id)"
-						>
-							{{ tag.name }}
-							<text v-if="selectedTags.includes(tag.id)" class="remove-tag" @click.stop="removeTag(tag.id)">×</text>
-						</view>
-						<view class="add-tag" @click="showAddTag = true">
-							<image src="/static/icons/add.png" mode="aspectFit" class="add-icon"></image>
-							创建新偏好
-						</view>
+        <!-- 添加兴趣爱好 -->
+        <view class="add-interests">
+          <view class="add-title">
+            添加兴趣爱好
+            <text class="add-hint">(最多选择5个)</text>
+		</view>
+          <view class="interest-tags">
+            <view
+              v-for="(tag, index) in selectedTags"
+              :key="index"
+              class="interest-tag"
+            >
+              {{ tag.name }}
+              <text class="remove-tag" @click.stop="removeTag(tag)">×</text>
+		</view>
+            <view
+              class="add-tag"
+              @click="showPopup"
+              v-if="!isMaxSelected"
+            >
+              <image
+                src="/static/me/step/dlzc_icon_tianjia.png"
+                mode="aspectFit"
+                class="add-icon"
+              ></image>
+              创建新偏好
 					</view>
 				</view>
 			</view>
+      </view>
 		</view>
 
-		<!-- 底部按钮 -->
-		<view class="bottom-button" :class="{ 'step2': currentStep === 2 }" @click="handleNext">
-			{{ currentStep === 1 ? '下一步' : '完成' }}
-		</view>
+    <!-- 底部按钮 -->
+    <view class="bottom-button" @click="handleNext">
+      {{ currentStep === 1 ? "下一步" : "完成" }}
+    </view>
 
-		<!-- 日期选择弹窗 -->
-		<uni-datetime-picker
-			v-if="showDatePicker"
-			type="date"
-			:value="userInfo.birthday"
-			@confirm="onDateConfirm"
-			@close="showDatePicker = false"
-		/>
-
-		<!-- 添加标签弹窗 -->
-		<uni-popup v-if="showAddTag" @close="showAddTag = false">
-			<view class="add-tag-popup">
-				<input 
-					type="text" 
-					v-model="newTag" 
-					placeholder="请输入新的兴趣爱好"
-					@confirm="addNewTag"
-				/>
-				<button @click="addNewTag">添加</button>
+    <!-- 添加标签弹窗 -->
+    <uni-popup ref="addTagPopup" type="center" :mask-click="false">
+      <view class="add-tag-popup">
+        <view class="popup-title">创建新偏好</view>
+        <scroll-view 
+          scroll-y 
+          class="popup-content"
+          :scroll-top="scrollTop"
+          @scroll="onScroll"
+        >
+          <view class="popup-input">
+            <input 
+              type="text" 
+              v-model="newTag" 
+              :disabled="isMaxSelected"
+              :placeholder="isMaxSelected ? '已达到标签上限' : '输入您的兴趣爱好'" 
+              placeholder-style="color: #999999;"
+              maxlength="5"
+              @confirm="addNewTag"
+              class="tag-input"
+              :class="{ 'disabled': isMaxSelected }"
+            />
+          </view>
+          <view class="selected-tags" v-if="selectedTags.length > 0">
+            <view class="selected-tags-title">
+              已选标签 ({{ selectedTags.length }}/{{ maxTags }})
+              <text v-if="isMaxSelected" class="max-hint">已达到上限</text>
+            </view>
+            <view class="selected-tags-list">
+				<view 
+                v-for="(tag, index) in selectedTags" 
+					:key="index"
+                class="selected-tag"
+				>
+                {{ tag.name }}
+                <text class="remove-tag" @click.stop="removeTag(tag)">×</text>
+				</view>
 			</view>
-		</uni-popup>
+		</view>
+        </scroll-view>
+        <view class="popup-buttons">
+          <button class="btn-cancel" @click="closePopup">再考虑一下</button>
+          <button 
+            class="btn-confirm" 
+            :class="{ 'disabled': isMaxSelected || !newTag.trim() }"
+            @click="addNewTag"
+          >确认添加</button>
+		</view>
+      </view>
+    </uni-popup>
 	</view>
 </template>
 
 <script>
 	import {
 		requestAndroidPermission,
-		gotoAppPermissionSetting
-	} from '../index/permission.js'
+  gotoAppPermissionSetting,
+} from "../index/permission.js";
 	export default {
 		components: {},
 		data() {
 			return {
-				showRights: false,
-				title: '',
-				currentStep: 1,
-				sel: 1,
-				info: {},
-				showPop: false,
-				nickname: '',
-				wechat: '',
-				sex: 1,
-				age: 18,
-				height: 160,
-				weight: 50,
-				avator: '../../static/me/avator.png',
-				ziye: '',
-				qianmin: '',
-
-				xueli_sel: '',
-				xueli: ['初中', '初中', '中专', '高中', '专科', '本科', '研究生', '硕士', '博士'],
-				xinzuo_sel: '',
-				xinzuo: ['水瓶座', '双鱼座', '白羊座', '金牛座', '双子座', '巨蟹座', '狮子座', '处女座', '天秤座', '天蝎座', '射手座', '摩羯座'],
-
-				list_tag: [
-					'篮球', '排球', '足球', '羽毛球', '健身达人', '美食达人'
-				],
-				sel_tags: [],
-				selectedTags: [],
-				tagList: [
-					{ name: '游戏', size: 'large' },
-					{ name: '音乐', size: 'medium' },
-					{ name: '盲盒', size: 'large' },
-					{ name: '小可爱', size: 'small' },
-					{ name: '娃娃人', size: 'medium' },
-					{ name: '纹身', size: 'large' },
-					{ name: '洛丽塔', size: 'small' },
-					{ name: '女装', size: 'medium' },
-					{ name: '萌球', size: 'small' }
-				],
-				userInfo: {
-					avatar: '',
-					nickname: '',
-					gender: '',
-					birthday: ''
-				},
-				interests: [
-					{ id: 1, name: '电影' },
-					{ id: 2, name: '宠物' },
-					{ id: 3, name: 'Hip-Hop' },
-					{ id: 4, name: '旅行' },
-					{ id: 5, name: '潮玩' },
-					{ id: 6, name: '运动' },
-					{ id: 7, name: '游戏' },
-					{ id: 8, name: '二次元' }
-				],
-				selectedInterests: [],
-				interestTags: [
-					{ id: 1, name: 'ACG' },
-					{ id: 2, name: '明日方舟' },
-					{ id: 3, name: '手游深度玩家' },
-					{ id: 4, name: '游戏人生' },
-					{ id: 5, name: '碧蓝档案' },
-					{ id: 6, name: '夏目友人帐' },
-					{ id: 7, name: 'FATE' }
-				],
-				showDatePicker: false,
-				showAddTag: false,
-				newTag: ''
-			}
+      currentStep: 1,
+      userInfo: {
+        avatar: "",
+        nickname: "",
+        gender: "",
+        birthday: "",
+        xinzuo: "",
+      },
+      interests: [
+        { id: 1, name: "老二次元了" },
+        { id: 2, name: "coser" },
+        { id: 3, name: "沉迷音乐-Hop" },
+        { id: 4, name: "网游小达人" },
+        { id: 5, name: "AJ控" },
+        { id: 6, name: "白日梦想家" },
+        { id: 7, name: "撸铁狂魔" },
+        { id: 8, name: "古风汉服" },
+        { id: 9, name: "爱画画" },
+        { id: 10, name: "数码极客" },
+        { id: 11, name: "盲盒玩家" },
+        { id: 12, name: "三坑玩家" },
+        { id: 13, name: "动漫达人" },
+        { id: 14, name: "独立设计师" },
+        { id: 15, name: "爱卡通" },
+        { id: 16, name: "兜风去" },
+        { id: 17, name: "爱夜跑" },
+        { id: 18, name: "街头滑板" },
+        { id: 19, name: "球类运动" },
+        { id: 20, name: "lo娘" },
+        { id: 21, name: "rapper" },
+        { id: 22, name: "时尚达人" },
+        { id: 23, name: "机甲狂潮" },
+        { id: 24, name: "养宠物" },
+        { id: 25, name: "风轻云淡" },
+        { id: 26, name: "养多肉" },
+        { id: 27, name: "热爱自然" },
+        { id: 28, name: "赛博朋克" },
+        { id: 29, name: "骨子里高冷" },
+        { id: 30, name: "爱唠嗑" },
+        { id: 31, name: "资深中二" },
+        { id: 32, name: "天然呆" },
+        { id: 33, name: "思想家" },
+        { id: 34, name: "极度抽象" },
+        { id: 35, name: "学院派" },
+        { id: 36, name: "平平无奇" },
+        { id: 37, name: "热情奔放" },
+        { id: 38, name: "博古通今" },
+        { id: 39, name: "labubu粉" },
+        { id: 40, name: "玛特收藏家" },
+      ],
+      selectedInterests: [],
+      showAddTag: false,
+      newTag: "",
+      endDate: "",
+      circleConfig: {
+        size: 132,
+        gap: 30,
+        rowGap: 20,
+        offsetLefts: 30,
+        offsetTops: 20,
+        rows: 4,
+        baseTop: 30,
+        baseLeft: 30,
+      },
+      containerWidth: 0,
+      customTags: [],
+      maxTags: 5,
+      scrollTop: 0,
+    };
+  },
+  computed: {
+    totalWidth() {
+      const { size, gap, rows } = this.circleConfig;
+      const columns = Math.ceil(this.interests.length / rows);
+      return columns * (size + gap) + gap + "rpx";
+    },
+    selectedTags() {
+      const selectedPresets = this.interests
+        .filter((interest) => this.selectedInterests.includes(interest.id))
+        .map((interest) => ({
+          id: interest.id,
+          name: interest.name,
+          isPreset: true,
+        }));
+      return [...selectedPresets, ...this.customTags];
+    },
+    isMaxSelected() {
+      return this.selectedTags.length >= this.maxTags;
+    },
 		},
 		onLoad() {
-			this.currentStep = 1;
-			let tagStr =
-				"篮球、羽毛球、兵乓球、足球、滑板、滑旱冰、跑步、跳绳、举重、听音乐、看电影、绘画、写小说、看书、做弹弓玩、做木剑玩、做橡皮枪玩、积木、用麻将搭金字塔、拼图、拆装、扑克牌、小汽车、手表、鞋之类的、弹吉他、钢琴、萨克斯、葫芦丝、大号、小号、折纸、剪纸、品茶、涂鸦、英雄联盟、qq堂、cs、cf、地下城勇士、桌面游戏";
-			this.list_tag = tagStr.split("、");
-			this.getInfoData();
+    this.currentStep = 1;
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = String(now.getMonth() + 1).padStart(2, "0");
+    const day = String(now.getDate()).padStart(2, "0");
+    this.endDate = `${year}-${month}-${day}`;
 		},
 		onShow() {},
 		methods: {
@@ -255,7 +371,7 @@
 			delTag(tg) {
 				let list_tag2 = [];
 				for (let i = 0; i < this.sel_tags.length; i++) {
-					if (this.sel_tags[i] != tg && this.sel_tags[i] != '') {
+        if (this.sel_tags[i] != tg && this.sel_tags[i] != "") {
 						list_tag2.push(this.sel_tags[i]);
 					}
 				}
@@ -278,16 +394,16 @@
 					let tmpTags = [];
 					for (let entry of this.sel_tags) {
 						// console.log(entry); // 1, "string", false
-						if (entry != itm && entry != '') {
+          if (entry != itm && entry != "") {
 							tmpTags.push(entry);
 						}
 					}
 					this.sel_tags = tmpTags;
 				} else {
-					if (this.sel_tags.length >= 10) {
-						this.$refs['ToastW3'].showToast({
-							title: "最多选择10个标签",
-							animation: 0
+        if (this.sel_tags.length >= 5) {
+          this.$refs["ToastW3"].showToast({
+            title: "最多选择5个标签",
+            animation: 0,
 						});
 						return;
 					}
@@ -306,43 +422,43 @@
 			SetXueli() {
 				let that = this;
 				uni.showActionSheet({
-					itemColor: '#000000',
+        itemColor: "#000000",
 					itemList: this.xueli,
-					success: function(res) {
+        success: function (res) {
 						that.xueli_sel = that.xueli[res.tapIndex];
 						// console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
 					},
-					fail: function(res) {
+        fail: function (res) {
 						console.log(res.errMsg);
-					}
+        },
 				});
 			},
 			SetXinzuo() {
 				let that = this;
 				uni.showActionSheet({
-					itemColor: '#000000',
+        itemColor: "#000000",
 					itemList: this.xinzuo,
-					success: function(res) {
+        success: function (res) {
 						that.xinzuo_sel = that.xinzuo[res.tapIndex];
 						// console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
 					},
-					fail: function(res) {
+        fail: function (res) {
 						console.log(res.errMsg);
-					}
+        },
 				});
 			},
 			getInfoData() {
-				console.log(this.$apiHost + '/Member/getinfoData');
+      console.log(this.$apiHost + "/Member/getinfoData");
 				uni.request({
-					url: this.$apiHost + '/Member/getinfoData', //仅为示例，并非真实接口地址。
+        url: this.$apiHost + "/Member/getinfoData", //仅为示例，并非真实接口地址。
 					data: {
-						uuid: getApp().globalData.uuid
+          uuid: getApp().globalData.uuid,
 					},
 					header: {
-						'content-type': 'application/json' //自定义请求头信息
+          "content-type": "application/json", //自定义请求头信息
 					},
 					success: (res) => {
-						console.log("res", res.data)
+          console.log("res", res.data);
 						this.nickname = res.data.nickname;
 						this.wechat = res.data.wechat;
 						this.sex = res.data.sex || 2;
@@ -361,12 +477,12 @@
 								this.sel_tags = res.data.aihao.split(",");
 							}
 						}
-					}
+        },
 				});
 			},
 
 			submitData() {
-				let aihao = this.sel_tags.join(',')
+      let aihao = this.sel_tags.join(",");
 				let obj2 = {
 					uuid: getApp().globalData.uuid,
 					avator: this.avator,
@@ -380,34 +496,34 @@
 					xinzuo: this.xinzuo_sel,
 					ziye: this.ziye,
 					qianmin: this.qianmin,
-					aihao: aihao
-				}
+        aihao: aihao,
+      };
 				// console.log("obj2", obj2);
 				uni.request({
-					url: this.$apiHost + '/Member/setinfoData', //仅为示例，并非真实接口地址。
+        url: this.$apiHost + "/Member/setinfoData", //仅为示例，并非真实接口地址。
 					data: obj2,
-					method: 'POST',
+        method: "POST",
 					header: {
-						'Content-Type': 'application/x-www-form-urlencoded',
-						'sign': getApp().globalData.headerSign
+          "Content-Type": "application/x-www-form-urlencoded",
+          sign: getApp().globalData.headerSign,
 					},
-					dataType: 'json',
+        dataType: "json",
 					// header: {
 					// 	'content-type': 'application/json', //自定义请求头信息
 					// 	'Access-Control-Allow-Origin': '*'
 					// },
 					success: (res) => {
-						console.log("res", res.data)
-						this.$refs['ToastW3'].showToast({
+          console.log("res", res.data);
+          this.$refs["ToastW3"].showToast({
 							title: res.data.str,
-							animation: 0
+            animation: 0,
 						});
 						if (res.data.success == "yes") {
 							uni.switchTab({
 								url: "/pages/index/index",
 							});
 						}
-					}
+        },
 				});
 			},
 			// upload() {
@@ -429,497 +545,998 @@
 				var _self = this;
 				uni.chooseImage({
 					count: 1,
-					sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
-					sourceType: ['album', 'camera'], //从相册、相机选择
-					extension: ['.png', '.jpeg', '.jpg'],
-					success: function(res) {
-						console.log('res:', res)
-						_self.imglocal = res.tempFilePaths[0]
+        sizeType: ["compressed"], //可以指定是原图还是压缩图，默认二者都有
+        sourceType: ["album", "camera"], //从相册、相机选择
+        extension: [".png", ".jpeg", ".jpg"],
+        success: function (res) {
+          console.log("res:", res);
+          _self.imglocal = res.tempFilePaths[0];
 						const tempFilePaths = res.tempFilePaths[0];
-						console.log('tempFilePaths:', tempFilePaths);
+          console.log("tempFilePaths:", tempFilePaths);
 						// 图片上传
 						const uploadTask = uni.uploadFile({
-							url: _self.$apiHost + '/Xweb/upload_img?skey=' + _self.skey, // post请求地址
+            url: _self.$apiHost + "/Xweb/upload_img?skey=" + _self.skey, // post请求地址
 							filePath: res.tempFilePaths[0],
-							name: 'file', // 待确认
-							success: function(uploadFileRes) {
-								let resdata = JSON.parse(uploadFileRes.data)
-								console.log('Success11:', uploadFileRes);
-								console.log('Success21:', resdata);
-								if (resdata.success == 'yes') {
+            name: "file", // 待确认
+            success: function (uploadFileRes) {
+              let resdata = JSON.parse(uploadFileRes.data);
+              console.log("Success11:", uploadFileRes);
+              console.log("Success21:", resdata);
+              if (resdata.success == "yes") {
 									_self.avator = resdata.url;
 								}
 							},
-							fail: function(uploadFileFail) {
-								console.log('Error:', uploadFileFail.data);
+            fail: function (uploadFileFail) {
+              console.log("Error:", uploadFileFail.data);
 							},
 							complete: () => {
-								console.log('Complete:');
-							}
+              console.log("Complete:");
+            },
 						});
 					},
-					error: function(e) {
+        error: function (e) {
 						console.log(e);
-					}
+        },
 				});
 			},
 			checkRights() {
 				let that = this;
 				that.showRights = true;
-				requestAndroidPermission('android.permission.CAMERA')
-					.then(result => {
+      requestAndroidPermission("android.permission.CAMERA")
+        .then((result) => {
 						that.showRights = false;
 						// 根据返回的结果进行处理
-						if (result === 1) {} else if (result === 0) {
-							console.log('权限被拒绝');
+          if (result === 1) {
+          } else if (result === 0) {
+            console.log("权限被拒绝");
 						} else if (result === -1) {
-							console.log('权限被永久拒绝');
+            console.log("权限被永久拒绝");
 						}
 					})
-					.catch(error => {
+        .catch((error) => {
 						that.showRights = true;
-						console.log('权限申请失败：', error);
+          console.log("权限申请失败：", error);
 					});
 			},
-			selectTag(index) {
-				const tagIndex = this.selectedTags.indexOf(index);
-				if (tagIndex === -1) {
-					// 如果未选中，则添加到选中数组
-					this.selectedTags.push(index);
-				} else {
-					// 如果已选中，则从数组中移除
-					this.selectedTags.splice(tagIndex, 1);
-				}
-			},
-			chooseAvatar() {
-				uni.chooseImage({
-					count: 1,
-					sizeType: ['compressed'],
-					sourceType: ['album', 'camera'],
-					success: (res) => {
-						this.userInfo.avatar = res.tempFilePaths[0]
-					}
-				})
-			},
-			toggleInterest(id) {
-				const index = this.selectedInterests.indexOf(id)
-				if (index === -1) {
-					this.selectedInterests.push(id)
-				} else {
-					this.selectedInterests.splice(index, 1)
-				}
-			},
-			toggleTag(id) {
-				const index = this.selectedTags.indexOf(id)
-				if (index === -1) {
-					this.selectedTags.push(id)
-				} else {
-					this.selectedTags.splice(index, 1)
-				}
-			},
-			removeTag(id) {
-				const index = this.selectedTags.indexOf(id)
-				if (index !== -1) {
-					this.selectedTags.splice(index, 1)
-				}
-			},
-			addNewTag() {
-				if (this.newTag.trim()) {
-					const newId = this.interestTags.length + 1
-					this.interestTags.push({
-						id: newId,
-						name: this.newTag.trim()
-					})
-					this.selectedTags.push(newId)
-					this.newTag = ''
-					this.showAddTag = false
-				}
-			},
-			onDateConfirm(date) {
-				this.userInfo.birthday = this.$u.timeFormat(date, 'yyyy-mm-dd')
-				this.showDatePicker = false
-			},
-			handleNext() {
-				if (this.currentStep === 1) {
-					// 验证第一步数据
-					if (!this.userInfo.nickname) {
-						uni.showToast({
-							title: '请输入昵称',
-							icon: 'none'
-						})
-						return
-					}
-					if (!this.userInfo.gender) {
-						uni.showToast({
-							title: '请选择性别',
-							icon: 'none'
-						})
-						return
-					}
-					this.currentStep = 2
+    chooseAvatar() {
+      uni.chooseImage({
+        count: 1,
+        sizeType: ["compressed"],
+        sourceType: ["album", "camera"],
+        success: (res) => {
+          this.userInfo.avatar = res.tempFilePaths[0];
+        },
+      });
+    },
+    toggleInterest(id) {
+      if (this.selectedInterests.includes(id)) {
+        // 取消选择
+        this.selectedInterests.splice(this.selectedInterests.indexOf(id), 1);
+      } else if (!this.isMaxSelected) {
+        // 添加选择
+        this.selectedInterests.push(id);
 				} else {
-					// 验证第二步数据
-					if (this.selectedInterests.length === 0 && this.selectedTags.length === 0) {
-						uni.showToast({
-							title: '请至少选择一个兴趣',
-							icon: 'none'
-						})
-						return
-					}
-					// 提交所有数据
-					this.submitUserInfo()
-				}
-			},
-			submitUserInfo() {
-				const data = {
-					...this.userInfo,
-					interests: this.selectedInterests,
-					tags: this.selectedTags
-				}
-				
-				uni.showLoading({
-					title: '保存中...'
-				})
+        uni.showToast({
+          title: '最多只能选择5个标签哦',
+          icon: 'none',
+          duration: 1500
+        });
+      }
+    },
+    removeTag(tag) {
+      if (tag.isPreset) {
+        const index = this.selectedInterests.indexOf(tag.id);
+        if (index !== -1) {
+          this.selectedInterests.splice(index, 1);
+        }
+      } else {
+        const index = this.customTags.findIndex(
+          (item) => item.name === tag.name
+        );
+        if (index !== -1) {
+          this.customTags.splice(index, 1);
+        }
+      }
 
-				// 调用API保存用户信息
-				uni.request({
-					url: this.$apiHost + '/user/updateProfile',
-					method: 'POST',
-					data: data,
-					header: {
-						'content-type': 'application/json',
-						'sign': getApp().globalData.headerSign
-					},
-					success: (res) => {
-						if (res.data.success === 'yes') {
-							uni.showToast({
-								title: '保存成功',
-								icon: 'success'
-							})
-							// 延迟跳转
-							setTimeout(() => {
-								uni.switchTab({
-									url: '/pages/index/index'
-								})
-							}, 1500)
-						} else {
-							uni.showToast({
-								title: res.data.msg || '保存失败',
-								icon: 'none'
-							})
-						}
-					},
-					fail: () => {
-						uni.showToast({
-							title: '网络错误',
-							icon: 'none'
-						})
-					},
-					complete: () => {
-						uni.hideLoading()
-					}
-				})
-			}
-		}
-	}
+      uni.showToast({
+        title: '已删除',
+        icon: 'none',
+        duration: 1500
+      });
+    },
+    showPopup() {
+      this.$refs.addTagPopup.open();
+    },
+    closePopup() {
+      this.$refs.addTagPopup.close();
+      this.newTag = '';
+    },
+    addNewTag() {
+      const tagName = this.newTag.trim();
+      if (!tagName) {
+        uni.showToast({
+          title: '请输入标签内容',
+          icon: 'none'
+        });
+        return;
+      }
+
+      if (tagName.length > 5) {
+        uni.showToast({
+          title: '标签最多5个字哦',
+          icon: 'none'
+        });
+        return;
+      }
+      
+      if (this.isMaxSelected) {
+        uni.showToast({
+          title: '最多只能添加5个标签哦',
+          icon: 'none'
+        });
+        return;
+      }
+
+      const isPresetDuplicate = this.interests.some(
+        (interest) => interest.name === tagName
+      );
+      
+      const isCustomDuplicate = this.customTags.some(
+        (tag) => tag.name === tagName
+      );
+
+      if (isPresetDuplicate || isCustomDuplicate) {
+        uni.showToast({
+          title: '这个标签已经添加过啦',
+          icon: 'none'
+        });
+        return;
+      }
+
+      this.customTags.push({
+        name: tagName,
+        isCustom: true,
+      });
+      
+      uni.showToast({
+        title: '添加成功',
+        icon: 'success',
+        duration: 1500
+      });
+      
+      this.newTag = '';
+      this.closePopup();
+    },
+    generateRandomNickname() {
+      const characters = "0123456789";
+      let result = "织梦者_";
+      for (let i = 0; i < 8; i++) {
+        result += characters.charAt(
+          Math.floor(Math.random() * characters.length)
+        );
+      }
+      this.userInfo.nickname = result;
+    },
+    bindDateChange(e) {
+      const selectedDate = new Date(e.detail.value);
+      const now = new Date();
+
+      if (selectedDate > now) {
+        uni.showToast({
+          title: "不能选择未来日期",
+          icon: "none",
+        });
+        return;
+      }
+
+      this.userInfo.birthday = e.detail.value;
+      this.setXinzuoByDate(e.detail.value);
+    },
+    bindXinzuoChange(e) {
+      const index = e.detail.value;
+      this.xinzuoIndex = index;
+      this.userInfo.xinzuo = this.xinzuo[index];
+    },
+    setXinzuoByDate(birthday) {
+      if (!birthday) return;
+      const date = new Date(birthday);
+      const month = date.getMonth() + 1;
+      const day = date.getDate();
+
+      let xinzuoIndex = 0;
+      if ((month == 1 && day >= 20) || (month == 2 && day <= 18)) {
+        xinzuoIndex = 0; // 水瓶座
+      } else if ((month == 2 && day >= 19) || (month == 3 && day <= 20)) {
+        xinzuoIndex = 1; // 双鱼座
+      } else if ((month == 3 && day >= 21) || (month == 4 && day <= 19)) {
+        xinzuoIndex = 2; // 白羊座
+      } else if ((month == 4 && day >= 20) || (month == 5 && day <= 20)) {
+        xinzuoIndex = 3; // 金牛座
+      } else if ((month == 5 && day >= 21) || (month == 6 && day <= 21)) {
+        xinzuoIndex = 4; // 双子座
+      } else if ((month == 6 && day >= 22) || (month == 7 && day <= 22)) {
+        xinzuoIndex = 5; // 巨蟹座
+      } else if ((month == 7 && day >= 23) || (month == 8 && day <= 22)) {
+        xinzuoIndex = 6; // 狮子座
+      } else if ((month == 8 && day >= 23) || (month == 9 && day <= 22)) {
+        xinzuoIndex = 7; // 处女座
+      } else if ((month == 9 && day >= 23) || (month == 10 && day <= 23)) {
+        xinzuoIndex = 8; // 天秤座
+      } else if ((month == 10 && day >= 24) || (month == 11 && day <= 22)) {
+        xinzuoIndex = 9; // 天蝎座
+      } else if ((month == 11 && day >= 23) || (month == 12 && day <= 21)) {
+        xinzuoIndex = 10; // 射手座
+      } else {
+        xinzuoIndex = 11; // 摩羯座
+      }
+
+      this.xinzuoIndex = xinzuoIndex;
+      this.userInfo.xinzuo = this.xinzuo[xinzuoIndex];
+    },
+    getCircleStyle(index) {
+      const {
+        size,
+        gap,
+        rowGap,
+        rows,
+        baseTop,
+        offsetLefts,
+        offsetTops,
+        baseLeft,
+      } = this.circleConfig;
+      const row = index % rows;
+      const column = Math.floor(index / rows);
+      let offsetLeft = 0;
+      let offsetTop = 0;
+
+      if (row == 0 || row == 2) {
+        offsetLeft = offsetLefts;
+      } else {
+        offsetLeft = -offsetLefts;
+      }
+      if (column == 1 || column == 3) {
+        offsetTop = offsetTops;
+      } else {
+        offsetTop = -offsetTops;
+      }
+
+      const left = baseLeft + column * (size + gap) + offsetLeft + "rpx";
+      const top = baseTop + row * (size + rowGap) + offsetTop + "rpx";
+
+      return {
+        position: "absolute",
+        left,
+        top,
+        width: size + "rpx",
+        height: size + "rpx",
+      };
+    },
+    getContainerStyle() {
+      return {
+        width: this.totalWidth,
+        height: "648rpx",
+        position: "relative",
+      };
+    },
+    handleTouchStart(e) {
+      this.touchStartX = e.touches[0].clientX;
+      this.touchStartScrollLeft = e.currentTarget.scrollLeft;
+    },
+    handleTouchMove(e) {
+      if (!this.touchStartX) return;
+      const deltaX = this.touchStartX - e.touches[0].clientX;
+      e.currentTarget.scrollLeft = this.touchStartScrollLeft + deltaX;
+    },
+    handleTouchEnd() {
+      this.touchStartX = null;
+      this.touchStartScrollLeft = null;
+    },
+    handleNext() {
+      if (this.currentStep === 1) {
+        // 验证第一步数据
+        if (!this.userInfo.nickname) {
+          uni.showToast({
+            title: "请输入昵称",
+            icon: "none",
+          });
+          return;
+        }
+        if (!this.userInfo.gender) {
+          uni.showToast({
+            title: "请选择性别",
+            icon: "none",
+          });
+          return;
+        }
+        this.currentStep = 2;
+      } else {
+        // 验证第二步数据
+        if (
+          this.selectedInterests.length === 0 &&
+          this.selectedTags.length === 0
+        ) {
+          uni.showToast({
+            title: "请至少选择一个兴趣",
+            icon: "none",
+          });
+          return;
+        }
+        // 提交所有数据
+        this.submitUserInfo();
+      }
+    },
+    submitUserInfo() {
+		let tagStr = this.selectedTags.map(item => item.name).join(',');
+      const data = {
+        ...this.userInfo,
+        interests: this.selectedInterests,
+        tags: tagStr,
+		uuid: getApp().globalData.uuid,
+		
+      };
+
+      uni.showLoading({
+        title: "保存中...",
+      });
+	  uni.request({
+        url: this.$apiHost + "/Member/setinfoData", //仅为示例，并非真实接口地址。
+        data: data,
+        method: "POST",
+        header: {
+          "Content-Type": "application/x-www-form-urlencoded",
+          sign: getApp().globalData.headerSign,
+        },
+        dataType: "json",
+        // header: {
+        // 	'content-type': 'application/json', //自定义请求头信息
+        // 	'Access-Control-Allow-Origin': '*'
+        // },
+        success: (res) => {
+			if (res.data.success === "yes") {
+            uni.showToast({
+              title: "保存成功",
+              icon: "success",
+            });
+            // 延迟跳转
+            setTimeout(() => {
+              uni.switchTab({
+                url: "/pages/index/index",
+              });
+            }, 1500);
+          } else {
+            uni.showToast({
+              title: res.data.msg || "保存失败",
+              icon: "none",
+            });
+          }
+        },      fail: () => {
+          uni.showToast({
+            title: "网络错误",
+            icon: "none",
+          });
+        },
+        complete: () => {
+          uni.hideLoading();
+        },
+      });
+      
+    },
+    onScroll(e) {
+      this.scrollTop = e.detail.scrollTop;
+    }
+  },
+};
 </script>
 
 <style lang="scss">
-	@import 'normal.scss';
-
-	.popSel {
-		position: fixed;
-		z-index: 999999;
-		top: 0;
-		left: 0;
-		background-color: #121212;
-		width: 100vh;
-		height: 100vh;
-	}
+.reserveASeat {
+  width: 100%;
+  height: calc(var(--status-bar-height) + 20rpx);
+}
 
-	.tag_all_select {
-		padding: 20rpx;
-		
-		.tag_items {
-			display: flex;
-			flex-wrap: wrap;
-			gap: 30rpx;
-			justify-content: center;
-			align-items: center;
-			
-			.tag_item {
+.popSel {
+  position: fixed;
+  z-index: 101;
+  top: 0;
+  left: 0;
+  background-color: #f2f6f2;
+  width: 100%;
+  height: 100vh;
+  overflow-y: scroll;
+  -webkit-overflow-scrolling: touch;
+  box-sizing: border-box;
+  padding-bottom: 100rpx;
+}
+
+.tag_all_select {
+  padding: 20rpx;
+  height: 100%;
+  overflow-y: auto;
+
+  .tag_items {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 30rpx;
+    justify-content: center;
+    align-items: center;
+    padding-bottom: 50rpx;
+
+    .tag_item {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 50%;
+      background: rgba(255, 255, 255, 0.1);
+      color: #333;
+      font-size: 26rpx;
+      transition: all 0.3s ease;
+      cursor: pointer;
+
+      &.small {
+        width: 120rpx;
+        height: 120rpx;
+      }
+
+      &.medium {
+        width: 160rpx;
+        height: 160rpx;
+        font-size: 28rpx;
+      }
+
+      &.large {
+        width: 200rpx;
+        height: 200rpx;
+        font-size: 32rpx;
+      }
+
+      &.active {
+        transform: scale(1.2);
+        background: rgba(255, 255, 255, 0.2);
+        box-shadow: 0 0 20rpx rgba(255, 255, 255, 0.3);
+        z-index: 1;
+      }
+
+      &:not(.active):hover {
+        transform: scale(1.05);
+      }
+    }
+  }
+}
+
+.step-container {
+  min-height: 100vh;
+  background: url("../../static/me/step/wd_bg_bianjiziliao.png") top center/100%
+      no-repeat,
+    #f2f6f2;
+  padding: 40rpx 0;
+  padding-bottom: 230rpx;
+  box-sizing: border-box;
+}
+
+.step-header {
+  margin-bottom: 20rpx;
+  padding: 0 40rpx;
+
+  .step-number {
+    font-size: 48rpx;
+    font-weight: bold;
+    color: #000;
+    margin-bottom: 20rpx;
+    display: block;
+    text-align: center;
+  }
+
+  .progress-container {
+    height: 6rpx;
+    background: #f1f1f1;
+    border-radius: 4rpx;
+    overflow: hidden;
+
+    .progress-inner {
+      height: 100%;
+      background: #1f1f1f;
+      border-radius: 4rpx;
+      transition: width 0.3s ease;
+      height: 6rpx;
+    }
+  }
+}
+
+.step-content {
+  padding:0 40rpx; 
+
+  .step-title {
+    text-align: center;
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #666;
+    margin-bottom: 50rpx;
+    letter-spacing: 1rpx;
+
+    text {
+      font-size: 40rpx;
+    }
+  }
+}
+
+.avatar-section {
 				display: flex;
-				align-items: center;
 				justify-content: center;
+  margin-bottom: 60rpx;
+
+  .avatar-wrapper {
+    width: 200rpx;
+    height: 200rpx;
 				border-radius: 50%;
-				background: rgba(255,255,255,0.1);
-				color: #fff;
-				font-size: 26rpx;
+    background: #f8f8f8;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 4rpx dashed #e5e5e5;
+    position: relative;
+
+    .avatar {
+      width: 100%;
+      height: 100%;
+    }
+
+    .avatar-placeholder {
+      width: 64rpx;
+      height: 64rpx;
+      position: absolute;
+      bottom: 0;
+      right: 0;
+
+      .camera-icon {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+}
+
+.input-section {
+  margin-bottom: 20rpx;
+
+  .input-wrapper {
+    position: relative;
+    display: flex;
+    align-items: center;
+    background: #f8f8f8;
+    border-radius: 16rpx;
+    padding-right: 20rpx;
+
+    input {
+      flex: 1;
+      height: 88rpx;
+      padding: 0 20rpx 0 30rpx;
+      font-size: 28rpx;
+      color: #333;
+      background: transparent;
+
+      &::placeholder {
+        color: #999;
+      }
+    }
+
+    .input-actions {
+      display: flex;
+      align-items: center;
+      gap: 16rpx;
+
+      .close-icon {
+        width: 36rpx;
+        height: 36rpx;
+      }
+
+      .random {
+        width: 44rpx;
+        height: 44rpx;
+      }
+    }
+  }
+}
+
+.gender-section {
+  margin-bottom: 20rpx;
+
+  .gender-options {
+    display: flex;
+    gap: 20rpx;
+
+    .gender-item {
+      flex: 1;
+      background: #f8f8f8;
+      border-radius: 20rpx;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
 				transition: all 0.3s ease;
-				cursor: pointer;
-				
-				&.small {
+
+      width: 184px;
+      height: 168rpx;
+      border-radius: 20rpx;
+      border: 4rpx solid #e9e9e9;
+
+      &.active {
+        background: linear-gradient(
+          180deg,
+          #f0ffd9 0%,
+          rgba(240, 255, 217, 0) 99%
+        );
+        transform: scale(1.02);
+        border-color: #1f1f1f;
+      }
+
+      .gender-icon {
+        width: 80rpx;
+        height: 80rpx;
+        margin-bottom: 16rpx;
+      }
+
+      text {
+        font-size: 28rpx;
+        color: #333;
+      }
+    }
+  }
+}
+
+.birthday-section {
+  margin-bottom: 20rpx;
+  background: #fff;
+  padding: 20rpx;
+  border-radius: 20rpx;
+
+  .input-label {
+    font-size: 28rpx;
+    color: #333;
+    padding-bottom: 20rpx;
+  }
+
+  .birthday-picker {
+    height: 88rpx;
+    background: #f8f8f8;
+    border-radius: 16rpx;
+    padding: 0 30rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    picker {
+      flex: 1;
+      height: 100%;
+
+      .uni-input {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        gap: 12rpx;
+
+        text {
+          font-size: 28rpx;
+          color: #333;
+
+          &.placeholder {
+            color: #999;
+          }
+
+          &.constellation {
+            font-size: 28rpx;
+            color: #1f1f1f;
+            padding: 4rpx 12rpx;
+            border-radius: 8rpx;
+          }
+        }
+      }
+    }
+
+    .arrow-icon {
+      width: 32rpx;
+      height: 32rpx;
+      flex-shrink: 0;
+    }
+  }
+}
+
+.interest-section {
+  .interest-tip {
+    font-size: 28rpx;
+    color: #666;
+    margin-bottom: 30rpx;
+    padding: 0 20rpx;
+  }
+
+  .interest-circles {
+    width: 100%;
+    height: 648rpx;
+    overflow-x: scroll;
+    overflow-y: hidden;
+    position: relative;
+    margin-bottom: 60rpx;
+    padding: 10rpx;
+    box-sizing: border-box;
+    -webkit-overflow-scrolling: touch;
+
+    &::-webkit-scrollbar {
+      display: none;
+    }
+
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+
+    .interest-circles-container {
+      position: relative;
+      height: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      gap: 20rpx;
+      padding: 20rpx;
+    }
+
+    .interest-circle-box {
+      width: 132rpx;
+      height: 132rpx;
+      border-radius: 50%;
+      position: relative;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      &.active {
+        background: url("../../static/me/step/dlzc_btn_xuanzhong.png") no-repeat
+          center center / 100% 100%;
+      }
+
+      &.disabled {
+        opacity: 0.5;
+        cursor: not-allowed;
+        
+        .interest-circle {
+          background: rgba(0, 0, 0, 0.02);
+        }
+      }
+
+      .interest-circle {
 					width: 120rpx;
 					height: 120rpx;
-				}
-				
-				&.medium {
-					width: 160rpx;
-					height: 160rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 50%;
+        background: rgba(0, 0, 0, 0.04);
+        font-size: 24rpx;
+        color: #666;
+        transition: all 0.3s ease;
+        text-align: center;
+        box-sizing: border-box;
+        max-width: 120rpx;
+        padding: 10rpx;
+
+        > view {
+          width: 100%;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+      }
+    }
+  }
+}
+
+.interest-tags {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20rpx;
+  margin-top: 30rpx;
+  padding: 0 20rpx;
+
+  .interest-tag {
+    padding: 16rpx 24rpx;
+    background: #FFFFFF;
+    border-radius: 100rpx;
 					font-size: 28rpx;
-				}
-				
-				&.large {
-					width: 200rpx;
-					height: 200rpx;
+    color: #333333;
+    display: flex;
+    align-items: center;
+    box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
+    position: relative;
+
+    .remove-tag {
+      margin-left: 12rpx;
+      font-size: 32rpx;
+      color: #333333;
+      padding: 0 6rpx;
+      display: flex;
+      align-items: center;
+      position: relative;
+      z-index: 1;
+      
+      &::after {
+        content: '';
+        position: absolute;
+        left: -8rpx;
+        right: -8rpx;
+        top: -8rpx;
+        bottom: -8rpx;
+        z-index: 0;
+      }
+    }
+  }
+
+  .add-tag {
+    padding: 16rpx 24rpx;
+    background: #FFFFFF;
+    border-radius: 100rpx;
+    font-size: 28rpx;
+    color: #333333;
+    display: flex;
+    align-items: center;
+    box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
+
+    .add-icon {
+      width: 32rpx;
+      height: 32rpx;
+      margin-right: 12rpx;
+    }
+  }
+}
+
+.bottom-button {
+  position: fixed;
+  left: 40rpx;
+  right: 40rpx;
+  bottom: 40rpx;
+  height: 88rpx;
+  background: #000;
+  border-radius: 44rpx;
+  color: #fff;
 					font-size: 32rpx;
-				}
-				
-				&.active {
-					transform: scale(1.2);
-					background: rgba(255,255,255,0.2);
-					box-shadow: 0 0 20rpx rgba(255,255,255,0.3);
-					z-index: 1;
-				}
-				
-				&:not(.active):hover {
-					transform: scale(1.05);
-				}
-			}
-		}
-	}
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: all 0.3s ease;
 
-	.step-container {
-		min-height: 100vh;
-		background: #fff;
-		padding: 60rpx 40rpx;
-		box-sizing: border-box;
-	}
+  &.step2 {
+    background: linear-gradient(90deg, #acf934 0%, #23c343 100%);
+    color: #000;
+  }
+}
 
-	.step-header {
-		margin-bottom: 60rpx;
-		
-		.step-title {
-			font-size: 48rpx;
-			font-weight: bold;
-			color: #000;
-			margin-bottom: 20rpx;
-		}
-		
-		.step-progress {
-			height: 6rpx;
-			background: #F1F1F1;
-			border-radius: 3rpx;
-			
-			.progress-inner {
-				height: 100%;
-				background: #000;
-				border-radius: 3rpx;
-				transition: width 0.3s;
-			}
-		}
-	}
+.add-tag-popup {
+  background: #FFFFFF;
+  border-radius: 24rpx;
+  width: 580rpx;
+  height: 70vh;
+  max-height: 800rpx;
+  display: flex;
+  flex-direction: column;
 
-	.step-content {
-		.step-subtitle {
-			font-size: 36rpx;
-			font-weight: bold;
-			color: #000;
-			margin-bottom: 40rpx;
-		}
-	}
+  .popup-title {
+    padding: 40rpx 30rpx 20rpx;
+    font-size: 32rpx;
+    color: #333333;
+    text-align: center;
+    font-weight: 600;
+    flex-shrink: 0;
+  }
 
-	.avatar-section {
-		display: flex;
-		justify-content: center;
-		margin-bottom: 60rpx;
-		
-		.avatar-wrapper {
-			width: 180rpx;
-			height: 180rpx;
-			border-radius: 50%;
-			overflow: hidden;
-			background: #F8F8F8;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			
-			.avatar {
-				width: 100%;
-				height: 100%;
-			}
-			
-			.avatar-placeholder {
-				width: 60rpx;
-				height: 60rpx;
-				
-				.camera-icon {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-	}
+  .popup-content {
+    flex: 1;
+    overflow-y: auto;
+    padding: 0 30rpx;
+    margin-bottom: 20rpx;
 
-	.input-section {
-		margin-bottom: 40rpx;
-		
-		.input-label {
-			font-size: 28rpx;
-			color: #666;
-			margin-bottom: 20rpx;
-		}
-		
-		.input-wrapper {
-			position: relative;
-			
-			input {
-				width: 100%;
-				height: 88rpx;
-				background: #F8F8F8;
-				border-radius: 44rpx;
-				padding: 0 30rpx;
-				font-size: 28rpx;
-			}
-			
-			.clear-icon {
-				position: absolute;
-				right: 30rpx;
-				top: 50%;
-				transform: translateY(-50%);
-				width: 32rpx;
-				height: 32rpx;
-			}
-		}
-	}
+    .popup-input {
+      margin-bottom: 30rpx;
 
-	.gender-section {
-		margin-bottom: 40rpx;
-		
-		.gender-options {
-			display: flex;
-			justify-content: space-between;
-			
-			.gender-item {
-				flex: 1;
-				height: 160rpx;
-				background: #F8F8F8;
-				border-radius: 20rpx;
-				margin: 0 10rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-				
-				&.active {
-					background: #E8FFD5;
-				}
-				
-				.gender-icon {
-					width: 60rpx;
-					height: 60rpx;
-					margin-bottom: 10rpx;
-				}
-				
-				text {
-					font-size: 24rpx;
-					color: #333;
-				}
-			}
-		}
-	}
+      .tag-input {
+        width: 100%;
+        height: 80rpx;
+        background: #f2f6f2;
+        border-radius: 12rpx;
+        padding: 0 24rpx;
+        font-size: 28rpx;
+        color: #333333;
 
-	.interest-section {
-		.interest-tip {
-			font-size: 28rpx;
-			color: #666;
-			margin-bottom: 30rpx;
-		}
-		
-		.interest-circles {
-			display: flex;
-			flex-wrap: wrap;
-			gap: 20rpx;
-			margin-bottom: 60rpx;
-			
-			.interest-circle {
-				width: 140rpx;
-				height: 140rpx;
-				border-radius: 50%;
-				background: #F8F8F8;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				font-size: 28rpx;
-				color: #333;
-				
-				&.active {
-					background: #ACF934;
-					color: #000;
-				}
-			}
-		}
-	}
+        &.disabled {
+          background: rgba(0, 0, 0, 0.02);
+          color: #999;
+        }
+      }
+    }
 
-	.interest-tags {
-		display: flex;
-		flex-wrap: wrap;
-		gap: 20rpx;
-		
-		.interest-tag {
-			padding: 16rpx 30rpx;
-			background: #F8F8F8;
-			border-radius: 30rpx;
-			font-size: 28rpx;
-			color: #333;
-			display: flex;
-			align-items: center;
-			
-			&.active {
-				background: #ACF934;
-				color: #000;
-			}
-			
-			.remove-tag {
-				margin-left: 10rpx;
-				font-size: 32rpx;
-			}
-		}
-		
-		.add-tag {
-			padding: 16rpx 30rpx;
-			background: #F8F8F8;
-			border-radius: 30rpx;
-			font-size: 28rpx;
-			color: #666;
-			display: flex;
-			align-items: center;
-			
-			.add-icon {
-				width: 32rpx;
-				height: 32rpx;
-				margin-right: 10rpx;
-			}
-		}
-	}
+    .selected-tags {
+      .selected-tags-title {
+        font-size: 28rpx;
+        color: #666666;
+        margin-bottom: 20rpx;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        
+        .max-hint {
+          font-size: 24rpx;
+          color: #FF6B6B;
+        }
+      }
 
-	.bottom-button {
-		position: fixed;
-		left: 40rpx;
-		right: 40rpx;
-		bottom: 40rpx;
-		height: 88rpx;
-		background: #000;
-		border-radius: 44rpx;
-		color: #fff;
-		font-size: 32rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		
-		&.step2 {
-			background: #ACF934;
-			color: #000;
+      .selected-tags-list {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 16rpx;
+
+        .selected-tag {
+          padding: 12rpx 24rpx;
+          background: #f2f6f2;
+          border-radius: 100rpx;
+          font-size: 26rpx;
+          color: #333333;
+        }
+      }
+    }
+  }
+
+  .popup-buttons {
+    padding: 20rpx 30rpx 30rpx;
+    display: flex;
+    gap: 20rpx;
+    background: #FFFFFF;
+    flex-shrink: 0;
+    position: relative;
+
+    &::before {
+      content: '';
+      position: absolute;
+      left: 0;
+      right: 0;
+      top: -20rpx;
+      height: 20rpx;
+      background: linear-gradient(to top, rgba(255,255,255,1), rgba(255,255,255,0));
+    }
+
+    button {
+      flex: 1;
+      height: 80rpx;
+      border-radius: 12rpx;
+      font-size: 28rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border: none;
+
+      &.btn-cancel {
+        background: #FFFFFF;
+        color: #333333;
+        border: 2rpx solid #1F1F1F;
+      }
+
+      &.btn-confirm {
+        background: #333333;
+        color: #FFFFFF;
+
+        &.disabled {
+          opacity: 0.5;
+          background: #999;
+        }
+      }
+    }
+  }
+}
+
+.birthday-section,
+.input-section,
+.gender-section {
+  background: #fff;
+  padding: 20rpx;
+  border-radius: 20rpx;
+
+  .input-label {
+    font-size: 28rpx;
+    color: #333;
+    padding-bottom: 20rpx;
 		}
 	}
 </style>

uni_modules/uni-datetime-picker/changelog.md

@@ -0,0 +1,169 @@
+## 2.2.40（2025-04-14）
+- 修复 绑定字符串值的时，日历面板选中状态未重置到默认值的问题
+## 2.2.39（2025-04-14）
+- 修复 在 iOS 微信小程序上type='daterange'时，传入'YYYY-MM-DD'格式不生效的问题
+
+## 2.2.38（2024-10-15）
+- 修复 微信小程序中的getSystemInfo警告
+## 2.2.35（2024-09-21）
+- 修复 没有选中日期时点击确定直接报错的Bug [详情](https://ask.dcloud.net.cn/question/198168)
+## 2.2.34（2024-04-24）
+- 新增 日期点击事件，在点击日期时会触发该事件。
+## 2.2.33（2024-04-15）
+- 修复 抖音小程序事件传递失效bug
+## 2.2.32（2024-02-20）
+- 修复 日历的close事件触发异常的bug [详情](https://github.com/dcloudio/uni-ui/issues/844)
+## 2.2.31（2024-02-20）
+- 修复 h5平台 右边日历的月份默认+1的bug [详情](https://github.com/dcloudio/uni-ui/issues/841)
+## 2.2.30（2024-01-31）
+- 修复 隐藏“秒”时，在IOS15及以下版本时出现 结束时间在开始时间之前 的bug [详情](https://github.com/dcloudio/uni-ui/issues/788)
+## 2.2.29（2024-01-20）
+- 新增 show事件，弹窗弹出时触发该事件 [详情](https://github.com/dcloudio/uni-app/issues/4694)
+## 2.2.28（2024-01-18）
+- 去除 noChange事件，当进行日期范围选择时，若只选了一天，则开始结束日期都为同一天 [详情](https://github.com/dcloudio/uni-ui/issues/815)
+## 2.2.27（2024-01-10）
+- 优化 增加noChange事件，当进行日期范围选择时，若有空值，则触发该事件 [详情](https://github.com/dcloudio/uni-ui/issues/815)
+## 2.2.26（2024-01-08）
+- 修复 字节小程序时间选择范围器失效问题 [详情](https://github.com/dcloudio/uni-ui/issues/834)
+## 2.2.25（2023-10-18）
+- 修复 PC端初次修改时间，开始时间未更新的Bug [详情](https://github.com/dcloudio/uni-ui/issues/737)
+## 2.2.24（2023-06-02）
+- 修复 部分情况修改时间，开始、结束时间显示异常的Bug [详情](https://ask.dcloud.net.cn/question/171146)
+- 优化 当前月可以选择上月、下月的日期的Bug
+## 2.2.23（2023-05-02）
+- 修复 部分情况修改时间，开始时间未更新的Bug [详情](https://github.com/dcloudio/uni-ui/issues/737)
+- 修复 部分平台及设备第一次点击无法显示弹框的Bug
+- 修复 ios 日期格式未补零显示及使用异常的Bug [详情](https://ask.dcloud.net.cn/question/162979)
+## 2.2.22（2023-03-30）
+- 修复 日历 picker 修改年月后，自动选中当月1日的Bug [详情](https://ask.dcloud.net.cn/question/165937)
+- 修复 小程序端 低版本 ios NaN的Bug [详情](https://ask.dcloud.net.cn/question/162979)
+## 2.2.21（2023-02-20）
+- 修复 firefox 浏览器显示区域点击无法拉起日历弹框的Bug [详情](https://ask.dcloud.net.cn/question/163362)
+## 2.2.20（2023-02-17）
+- 优化 值为空依然选中当天问题
+- 优化 提供 default-value 属性支持配置选择器打开时默认显示的时间
+- 优化 非范围选择未选择日期时间，点击确认按钮选中当前日期时间
+- 优化 字节小程序日期时间范围选择，底部日期换行的Bug
+## 2.2.19（2023-02-09）
+- 修复 2.2.18 引起范围选择配置 end 选择无效的Bug [详情](https://github.com/dcloudio/uni-ui/issues/686)
+## 2.2.18（2023-02-08）
+- 修复 移动端范围选择change事件触发异常的Bug [详情](https://github.com/dcloudio/uni-ui/issues/684)
+- 优化 PC端输入日期格式错误时返回当前日期时间
+- 优化 PC端输入日期时间超出 start、end 限制的Bug
+- 优化 移动端日期时间范围用法时间展示不完整问题
+## 2.2.17（2023-02-04）
+- 修复 小程序端绑定 Date 类型报错的Bug [详情](https://github.com/dcloudio/uni-ui/issues/679)
+- 修复 vue3 time-picker 无法显示绑定时分秒的Bug
+## 2.2.16（2023-02-02）
+- 修复 字节小程序报错的Bug
+## 2.2.15（2023-02-02）
+- 修复 某些情况切换月份错误的Bug
+## 2.2.14（2023-01-30）
+- 修复 某些情况切换月份错误的Bug [详情](https://ask.dcloud.net.cn/question/162033)
+## 2.2.13（2023-01-10）
+- 修复 多次加载组件造成内存占用的Bug
+## 2.2.12（2022-12-01）
+- 修复 vue3 下 i18n 国际化初始值不正确的Bug
+## 2.2.11（2022-09-19）
+- 修复 支付宝小程序样式错乱的Bug [详情](https://github.com/dcloudio/uni-app/issues/3861)
+## 2.2.10（2022-09-19）
+- 修复 反向选择日期范围，日期显示异常的Bug [详情](https://ask.dcloud.net.cn/question/153401?item_id=212892&rf=false)
+## 2.2.9（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 2.2.8（2022-09-08）
+- 修复 close事件无效的Bug
+## 2.2.7（2022-09-05）
+- 修复 移动端 maskClick 无效的Bug [详情](https://ask.dcloud.net.cn/question/140824)
+## 2.2.6（2022-06-30）
+- 优化 组件样式，调整了组件图标大小、高度、颜色等，与uni-ui风格保持一致
+## 2.2.5（2022-06-24）
+- 修复 日历顶部年月及底部确认未国际化的Bug
+## 2.2.4（2022-03-31）
+- 修复 Vue3 下动态赋值,单选类型未响应的Bug
+## 2.2.3（2022-03-28）
+- 修复 Vue3 下动态赋值未响应的Bug
+## 2.2.2（2021-12-10）
+- 修复 clear-icon 属性在小程序平台不生效的Bug
+## 2.2.1（2021-12-10）
+- 修复 日期范围选在小程序平台，必须多点击一次才能取消选中状态的Bug
+## 2.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源 [详情](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移 [https://uniapp.dcloud.io/component/uniui/uni-datetime-picker](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+## 2.1.5（2021-11-09）
+- 新增 提供组件设计资源，组件样式调整
+## 2.1.4（2021-09-10）
+- 修复 hide-second 在移动端的Bug
+- 修复 单选赋默认值时，赋值日期未高亮的Bug
+- 修复 赋默认值时，移动端未正确显示时间的Bug
+## 2.1.3（2021-09-09）
+- 新增 hide-second 属性，支持只使用时分，隐藏秒
+## 2.1.2（2021-09-03）
+- 优化 取消选中时（范围选）直接开始下一次选择, 避免多点一次
+- 优化 移动端支持清除按钮，同时支持通过 ref 调用组件的 clear 方法
+- 优化 调整字号大小，美化日历界面
+- 修复 因国际化导致的 placeholder 失效的Bug
+## 2.1.1（2021-08-24）
+- 新增 支持国际化
+- 优化 范围选择器在 pc 端过宽的问题
+## 2.1.0（2021-08-09）
+- 新增 适配 vue3
+## 2.0.19（2021-08-09）
+- 新增 支持作为 uni-forms 子组件相关功能
+- 修复 在 uni-forms 中使用时，选择时间报 NAN 错误的Bug
+## 2.0.18（2021-08-05）
+- 修复 type 属性动态赋值无效的Bug
+- 修复 ‘确认’按钮被 tabbar 遮盖 bug
+- 修复 组件未赋值时范围选左、右日历相同的Bug
+## 2.0.17（2021-08-04）
+- 修复 范围选未正确显示当前值的Bug
+- 修复 h5 平台（移动端）报错 'cale' of undefined 的Bug
+## 2.0.16（2021-07-21）
+- 新增 return-type 属性支持返回 date 日期对象
+## 2.0.15（2021-07-14）
+- 修复 单选日期类型，初始赋值后不在当前日历的Bug
+- 新增 clearIcon 属性，显示框的清空按钮可配置显示隐藏（仅 pc 有效）
+- 优化 移动端移除显示框的清空按钮，无实际用途
+## 2.0.14（2021-07-14）
+- 修复 组件赋值为空，界面未更新的Bug
+- 修复 start 和 end 不能动态赋值的Bug
+- 修复 范围选类型，用户选择后再次选择右侧日历（结束日期）显示不正确的Bug
+## 2.0.13（2021-07-08）
+- 修复 范围选择不能动态赋值的Bug
+## 2.0.12（2021-07-08）
+- 修复 范围选择的初始时间在一个月内时，造成无法选择的bug
+## 2.0.11（2021-07-08）
+- 优化 弹出层在超出视窗边缘定位不准确的问题
+## 2.0.10（2021-07-08）
+- 修复 范围起始点样式的背景色与今日样式的字体前景色融合，导致日期字体看不清的Bug
+- 优化 弹出层在超出视窗边缘被遮盖的问题
+## 2.0.9（2021-07-07）
+- 新增 maskClick 事件
+- 修复 特殊情况日历 rpx 布局错误的Bug，rpx -> px
+- 修复 范围选择时清空返回值不合理的bug，['', ''] -> []
+## 2.0.8（2021-07-07）
+- 新增 日期时间显示框支持插槽
+## 2.0.7（2021-07-01）
+- 优化 添加 uni-icons 依赖
+## 2.0.6（2021-05-22）
+- 修复 图标在小程序上不显示的Bug
+- 优化 重命名引用组件，避免潜在组件命名冲突
+## 2.0.5（2021-05-20）
+- 优化 代码目录扁平化
+## 2.0.4（2021-05-12）
+- 新增 组件示例地址
+## 2.0.3（2021-05-10）
+- 修复 ios 下不识别 '-' 日期格式的Bug
+- 优化 pc 下弹出层添加边框和阴影
+## 2.0.2（2021-05-08）
+- 修复 在 admin 中获取弹出层定位错误的bug
+## 2.0.1（2021-05-08）
+- 修复 type 属性向下兼容，默认值从 date 变更为 datetime
+## 2.0.0（2021-04-30）
+- 支持日历形式的日期+时间的范围选择
+ > 注意：此版本不向后兼容，不再支持单独时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）
+## 1.0.6（2021-03-18）
+- 新增 hide-second 属性，时间支持仅选择时、分
+- 修复 选择跟显示的日期不一样的Bug
+- 修复 chang事件触发2次的Bug
+- 修复 分、秒 end 范围错误的Bug
+- 优化 更好的 nvue 适配

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

@@ -0,0 +1,177 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--before-checked-x':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked-x':weeks.afterMultiple,
+		}" @click="choiceDate(weeks)" @mouseenter="handleMousemove(weeks)">
+		<view class="uni-calendar-item__weeks-box-item" :class="{
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && (calendar.userChecked || !checkHover),
+				'uni-calendar-item--checked-range-text': checkHover,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'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>
+		</view>
+		<view :class="{'uni-calendar-item--today': weeks.isToday}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			checkHover: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			},
+			handleMousemove(weeks) {
+				this.$emit('handleMouse', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	$uni-primary: #007aff !default;
+
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 1px 0;
+		position: relative;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: 14px;
+		// font-family: Lato-Bold, Lato;
+		font-weight: bold;
+		color: darken($color: $uni-primary, $amount: 40%);
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 40px;
+		height: 40px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: #dd524d;
+
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--disable {
+		cursor: default;
+	}
+
+	.uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
+		color: #D1D1D1;
+	}
+
+	.uni-calendar-item--today {
+		position: absolute;
+		top: 10px;
+		right: 17%;
+		background-color: #dd524d;
+		width:6px;
+		height: 6px;
+		border-radius: 50%;
+	}
+
+	.uni-calendar-item--extra {
+		color: #dd524d;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--checked {
+		background-color: $uni-primary;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #fff;
+	}
+
+	.uni-calendar-item--checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
+		color: #333;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color:  #F6F7FC;
+		// color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--before-checked,
+	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
+		background-color: $uni-primary;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #F6F7FC;
+	}
+
+	.uni-calendar-item--before-checked .uni-calendar-item--checked-text,
+	.uni-calendar-item--after-checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--before-checked-x {
+		border-top-left-radius: 50px;
+		border-bottom-left-radius: 50px;
+		box-sizing: border-box;
+		background-color: #F6F7FC;
+	}
+
+	.uni-calendar-item--after-checked-x {
+		border-top-right-radius: 50px;
+		border-bottom-right-radius: 50px;
+		background-color: #F6F7FC;
+	}
+</style>

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

@@ -0,0 +1,947 @@
+<template>
+	<view class="uni-calendar" @mouseleave="leaveCale">
+
+		<view v-if="!insert && show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
+			@click="maskClick"></view>
+
+		<view v-if="insert || show" class="uni-calendar__content"
+			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow, 'uni-calendar__content-mobile': aniMaskShow}">
+			<view class="uni-calendar__header" :class="{'uni-calendar__header-mobile' :!insert}">
+
+				<view class="uni-calendar__header-btn-box" @click.stop="changeMonth('pre')">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text
+						class="uni-calendar__header-text">{{ (nowDate.year||'') + yearText + ( nowDate.month||'') + monthText}}</text>
+				</picker>
+
+				<view class="uni-calendar__header-btn-box" @click.stop="changeMonth('next')">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+
+				<view v-if="!insert" class="dialog-close" @click="maskClick">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+			</view>
+			<view class="uni-calendar__box">
+
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+
+				<view class="uni-calendar__weeks" style="padding-bottom: 7px;">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{MONText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar" :selected="selected"
+							:checkHover="range" @change="choiceDate" @handleMouse="handleMouse">
+						</calendar-item>
+					</view>
+				</view>
+			</view>
+
+			<view v-if="!insert && !range && hasTime" class="uni-date-changed uni-calendar--fixed-top"
+				style="padding: 0 80px;">
+				<view class="uni-date-changed--time-date">{{tempSingleDate ? tempSingleDate : selectDateText}}</view>
+				<time-picker type="time" :start="timepickerStartTime" :end="timepickerEndTime" v-model="time"
+					:disabled="!tempSingleDate" :border="false" :hide-second="hideSecond" class="time-picker-style">
+				</time-picker>
+			</view>
+
+			<view v-if="!insert && range && hasTime" class="uni-date-changed uni-calendar--fixed-top">
+				<view class="uni-date-changed--time-start">
+					<view class="uni-date-changed--time-date">{{tempRange.before ? tempRange.before : startDateText}}
+					</view>
+					<time-picker type="time" :start="timepickerStartTime" v-model="timeRange.startTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
+					</time-picker>
+				</view>
+				<view style="line-height: 50px;">
+					<uni-icons type="arrowthinright" color="#999"></uni-icons>
+				</view>
+				<view class="uni-date-changed--time-end">
+					<view class="uni-date-changed--time-date">{{tempRange.after ? tempRange.after : endDateText}}</view>
+					<time-picker type="time" :end="timepickerEndTime" v-model="timeRange.endTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.after" class="time-picker-style">
+					</time-picker>
+				</view>
+			</view>
+
+			<view v-if="!insert" class="uni-date-changed uni-date-btn--ok">
+				<view class="uni-datetime-picker--btn" @click="confirm">{{confirmText}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		Calendar,
+		getDate,
+		getTime
+	} from './util.js';
+	import calendarItem from './calendar-item.vue'
+	import timePicker from './time-picker.vue'
+
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(i18nMessages)
+
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @property {[String} defaultValue 选择器打开时默认显示的时间
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem,
+			timePicker
+		},
+
+		options: {
+			// #ifdef MP-TOUTIAO
+			virtualHost: false,
+			// #endif
+			// #ifndef MP-TOUTIAO
+			virtualHost: true
+			// #endif
+		},
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			defTime: {
+				type: [String, Object],
+				default: ''
+			},
+			selectableTimes: {
+				type: [Object],
+				default () {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			startPlaceholder: {
+				type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			hasTime: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			},
+			checkHover: {
+				type: Boolean,
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+			pleStatus: {
+				type: Object,
+				default () {
+					return {
+						before: '',
+						after: '',
+						data: [],
+						fulldate: ''
+					}
+				}
+			},
+			defaultValue: {
+				type: [String, Object, Array],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: {},
+				aniMaskShow: false,
+				firstEnter: true,
+				time: '',
+				timeRange: {
+					startTime: '',
+					endTime: ''
+				},
+				tempSingleDate: '',
+				tempRange: {
+					before: '',
+					after: ''
+				}
+			}
+		},
+		watch: {
+			date: {
+				immediate: true,
+				handler(newVal) {
+					if (!this.range) {
+						this.tempSingleDate = newVal
+						setTimeout(() => {
+							this.init(newVal)
+						}, 100)
+					}
+				}
+			},
+			defTime: {
+				immediate: true,
+				handler(newVal) {
+					if (!this.range) {
+						this.time = newVal
+					} else {
+						this.timeRange.startTime = newVal.start
+						this.timeRange.endTime = newVal.end
+					}
+				}
+			},
+			startDate(val) {
+				// 字节小程序 watch 早于 created
+				if (!this.cale) {
+					return
+				}
+				this.cale.setStartDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val) {
+				// 字节小程序 watch 早于 created
+				if (!this.cale) {
+					return
+				}
+				this.cale.setEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				// 字节小程序 watch 早于 created
+				if (!this.cale) {
+					return
+				}
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			},
+			pleStatus: {
+				immediate: true,
+				handler(newVal) {
+					const {
+						before,
+						after,
+						fulldate,
+						which
+					} = newVal
+					this.tempRange.before = before
+					this.tempRange.after = after
+					setTimeout(() => {
+						if (fulldate) {
+							this.cale.setHoverMultiple(fulldate)
+							if (before && after) {
+								this.cale.lastHover = true
+								if (this.rangeWithinMonth(after, before)) return
+								this.setDate(before)
+							} else {
+								this.cale.setMultiple(fulldate)
+								this.setDate(this.nowDate.fullDate)
+								this.calendar.fullDate = ''
+								this.cale.lastHover = false
+							}
+						} else {
+							// 字节小程序 watch 早于 created
+							if (!this.cale) {
+								return
+							}
+
+							this.cale.setDefaultMultiple(before, after)
+							if (which === 'left' && before) {
+								this.setDate(before)
+								this.weeks = this.cale.weeks
+							} else if (after) {
+								this.setDate(after)
+								this.weeks = this.cale.weeks
+							}
+							this.cale.lastHover = true
+						}
+					}, 16)
+				}
+			}
+		},
+		computed: {
+			timepickerStartTime() {
+				const activeDate = this.range ? this.tempRange.before : this.calendar.fullDate
+				return activeDate === this.startDate ? this.selectableTimes.start : ''
+			},
+			timepickerEndTime() {
+				const activeDate = this.range ? this.tempRange.after : this.calendar.fullDate
+				return activeDate === this.endDate ? this.selectableTimes.end : ''
+			},
+			/**
+			 * for i18n
+			 */
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			yearText() {
+				return t("uni-datetime-picker.year")
+			},
+			monthText() {
+				return t("uni-datetime-picker.month")
+			},
+			MONText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+			confirmText() {
+				return t("uni-calender.confirm")
+			},
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			// 选中某一天
+			this.init(this.date)
+		},
+		methods: {
+			leaveCale() {
+				this.firstEnter = true
+			},
+			handleMouse(weeks) {
+				if (weeks.disable) return
+				if (this.cale.lastHover) return
+				let {
+					before,
+					after
+				} = this.cale.multipleStatus
+				if (!before) return
+				this.calendar = weeks
+				// 设置范围选
+				this.cale.setHoverMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				// hover时，进入一个日历，更新另一个
+				if (this.firstEnter) {
+					this.$emit('firstEnterCale', this.cale.multipleStatus)
+					this.firstEnter = false
+				}
+			},
+			rangeWithinMonth(A, B) {
+				const [yearA, monthA] = A.split('-')
+				const [yearB, monthB] = B.split('-')
+				return yearA === yearB && monthA === monthB
+			},
+			// 蒙版点击事件
+			maskClick() {
+				this.close()
+				this.$emit('maskClose')
+			},
+
+			clearCalender() {
+				if (this.range) {
+					this.timeRange.startTime = ''
+					this.timeRange.endTime = ''
+					this.tempRange.before = ''
+					this.tempRange.after = ''
+					this.cale.multipleStatus.before = ''
+					this.cale.multipleStatus.after = ''
+					this.cale.multipleStatus.data = []
+					this.cale.lastHover = false
+				} else {
+					this.time = ''
+					this.tempSingleDate = ''
+				}
+				this.calendar.fullDate = ''
+				this.setDate(new Date())
+			},
+
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				this.setDate(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				// 字节小程序 watch 早于 created
+				if (!this.cale) {
+					return
+				}
+				this.cale.setDate(date || new Date())
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+				this.calendar = {
+					...this.nowDate
+				}
+				if (!date) {
+					// 优化date为空默认不选中今天
+					this.calendar.fullDate = ''
+					if (this.defaultValue && !this.range) {
+						// 暂时只支持移动端非范围选择
+						const defaultDate = new Date(this.defaultValue)
+						const fullDate = getDate(defaultDate)
+						const year = defaultDate.getFullYear()
+						const month = defaultDate.getMonth() + 1
+						const date = defaultDate.getDate()
+						const day = defaultDate.getDay()
+						this.calendar = {
+								fullDate,
+								year,
+								month,
+								date,
+								day
+							},
+							this.tempSingleDate = fullDate
+						this.time = getTime(defaultDate, this.hideSecond)
+					}
+				}
+			},
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change(isSingleChange) {
+				if (!this.insert && !isSingleChange) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				if (!this.range) {
+					if (!this.calendar.fullDate) {
+						this.calendar = this.cale.getInfo(new Date())
+						this.tempSingleDate = this.calendar.fullDate
+					}
+					if (this.hasTime && !this.time) {
+						this.time = getTime(new Date(), this.hideSecond)
+					}
+				}
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					time: this.time,
+					timeRange: this.timeRange,
+					fulldate: fullDate,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				this.calendar.userChecked = true
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate, true)
+				this.weeks = this.cale.weeks
+				this.tempSingleDate = this.calendar.fullDate
+				const beforeDate = new Date(this.cale.multipleStatus.before).getTime()
+				const afterDate = new Date(this.cale.multipleStatus.after).getTime()
+				if (beforeDate > afterDate && afterDate) {
+					this.tempRange.before = this.cale.multipleStatus.after
+					this.tempRange.after = this.cale.multipleStatus.before
+				} else {
+					this.tempRange.before = this.cale.multipleStatus.before
+					this.tempRange.after = this.cale.multipleStatus.after
+				}
+				this.change(true)
+			},
+			changeMonth(type) {
+				let newDate
+				if (type === 'pre') {
+					newDate = this.cale.getPreMonthObj(this.nowDate.fullDate).fullDate
+				} else if (type === 'next') {
+					newDate = this.cale.getNextMonthObj(this.nowDate.fullDate).fullDate
+				}
+
+				this.setDate(newDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		bottom: calc(var(--window-bottom));
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__content-mobile {
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.1);
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+	}
+
+	.uni-calendar__header-mobile {
+		padding: 10px;
+		padding-bottom: 0;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: rgba(0, 0, 0, 0.4);
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: #fff;
+		background-color: #f1f1f1;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: 15px;
+		color: #666;
+	}
+
+	.uni-calendar__button-text {
+		text-align: center;
+		width: 100px;
+		font-size: 14px;
+		color: $uni-primary;
+		/* #ifndef APP-NVUE */
+		letter-spacing: 3px;
+		/* #endif */
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 9px;
+		height: 9px;
+		border-left-color: #808080;
+		border-left-style: solid;
+		border-left-width: 1px;
+		border-top-color: #555555;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 40px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 12px;
+		color: #B2B2B2;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+		// padding: 0 10px;
+		padding-bottom: 7px;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: #999;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+
+	.uni-date-changed {
+		padding: 0 10px;
+		// line-height: 50px;
+		text-align: center;
+		color: #333;
+		border-top-color: #DCDCDC;
+		;
+		border-top-style: solid;
+		border-top-width: 1px;
+		flex: 1;
+	}
+
+	.uni-date-btn--ok {
+		padding: 20px 15px;
+	}
+
+	.uni-date-changed--time-start {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-end {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-date {
+		color: #999;
+		line-height: 50px;
+		/* #ifdef MP-TOUTIAO */
+		font-size: 16px;
+		/* #endif */
+		margin-right: 5px;
+		// opacity: 0.6;
+	}
+
+	.time-picker-style {
+		// width: 62px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center
+	}
+
+	.mr-10 {
+		margin-right: 10px;
+	}
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 25px;
+		margin-top: 10px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #737987;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.uni-datetime-picker--btn {
+		border-radius: 100px;
+		height: 40px;
+		line-height: 40px;
+		background-color: $uni-primary;
+		color: #fff;
+		font-size: 16px;
+		letter-spacing: 2px;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-datetime-picker--btn:active {
+		opacity: 0.7;
+	}
+
+	/* #endif */
+</style>

uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json

@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "select date",
+	"uni-datetime-picker.selectTime": "select time",
+	"uni-datetime-picker.selectDateTime": "select date and time",
+	"uni-datetime-picker.startDate": "start date",
+	"uni-datetime-picker.endDate": "end date",
+	"uni-datetime-picker.startTime": "start time",
+	"uni-datetime-picker.endTime": "end time",
+	"uni-datetime-picker.ok": "ok",
+	"uni-datetime-picker.clear": "clear",
+	"uni-datetime-picker.cancel": "cancel",
+	"uni-datetime-picker.year": "-",
+	"uni-datetime-picker.month": "",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN",
+	"uni-calender.confirm": "confirm"
+}

uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js

@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}

uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json

@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "选择日期",
+	"uni-datetime-picker.selectTime": "选择时间",
+	"uni-datetime-picker.selectDateTime": "选择日期时间",
+	"uni-datetime-picker.startDate": "开始日期",
+	"uni-datetime-picker.endDate": "结束日期",
+	"uni-datetime-picker.startTime": "开始时间",
+	"uni-datetime-picker.endTime": "结束时间",
+	"uni-datetime-picker.ok": "确定",
+	"uni-datetime-picker.clear": "清除",
+	"uni-datetime-picker.cancel": "取消",
+	"uni-datetime-picker.year": "年",
+	"uni-datetime-picker.month": "月",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六",
+	"uni-calender.confirm": "确认"
+}

uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json

@@ -0,0 +1,22 @@
+{
+  "uni-datetime-picker.selectDate": "選擇日期",
+  "uni-datetime-picker.selectTime": "選擇時間",
+  "uni-datetime-picker.selectDateTime": "選擇日期時間",
+  "uni-datetime-picker.startDate": "開始日期",
+  "uni-datetime-picker.endDate": "結束日期",
+  "uni-datetime-picker.startTime": "開始时间",
+  "uni-datetime-picker.endTime": "結束时间",
+  "uni-datetime-picker.ok": "確定",
+  "uni-datetime-picker.clear": "清除",
+  "uni-datetime-picker.cancel": "取消",
+  "uni-datetime-picker.year": "年",
+  "uni-datetime-picker.month": "月",
+  "uni-calender.SUN": "日",
+  "uni-calender.MON": "一",
+  "uni-calender.TUE": "二",
+  "uni-calender.WED": "三",
+  "uni-calender.THU": "四",
+  "uni-calender.FRI": "五",
+  "uni-calender.SAT": "六",
+  "uni-calender.confirm": "確認"
+}

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

@@ -0,0 +1,940 @@
+<template>
+	<view class="uni-datetime-picker">
+		<view @click="initTimePicker">
+			<slot>
+				<view class="uni-datetime-picker-timebox-pointer"
+					:class="{'uni-datetime-picker-disabled': disabled, 'uni-datetime-picker-timebox': border}">
+					<text class="uni-datetime-picker-text">{{time}}</text>
+					<view v-if="!time" class="uni-datetime-picker-time">
+						<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view v-if="visible" id="mask" class="uni-datetime-picker-mask" @click="tiggerTimePicker"></view>
+		<view v-if="visible" class="uni-datetime-picker-popup" :class="[dateShow && timeShow ? '' : 'fix-nvue-height']"
+			:style="fixNvueBug">
+			<view class="uni-title">
+				<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+			</view>
+			<view v-if="dateShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :indicator-style="indicatorStyle" :value="ymd"
+					@change="bindDateChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in years" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in months" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in days" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign sign-left">-</text>
+				<text class="uni-datetime-picker-sign sign-right">-</text>
+			</view>
+			<view v-if="timeShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :class="[hideSecond ? 'time-hide-second' : '']"
+					:indicator-style="indicatorStyle" :value="hms" @change="bindTimeChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in hours" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in minutes" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!hideSecond">
+						<view class="uni-datetime-picker-item" v-for="(item,index) in seconds" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign" :class="[hideSecond ? 'sign-center' : 'sign-left']">:</text>
+				<text v-if="!hideSecond" class="uni-datetime-picker-sign sign-right">:</text>
+			</view>
+			<view class="uni-datetime-picker-btn">
+				<view @click="clearTime">
+					<text class="uni-datetime-picker-btn-text">{{clearText}}</text>
+				</view>
+				<view class="uni-datetime-picker-btn-group">
+					<view class="uni-datetime-picker-cancel" @click="tiggerTimePicker">
+						<text class="uni-datetime-picker-btn-text">{{cancelText}}</text>
+					</view>
+					<view @click="setTime">
+						<text class="uni-datetime-picker-btn-text">{{okText}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(i18nMessages)
+	import {
+		fixIosDateFormat
+	} from './util'
+
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 可以同时选择日期和时间的选择器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} type = [datetime | date | time] 显示模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {String|Number} value 默认值
+	 * @property {String|Number} start 起始日期或时间
+	 * @property {String|Number} end 起始日期或时间
+	 * @property {String} return-type = [timestamp | string]
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'UniDatetimePicker',
+		data() {
+			return {
+				indicatorStyle: `height: 50px;`,
+				visible: false,
+				fixNvueBug: {},
+				dateShow: true,
+				timeShow: true,
+				title: '日期和时间',
+				// 输入框当前时间
+				time: '',
+				// 当前的年月日时分秒
+				year: 1920,
+				month: 0,
+				day: 0,
+				hour: 0,
+				minute: 0,
+				second: 0,
+				// 起始时间
+				startYear: 1920,
+				startMonth: 1,
+				startDay: 1,
+				startHour: 0,
+				startMinute: 0,
+				startSecond: 0,
+				// 结束时间
+				endYear: 2120,
+				endMonth: 12,
+				endDay: 31,
+				endHour: 23,
+				endMinute: 59,
+				endSecond: 59,
+			}
+		},
+		options: {
+			// #ifdef MP-TOUTIAO
+			virtualHost: false,
+			// #endif
+			// #ifndef MP-TOUTIAO
+			virtualHost: true
+			// #endif
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				handler(newVal) {
+					if (newVal) {
+						this.parseValue(fixIosDateFormat(newVal))
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				handler(newVal) {
+					if (newVal) {
+						this.parseValue(fixIosDateFormat(newVal))
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			type: {
+				handler(newValue) {
+					if (newValue === 'date') {
+						this.dateShow = true
+						this.timeShow = false
+						this.title = '日期'
+					} else if (newValue === 'time') {
+						this.dateShow = false
+						this.timeShow = true
+						this.title = '时间'
+					} else {
+						this.dateShow = true
+						this.timeShow = true
+						this.title = '日期和时间'
+					}
+				},
+				immediate: true
+			},
+			start: {
+				handler(newVal) {
+					this.parseDatetimeRange(fixIosDateFormat(newVal), 'start')
+				},
+				immediate: true
+			},
+			end: {
+				handler(newVal) {
+					this.parseDatetimeRange(fixIosDateFormat(newVal), 'end')
+				},
+				immediate: true
+			},
+
+			// 月、日、时、分、秒可选范围变化后，检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			months(newVal) {
+				this.checkValue('month', this.month, newVal)
+			},
+			days(newVal) {
+				this.checkValue('day', this.day, newVal)
+			},
+			hours(newVal) {
+				this.checkValue('hour', this.hour, newVal)
+			},
+			minutes(newVal) {
+				this.checkValue('minute', this.minute, newVal)
+			},
+			seconds(newVal) {
+				this.checkValue('second', this.second, newVal)
+			}
+		},
+		computed: {
+			// 当前年、月、日、时、分、秒选择范围
+			years() {
+				return this.getCurrentRange('year')
+			},
+
+			months() {
+				return this.getCurrentRange('month')
+			},
+
+			days() {
+				return this.getCurrentRange('day')
+			},
+
+			hours() {
+				return this.getCurrentRange('hour')
+			},
+
+			minutes() {
+				return this.getCurrentRange('minute')
+			},
+
+			seconds() {
+				return this.getCurrentRange('second')
+			},
+
+			// picker 当前值数组
+			ymd() {
+				return [this.year - this.minYear, this.month - this.minMonth, this.day - this.minDay]
+			},
+			hms() {
+				return [this.hour - this.minHour, this.minute - this.minMinute, this.second - this.minSecond]
+			},
+
+			// 当前 date 是 start
+			currentDateIsStart() {
+				return this.year === this.startYear && this.month === this.startMonth && this.day === this.startDay
+			},
+
+			// 当前 date 是 end
+			currentDateIsEnd() {
+				return this.year === this.endYear && this.month === this.endMonth && this.day === this.endDay
+			},
+
+			// 当前年、月、日、时、分、秒的最小值和最大值
+			minYear() {
+				return this.startYear
+			},
+			maxYear() {
+				return this.endYear
+			},
+			minMonth() {
+				if (this.year === this.startYear) {
+					return this.startMonth
+				} else {
+					return 1
+				}
+			},
+			maxMonth() {
+				if (this.year === this.endYear) {
+					return this.endMonth
+				} else {
+					return 12
+				}
+			},
+			minDay() {
+				if (this.year === this.startYear && this.month === this.startMonth) {
+					return this.startDay
+				} else {
+					return 1
+				}
+			},
+			maxDay() {
+				if (this.year === this.endYear && this.month === this.endMonth) {
+					return this.endDay
+				} else {
+					return this.daysInMonth(this.year, this.month)
+				}
+			},
+			minHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart) {
+						return this.startHour
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					return this.startHour
+				}
+			},
+			maxHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd) {
+						return this.endHour
+					} else {
+						return 23
+					}
+				}
+				if (this.type === 'time') {
+					return this.endHour
+				}
+			},
+			minMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+			},
+			maxMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+			},
+			minSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+			},
+			maxSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+			},
+
+			/**
+			 * for i18n
+			 */
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			cancelText() {
+				return t("uni-datetime-picker.cancel")
+			}
+		},
+
+		mounted() {
+			// #ifdef APP-NVUE
+			const res = uni.getSystemInfoSync();
+			this.fixNvueBug = {
+				top: res.windowHeight / 2,
+				left: res.windowWidth / 2
+			}
+			// #endif
+		},
+
+		methods: {
+			/**
+			 * @param {Object} item
+			 * 小于 10 在前面加个 0
+			 */
+
+			lessThanTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			/**
+			 * 解析时分秒字符串，例如：00:00:00
+			 * @param {String} timeString
+			 */
+			parseTimeType(timeString) {
+				if (timeString) {
+					let timeArr = timeString.split(':')
+					this.hour = Number(timeArr[0])
+					this.minute = Number(timeArr[1])
+					this.second = Number(timeArr[2])
+				}
+			},
+
+			/**
+			 * 解析选择器初始值，类型可以是字符串、时间戳，例如：2000-10-02、'08:30:00'、 1610695109000
+			 * @param {String | Number} datetime
+			 */
+			initPickerValue(datetime) {
+				let defaultValue = null
+				if (datetime) {
+					defaultValue = this.compareValueWithStartAndEnd(datetime, this.start, this.end)
+				} else {
+					defaultValue = Date.now()
+					defaultValue = this.compareValueWithStartAndEnd(defaultValue, this.start, this.end)
+				}
+				this.parseValue(defaultValue)
+			},
+
+			/**
+			 * 初始值规则：
+			 * - 用户设置初始值 value
+			 * 	- 设置了起始时间 start、终止时间 end，并 start < value < end，初始值为 value， 否则初始值为 start
+			 * 	- 只设置了起始时间 start，并 start < value，初始值为 value，否则初始值为 start
+			 * 	- 只设置了终止时间 end，并 value < end，初始值为 value，否则初始值为 end
+			 * 	- 无起始终止时间，则初始值为 value
+			 * - 无初始值 value，则初始值为当前本地时间 Date.now()
+			 * @param {Object} value
+			 * @param {Object} dateBase
+			 */
+			compareValueWithStartAndEnd(value, start, end) {
+				let winner = null
+				value = this.superTimeStamp(value)
+				start = this.superTimeStamp(start)
+				end = this.superTimeStamp(end)
+
+				if (start && end) {
+					if (value < start) {
+						winner = new Date(start)
+					} else if (value > end) {
+						winner = new Date(end)
+					} else {
+						winner = new Date(value)
+					}
+				} else if (start && !end) {
+					winner = start <= value ? new Date(value) : new Date(start)
+				} else if (!start && end) {
+					winner = value <= end ? new Date(value) : new Date(end)
+				} else {
+					winner = new Date(value)
+				}
+
+				return winner
+			},
+
+			/**
+			 * 转换为可比较的时间戳，接受日期、时分秒、时间戳
+			 * @param {Object} value
+			 */
+			superTimeStamp(value) {
+				let dateBase = ''
+				if (this.type === 'time' && value && typeof value === 'string') {
+					const now = new Date()
+					const year = now.getFullYear()
+					const month = now.getMonth() + 1
+					const day = now.getDate()
+					dateBase = year + '/' + month + '/' + day + ' '
+				}
+				if (Number(value)) {
+					value = parseInt(value)
+					dateBase = 0
+				}
+				return this.createTimeStamp(dateBase + value)
+			},
+
+			/**
+			 * 解析默认值 value，字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseValue(value) {
+				if (!value) {
+					return
+				}
+				if (this.type === 'time' && typeof value === "string") {
+					this.parseTimeType(value)
+				} else {
+					let defaultDate = null
+					defaultDate = new Date(value)
+					if (this.type !== 'time') {
+						this.year = defaultDate.getFullYear()
+						this.month = defaultDate.getMonth() + 1
+						this.day = defaultDate.getDate()
+					}
+					if (this.type !== 'date') {
+						this.hour = defaultDate.getHours()
+						this.minute = defaultDate.getMinutes()
+						this.second = defaultDate.getSeconds()
+					}
+				}
+				if (this.hideSecond) {
+					this.second = 0
+				}
+			},
+
+			/**
+			 * 解析可选择时间范围 start、end，年月日字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseDatetimeRange(point, pointType) {
+				// 时间为空，则重置为初始值
+				if (!point) {
+					if (pointType === 'start') {
+						this.startYear = 1920
+						this.startMonth = 1
+						this.startDay = 1
+						this.startHour = 0
+						this.startMinute = 0
+						this.startSecond = 0
+					}
+					if (pointType === 'end') {
+						this.endYear = 2120
+						this.endMonth = 12
+						this.endDay = 31
+						this.endHour = 23
+						this.endMinute = 59
+						this.endSecond = 59
+					}
+					return
+				}
+				if (this.type === 'time') {
+					const pointArr = point.split(':')
+					this[pointType + 'Hour'] = Number(pointArr[0])
+					this[pointType + 'Minute'] = Number(pointArr[1])
+					this[pointType + 'Second'] = Number(pointArr[2])
+				} else {
+					if (!point) {
+						pointType === 'start' ? this.startYear = this.year - 60 : this.endYear = this.year + 60
+						return
+					}
+					if (Number(point)) {
+						point = parseInt(point)
+					}
+					// datetime 的 end 没有时分秒, 则不限制
+					const hasTime = /[0-9]:[0-9]/
+					if (this.type === 'datetime' && pointType === 'end' && typeof point === 'string' && !hasTime.test(
+							point)) {
+						point = point + ' 23:59:59'
+					}
+					const pointDate = new Date(point)
+					this[pointType + 'Year'] = pointDate.getFullYear()
+					this[pointType + 'Month'] = pointDate.getMonth() + 1
+					this[pointType + 'Day'] = pointDate.getDate()
+					if (this.type === 'datetime') {
+						this[pointType + 'Hour'] = pointDate.getHours()
+						this[pointType + 'Minute'] = pointDate.getMinutes()
+						this[pointType + 'Second'] = pointDate.getSeconds()
+					}
+				}
+			},
+
+			// 获取 年、月、日、时、分、秒 当前可选范围
+			getCurrentRange(value) {
+				const range = []
+				for (let i = this['min' + this.capitalize(value)]; i <= this['max' + this.capitalize(value)]; i++) {
+					range.push(i)
+				}
+				return range
+			},
+
+			// 字符串首字母大写
+			capitalize(str) {
+				return str.charAt(0).toUpperCase() + str.slice(1)
+			},
+
+			// 检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			checkValue(name, value, values) {
+				if (values.indexOf(value) === -1) {
+					this[name] = values[0]
+				}
+			},
+
+			// 每个月的实际天数
+			daysInMonth(year, month) { // Use 1 for January, 2 for February, etc.
+				return new Date(year, month, 0).getDate();
+			},
+
+			/**
+			 * 生成时间戳
+			 * @param {Object} time
+			 */
+			createTimeStamp(time) {
+				if (!time) return
+				if (typeof time === "number") {
+					return time
+				} else {
+					time = time.replace(/-/g, '/')
+					if (this.type === 'date') {
+						time = time + ' ' + '00:00:00'
+					}
+					return Date.parse(time)
+				}
+			},
+
+			/**
+			 * 生成日期或时间的字符串
+			 */
+			createDomSting() {
+				const yymmdd = this.year +
+					'-' +
+					this.lessThanTen(this.month) +
+					'-' +
+					this.lessThanTen(this.day)
+
+				let hhmmss = this.lessThanTen(this.hour) +
+					':' +
+					this.lessThanTen(this.minute)
+
+				if (!this.hideSecond) {
+					hhmmss = hhmmss + ':' + this.lessThanTen(this.second)
+				}
+
+				if (this.type === 'date') {
+					return yymmdd
+				} else if (this.type === 'time') {
+					return hhmmss
+				} else {
+					return yymmdd + ' ' + hhmmss
+				}
+			},
+
+			/**
+			 * 初始化返回值，并抛出 change 事件
+			 */
+			initTime(emit = true) {
+				this.time = this.createDomSting()
+				if (!emit) return
+				if (this.returnType === 'timestamp' && this.type !== 'time') {
+					this.$emit('change', this.createTimeStamp(this.time))
+					this.$emit('input', this.createTimeStamp(this.time))
+					this.$emit('update:modelValue', this.createTimeStamp(this.time))
+				} else {
+					this.$emit('change', this.time)
+					this.$emit('input', this.time)
+					this.$emit('update:modelValue', this.time)
+				}
+			},
+
+			/**
+			 * 用户选择日期或时间更新 data
+			 * @param {Object} e
+			 */
+			bindDateChange(e) {
+				const val = e.detail.value
+				this.year = this.years[val[0]]
+				this.month = this.months[val[1]]
+				this.day = this.days[val[2]]
+			},
+			bindTimeChange(e) {
+				const val = e.detail.value
+				this.hour = this.hours[val[0]]
+				this.minute = this.minutes[val[1]]
+				this.second = this.seconds[val[2]]
+			},
+
+			/**
+			 * 初始化弹出层
+			 */
+			initTimePicker() {
+				if (this.disabled) return
+				const value = fixIosDateFormat(this.time)
+				this.initPickerValue(value)
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 触发或关闭弹框
+			 */
+			tiggerTimePicker(e) {
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 用户点击“清空”按钮，清空当前值
+			 */
+			clearTime() {
+				this.time = ''
+				this.$emit('change', this.time)
+				this.$emit('input', this.time)
+				this.$emit('update:modelValue', this.time)
+				this.tiggerTimePicker()
+			},
+
+			/**
+			 * 用户点击“确定”按钮
+			 */
+			setTime() {
+				this.initTime()
+				this.tiggerTimePicker()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-datetime-picker {
+		/* #ifndef APP-NVUE */
+		/* width: 100%; */
+		/* #endif */
+	}
+
+	.uni-datetime-picker-view {
+		height: 130px;
+		width: 270px;
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-item {
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-btn {
+		margin-top: 60px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.uni-datetime-picker-btn-text {
+		font-size: 14px;
+		color: $uni-primary;
+	}
+
+	.uni-datetime-picker-btn-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-datetime-picker-cancel {
+		margin-right: 30px;
+	}
+
+	.uni-datetime-picker-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-duration: 0.3s;
+		z-index: 998;
+	}
+
+	.uni-datetime-picker-popup {
+		border-radius: 8px;
+		padding: 30px;
+		width: 270px;
+		/* #ifdef APP-NVUE */
+		height: 500px;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 330px;
+		/* #endif */
+		background-color: #fff;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		transition-duration: 0.3s;
+		z-index: 999;
+	}
+
+	.fix-nvue-height {
+		/* #ifdef APP-NVUE */
+		height: 330px;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-time {
+		color: grey;
+	}
+
+	.uni-datetime-picker-column {
+		height: 50px;
+	}
+
+	.uni-datetime-picker-timebox {
+
+		border: 1px solid #E5E5E5;
+		border-radius: 5px;
+		padding: 7px 10px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-timebox-pointer {
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-datetime-picker-disabled {
+		opacity: 0.4;
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-text {
+		font-size: 14px;
+		line-height: 50px
+	}
+
+	.uni-datetime-picker-sign {
+		position: absolute;
+		top: 53px;
+		/* 减掉 10px 的元素高度，兼容nvue */
+		color: #999;
+		/* #ifdef APP-NVUE */
+		font-size: 16px;
+		/* #endif */
+	}
+
+	.sign-left {
+		left: 86px;
+	}
+
+	.sign-right {
+		right: 86px;
+	}
+
+	.sign-center {
+		left: 135px;
+	}
+
+	.uni-datetime-picker__container-box {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 40px;
+	}
+
+	.time-hide-second {
+		width: 180px;
+	}
+</style>

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

@@ -0,0 +1,1073 @@
+<template>
+	<view class="uni-date">
+		<view class="uni-date-editor" @click="show">
+			<slot>
+				<view class="uni-date-editor--x"
+					:class="{'uni-date-editor--x__disabled': disabled,'uni-date-x--border': border}">
+					<view v-if="!isRange" class="uni-date-x uni-date-single">
+						<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
+						<view class="uni-date__x-input">{{ displayValue || singlePlaceholderText }}</view>
+					</view>
+
+					<view v-else class="uni-date-x uni-date-range">
+						<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
+						<view class="uni-date__x-input text-center">{{ displayRangeValue.startDate || startPlaceholderText }}</view>
+
+						<view class="range-separator">{{rangeSeparator}}</view>
+
+						<view class="uni-date__x-input text-center">{{ displayRangeValue.endDate || endPlaceholderText }}</view>
+					</view>
+
+					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
+						<uni-icons type="clear" color="#c0c4cc" size="22"></uni-icons>
+					</view>
+				</view>
+			</slot>
+		</view>
+
+		<view v-show="pickerVisible" class="uni-date-mask--pc" @click="close"></view>
+
+		<view v-if="!isPhone" v-show="pickerVisible" ref="datePicker" class="uni-date-picker__container">
+			<view v-if="!isRange" class="uni-date-single--x" :style="pickerPositionStyle">
+				<view class="uni-popper__arrow"></view>
+
+				<view v-if="hasTime" class="uni-date-changed popup-x-header">
+					<input class="uni-date__input text-center" type="text" v-model="inputDate" :placeholder="selectDateText" />
+
+					<time-picker type="time" v-model="pickerTime" :border="false" :disabled="!inputDate"
+						:start="timepickerStartTime" :end="timepickerEndTime" :hideSecond="hideSecond" style="width: 100%;">
+						<input class="uni-date__input text-center" type="text" v-model="pickerTime" :placeholder="selectTimeText"
+							:disabled="!inputDate" />
+					</time-picker>
+				</view>
+
+				<Calendar ref="pcSingle" :showMonth="false" :start-date="calendarRange.startDate"
+					:end-date="calendarRange.endDate" :date="calendarDate" @change="singleChange" :default-value="defaultValue"
+					style="padding: 0 8px;" />
+
+				<view v-if="hasTime" class="popup-x-footer">
+					<text class="confirm-text" @click="confirmSingleChange">{{okText}}</text>
+				</view>
+			</view>
+
+			<view v-else class="uni-date-range--x" :style="pickerPositionStyle">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="popup-x-header uni-date-changed">
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
+							:placeholder="startDateText" />
+
+						<time-picker type="time" v-model="tempRange.startTime" :start="timepickerStartTime" :border="false"
+							:disabled="!tempRange.startDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startTime"
+								:placeholder="startTimeText" :disabled="!tempRange.startDate" />
+						</time-picker>
+					</view>
+
+					<uni-icons type="arrowthinright" color="#999" style="line-height: 40px;"></uni-icons>
+
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endDate"
+							:placeholder="endDateText" />
+
+						<time-picker type="time" v-model="tempRange.endTime" :end="timepickerEndTime" :border="false"
+							:disabled="!tempRange.endDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endTime"
+								:placeholder="endTimeText" :disabled="!tempRange.endDate" />
+						</time-picker>
+					</view>
+				</view>
+
+				<view class="popup-x-body">
+					<Calendar ref="left" :showMonth="false" :start-date="calendarRange.startDate"
+						:end-date="calendarRange.endDate" :range="true" :pleStatus="endMultipleStatus" @change="leftChange"
+						@firstEnterCale="updateRightCale" style="padding: 0 8px;"/>
+					<Calendar ref="right" :showMonth="false" :start-date="calendarRange.startDate"
+						:end-date="calendarRange.endDate" :range="true" @change="rightChange" :pleStatus="startMultipleStatus"
+						@firstEnterCale="updateLeftCale" style="padding: 0 8px;border-left: 1px solid #F1F1F1;" />
+				</view>
+
+				<view v-if="hasTime" class="popup-x-footer">
+					<text @click="clear">{{clearText}}</text>
+					<text class="confirm-text" @click="confirmRangeChange">{{okText}}</text>
+				</view>
+			</view>
+		</view>
+
+		<Calendar v-if="isPhone" ref="mobile" :clearDate="false" :date="calendarDate" :defTime="mobileCalendarTime"
+			:start-date="calendarRange.startDate" :end-date="calendarRange.endDate" :selectableTimes="mobSelectableTime"
+			:startPlaceholder="startPlaceholder" :endPlaceholder="endPlaceholder" :default-value="defaultValue"
+			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :hasTime="hasTime" :insert="false"
+			:hideSecond="hideSecond" @confirm="mobileChange" @maskClose="close" @change="calendarClick"/>
+	</view>
+</template>
+<script>
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 同时支持 PC 和移动端使用日历选择日期和日期范围
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3962
+	 * @property {String} type 选择器类型
+	 * @property {String|Number|Array|Date} value 绑定值
+	 * @property {String} placeholder 单选择时的占位内容
+	 * @property {String} start 起始时间
+	 * @property {String} end 终止时间
+	 * @property {String} start-placeholder 范围选择时开始日期的占位内容
+	 * @property {String} end-placeholder 范围选择时结束日期的占位内容
+	 * @property {String} range-separator 选择范围时的分隔符
+	 * @property {Boolean} border = [true|false] 是否有边框
+	 * @property {Boolean} disabled = [true|false] 是否禁用
+	 * @property {Boolean} clearIcon = [true|false] 是否显示清除按钮（仅PC端适用）
+	 * @property {[String} defaultValue 选择器打开时默认显示的时间
+	 * @event {Function} change 确定日期时触发的事件
+	 * @event {Function} maskClick 点击遮罩层触发的事件
+	 * @event {Function} show 打开弹出层
+	 * @event {Function} close 关闭弹出层
+	 * @event {Function} clear 清除上次选中的状态和值
+	 **/
+	import Calendar from './calendar.vue'
+	import TimePicker from './time-picker.vue'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	import {
+		getDateTime,
+		getDate,
+		getTime,
+		getDefaultSecond,
+		dateCompare,
+		checkDate,
+		fixIosDateFormat
+	} from './util'
+
+	export default {
+		name: 'UniDatetimePicker',
+
+		options: {
+			// #ifdef MP-TOUTIAO
+			virtualHost: false,
+			// #endif
+			// #ifndef MP-TOUTIAO
+			virtualHost: true
+			// #endif
+		},
+		components: {
+			Calendar,
+			TimePicker
+		},
+		data() {
+			return {
+				isRange: false,
+				hasTime: false,
+				displayValue: '',
+				inputDate: '',
+				calendarDate: '',
+				pickerTime: '',
+				calendarRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				displayRangeValue: {
+					startDate: '',
+					endDate: '',
+				},
+				tempRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				// 左右日历同步数据
+				startMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				endMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				pickerVisible: false,
+				pickerPositionStyle: null,
+				isEmitValue: false,
+				isPhone: false,
+				isFirstShow: true,
+				i18nT: () => {}
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			placeholder: {
+				type: String,
+				default: ''
+			},
+			startPlaceholder: {
+				type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			rangeSeparator: {
+				type: String,
+				default: '-'
+			},
+			border: {
+				type: [Boolean],
+				default: true
+			},
+			disabled: {
+				type: [Boolean],
+				default: false
+			},
+			clearIcon: {
+				type: [Boolean],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+			defaultValue: {
+				type: [String, Object, Array],
+				default: ''
+			}
+		},
+		watch: {
+			type: {
+				immediate: true,
+				handler(newVal) {
+					this.hasTime = newVal.indexOf('time') !== -1
+					this.isRange = newVal.indexOf('range') !== -1
+				}
+			},
+			// #ifndef VUE3
+			value: {
+				immediate: true,
+				handler(newVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			start: {
+				immediate: true,
+				handler(newVal) {
+					if (!newVal) return
+					this.calendarRange.startDate = getDate(newVal)
+					if (this.hasTime) {
+						this.calendarRange.startTime = getTime(newVal)
+					}
+				}
+			},
+			end: {
+				immediate: true,
+				handler(newVal) {
+					if (!newVal) return
+					this.calendarRange.endDate = getDate(newVal)
+					if (this.hasTime) {
+						this.calendarRange.endTime = getTime(newVal, this.hideSecond)
+					}
+				}
+			},
+		},
+		computed: {
+			timepickerStartTime() {
+				const activeDate = this.isRange ? this.tempRange.startDate : this.inputDate
+				return activeDate === this.calendarRange.startDate ? this.calendarRange.startTime : ''
+			},
+			timepickerEndTime() {
+				const activeDate = this.isRange ? this.tempRange.endDate : this.inputDate
+				return activeDate === this.calendarRange.endDate ? this.calendarRange.endTime : ''
+			},
+			mobileCalendarTime() {
+				const timeRange = {
+					start: this.tempRange.startTime,
+					end: this.tempRange.endTime
+				}
+				return this.isRange ? timeRange : this.pickerTime
+			},
+			mobSelectableTime() {
+				return {
+					start: this.calendarRange.startTime,
+					end: this.calendarRange.endTime
+				}
+			},
+			datePopupWidth() {
+				// todo
+				return this.isRange ? 653 : 301
+			},
+
+			/**
+			 * for i18n
+			 */
+			singlePlaceholderText() {
+				return this.placeholder || (this.type === 'date' ? this.selectDateText : this.selectDateTimeText)
+			},
+			startPlaceholderText() {
+				return this.startPlaceholder || this.startDateText
+			},
+			endPlaceholderText() {
+				return this.endPlaceholder || this.endDateText
+			},
+			selectDateText() {
+				return this.i18nT("uni-datetime-picker.selectDate")
+			},
+			selectDateTimeText() {
+				return this.i18nT("uni-datetime-picker.selectDateTime")
+			},
+			selectTimeText() {
+				return this.i18nT("uni-datetime-picker.selectTime")
+			},
+			startDateText() {
+				return this.startPlaceholder || this.i18nT("uni-datetime-picker.startDate")
+			},
+			startTimeText() {
+				return this.i18nT("uni-datetime-picker.startTime")
+			},
+			endDateText() {
+				return this.endPlaceholder || this.i18nT("uni-datetime-picker.endDate")
+			},
+			endTimeText() {
+				return this.i18nT("uni-datetime-picker.endTime")
+			},
+			okText() {
+				return this.i18nT("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return this.i18nT("uni-datetime-picker.clear")
+			},
+			showClearIcon() {
+				return this.clearIcon && !this.disabled && (this.displayValue || (this.displayRangeValue.startDate && this
+					.displayRangeValue.endDate))
+			}
+		},
+		created() {
+			this.initI18nT()
+			this.platform()
+		},
+		methods: {
+			initI18nT() {
+				const vueI18n = initVueI18n(i18nMessages)
+				this.i18nT = vueI18n.t
+			},
+			initPicker(newVal) {
+				if ((!newVal && !this.defaultValue) || Array.isArray(newVal) && !newVal.length) {
+					this.$nextTick(() => {
+						this.clear(false)
+					})
+					return
+				}
+
+				if (!Array.isArray(newVal) && !this.isRange) {
+					if (newVal) {
+						this.displayValue = this.inputDate = this.calendarDate = getDate(newVal)
+						if (this.hasTime) {
+							this.pickerTime = getTime(newVal, this.hideSecond)
+							this.displayValue = `${this.displayValue} ${this.pickerTime}`
+						}
+					} else if (this.defaultValue) {
+						this.inputDate = this.calendarDate = getDate(this.defaultValue)
+						if (this.hasTime) {
+							this.pickerTime = getTime(this.defaultValue, this.hideSecond)
+						}
+					}
+				} else {
+					const [before, after] = newVal
+					if (!before && !after) return
+					const beforeDate = getDate(before)
+					const beforeTime = getTime(before, this.hideSecond)
+
+					const afterDate = getDate(after)
+					const afterTime = getTime(after, this.hideSecond)
+					const startDate = beforeDate
+					const endDate = afterDate
+					this.displayRangeValue.startDate = this.tempRange.startDate = startDate
+					this.displayRangeValue.endDate = this.tempRange.endDate = endDate
+
+					if (this.hasTime) {
+						this.displayRangeValue.startDate = `${beforeDate} ${beforeTime}`
+						this.displayRangeValue.endDate = `${afterDate} ${afterTime}`
+						this.tempRange.startTime = beforeTime
+						this.tempRange.endTime = afterTime
+					}
+					const defaultRange = {
+						before: beforeDate,
+						after: afterDate
+					}
+					this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, defaultRange, {
+						which: 'right'
+					})
+					this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, defaultRange, {
+						which: 'left'
+					})
+				}
+			},
+			updateLeftCale(e) {
+				const left = this.$refs.left
+				// 设置范围选
+				left.cale.setHoverMultiple(e.after)
+				left.setDate(this.$refs.left.nowDate.fullDate)
+			},
+			updateRightCale(e) {
+				const right = this.$refs.right
+				// 设置范围选
+				right.cale.setHoverMultiple(e.after)
+				right.setDate(this.$refs.right.nowDate.fullDate)
+			},
+			platform() {
+				if (typeof navigator !== "undefined") {
+					this.isPhone = navigator.userAgent.toLowerCase().indexOf('mobile') !== -1
+					return
+				}
+				// #ifdef MP-WEIXIN
+				const {
+					windowWidth
+				} = uni.getWindowInfo()
+				// #endif
+				// #ifndef MP-WEIXIN
+				const {
+					windowWidth
+				} = uni.getSystemInfoSync()
+				// #endif
+				this.isPhone = windowWidth <= 500
+				this.windowWidth = windowWidth
+			},
+			show() {
+				this.$emit("show")
+				if (this.disabled) {
+					return
+				}
+				this.platform()
+				if (this.isPhone) {
+					setTimeout(() => {
+						this.$refs.mobile.open()
+					}, 0);
+					return
+				}
+				this.pickerPositionStyle = {
+					top: '10px'
+				}
+				const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor")
+				dateEditor.boundingClientRect(rect => {
+					if (this.windowWidth - rect.left < this.datePopupWidth) {
+						this.pickerPositionStyle.right = 0
+					}
+				}).exec()
+				setTimeout(() => {
+					this.pickerVisible = !this.pickerVisible
+					if (!this.isPhone && this.isRange && this.isFirstShow) {
+						this.isFirstShow = false
+						const {
+							startDate,
+							endDate
+						} = this.calendarRange
+						if (startDate && endDate) {
+							if (this.diffDate(startDate, endDate) < 30) {
+								this.$refs.right.changeMonth('pre')
+							}
+						} else {
+							// this.$refs.right.changeMonth('next')
+							if (this.isPhone) {
+								this.$refs.right.cale.lastHover = false;
+							}
+						}
+					}
+
+				}, 50)
+			},
+			close() {
+				setTimeout(() => {
+					this.pickerVisible = false
+					this.$emit('maskClick', this.value)
+					this.$refs.mobile && this.$refs.mobile.close()
+				}, 20)
+			},
+			setEmit(value) {
+				if (this.returnType === "timestamp" || this.returnType === "date") {
+					if (!Array.isArray(value)) {
+						if (!this.hasTime) {
+							value = value + ' ' + '00:00:00'
+						}
+						value = this.createTimestamp(value)
+						if (this.returnType === "date") {
+							value = new Date(value)
+						}
+					} else {
+						if (!this.hasTime) {
+							value[0] = value[0] + ' ' + '00:00:00'
+							value[1] = value[1] + ' ' + '00:00:00'
+						}
+						value[0] = this.createTimestamp(value[0])
+						value[1] = this.createTimestamp(value[1])
+						if (this.returnType === "date") {
+							value[0] = new Date(value[0])
+							value[1] = new Date(value[1])
+						}
+					}
+				}
+
+				this.$emit('update:modelValue', value)
+				this.$emit('input', value)
+				this.$emit('change', value)
+				this.isEmitValue = true
+			},
+			createTimestamp(date) {
+				date = fixIosDateFormat(date)
+				return Date.parse(new Date(date))
+			},
+			singleChange(e) {
+				this.calendarDate = this.inputDate = e.fulldate
+				if (this.hasTime) return
+				this.confirmSingleChange()
+			},
+			confirmSingleChange() {
+				if (!checkDate(this.inputDate)) {
+					const now = new Date()
+					this.calendarDate = this.inputDate = getDate(now)
+					this.pickerTime = getTime(now, this.hideSecond)
+				}
+
+				let startLaterInputDate = false
+				let startDate, startTime
+				if (this.start) {
+					let startString = this.start
+					if (typeof this.start === 'number') {
+						startString = getDateTime(this.start, this.hideSecond)
+					}
+					[startDate, startTime] = startString.split(' ')
+					if (this.start && !dateCompare(startDate, this.inputDate)) {
+						startLaterInputDate = true
+						this.inputDate = startDate
+					}
+				}
+
+				let endEarlierInputDate = false
+				let endDate, endTime
+				if (this.end) {
+					let endString = this.end
+					if (typeof this.end === 'number') {
+						endString = getDateTime(this.end, this.hideSecond)
+					}
+					[endDate, endTime] = endString.split(' ')
+					if (this.end && !dateCompare(this.inputDate, endDate)) {
+						endEarlierInputDate = true
+						this.inputDate = endDate
+					}
+				}
+				if (this.hasTime) {
+					if (startLaterInputDate) {
+						this.pickerTime = startTime || getDefaultSecond(this.hideSecond)
+					}
+					if (endEarlierInputDate) {
+						this.pickerTime = endTime || getDefaultSecond(this.hideSecond)
+					}
+					if (!this.pickerTime) {
+						this.pickerTime = getTime(Date.now(), this.hideSecond)
+					}
+					this.displayValue = `${this.inputDate} ${this.pickerTime}`
+				} else {
+					this.displayValue = this.inputDate
+				}
+				this.setEmit(this.displayValue)
+				this.pickerVisible = false
+			},
+			leftChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, obj)
+				this.$emit('calendarClick', e)
+			},
+			rightChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, obj)
+				this.$emit('calendarClick', e)
+			},
+			mobileChange(e) {
+				if (this.isRange) {
+					const {
+						before,
+						after
+					} = e.range
+					if (!before) {
+						return;
+					}
+
+					this.handleStartAndEnd(before, after, true)
+					if (this.hasTime) {
+						const {
+							startTime,
+							endTime
+						} = e.timeRange
+						this.tempRange.startTime = startTime
+						this.tempRange.endTime = endTime
+					}
+					this.confirmRangeChange()
+				} else {
+					if (this.hasTime) {
+						this.displayValue = e.fulldate + ' ' + e.time
+					} else {
+						this.displayValue = e.fulldate
+					}
+					this.setEmit(this.displayValue)
+					this.calendarDate = this.displayValue;
+				}
+				this.$refs.mobile.close()
+			},
+			rangeChange(before, after) {
+				if (!(before && after)) return
+				this.handleStartAndEnd(before, after, true)
+				if (this.hasTime) return
+				this.confirmRangeChange()
+			},
+			confirmRangeChange() {
+				if (!this.tempRange.startDate || !this.tempRange.endDate) {
+					this.pickerVisible = false
+					return
+				}
+				if (!checkDate(this.tempRange.startDate)) {
+					this.tempRange.startDate = getDate(Date.now())
+				}
+				if (!checkDate(this.tempRange.endDate)) {
+					this.tempRange.endDate = getDate(Date.now())
+				}
+
+				let start, end
+
+				let startDateLaterRangeStartDate = false
+				let startDateLaterRangeEndDate = false
+				let startDate, startTime
+
+				let compareStartDateString = this.tempRange.startDate
+				let compareEndDateString = this.tempRange.endDate
+				if (this.hasTime) {
+					compareStartDateString = `${this.tempRange.startDate} ${this.tempRange.startTime}`
+					compareEndDateString = `${this.tempRange.endDate} ${this.tempRange.endTime}`
+				}
+
+				if (this.start) {
+					let startString = this.start
+					if (typeof this.start === 'number') {
+						startString = getDateTime(this.start, this.hideSecond)
+					}
+					[startDate, startTime] = startString.split(' ')
+					if (this.start && !dateCompare(this.start, compareStartDateString)) {
+						startDateLaterRangeStartDate = true
+						this.tempRange.startDate = startDate
+					}
+					if (this.start && !dateCompare(this.start, compareEndDateString)) {
+						startDateLaterRangeEndDate = true
+						this.tempRange.endDate = startDate
+					}
+				}
+				let endDateEarlierRangeStartDate = false
+				let endDateEarlierRangeEndDate = false
+				let endDate, endTime
+				if (this.end) {
+					let endString = this.end
+					if (typeof this.end === 'number') {
+						endString = getDateTime(this.end, this.hideSecond)
+					}
+					[endDate, endTime] = endString.split(' ')
+
+					if (this.end && !dateCompare(compareStartDateString, this.end)) {
+						endDateEarlierRangeStartDate = true
+						this.tempRange.startDate = endDate
+					}
+					if (this.end && !dateCompare(compareEndDateString, this.end)) {
+						endDateEarlierRangeEndDate = true
+						this.tempRange.endDate = endDate
+					}
+				}
+				if (!this.hasTime) {
+					start = this.displayRangeValue.startDate = this.tempRange.startDate
+					end = this.displayRangeValue.endDate = this.tempRange.endDate
+				} else {
+					if (startDateLaterRangeStartDate) {
+						this.tempRange.startTime = startTime || getDefaultSecond(this.hideSecond)
+					} else if (endDateEarlierRangeStartDate) {
+						this.tempRange.startTime = endTime || getDefaultSecond(this.hideSecond)
+					}
+					if (!this.tempRange.startTime) {
+						this.tempRange.startTime = getTime(Date.now(), this.hideSecond)
+					}
+
+					if (startDateLaterRangeEndDate) {
+						this.tempRange.endTime = startTime || getDefaultSecond(this.hideSecond)
+					} else if (endDateEarlierRangeEndDate) {
+						this.tempRange.endTime = endTime || getDefaultSecond(this.hideSecond)
+					}
+					if (!this.tempRange.endTime) {
+						this.tempRange.endTime = getTime(Date.now(), this.hideSecond)
+					}
+					start = this.displayRangeValue.startDate = `${this.tempRange.startDate} ${this.tempRange.startTime}`
+					end = this.displayRangeValue.endDate = `${this.tempRange.endDate} ${this.tempRange.endTime}`
+				}
+				if (!dateCompare(start, end)) {
+					[start, end] = [end, start]
+				}
+				this.displayRangeValue.startDate = start
+				this.displayRangeValue.endDate = end
+				const displayRange = [start, end]
+				this.setEmit(displayRange)
+				this.pickerVisible = false
+			},
+			handleStartAndEnd(before, after, temp = false) {
+				if (!before) return
+				if (!after) after = before;
+				const type = temp ? 'tempRange' : 'range'
+				const isStartEarlierEnd = dateCompare(before, after)
+				this[type].startDate = isStartEarlierEnd ? before : after
+				this[type].endDate = isStartEarlierEnd ? after : before
+			},
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				return startDate <= endDate
+			},
+
+			/**
+			 * 比较时间差
+			 */
+			diffDate(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				const diff = (endDate - startDate) / (24 * 60 * 60 * 1000)
+				return Math.abs(diff)
+			},
+
+			clear(needEmit = true) {
+				if (!this.isRange) {
+					this.displayValue = ''
+					this.inputDate = ''
+					this.pickerTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.pcSingle && this.$refs.pcSingle.clearCalender()
+					}
+					if (needEmit) {
+						this.$emit('change', '')
+						this.$emit('input', '')
+						this.$emit('update:modelValue', '')
+					}
+				} else {
+					this.displayRangeValue.startDate = ''
+					this.displayRangeValue.endDate = ''
+					this.tempRange.startDate = ''
+					this.tempRange.startTime = ''
+					this.tempRange.endDate = ''
+					this.tempRange.endTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.left && this.$refs.left.clearCalender()
+						this.$refs.right && this.$refs.right.clearCalender()
+						this.$refs.right && this.$refs.right.changeMonth('next')
+					}
+					if (needEmit) {
+						this.$emit('change', [])
+						this.$emit('input', [])
+						this.$emit('update:modelValue', [])
+					}
+				}
+			},
+
+			calendarClick(e) {
+				this.$emit('calendarClick', e)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-date {
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-date-x {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		border-radius: 4px;
+		background-color: #fff;
+		color: #666;
+		font-size: 14px;
+		flex: 1;
+
+		.icon-calendar {
+			padding-left: 3px;
+		}
+
+		.range-separator {
+			height: 35px;
+			/* #ifndef MP */
+			padding: 0 2px;
+			/* #endif */
+			line-height: 35px;
+		}
+	}
+
+	.uni-date-x--border {
+		box-sizing: border-box;
+		border-radius: 4px;
+		border: 1px solid #e5e5e5;
+	}
+
+	.uni-date-editor--x {
+		display: flex;
+		align-items: center;
+		position: relative;
+	}
+
+	.uni-date-editor--x .uni-date__icon-clear {
+		padding-right: 3px;
+		display: flex;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-date__x-input {
+		width: auto;
+		height: 35px;
+		/* #ifndef MP */
+		padding-left: 5px;
+		/* #endif */
+		position: relative;
+		flex: 1;
+		line-height: 35px;
+		font-size: 14px;
+		overflow: hidden;
+	}
+
+	.text-center {
+		text-align: center;
+	}
+
+	.uni-date__input {
+		height: 40px;
+		width: 100%;
+		line-height: 40px;
+		font-size: 14px;
+	}
+
+	.uni-date-range__input {
+		text-align: center;
+		max-width: 142px;
+	}
+
+	.uni-date-picker__container {
+		position: relative;
+	}
+
+	.uni-date-mask--pc {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0);
+		transition-duration: 0.3s;
+		z-index: 996;
+	}
+
+	.uni-date-single--x {
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-range--x {
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-editor--x__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	.uni-date-editor--logo {
+		width: 16px;
+		height: 16px;
+		vertical-align: middle;
+	}
+
+	/* 添加时间 */
+	.popup-x-header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.popup-x-header--datetime {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+	}
+
+	.popup-x-body {
+		display: flex;
+	}
+
+	.popup-x-footer {
+		padding: 0 15px;
+		border-top-color: #F1F1F1;
+		border-top-style: solid;
+		border-top-width: 1px;
+		line-height: 40px;
+		text-align: right;
+		color: #666;
+	}
+
+	.popup-x-footer text:hover {
+		color: $uni-primary;
+		cursor: pointer;
+		opacity: 0.8;
+	}
+
+	.popup-x-footer .confirm-text {
+		margin-left: 20px;
+		color: $uni-primary;
+	}
+
+	.uni-date-changed {
+		text-align: center;
+		color: #333;
+		border-bottom-color: #F1F1F1;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-date-changed--time text {
+		height: 50px;
+		line-height: 50px;
+	}
+
+	.uni-date-changed .uni-date-changed--time {
+		flex: 1;
+	}
+
+	.uni-date-changed--time-date {
+		color: #333;
+		opacity: 0.6;
+	}
+
+	.mr-50 {
+		margin-right: 50px;
+	}
+
+	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border: 6px solid transparent;
+		border-top-width: 0;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-bottom-color: #fff;
+	}
+</style>

uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js

@@ -0,0 +1,421 @@
+class Calendar {
+	constructor({
+		selected,
+		startDate,
+		endDate,
+		range,
+	} = {}) {
+		// 当前日期
+		this.date = this.getDateObj(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 起始时间
+		this.startDate = startDate
+		// 终止时间
+		this.endDate = endDate
+		// 是否范围选择
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		this.lastHover = false
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		const selectDate = this.getDateObj(date)
+		this.getWeeks(selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	setStartDate(startDate) {
+		this.startDate = startDate
+	}
+
+	setEndDate(endDate) {
+		this.endDate = endDate
+	}
+
+	getPreMonthObj(date) {
+		date = fixIosDateFormat(date)
+		date = new Date(date)
+
+		const oldMonth = date.getMonth()
+		date.setMonth(oldMonth - 1)
+		const newMonth = date.getMonth()
+		if (oldMonth !== 0 && newMonth - oldMonth === 0) {
+			date.setMonth(newMonth - 1)
+		}
+		return this.getDateObj(date)
+	}
+	getNextMonthObj(date) {
+		date = fixIosDateFormat(date)
+		date = new Date(date)
+
+		const oldMonth = date.getMonth()
+		date.setMonth(oldMonth + 1)
+		const newMonth = date.getMonth()
+		if (newMonth - oldMonth > 1) {
+			date.setMonth(newMonth - 1)
+		}
+		return this.getDateObj(date)
+	}
+
+	/**
+	 * 获取指定格式Date对象
+	 */
+	getDateObj(date) {
+		date = fixIosDateFormat(date)
+		date = new Date(date)
+
+		return {
+			fullDate: getDate(date),
+			year: date.getFullYear(),
+			month: addZero(date.getMonth() + 1),
+			date: addZero(date.getDate()),
+			day: date.getDay()
+		}
+	}
+
+	/**
+	 * 获取上一个月日期集合
+	 */
+	getPreMonthDays(amount, dateObj) {
+		const result = []
+		for (let i = amount - 1; i >= 0; i--) {
+			const month = dateObj.month - 1
+			result.push({
+				date: new Date(dateObj.year, month, -i).getDate(),
+				month,
+				disable: true
+			})
+		}
+		return result
+	}
+	/**
+	 * 获取本月日期集合
+	 */
+	getCurrentMonthDays(amount, dateObj) {
+		const result = []
+		const fullDate = this.date.fullDate
+		for (let i = 1; i <= amount; i++) {
+			const currentDate = `${dateObj.year}-${dateObj.month}-${addZero(i)}`
+			const isToday = fullDate === currentDate
+			// 获取打点信息
+			const info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(currentDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				disableBefore = dateCompare(this.startDate, currentDate)
+			}
+
+			if (this.endDate) {
+				disableAfter = dateCompare(currentDate, this.endDate)
+			}
+
+			let multiples = this.multipleStatus.data
+			let multiplesStatus = -1
+			if (this.range && multiples) {
+				multiplesStatus = multiples.findIndex((item) => {
+					return this.dateEqual(item, currentDate)
+				})
+			}
+			const checked = multiplesStatus !== -1
+
+			result.push({
+				fullDate: currentDate,
+				year: dateObj.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(currentDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(currentDate, this.multipleStatus.before, this.multipleStatus.after),
+				month: dateObj.month,
+				disable: (this.startDate && !dateCompare(this.startDate, currentDate)) || (this.endDate && !dateCompare(
+					currentDate, this.endDate)),
+				isToday,
+				userChecked: false,
+				extraInfo: info
+			})
+		}
+		return result
+	}
+	/**
+	 * 获取下一个月日期集合
+	 */
+	_getNextMonthDays(amount, dateObj) {
+		const result = []
+		const month = dateObj.month + 1
+		for (let i = 1; i <= amount; i++) {
+			result.push({
+				date: i,
+				month,
+				disable: true
+			})
+		}
+		return result
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const res = this.calendar.find(item => item.fullDate === this.getDateObj(date).fullDate)
+		return res ? res : this.getDateObj(date)
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		before = new Date(fixIosDateFormat(before))
+		after = new Date(fixIosDateFormat(after))
+		return before.valueOf() === after.valueOf()
+	}
+
+	/**
+	 *  比较真实起始日期
+	 */
+
+	isLogicBefore(currentDate, before, after) {
+		let logicBefore = before
+		if (before && after) {
+			logicBefore = dateCompare(before, after) ? before : after
+		}
+		return this.dateEqual(logicBefore, currentDate)
+	}
+
+	isLogicAfter(currentDate, before, after) {
+		let logicAfter = after
+		if (before && after) {
+			logicAfter = dateCompare(before, after) ? after : before
+		}
+		return this.dateEqual(logicAfter, currentDate)
+	}
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDateObj(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		if (!this.range) return
+
+		let {
+			before,
+			after
+		} = this.multipleStatus
+		if (before && after) {
+			if (!this.lastHover) {
+				this.lastHover = true
+				return
+			}
+			this.multipleStatus.before = fullDate
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+			this.multipleStatus.fulldate = ''
+			this.lastHover = false
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+				this.multipleStatus.after = undefined;
+				this.lastHover = false
+			} else {
+				this.multipleStatus.after = fullDate
+				if (dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus
+						.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus
+						.before);
+				}
+				this.lastHover = true
+			}
+		}
+		this.getWeeks(fullDate)
+	}
+
+	/**
+	 *  鼠标 hover 更新多选状态
+	 */
+	setHoverMultiple(fullDate) {
+		//抖音小程序点击会触发hover事件，需要避免一下
+		// #ifndef MP-TOUTIAO
+		if (!this.range || this.lastHover) return
+		const {
+			before
+		} = this.multipleStatus
+
+		if (!before) {
+			this.multipleStatus.before = fullDate
+		} else {
+			this.multipleStatus.after = fullDate
+			if (dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+			} else {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+			}
+		}
+		this.getWeeks(fullDate)
+		// #endif
+
+	}
+
+	/**
+	 * 更新默认值多选状态
+	 */
+	setDefaultMultiple(before, after) {
+		this.multipleStatus.before = before
+		this.multipleStatus.after = after
+		if (before && after) {
+			if (dateCompare(before, after)) {
+				this.multipleStatus.data = this.geDateAll(before, after);
+				this.getWeeks(after)
+			} else {
+				this.multipleStatus.data = this.geDateAll(after, before);
+				this.getWeeks(before)
+			}
+		}
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	getWeeks(dateData) {
+		const {
+			year,
+			month,
+		} = this.getDateObj(dateData)
+
+		const preMonthDayAmount = new Date(year, month - 1, 1).getDay()
+		const preMonthDays = this.getPreMonthDays(preMonthDayAmount, this.getDateObj(dateData))
+
+		const currentMonthDayAmount = new Date(year, month, 0).getDate()
+		const currentMonthDays = this.getCurrentMonthDays(currentMonthDayAmount, this.getDateObj(dateData))
+
+		const nextMonthDayAmount = 42 - preMonthDayAmount - currentMonthDayAmount
+		const nextMonthDays = this._getNextMonthDays(nextMonthDayAmount, this.getDateObj(dateData))
+
+		const calendarDays = [...preMonthDays, ...currentMonthDays, ...nextMonthDays]
+
+		const weeks = new Array(6)
+		for (let i = 0; i < calendarDays.length; i++) {
+			const index = Math.floor(i / 7)
+			if (!weeks[index]) {
+				weeks[index] = new Array(7)
+			}
+			weeks[index][i % 7] = calendarDays[i]
+		}
+
+		this.calendar = calendarDays
+		this.weeks = weeks
+	}
+}
+
+function getDateTime(date, hideSecond) {
+	return `${getDate(date)} ${getTime(date, hideSecond)}`
+}
+
+function getDate(date) {
+	date = fixIosDateFormat(date)
+	date = new Date(date)
+	const year = date.getFullYear()
+	const month = date.getMonth() + 1
+	const day = date.getDate()
+	return `${year}-${addZero(month)}-${addZero(day)}`
+}
+
+function getTime(date, hideSecond) {
+	date = fixIosDateFormat(date)
+	date = new Date(date)
+	const hour = date.getHours()
+	const minute = date.getMinutes()
+	const second = date.getSeconds()
+	return hideSecond ? `${addZero(hour)}:${addZero(minute)}` : `${addZero(hour)}:${addZero(minute)}:${addZero(second)}`
+}
+
+function addZero(num) {
+	if (num < 10) {
+		num = `0${num}`
+	}
+	return num
+}
+
+function getDefaultSecond(hideSecond) {
+	return hideSecond ? '00:00' : '00:00:00'
+}
+
+function dateCompare(startDate, endDate) {
+	startDate = new Date(fixIosDateFormat(startDate))
+	endDate = new Date(fixIosDateFormat(endDate))
+	return startDate <= endDate
+}
+
+function checkDate(date) {
+	const dateReg = /((19|20)\d{2})(-|\/)\d{1,2}(-|\/)\d{1,2}/g
+	return date.match(dateReg)
+}
+//ios低版本15及以下，无法匹配 没有 ’秒‘ 时的情况，所以需要在末尾 秒 加上 问号
+const dateTimeReg = /^\d{4}-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01])( [0-5]?[0-9]:[0-5]?[0-9](:[0-5]?[0-9])?)?$/;
+
+function fixIosDateFormat(value) {
+	if (typeof value === 'string' && dateTimeReg.test(value)) {
+		value = value.replace(/-/g, '/')
+	}
+	return value
+}
+
+export {
+	Calendar,
+	getDateTime,
+	getDate,
+	getTime,
+	addZero,
+	getDefaultSecond,
+	dateCompare,
+	checkDate,
+	fixIosDateFormat
+}

uni_modules/uni-datetime-picker/package.json

@@ -0,0 +1,90 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.40",
+  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
+  "keywords": [
+    "uni-datetime-picker",
+    "uni-ui",
+    "uniui",
+    "日期时间选择器",
+    "日期时间"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+            "app-vue": "y",
+            "app-nvue": "n",
+            "app-harmony": "u",
+            "app-uvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-datetime-picker/readme.md

@@ -0,0 +1,21 @@
+
+
+> `重要通知：组件升级更新 2.0.0 后，支持日期+时间范围选择，组件 ui 将使用日历选择日期，ui 变化较大，同时支持 PC 和 移动端。此版本不向后兼容，不再支持单独的时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）。若仍需使用旧版本，可在插件市场下载*非uni_modules版本*，旧版本将不再维护`
+
+## DatetimePicker 时间选择器
+
+> **组件名：uni-datetime-picker**
+> 代码块： `uDatetimePicker`
+
+
+该组件的优势是，支持**时间戳**输入和输出（起始时间、终止时间也支持时间戳），可**同时选择**日期和时间。
+
+若只是需要单独选择日期和时间，不需要时间戳输入和输出，可使用原生的 picker 组件。
+
+**_点击 picker 默认值规则：_**
+
+- 若设置初始值 value, 会显示在 picker 显示框中
+- 若无初始值 value，则初始值 value 为当前本地时间 Date.now()， 但不会显示在 picker 显示框中
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uni-icons/changelog.md

@@ -1,3 +1,5 @@
+## 2.0.10（2024-06-07）
+- 优化 uni-app x 中，size 属性的类型
 ## 2.0.9（2024-01-12）
 fix: 修复图标大小默认值错误的问题
 ## 2.0.8（2023-12-14）

uni_modules/uni-icons/components/uni-icons/uni-icons.uvue

@@ -1,91 +1,91 @@
 <template>
-	<text class="uni-icons" :style="styleObj">
-		<slot>{{unicode}}</slot>
-	</text>
+  <text class="uni-icons" :style="styleObj">
+    <slot>{{unicode}}</slot>
+  </text>
 </template>
 
 <script>
-	import { fontData, IconsDataItem } from './uniicons_file'
+  import { fontData, IconsDataItem } from './uniicons_file'
 
-	/**
-	 * Icons 图标
-	 * @description 用于展示 icon 图标
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
-	 * @property {Number} size 图标大小
-	 * @property {String} type 图标图案，参考示例
-	 * @property {String} color 图标颜色
-	 * @property {String} customPrefix 自定义图标
-	 * @event {Function} click 点击 Icon 触发事件
-	 */
-	export default {
-		name: "uni-icons",
-		props: {
-			type: {
-				type: String,
-				default: ''
-			},
-			color: {
-				type: String,
-				default: '#333333'
-			},
-			size: {
-				type: Object,
-				default: 16
-			},
-			fontFamily: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {};
-		},
-		computed: {
-			unicode() : string {
-				let codes = fontData.find((item : IconsDataItem) : boolean => { return item.font_class == this.type })
-				if (codes !== null) {
-					return codes.unicode
-				}
-				return ''
-			},
-			iconSize() : string {
-				const size = this.size
-				if (typeof size == 'string') {
-					const reg = /^[0-9]*$/g
-					return reg.test(size as string) ? '' + size + 'px' : '' + size;
-					// return '' + this.size
-				}
-				return this.getFontSize(size as number)
-			},
-			styleObj() : UTSJSONObject {
-				if (this.fontFamily !== '') {
-					return { color: this.color, fontSize: this.iconSize, fontFamily: this.fontFamily }
-				}
-				return { color: this.color, fontSize: this.iconSize }
-			}
-		},
-		created() { },
-		methods: {
-			/**
-			 * 字体大小
-			 */
-			getFontSize(size : number) : string {
-				return size + 'px';
-			},
-		},
-	}
+  /**
+   * Icons 图标
+   * @description 用于展示 icon 图标
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+   * @property {Number,String} size 图标大小
+   * @property {String} type 图标图案，参考示例
+   * @property {String} color 图标颜色
+   * @property {String} customPrefix 自定义图标
+   * @event {Function} click 点击 Icon 触发事件
+   */
+  export default {
+    name: "uni-icons",
+    props: {
+      type: {
+        type: String,
+        default: ''
+      },
+      color: {
+        type: String,
+        default: '#333333'
+      },
+      size: {
+        type: [Number, String],
+        default: 16
+      },
+      fontFamily: {
+        type: String,
+        default: ''
+      }
+    },
+    data() {
+      return {};
+    },
+    computed: {
+      unicode() : string {
+        let codes = fontData.find((item : IconsDataItem) : boolean => { return item.font_class == this.type })
+        if (codes !== null) {
+          return codes.unicode
+        }
+        return ''
+      },
+      iconSize() : string {
+        const size = this.size
+        if (typeof size == 'string') {
+          const reg = /^[0-9]*$/g
+          return reg.test(size as string) ? '' + size + 'px' : '' + size;
+          // return '' + this.size
+        }
+        return this.getFontSize(size as number)
+      },
+      styleObj() : UTSJSONObject {
+        if (this.fontFamily !== '') {
+          return { color: this.color, fontSize: this.iconSize, fontFamily: this.fontFamily }
+        }
+        return { color: this.color, fontSize: this.iconSize }
+      }
+    },
+    created() { },
+    methods: {
+      /**
+       * 字体大小
+       */
+      getFontSize(size : number) : string {
+        return size + 'px';
+      },
+    },
+  }
 </script>
 
 <style scoped>
-	@font-face {
-		font-family: UniIconsFontFamily;
-		src: url('./uniicons.ttf');
-	}
+  @font-face {
+    font-family: UniIconsFontFamily;
+    src: url('./uniicons.ttf');
+  }
 
-	.uni-icons {
-		font-family: UniIconsFontFamily;
-		font-size: 18px;
-		font-style: normal;
-		color: #333;
-	}
+  .uni-icons {
+    font-family: UniIconsFontFamily;
+    font-size: 18px;
+    font-style: normal;
+    color: #333;
+  }
 </style>

uni_modules/uni-icons/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",
@@ -42,7 +42,8 @@
     "platforms": {
       "cloud": {
         "tcb": "y",
-        "aliyun": "y"
+        "aliyun": "y",
+        "alipay": "n"
       },
       "client": {
         "App": {