From aa47166ae7df893ab0f0ccb13fd978f423888b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=80=AA?= <690927457@qq.com>
Date: Wed, 18 Oct 2023 21:00:42 +0800
Subject: [PATCH] =?UTF-8?q?10.18=E5=89=8D=E7=9A=84=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/index.js                                  |    5 +
 api/request.js                                |   22 +-
 config/index.js                               |    2 +-
 manifest.json                                 |    4 +-
 pages.json                                    |   10 +-
 pages/index/index.vue                         |   88 +-
 pages/login/login.vue                         |  173 +++
 pages/user/index.vue                          |   90 +-
 static/avatar.png                             |  Bin 0 -> 7203 bytes
 store/index.js                                |    2 +-
 uni_modules/uni-datetime-picker/changelog.md  |  140 +++
 .../uni-datetime-picker/calendar-item.vue     |  177 +++
 .../uni-datetime-picker/calendar.vue          |  929 +++++++++++++++
 .../uni-datetime-picker/i18n/en.json          |   22 +
 .../uni-datetime-picker/i18n/index.js         |    8 +
 .../uni-datetime-picker/i18n/zh-Hans.json     |   22 +
 .../uni-datetime-picker/i18n/zh-Hant.json     |   22 +
 .../uni-datetime-picker/time-picker.vue       |  934 +++++++++++++++
 .../uni-datetime-picker.vue                   | 1032 +++++++++++++++++
 .../components/uni-datetime-picker/util.js    |  453 ++++++++
 uni_modules/uni-datetime-picker/package.json  |   87 ++
 uni_modules/uni-datetime-picker/readme.md     |   21 +
 uni_modules/uni-easyinput/changelog.md        |   97 ++
 .../components/uni-easyinput/common.js        |   56 +
 .../uni-easyinput/uni-easyinput.vue           |  657 +++++++++++
 uni_modules/uni-easyinput/package.json        |   87 ++
 uni_modules/uni-easyinput/readme.md           |   11 +
 unpackage/dist/dev/mp-weixin/api/index.js     |    6 +
 unpackage/dist/dev/mp-weixin/api/request.js   |   10 +-
 unpackage/dist/dev/mp-weixin/app.js           |    1 +
 unpackage/dist/dev/mp-weixin/app.json         |    7 +-
 unpackage/dist/dev/mp-weixin/common/vendor.js |  435 +++++--
 unpackage/dist/dev/mp-weixin/config/index.js  |    2 +-
 .../dist/dev/mp-weixin/pages/index/index.js   |   51 +-
 .../dist/dev/mp-weixin/pages/index/index.json |    2 +
 .../dist/dev/mp-weixin/pages/index/index.wxml |    2 +-
 .../dist/dev/mp-weixin/pages/index/index.wxss |   30 +
 .../dist/dev/mp-weixin/pages/login/login.js   |  111 ++
 .../dist/dev/mp-weixin/pages/login/login.json |    6 +
 .../dist/dev/mp-weixin/pages/login/login.wxml |    1 +
 .../dist/dev/mp-weixin/pages/login/login.wxss |   75 ++
 .../dist/dev/mp-weixin/pages/user/index.js    |   57 +-
 .../dist/dev/mp-weixin/pages/user/index.wxml  |    2 +-
 .../dist/dev/mp-weixin/pages/user/index.wxss  |   51 +
 .../dist/dev/mp-weixin/static/avatar.png      |  Bin 0 -> 7203 bytes
 unpackage/dist/dev/mp-weixin/store/index.js   |    1 -
 .../uni-datetime-picker/calendar-item.js      |   58 +
 .../uni-datetime-picker/calendar-item.json    |    4 +
 .../uni-datetime-picker/calendar-item.wxml    |    1 +
 .../uni-datetime-picker/calendar-item.wxss    |  113 ++
 .../uni-datetime-picker/calendar.js           |  597 ++++++++++
 .../uni-datetime-picker/calendar.json         |    8 +
 .../uni-datetime-picker/calendar.wxml         |    1 +
 .../uni-datetime-picker/calendar.wxss         |  251 ++++
 .../uni-datetime-picker/i18n/index.js         |   73 ++
 .../uni-datetime-picker/time-picker.js        |  696 +++++++++++
 .../uni-datetime-picker/time-picker.json      |    4 +
 .../uni-datetime-picker/time-picker.wxml      |    1 +
 .../uni-datetime-picker/time-picker.wxss      |  127 ++
 .../uni-datetime-picker.js                    |  828 +++++++++++++
 .../uni-datetime-picker.json                  |    8 +
 .../uni-datetime-picker.wxml                  |    1 +
 .../uni-datetime-picker.wxss                  |  201 ++++
 .../components/uni-datetime-picker/util.js    |  406 +++++++
 .../components/uni-easyinput/uni-easyinput.js |  448 +++++++
 .../uni-easyinput/uni-easyinput.json          |    6 +
 .../uni-easyinput/uni-easyinput.wxml          |    1 +
 .../uni-easyinput/uni-easyinput.wxss          |  133 +++
 unpackage/dist/dev/mp-weixin/utils/index.js   |  101 ++
 utils/index.js                                |   40 +-
 70 files changed, 9936 insertions(+), 172 deletions(-)
 create mode 100644 pages/login/login.vue
 create mode 100644 static/avatar.png
 create mode 100644 uni_modules/uni-datetime-picker/changelog.md
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
 create mode 100644 uni_modules/uni-datetime-picker/package.json
 create mode 100644 uni_modules/uni-datetime-picker/readme.md
 create mode 100644 uni_modules/uni-easyinput/changelog.md
 create mode 100644 uni_modules/uni-easyinput/components/uni-easyinput/common.js
 create mode 100644 uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
 create mode 100644 uni_modules/uni-easyinput/package.json
 create mode 100644 uni_modules/uni-easyinput/readme.md
 create mode 100644 unpackage/dist/dev/mp-weixin/pages/login/login.js
 create mode 100644 unpackage/dist/dev/mp-weixin/pages/login/login.json
 create mode 100644 unpackage/dist/dev/mp-weixin/pages/login/login.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/pages/login/login.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/static/avatar.png
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.json
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/utils/index.js

diff --git a/api/index.js b/api/index.js
index 3bc6212..b2dbea8 100644
--- a/api/index.js
+++ b/api/index.js
@@ -5,6 +5,11 @@ const API = {
 	//微信登录
 	getToken: data => net.POST('/login/token',data), // 获取token
 	wx_login: (data,userId) => net.POST('/user/binding/wechat',data,true,{"userId":userId}), // 微信登录
+	// upload: (data) => net.POST('/user/upload',data), // 文件上传
+	userinfoUpdae:data => net.PUT('/user/info',data), // 更新用户信息
+	// 首页
+	getHospitalList:data => net.GET('/hospital/list',data), // 获取医院信息
+	
 	/* 
 	 首页信息
 	 */
diff --git a/api/request.js b/api/request.js
index d7407f5..7dc2c7b 100644
--- a/api/request.js
+++ b/api/request.js
@@ -3,13 +3,23 @@ import config from '../config'
 // import store from '../store'
 
 const loginUrl = 'pages/user/login';
-
+// function JSON_to_URLEncoded(element,key,list){
+//   var list = list || [];
+//   if(typeof(element)=='object'){
+//     for (var idx in element)
+//       JSON_to_URLEncoded(element[idx],key?key+'['+idx+']':idx,list);
+//   } else {
+//     list.push(key+'='+encodeURIComponent(element));
+//   }
+//   return list.join('&');
+// }
 export default {
 	REQUEST(url, method = 'GET', data, checkLogin = true, header) {
-		let token = uni.getStorageSync('access_token') || 'Basic ZGV20mRldjEyMw==';
+		
+		let token = uni.getStorageSync('access_token') || 'Basic ZGV2OmRldjEyMw==';
 		const headers = {
-			"Content-Type": "application/json",
-			// "Content-Type": "application/x-www-form-urlencoded",
+			// "Content-Type": "application/json",
+			"Content-Type": "application/x-www-form-urlencoded",
 			"Authorization": token,
 			"x-token": token,
 			"token":token,
@@ -18,10 +28,6 @@ export default {
 		}
 		var pages = getCurrentPages();
 		var page = pages[pages.length - 1];
-		if(!header) {
-			headers["Content-Type"] =  'application/x-www-form-urlencode'
-		}
-		console.log("headers :",headers)
 		return uni.request({
 			url: config.baseUrl + url,
 			method,
diff --git a/config/index.js b/config/index.js
index 631383e..2972aff 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,6 +1,6 @@
 // isdev 为 true 表示开发环境 false 表示发布环境
 const isdev = true;
-const baseUrl = isdev ? 'https://71e86bc1.r15.cpolar.top' : 'http://niunai.zhitou1688.com';// 办公室接口 & 测试环境
+const baseUrl = isdev ? 'http://2580c89.r18.cpolar.top/' : 'http://niunai.zhitou1688.com';// 办公室接口 & 测试环境
 // const baseUrl = isdev ? 'http://192.168.1.133:8899' : 'https://api.gwkjxb.com';// 办公室接口 & 正式环境
 // const baseUrl = 'https://api.gwkjxb.com';// 正式环境（由于本地测试后台没有启动，暂时通用正式服）
 
diff --git a/manifest.json b/manifest.json
index 7110b62..ec17600 100644
--- a/manifest.json
+++ b/manifest.json
@@ -52,7 +52,9 @@
     "mp-weixin" : {
         "appid" : "wxaaf66dbb5c3983b3",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false
+			// "ignoreDevUnusedFiles": false ,
+			// "ignoreUploadUnusedFiles": false”
         },
         "usingComponents" : true
     },
diff --git a/pages.json b/pages.json
index b1e3ed8..1624c66 100644
--- a/pages.json
+++ b/pages.json
@@ -17,12 +17,18 @@
 			"style": {
 				"navigationBarTitleText": "我的"
 			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
 		}
 	],
 	"globalStyle": {
-		"navigationBarTextStyle": "black",
+		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
+		"navigationBarBackgroundColor": "#26758d",
 		"backgroundColor": "#F8F8F8"
 	},
 	"uniIdRouter": {},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 02bb541..7cde14a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,5 +1,7 @@
 <script setup>
 	// 引入依赖
+	import uniDatetimePicker from '@/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue' 
+	import uniEasyinput from '@/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue' 
 	import { onLoad } from "@dcloudio/uni-app"
 	import mySwiper from "@/components/mySwiper.vue"
 	import {ref,onMounted,nextTick} from "vue"
@@ -8,11 +10,11 @@
 	const store = useStore()
 	onLoad((e) => {
 		if(!store.userInfo?.has_operation) { // 未填写手术信息
-			// operation_flag.value = true
-			// setTimeout(()=>{
-			// 	console.log(inputDialog.value)
-			// 	inputDialog.value.open()
-			// },0)
+			operation_flag.value = true
+			setTimeout(()=>{
+				console.log(inputDialog.value)
+				inputDialog.value.open()
+			},0)
 		}
 	})
 	// 变量
@@ -42,6 +44,21 @@
 			weigh: 6,
 		}
 	])
+	function toClose() {
+		inputDialog.value.close()
+	}
+	function radioChange(e) {
+		console.log(e)
+	}
+	const single = ref('')
+	function maskClick(e){
+		console.log('maskClick事件:', e);
+	}
+	const hValue = ref('') // 医院
+	const hValueId = ref('') // 医院id
+	function onClickH(e) {
+		console.log(hValue.value)
+	}
 </script>
 <template>
 	<view class="content page-box">
@@ -78,9 +95,33 @@
 		</view>
 		<uni-popup ref="inputDialog" :is-mask-click='false'>
 			<view class="pop-box">
-				<view class="pb-title">手术信息</view>
+				<view class="pb-title">完善手术信息</view>
+				<view class="pb-content">
+					<view class="pb-item">
+						<view class="pb-item-left">已经手术</view>
+						<view class="pb-item-right">
+							<radio-group @change="radioChange">
+								<label class="radio"><radio value="1" />是</label>
+								<label class="radio"><radio value="0" />否</label>
+							</radio-group>
+						</view>
+					</view>
+					<view class="pb-item">
+						<view class="pb-item-left">手术时间</view>
+						<view class="pb-item-right">
+							<!-- <uni-datetime-picker type="date" :clear-icon="false" v-model="single" @maskClick="maskClick" /> -->
+							<uniDatetimePicker type="date" :clear-icon="false" v-model="single" @maskClick="maskClick" ></uniDatetimePicker>
+						</view>
+					</view>
+					<view class="pb-item">
+						<view class="pb-item-left">医院名称</view>
+						<view class="pb-item-right">
+							<uniEasyinput suffixIcon="search" v-model="hValue" focus placeholder="请输入内容" @iconClick="onClickH"></uniEasyinput>
+						</view>
+					</view>
+				</view>
 			</view>
-			<view class="pop-close">
+			<view class="pop-close" @tap="toClose">
 				关闭
 			</view>
 			<!-- <uni-popup-dialog ref="inputClose" mode="input" title="输入内容" value="对话框预置提示内容!"
@@ -89,6 +130,27 @@
 	</view>
 </template>
 <style scoped lang="scss">
+	.radio{
+		margin-right:20rpx;
+	}
+	.pb-item{
+		display: flex;
+		align-items: center;
+		margin-bottom: 40rpx;
+		// justify-content: space-between;
+		.pb-item-left{
+			width: 30%;
+		}
+		.pb-item-right{
+			margin-left: 10rpx;
+			width: 75%;
+		}
+	}
+	:deep(){
+		.uni-popup__wrapper{
+			width: 100%;
+		}
+	}
 	.part-title{
 		border-left: 10rpx solid #fe915d;
 		padding-left: 20rpx;
@@ -148,8 +210,20 @@
 		margin-top: 20rpx;
 	}
 	.pop-box{
+		.pb-title{
+			text-align: center;
+			margin-bottom: 40rpx;
+		}
 		background-color: white;
 		padding: 20rpx;
+		width: 80%;
+		margin: 0 auto;
+		border-radius: 20rpx;
+	}
+	.pop-close{
+		text-align: center;
+		color: white;
+		margin-top: 20rpx;
 	}
 	.page-box{
 		padding: 20rpx;
diff --git a/pages/login/login.vue b/pages/login/login.vue
new file mode 100644
index 0000000..c2cf2a7
--- /dev/null
+++ b/pages/login/login.vue
@@ -0,0 +1,173 @@
+<script setup>
+	// 引入依赖
+	import { onLoad } from "@dcloudio/uni-app"
+	// import mySwiper from "@/components/mySwiper.vue"
+	import {ref,onMounted,nextTick,watch} from "vue"
+	import {useStore} from '@/store/index.js'
+	const store = useStore()
+	import api from "@/api/index"
+	import custom from "@/utils/index.js"
+	onLoad(() => {
+		// is_login.value = custom.checkLogin()
+		// console.log(is_login.value)
+	})
+	
+	// 变量
+	const avatarUrl = ref(null)
+	const nickname = ref('')
+	const res_form = ref(null)
+	watch(nickname,(v1,v2)=> {
+		console.log("watch",v1)
+	})
+	// 函数
+	function onChooseAvatar(e) {
+		// const { avatarUrl } = e.detail 
+		// console.log(avatarUrl)
+		avatarUrl.value = e.detail.avatarUrl
+		
+	}
+	function getPhoneNumber (e) {
+		// tel_code.value = e.detail.code
+		// console.log(e)
+		getAccess_token({code:e.detail.code})
+		// console.log(e.detail.code)  // 动态令牌
+		// console.log(e.detail.errMsg) // 回调信息（成功失败都会返回）
+		// console.log(e.detail.errno)  // 错误码（失败时返回）
+	}
+	async function getAccess_token(params={}){//获取token 获取手机号
+	    //清除token缓存
+	    // wx.clearStorageSync();
+	    //访问接口
+	    const data={
+	      username:params.code,//手机号按钮获取的code
+	      type:'wechat_mini_app',
+	      identity:'user',
+	      password:'111',
+		  avatarUrl:avatarUrl.value,
+		  nickName:nickname.value
+	    }
+		// console.log('登录参数:',data);return;
+		const res = await api.getToken(data)
+		if(res.code === 200) {
+			uni.setStorageSync('avatarUrl', avatarUrl.value);//avatarUrl
+			res_form.value = res.data
+			res_form.value.access_token = 'Bearer '+res.data.access_token
+			let userId = res.data.userId
+			uni.setStorageSync('access_token',res_form.value.access_token);// token单独缓存一次
+			wx_login(userId)
+		}
+	}
+	async function wx_login(userId){
+		let res=await new Promise(resolve=>{
+			uni.login({
+				  provider: 'weixin', //使用微信登录
+				  success: function (loginRes) {
+					  resolve(loginRes);
+					  console.log(loginRes,'微信登录返回信息');
+				  }
+			});
+		});
+		let res2=await api.wx_login({code:res.code},userId);
+		if(res2.code === 0) {
+			// for(let prop in res_form.value) {
+			// 	uni.setStorageSync(prop,res_form.value[prop])
+			// }
+			uni.setStorageSync('userInfo',JSON.stringify(res_form.value))
+			custom.uploadImage(avatarUrl.value,async (file)=>{
+				avatarUrl.value = file.data.file.url
+				uni.setStorageSync('avatarUrl', file.data.file.url);//头像链接
+				const up_res = await updateFunc() // 更新用户信息
+				uni.switchTab({
+					url:"/pages/user/index"
+				})
+			})
+		}
+		else{
+			uni.clearStorage();
+		}
+	}
+	async function updateFunc(){ // 更新用户信息,通过此接口获取用户是否填写手术信息
+		let user_info = JSON.parse(uni.getStorageSync('userInfo'))
+		user_info.avatar = avatarUrl.value
+		user_info.id =user_info.userId
+		// console.log(user_info)
+		return await api.userinfoUpdae(user_info)
+	}
+	function nameInput(e) {
+		nickname.value = e.detail.value
+		// console.log('拿到的值：',e)
+		// console.log('nickname:',nickname.value)
+	}
+</script>
+<template>
+	<view class="loginBox page-box img-part card-part"  style="text-align:center">
+		<view class="base-info">
+			<button class="avatar-wrapper" open-type="chooseAvatar" @chooseavatar="onChooseAvatar" style="border-radius: 50%;">
+			  <image class="avatar" v-if="avatarUrl" mode="aspectFill" :src="avatarUrl"></image>
+			  <uni-icons type="person-filled" color="white" v-else size="60"></uni-icons>
+			</button> 
+			<input type="nickname" @blur="nameInput" class="weui-input" placeholder="请输入昵称" v-model="nickname" />
+		</view>
+		<view class="btn-part">
+		    <button class="buy-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">立即登录</button>
+		</view>
+	</view>
+</template>
+<style scoped lang="scss">
+	.base-info{
+		padding: 50rpx 0;
+	}
+	.loginBox{
+		
+	}
+	/* pages/login/login.wxss */
+	page{
+	  height: 100%;
+	}
+	.container{
+	  align-items: center;
+	}
+	.title{
+	  font-weight: bolder;
+	  font-size: 40rpx;
+	}
+	.more-info{
+	  color: gray;
+	  font-size: 24rpx;
+	  margin-top: 1rem;
+	}
+	.buy-btn{
+	  display: inline-block;
+	  margin-top:1rem;
+	  background-color: #26758d;
+	  color: white;
+	  border-radius: 50rpx;
+	  font-weight: 200;
+	  font-size: 24rpx;
+	  width: 50%;
+	  padding: 10rpx 0;
+	}
+	.title-part{
+	  text-align: center;
+	}
+	.avatar-wrapper{
+	  width: 160rpx !important;
+	  height: 160rpx;
+	  padding: 0px;
+	  margin: 0 auto;
+	  overflow: hidden;
+	  margin-bottom: 40rpx;
+	  // border: 1px solid #26758d;
+	      background: #ececec;
+		      display: flex;
+		      align-items: center;
+		      justify-content: center;
+	}
+	.avatar{
+	  width: 160rpx;
+	  height: 160rpx;
+	}
+	.weui-input{
+	
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 56848fe..e6398af 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,15 +1,31 @@
 <script setup>
 	// 引入依赖
-	import { onLoad } from "@dcloudio/uni-app"
+	import { onLoad,onShow } from "@dcloudio/uni-app"
 	import mySwiper from "@/components/mySwiper.vue"
 	import {ref,onMounted,nextTick} from "vue"
 	import {useStore} from '@/store/index.js'
 	const store = useStore()
 	import api from "@/api/index"
+	import custom from "@/utils/index.js"
+	onShow(() => {
+		is_login.value = custom.checkLogin()
+		// console.log(is_login.value)
+		if(is_login.value) {
+			userinfo.value = uni.getStorageSync('userInfo')
+			avatar.value = uni.getStorageSync('avatarUrl')
+			userinfo.value = JSON.parse(userinfo.value)
+			// console.log(userinfo.value)
+		}
+	})
+	// 变量
+	const avatar = ref('')
+	const res_form = ref(null)
+	const is_login = ref(null)
+	const userinfo = ref(null)
 	// 函数
 	function getPhoneNumber (e) {
 		// tel_code.value = e.detail.code
-		console.log(e)
+		// console.log(e)
 		getAccess_token({code:e.detail.code})
 		// console.log(e.detail.code)  // 动态令牌
 		// console.log(e.detail.errMsg) // 回调信息（成功失败都会返回）
@@ -27,10 +43,15 @@
 	    }
 		// console.log('登录参数:',data)
 		const res = await api.getToken(data)
-		wx_login()
-		
+		if(res.code === 200) {
+			res_form.value = res.data
+			res_form.value.access_token = 'Bearer '+res.data.access_token
+			let userId = res.data.userId
+			uni.setStorageSync('access_token',res_form.value.access_token);// token单独缓存一次
+			wx_login(userId)
+		}
 	}
-	async function wx_login(token_res){
+	async function wx_login(userId){
 		let res=await new Promise(resolve=>{
 			uni.login({
 				  provider: 'weixin', //使用微信登录
@@ -40,18 +61,61 @@
 				  }
 			});
 		});
-		let userId = ''
-		// const res = await api.wx_login(data)
 		let res2=await api.wx_login({code:res.code},userId);
-	}
+		if(res2.code === 0) {
+			// for(let prop in res_form.value) {
+			// 	uni.setStorageSync(prop,res_form.value[prop])
+			// }
+			uni.setStorageSync(userInfo,JSON.stringify(res_form.value))
+		}
+		else{
+			uni.clearStorage();
+		}
+	}
+	function toLogin() {
+		uni.navigateTo({
+			url:"/pages/login/login"
+		})
+	}
 </script>
 <template>
 	<view class="user-box page-box">
-		<button class="submit-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
-			<!-- <image class="wx_loin_img" :src="wx_login" mode=""></image> -->
-			<text>登录</text>
-		</button>
+		<view class="userinfo-box">
+			<image :src="is_login?avatar:'../../static/avatar.png'" mode=""></image>
+			<view class="">
+				{{is_login?userinfo.nickname:'未登录'}}
+			</view>
+		</view>
+		<view class="btn-box" @tap="toLogin" v-if="!is_login">
+			<view class="btn">登录</view>
+		</view>
 	</view>
 </template>
-<style>
+<style scoped lang="scss">
+	.btn-box{
+		text-align: center;
+		margin-top: 40rpx;
+		.btn{
+			display: inline-block;
+			padding: 10px 20px;
+			background: #e2e2e2;
+			color: #26758d;
+			border-radius: 10px;
+			width: 50%;
+		}
+	}
+	.userinfo-box{
+		image{
+			width: 120rpx;
+			height: 120rpx;
+			border-radius: 50%;
+			background: white;
+			margin-right: 20rpx;
+		}
+		color: white;
+		background-color: #26758d;
+		display: flex;
+		align-items: center;
+		padding: 40rpx 20rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/static/avatar.png b/static/avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..c552c1fd953a5eb51ade2d075b94491ce143ff58
GIT binary patch
literal 7203
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

literal 0
HcmV?d00001

diff --git a/store/index.js b/store/index.js
index 2a9a49e..1641875 100644
--- a/store/index.js
+++ b/store/index.js
@@ -61,7 +61,7 @@ export const useStore = defineStore('main2', {
 			if(access_token) {
 				this.access_token = access_token
 				this.isLogin = true
-				this.getUserInfo()
+				// this.getUserInfo()
 			}
 			// else{
 			// 	if(!visitState) {
diff --git a/uni_modules/uni-datetime-picker/changelog.md b/uni_modules/uni-datetime-picker/changelog.md
new file mode 100644
index 0000000..1e82f46
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/changelog.md
@@ -0,0 +1,140 @@
+## 2.2.24（2023-06-02）
+- 修复 部分情况修改时间，开始、结束时间显示异常的Bug [详情](https://ask.dcloud.net.cn/question/171146)
+- 优化 当前月可以选择上月、下月的日期
+## 2.2.23（2023-05-02）
+- 修复 部分情况修改时间，开始时间未更新 [详情](https://github.com/dcloudio/uni-ui/issues/737)
+- 修复 部分平台及设备第一次点击无法显示弹框
+- 修复 ios 日期格式未补零显示及使用异常 [详情](https://ask.dcloud.net.cn/question/162979)
+## 2.2.22（2023-03-30）
+- 修复 日历 picker 修改年月后，自动选中当月1日 [详情](https://ask.dcloud.net.cn/question/165937)
+- 修复 小程序端 低版本 ios NaN [详情](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 属性支持配置选择器打开时默认显示的时间
+- 优化 非范围选择未选择日期时间，点击确认按钮选中当前日期时间
+- 优化 字节小程序日期时间范围选择，底部日期换行问题
+## 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 适配
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
new file mode 100644
index 0000000..8f3c461
--- /dev/null
+++ b/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>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
new file mode 100644
index 0000000..ec8e472
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
@@ -0,0 +1,929 @@
+<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="close">
+					<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
+		},
+		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() {
+				if (!this.insert) 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()
+			},
+      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>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
new file mode 100644
index 0000000..56cd0a6
--- /dev/null
+++ b/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"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
new file mode 100644
index 0000000..fa8f0f3
--- /dev/null
+++ b/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
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
new file mode 100644
index 0000000..d2df5e7
--- /dev/null
+++ b/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": "确认"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
new file mode 100644
index 0000000..d23fa3c
--- /dev/null
+++ b/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": "確認"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
new file mode 100644
index 0000000..f03dff6
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
@@ -0,0 +1,934 @@
+<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,
+			}
+		},
+		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();
+			},
+
+			//兼容 iOS、safari 日期格式
+			fixIosDateFormat(value) {
+				if (typeof value === 'string') {
+					value = value.replace(/-/g, '/')
+				}
+				return value
+			},
+
+			/**
+			 * 生成时间戳
+			 * @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>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
new file mode 100644
index 0000000..7650d0f
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -0,0 +1,1032 @@
+<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" />
+	</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: {
+			virtualHost: true
+		},
+		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
+        }
+				const { windowWidth } = uni.getSystemInfoSync()
+				this.isPhone = windowWidth <= 500
+				this.windowWidth = windowWidth
+			},
+			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')
+							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)
+			},
+			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)
+			},
+			mobileChange(e) {
+				if (this.isRange) {
+					const {before, after} = e.range
+
+          if(!before || !after){
+            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.$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
+        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, this.tempRange.startDate)) {
+            startDateLaterRangeStartDate = true
+            this.tempRange.startDate = startDate
+          }
+          if(this.start && !dateCompare(this.start, this.tempRange.endDate)) {
+            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(this.tempRange.startDate, this.end)) {
+            endDateEarlierRangeStartDate = true
+            this.tempRange.startDate = endDate
+          }
+          if(this.end && !dateCompare(this.tempRange.endDate, 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 && after)) return
+
+				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', [])
+					}
+				}
+			}
+		}
+	}
+</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>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
new file mode 100644
index 0000000..3ea5bb1
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
@@ -0,0 +1,453 @@
+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 ? dateObj.month -1 : 12
+			const year = month === 12 ? dateObj.year - 1 : dateObj.year
+			const date = new Date(year,month,-i).getDate()
+			const fullDate = `${year}-${addZero(month)}-${addZero(date)}`
+			let multiples = this.multipleStatus.data
+			let multiplesStatus = -1
+			if (this.range && multiples) {
+			  multiplesStatus = multiples.findIndex((item) => {
+			    return this.dateEqual(item, fullDate)
+			  })
+			}
+			const checked = multiplesStatus !== -1
+			// 获取打点信息
+			const extraInfo = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(fullDate, item.date)) {
+					return item
+				}
+			})
+			result.push({
+				fullDate,
+				year,
+				month,
+				date,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(fullDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(fullDate, this.multipleStatus.before, this.multipleStatus.after),
+				disable: (this.startDate && !dateCompare(this.startDate, fullDate)) || (this.endDate && !dateCompare(fullDate,this.endDate)),
+				isToday: fullDate === this.date.fullDate,
+				userChecked: false,
+				extraInfo
+			})
+		}
+		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 extraInfo = 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,
+				month: dateObj.month,
+				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),
+				disable: (this.startDate && !dateCompare(this.startDate, currentDate)) || (this.endDate && !dateCompare(currentDate,this.endDate)),
+				isToday,
+				userChecked: false,
+        extraInfo
+			})
+		}
+		return result
+	}
+	/**
+	 * 获取下一个月日期集合
+	 */
+	_getNextMonthDays(amount, dateObj) {
+		const result = []
+    const month = dateObj.month + 1
+		for (let i = 1; i <= amount; i++) {
+			const month = dateObj.month === 12 ? 1 : dateObj.month*1 + 1
+			const year = month === 1 ? dateObj.year + 1 : dateObj.year
+			const fullDate = `${year}-${addZero(month)}-${addZero(i)}`
+			let multiples = this.multipleStatus.data
+			let multiplesStatus = -1
+			if (this.range && multiples) {
+			  multiplesStatus = multiples.findIndex((item) => {
+			    return this.dateEqual(item, fullDate)
+			  })
+			}
+			const checked = multiplesStatus !== -1
+			// 获取打点信息
+			const extraInfo = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(fullDate, item.date)) {
+					return item
+				}
+			})
+			result.push({
+				fullDate,
+				year,
+				date: i,
+				month,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(fullDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(fullDate, this.multipleStatus.before, this.multipleStatus.after),
+				disable: (this.startDate && !dateCompare(this.startDate, fullDate)) || (this.endDate && !dateCompare(fullDate,this.endDate)),
+				isToday: fullDate === this.date.fullDate,
+				userChecked: false,
+				extraInfo
+			})
+		}
+		return result
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+
+		return this.calendar.find(item => item.fullDate === this.getDateObj(date).fullDate)
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	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.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) {
+    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)
+	}
+
+	/**
+	 * 更新默认值多选状态
+	 */
+	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)
+}
+
+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}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/package.json b/uni_modules/uni-datetime-picker/package.json
new file mode 100644
index 0000000..cabb668
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.24",
+  "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"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "n"
+        },
+        "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"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-datetime-picker/readme.md b/uni_modules/uni-datetime-picker/readme.md
new file mode 100644
index 0000000..162fbef
--- /dev/null
+++ b/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 
\ No newline at end of file
diff --git a/uni_modules/uni-easyinput/changelog.md b/uni_modules/uni-easyinput/changelog.md
new file mode 100644
index 0000000..765401a
--- /dev/null
+++ b/uni_modules/uni-easyinput/changelog.md
@@ -0,0 +1,97 @@
+## 1.1.9（2023-04-11）
+- 修复 vue3 下 keyboardheightchange 事件报错的bug
+## 1.1.8（2023-03-29）
+- 优化 trim 属性默认值
+## 1.1.7（2023-03-29）
+- 新增 cursor-spacing 属性
+## 1.1.6（2023-01-28）
+- 新增 keyboardheightchange 事件，可监听键盘高度变化
+## 1.1.5（2022-11-29）
+- 优化 主题样式
+## 1.1.4（2022-10-27）
+- 修复 props 中背景颜色无默认值的bug
+## 1.1.0（2022-06-30）
+
+- 新增 在 uni-forms 1.4.0 中使用可以在 blur 时校验内容
+- 新增 clear 事件，点击右侧叉号图标触发
+- 新增 change 事件 ，仅在输入框失去焦点或用户按下回车时触发
+- 优化 组件样式，组件获取焦点时高亮显示，图标颜色调整等
+
+## 1.0.5（2022-06-07）
+
+- 优化 clearable 显示策略
+
+## 1.0.4（2022-06-07）
+
+- 优化 clearable 显示策略
+
+## 1.0.3（2022-05-20）
+
+- 修复 关闭图标某些情况下无法取消的 bug
+
+## 1.0.2（2022-04-12）
+
+- 修复 默认值不生效的 bug
+
+## 1.0.1（2022-04-02）
+
+- 修复 value 不能为 0 的 bug
+
+## 1.0.0（2021-11-19）
+
+- 优化 组件 UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-easyinput](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
+
+## 0.1.4（2021-08-20）
+
+- 修复 在 uni-forms 的动态表单中默认值校验不通过的 bug
+
+## 0.1.3（2021-08-11）
+
+- 修复 在 uni-forms 中重置表单，错误信息无法清除的问题
+
+## 0.1.2（2021-07-30）
+
+- 优化 vue3 下事件警告的问题
+
+## 0.1.1
+
+- 优化 errorMessage 属性支持 Boolean 类型
+
+## 0.1.0（2021-07-13）
+
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+
+## 0.0.16（2021-06-29）
+
+- 修复 confirmType 属性（仅 type="text" 生效）导致多行文本框无法换行的 bug
+
+## 0.0.15（2021-06-21）
+
+- 修复 passwordIcon 属性拼写错误的 bug
+
+## 0.0.14（2021-06-18）
+
+- 新增 passwordIcon 属性，当 type=password 时是否显示小眼睛图标
+- 修复 confirmType 属性不生效的问题
+
+## 0.0.13（2021-06-04）
+
+- 修复 disabled 状态可清出内容的 bug
+
+## 0.0.12（2021-05-12）
+
+- 新增 组件示例地址
+
+## 0.0.11（2021-05-07）
+
+- 修复 input-border 属性不生效的问题
+
+## 0.0.10（2021-04-30）
+
+- 修复 ios 遮挡文字、显示一半的问题
+
+## 0.0.9（2021-02-05）
+
+- 调整为 uni_modules 目录规范
+- 优化 兼容 nvue 页面
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/common.js b/uni_modules/uni-easyinput/components/uni-easyinput/common.js
new file mode 100644
index 0000000..5549cc9
--- /dev/null
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/common.js
@@ -0,0 +1,56 @@
+/**
+ * @desc 函数防抖
+ * @param func 目标函数
+ * @param wait 延迟执行毫秒数
+ * @param immediate true - 立即执行， false - 延迟执行
+ */
+export const debounce = function(func, wait = 1000, immediate = true) {
+	let timer;
+	console.log(1);
+	return function() {
+		console.log(123);
+		let context = this,
+			args = arguments;
+		if (timer) clearTimeout(timer);
+		if (immediate) {
+			let callNow = !timer;
+			timer = setTimeout(() => {
+				timer = null;
+			}, wait);
+			if (callNow) func.apply(context, args);
+		} else {
+			timer = setTimeout(() => {
+				func.apply(context, args);
+			}, wait)
+		}
+	}
+}
+/**
+ * @desc 函数节流
+ * @param func 函数
+ * @param wait 延迟执行毫秒数
+ * @param type 1 使用表时间戳，在时间段开始的时候触发 2 使用表定时器，在时间段结束的时候触发
+ */
+export const throttle = (func, wait = 1000, type = 1) => {
+	let previous = 0;
+	let timeout;
+	return function() {
+		let context = this;
+		let args = arguments;
+		if (type === 1) {
+			let now = Date.now();
+
+			if (now - previous > wait) {
+				func.apply(context, args);
+				previous = now;
+			}
+		} else if (type === 2) {
+			if (!timeout) {
+				timeout = setTimeout(() => {
+					timeout = null;
+					func.apply(context, args)
+				}, wait)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
new file mode 100644
index 0000000..7f5113e
--- /dev/null
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -0,0 +1,657 @@
+<template>
+	<view class="uni-easyinput" :class="{ 'uni-easyinput-error': msg }" :style="boxStyle">
+		<view class="uni-easyinput__content" :class="inputContentClass" :style="inputContentStyle">
+			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc" @click="onClickIcon('prefix')" size="22"></uni-icons>
+			<textarea
+				v-if="type === 'textarea'"
+				class="uni-easyinput__content-textarea"
+				:class="{ 'input-padding': inputBorder }"
+				:name="name"
+				:value="val"
+				:placeholder="placeholder"
+				:placeholderStyle="placeholderStyle"
+				:disabled="disabled"
+				placeholder-class="uni-easyinput__placeholder-class"
+				:maxlength="inputMaxlength"
+				:focus="focused"
+				:autoHeight="autoHeight"
+				:cursor-spacing="cursorSpacing"
+				@input="onInput"
+				@blur="_Blur"
+				@focus="_Focus"
+				@confirm="onConfirm"
+        @keyboardheightchange="onkeyboardheightchange"
+			></textarea>
+			<input
+				v-else
+				:type="type === 'password' ? 'text' : type"
+				class="uni-easyinput__content-input"
+				:style="inputStyle"
+				:name="name"
+				:value="val"
+				:password="!showPassword && type === 'password'"
+				:placeholder="placeholder"
+				:placeholderStyle="placeholderStyle"
+				placeholder-class="uni-easyinput__placeholder-class"
+				:disabled="disabled"
+				:maxlength="inputMaxlength"
+				:focus="focused"
+				:confirmType="confirmType"
+				:cursor-spacing="cursorSpacing"
+				@focus="_Focus"
+				@blur="_Blur"
+				@input="onInput"
+				@confirm="onConfirm"
+        @keyboardheightchange="onkeyboardheightchange"
+			/>
+			<template v-if="type === 'password' && passwordIcon">
+				<!-- 开启密码时显示小眼睛 -->
+				<uni-icons
+					v-if="isVal"
+					class="content-clear-icon"
+					:class="{ 'is-textarea-icon': type === 'textarea' }"
+					:type="showPassword ? 'eye-slash-filled' : 'eye-filled'"
+					:size="22"
+					:color="focusShow ? primaryColor : '#c0c4cc'"
+					@click="onEyes"
+				></uni-icons>
+			</template>
+			<template v-else-if="suffixIcon">
+				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc" @click="onClickIcon('suffix')" size="22"></uni-icons>
+			</template>
+			<template v-else>
+				<uni-icons
+					v-if="clearable && isVal && !disabled && type !== 'textarea'"
+					class="content-clear-icon"
+					:class="{ 'is-textarea-icon': type === 'textarea' }"
+					type="clear"
+					:size="clearSize"
+					:color="msg ? '#dd524d' : focusShow ? primaryColor : '#c0c4cc'"
+					@click="onClear"
+				></uni-icons>
+			</template>
+			<slot name="right"></slot>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * Easyinput 输入框
+ * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=3455
+ * @property {String}	value	输入内容
+ * @property {String }	type	输入框的类型（默认text） password/text/textarea/..
+ * 	@value text			文本输入键盘
+ * 	@value textarea	多行文本输入键盘
+ * 	@value password	密码输入键盘
+ * 	@value number		数字输入键盘，注意iOS上app-vue弹出的数字键盘并非9宫格方式
+ * 	@value idcard		身份证输入键盘，信、支付宝、百度、QQ小程序
+ * 	@value digit		带小数点的数字键盘	，App的nvue页面、微信、支付宝、百度、头条、QQ小程序支持
+ * @property {Boolean}	clearable	是否显示右侧清空内容的图标控件，点击可清空输入框内容（默认true）
+ * @property {Boolean}	autoHeight	是否自动增高输入区域，type为textarea时有效（默认true）
+ * @property {String }	placeholder	输入框的提示文字
+ * @property {String }	placeholderStyle	placeholder的样式(内联样式，字符串)，如"color: #ddd"
+ * @property {Boolean}	focus	是否自动获得焦点（默认false）
+ * @property {Boolean}	disabled	是否禁用（默认false）
+ * @property {Number }	maxlength	最大输入长度，设置为 -1 的时候不限制最大长度（默认140）
+ * @property {String }	confirmType	设置键盘右下角按钮的文字，仅在type="text"时生效（默认done）
+ * @property {Number }	clearSize	清除图标的大小，单位px（默认15）
+ * @property {String}	prefixIcon	输入框头部图标
+ * @property {String}	suffixIcon	输入框尾部图标
+ * @property {String}	primaryColor	设置主题色（默认#2979ff）
+ * @property {Boolean}	trim	是否自动去除两端的空格
+ * @property {Boolean}	cursorSpacing	指定光标与键盘的距离，单位 px
+ * @value both	去除两端空格
+ * @value left	去除左侧空格
+ * @value right	去除右侧空格
+ * @value start	去除左侧空格
+ * @value end		去除右侧空格
+ * @value all		去除全部空格
+ * @value none	不去除空格
+ * @property {Boolean}	inputBorder	是否显示input输入框的边框（默认true）
+ * @property {Boolean}	passwordIcon	type=password时是否显示小眼睛图标
+ * @property {Object}	styles	自定义颜色
+ * @event {Function}	input	输入框内容发生变化时触发
+ * @event {Function}	focus	输入框获得焦点时触发
+ * @event {Function}	blur	输入框失去焦点时触发
+ * @event {Function}	confirm	点击完成按钮时触发
+ * @event {Function}	iconClick	点击图标时触发
+ * @example <uni-easyinput v-model="mobile"></uni-easyinput>
+ */
+function obj2strClass(obj) {
+	let classess = '';
+	for (let key in obj) {
+		const val = obj[key];
+		if (val) {
+			classess += `${key} `;
+		}
+	}
+	return classess;
+}
+
+function obj2strStyle(obj) {
+	let style = '';
+	for (let key in obj) {
+		const val = obj[key];
+		style += `${key}:${val};`;
+	}
+	return style;
+}
+export default {
+	name: 'uni-easyinput',
+	emits: ['click', 'iconClick', 'update:modelValue', 'input', 'focus', 'blur', 'confirm', 'clear', 'eyes', 'change', 'keyboardheightchange'],
+	model: {
+		prop: 'modelValue',
+		event: 'update:modelValue'
+	},
+	options: {
+		virtualHost: true
+	},
+	inject: {
+		form: {
+			from: 'uniForm',
+			default: null
+		},
+		formItem: {
+			from: 'uniFormItem',
+			default: null
+		}
+	},
+	props: {
+		name: String,
+		value: [Number, String],
+		modelValue: [Number, String],
+		type: {
+			type: String,
+			default: 'text'
+		},
+		clearable: {
+			type: Boolean,
+			default: true
+		},
+		autoHeight: {
+			type: Boolean,
+			default: false
+		},
+		placeholder: {
+			type: String,
+			default: ' '
+		},
+		placeholderStyle: String,
+		focus: {
+			type: Boolean,
+			default: false
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
+		maxlength: {
+			type: [Number, String],
+			default: 140
+		},
+		confirmType: {
+			type: String,
+			default: 'done'
+		},
+		clearSize: {
+			type: [Number, String],
+			default: 24
+		},
+		inputBorder: {
+			type: Boolean,
+			default: true
+		},
+		prefixIcon: {
+			type: String,
+			default: ''
+		},
+		suffixIcon: {
+			type: String,
+			default: ''
+		},
+		trim: {
+			type: [Boolean, String],
+			default: false
+		},
+		cursorSpacing: {
+			type: Number,
+			default: 0
+		},
+		passwordIcon: {
+			type: Boolean,
+			default: true
+		},
+		primaryColor: {
+			type: String,
+			default: '#2979ff'
+		},
+		styles: {
+			type: Object,
+			default() {
+				return {
+					color: '#333',
+					backgroundColor: '#fff',
+					disableColor: '#F7F6F6',
+					borderColor: '#e5e5e5'
+				};
+			}
+		},
+		errorMessage: {
+			type: [String, Boolean],
+			default: ''
+		}
+	},
+	data() {
+		return {
+			focused: false,
+			val: '',
+			showMsg: '',
+			border: false,
+			isFirstBorder: false,
+			showClearIcon: false,
+			showPassword: false,
+			focusShow: false,
+			localMsg: '',
+			isEnter: false // 用于判断当前是否是使用回车操作
+		};
+	},
+	computed: {
+		// 输入框内是否有值
+		isVal() {
+			const val = this.val;
+			// fixed by mehaotian 处理值为0的情况，字符串0不在处理范围
+			if (val || val === 0) {
+				return true;
+			}
+			return false;
+		},
+
+		msg() {
+			// console.log('computed', this.form, this.formItem);
+			// if (this.form) {
+			// 	return this.errorMessage || this.formItem.errMsg;
+			// }
+			// TODO 处理头条 formItem 中 errMsg 不更新的问题
+			return this.localMsg || this.errorMessage;
+		},
+		// 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，用户可以传入字符串数值
+		inputMaxlength() {
+			return Number(this.maxlength);
+		},
+
+		// 处理外层样式的style
+		boxStyle() {
+			return `color:${this.inputBorder && this.msg ? '#e43d33' : this.styles.color};`;
+		},
+		// input 内容的类和样式处理
+		inputContentClass() {
+			return obj2strClass({
+				'is-input-border': this.inputBorder,
+				'is-input-error-border': this.inputBorder && this.msg,
+				'is-textarea': this.type === 'textarea',
+				'is-disabled': this.disabled,
+				'is-focused': this.focusShow
+			});
+		},
+		inputContentStyle() {
+			const focusColor = this.focusShow ? this.primaryColor : this.styles.borderColor;
+			const borderColor = this.inputBorder && this.msg ? '#dd524d' : focusColor;
+			return obj2strStyle({
+				'border-color': borderColor || '#e5e5e5',
+				'background-color': this.disabled ? this.styles.disableColor : this.styles.backgroundColor
+			});
+		},
+		// input右侧样式
+		inputStyle() {
+			const paddingRight = this.type === 'password' || this.clearable || this.prefixIcon ? '' : '10px';
+			return obj2strStyle({
+				'padding-right': paddingRight,
+				'padding-left': this.prefixIcon ? '' : '10px'
+			});
+		}
+	},
+	watch: {
+		value(newVal) {
+			this.val = newVal;
+		},
+		modelValue(newVal) {
+			this.val = newVal;
+		},
+		focus(newVal) {
+			this.$nextTick(() => {
+				this.focused = this.focus;
+				this.focusShow = this.focus;
+			});
+		}
+	},
+	created() {
+		this.init();
+		// TODO 处理头条vue3 computed 不监听 inject 更改的问题（formItem.errMsg）
+		if (this.form && this.formItem) {
+			this.$watch('formItem.errMsg', newVal => {
+				this.localMsg = newVal;
+			});
+		}
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.focused = this.focus;
+			this.focusShow = this.focus;
+		});
+	},
+	methods: {
+		/**
+		 * 初始化变量值
+		 */
+		init() {
+			if (this.value || this.value === 0) {
+				this.val = this.value;
+			} else if (this.modelValue || this.modelValue === 0 || this.modelValue === '') {
+				this.val = this.modelValue;
+			} else {
+				this.val = null;
+			}
+		},
+
+		/**
+		 * 点击图标时触发
+		 * @param {Object} type
+		 */
+		onClickIcon(type) {
+			this.$emit('iconClick', type);
+		},
+
+		/**
+		 * 显示隐藏内容，密码框时生效
+		 */
+		onEyes() {
+			this.showPassword = !this.showPassword;
+			this.$emit('eyes', this.showPassword);
+		},
+
+		/**
+		 * 输入时触发
+		 * @param {Object} event
+		 */
+		onInput(event) {
+			let value = event.detail.value;
+			// 判断是否去除空格
+			if (this.trim) {
+				if (typeof this.trim === 'boolean' && this.trim) {
+					value = this.trimStr(value);
+				}
+				if (typeof this.trim === 'string') {
+					value = this.trimStr(value, this.trim);
+				}
+			}
+			if (this.errMsg) this.errMsg = '';
+			this.val = value;
+			// TODO 兼容 vue2
+			this.$emit('input', value);
+			// TODO　兼容　vue3
+			this.$emit('update:modelValue', value);
+		},
+
+		/**
+		 * 外部调用方法
+		 * 获取焦点时触发
+		 * @param {Object} event
+		 */
+		onFocus() {
+			this.$nextTick(() => {
+				this.focused = true;
+			});
+			this.$emit('focus', null);
+		},
+
+		_Focus(event) {
+			this.focusShow = true;
+			this.$emit('focus', event);
+		},
+
+		/**
+		 * 外部调用方法
+		 * 失去焦点时触发
+		 * @param {Object} event
+		 */
+		onBlur() {
+			this.focused = false;
+			this.$emit('focus', null);
+		},
+		_Blur(event) {
+			let value = event.detail.value;
+			this.focusShow = false;
+			this.$emit('blur', event);
+			// 根据类型返回值，在event中获取的值理论上讲都是string
+			if (this.isEnter === false) {
+				this.$emit('change', this.val);
+			}
+			// 失去焦点时参与表单校验
+			if (this.form && this.formItem) {
+				const { validateTrigger } = this.form;
+				if (validateTrigger === 'blur') {
+					this.formItem.onFieldChange();
+				}
+			}
+		},
+
+		/**
+		 * 按下键盘的发送键
+		 * @param {Object} e
+		 */
+		onConfirm(e) {
+			this.$emit('confirm', this.val);
+			this.isEnter = true;
+			this.$emit('change', this.val);
+			this.$nextTick(() => {
+				this.isEnter = false;
+			});
+		},
+
+		/**
+		 * 清理内容
+		 * @param {Object} event
+		 */
+		onClear(event) {
+			this.val = '';
+			// TODO 兼容 vue2
+			this.$emit('input', '');
+			// TODO 兼容 vue2
+			// TODO　兼容　vue3
+			this.$emit('update:modelValue', '');
+			// 点击叉号触发
+			this.$emit('clear');
+		},
+
+    /**
+     * 键盘高度发生变化的时候触发此事件
+     * 兼容性：微信小程序2.7.0+、App 3.1.0+
+     * @param {Object} event
+     */
+    onkeyboardheightchange(event) {
+      this.$emit("keyboardheightchange",event);
+    },
+
+		/**
+		 * 去除空格
+		 */
+		trimStr(str, pos = 'both') {
+			if (pos === 'both') {
+				return str.trim();
+			} else if (pos === 'left') {
+				return str.trimLeft();
+			} else if (pos === 'right') {
+				return str.trimRight();
+			} else if (pos === 'start') {
+				return str.trimStart();
+			} else if (pos === 'end') {
+				return str.trimEnd();
+			} else if (pos === 'all') {
+				return str.replace(/\s+/g, '');
+			} else if (pos === 'none') {
+				return str;
+			}
+			return str;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+$uni-error: #e43d33;
+$uni-border-1: #dcdfe6 !default;
+
+.uni-easyinput {
+	/* #ifndef APP-NVUE */
+	width: 100%;
+	/* #endif */
+	flex: 1;
+	position: relative;
+	text-align: left;
+	color: #333;
+	font-size: 14px;
+}
+
+.uni-easyinput__content {
+	flex: 1;
+	/* #ifndef APP-NVUE */
+	width: 100%;
+	display: flex;
+	box-sizing: border-box;
+	// min-height: 36px;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+	// 处理border动画刚开始显示黑色的问题
+	border-color: #fff;
+	transition-property: border-color;
+	transition-duration: 0.3s;
+}
+
+.uni-easyinput__content-input {
+	/* #ifndef APP-NVUE */
+	width: auto;
+	/* #endif */
+	position: relative;
+	overflow: hidden;
+	flex: 1;
+	line-height: 1;
+	font-size: 14px;
+	height: 35px;
+	// min-height: 36px;
+}
+
+.uni-easyinput__placeholder-class {
+	color: #999;
+	font-size: 12px;
+	// font-weight: 200;
+}
+
+.is-textarea {
+	align-items: flex-start;
+}
+
+.is-textarea-icon {
+	margin-top: 5px;
+}
+
+.uni-easyinput__content-textarea {
+	position: relative;
+	overflow: hidden;
+	flex: 1;
+	line-height: 1.5;
+	font-size: 14px;
+	margin: 6px;
+	margin-left: 0;
+	height: 80px;
+	min-height: 80px;
+	/* #ifndef APP-NVUE */
+	min-height: 80px;
+	width: auto;
+	/* #endif */
+}
+
+.input-padding {
+	padding-left: 10px;
+}
+
+.content-clear-icon {
+	padding: 0 5px;
+}
+
+.label-icon {
+	margin-right: 5px;
+	margin-top: -1px;
+}
+
+// 显示边框
+.is-input-border {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	box-sizing: border-box;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+	border: 1px solid $uni-border-1;
+	border-radius: 4px;
+	/* #ifdef MP-ALIPAY */
+	overflow: hidden;
+	/* #endif */
+}
+
+.uni-error-message {
+	position: absolute;
+	bottom: -17px;
+	left: 0;
+	line-height: 12px;
+	color: $uni-error;
+	font-size: 12px;
+	text-align: left;
+}
+
+.uni-error-msg--boeder {
+	position: relative;
+	bottom: 0;
+	line-height: 22px;
+}
+
+.is-input-error-border {
+	border-color: $uni-error;
+
+	.uni-easyinput__placeholder-class {
+		color: mix(#fff, $uni-error, 50%);
+	}
+}
+
+.uni-easyinput--border {
+	margin-bottom: 0;
+	padding: 10px 15px;
+	// padding-bottom: 0;
+	border-top: 1px #eee solid;
+}
+
+.uni-easyinput-error {
+	padding-bottom: 0;
+}
+
+.is-first-border {
+	/* #ifndef APP-NVUE */
+	border: none;
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	border-width: 0;
+	/* #endif */
+}
+
+.is-disabled {
+	background-color: #f7f6f6;
+	color: #d5d5d5;
+
+	.uni-easyinput__placeholder-class {
+		color: #d5d5d5;
+		font-size: 12px;
+	}
+}
+</style>
diff --git a/uni_modules/uni-easyinput/package.json b/uni_modules/uni-easyinput/package.json
new file mode 100644
index 0000000..bd128e1
--- /dev/null
+++ b/uni_modules/uni-easyinput/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-easyinput",
+  "displayName": "uni-easyinput 增强输入框",
+  "version": "1.1.9",
+  "description": "Easyinput 组件是对原生input组件的增强",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "input",
+    "uni-easyinput",
+    "输入框"
+],
+  "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"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "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"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-easyinput/readme.md b/uni_modules/uni-easyinput/readme.md
new file mode 100644
index 0000000..f1faf8f
--- /dev/null
+++ b/uni_modules/uni-easyinput/readme.md
@@ -0,0 +1,11 @@
+
+
+### Easyinput 增强输入框
+> **组件名：uni-easyinput**
+> 代码块： `uEasyinput`
+
+
+easyinput 组件是对原生input组件的增强 ，是专门为配合表单组件[uni-forms](https://ext.dcloud.net.cn/plugin?id=2773)而设计的，easyinput 内置了边框，图标等，同时包含 input 所有功能
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-easyinput)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/api/index.js b/unpackage/dist/dev/mp-weixin/api/index.js
index 4f304a3..8491bb6 100644
--- a/unpackage/dist/dev/mp-weixin/api/index.js
+++ b/unpackage/dist/dev/mp-weixin/api/index.js
@@ -7,6 +7,12 @@ const API = {
   // 获取token
   wx_login: (data, userId) => api_request.net.POST("/user/binding/wechat", data, true, { "userId": userId }),
   // 微信登录
+  // upload: (data) => net.POST('/user/upload',data), // 文件上传
+  userinfoUpdae: (data) => api_request.net.PUT("/user/info", data),
+  // 更新用户信息
+  // 首页
+  getHospitalList: (data) => api_request.net.GET("/hospital/list", data),
+  // 获取医院信息
   /* 
    首页信息
    */
diff --git a/unpackage/dist/dev/mp-weixin/api/request.js b/unpackage/dist/dev/mp-weixin/api/request.js
index 0e6ce17..bff5e5e 100644
--- a/unpackage/dist/dev/mp-weixin/api/request.js
+++ b/unpackage/dist/dev/mp-weixin/api/request.js
@@ -4,10 +4,10 @@ const config_index = require("../config/index.js");
 const loginUrl = "pages/user/login";
 const net = {
   REQUEST(url, method = "GET", data, checkLogin = true, header) {
-    let token = common_vendor.index.getStorageSync("access_token") || "Basic ZGV20mRldjEyMw==";
+    let token = common_vendor.index.getStorageSync("access_token") || "Basic ZGV2OmRldjEyMw==";
     const headers = {
-      "Content-Type": "application/json",
-      // "Content-Type": "application/x-www-form-urlencoded",
+      // "Content-Type": "application/json",
+      "Content-Type": "application/x-www-form-urlencoded",
       "Authorization": token,
       "x-token": token,
       "token": token
@@ -16,10 +16,6 @@ const net = {
     };
     var pages = getCurrentPages();
     var page = pages[pages.length - 1];
-    if (!header) {
-      headers["Content-Type"] = "application/x-www-form-urlencode";
-    }
-    console.log("headers :", headers);
     return common_vendor.index.request({
       url: config_index.config.baseUrl + url,
       method,
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 26f2973..9901132 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -5,6 +5,7 @@ if (!Math) {
   "./pages/index/index.js";
   "./pages/wikipedia/index.js";
   "./pages/user/index.js";
+  "./pages/login/login.js";
 }
 const _sfc_main = {
   onLaunch: function() {
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index 8f785f9..55033ec 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -2,12 +2,13 @@
   "pages": [
     "pages/index/index",
     "pages/wikipedia/index",
-    "pages/user/index"
+    "pages/user/index",
+    "pages/login/login"
   ],
   "window": {
-    "navigationBarTextStyle": "black",
+    "navigationBarTextStyle": "white",
     "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
+    "navigationBarBackgroundColor": "#26758d",
     "backgroundColor": "#F8F8F8"
   },
   "tabBar": {
diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js
index 8fb5b39..b71fcf8 100644
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -29,7 +29,7 @@ function normalizeStyle(value) {
     return res;
   } else if (isString(value)) {
     return value;
-  } else if (isObject(value)) {
+  } else if (isObject$1(value)) {
     return value;
   }
 }
@@ -57,7 +57,7 @@ function normalizeClass(value) {
         res += normalized + " ";
       }
     }
-  } else if (isObject(value)) {
+  } else if (isObject$1(value)) {
     for (const name in value) {
       if (value[name]) {
         res += name + " ";
@@ -66,6 +66,28 @@ function normalizeClass(value) {
   }
   return res.trim();
 }
+const toDisplayString = (val) => {
+  return isString(val) ? val : val == null ? "" : isArray(val) || isObject$1(val) && (val.toString === objectToString || !isFunction(val.toString)) ? JSON.stringify(val, replacer, 2) : String(val);
+};
+const replacer = (_key, val) => {
+  if (val && val.__v_isRef) {
+    return replacer(_key, val.value);
+  } else if (isMap(val)) {
+    return {
+      [`Map(${val.size})`]: [...val.entries()].reduce((entries, [key, val2]) => {
+        entries[`${key} =>`] = val2;
+        return entries;
+      }, {})
+    };
+  } else if (isSet(val)) {
+    return {
+      [`Set(${val.size})`]: [...val.values()]
+    };
+  } else if (isObject$1(val) && !isArray(val) && !isPlainObject$1(val)) {
+    return String(val);
+  }
+  return val;
+};
 const EMPTY_OBJ = Object.freeze({});
 const EMPTY_ARR = Object.freeze([]);
 const NOOP = () => {
@@ -81,17 +103,17 @@ const remove = (arr, el) => {
     arr.splice(i, 1);
   }
 };
-const hasOwnProperty$1 = Object.prototype.hasOwnProperty;
-const hasOwn = (val, key) => hasOwnProperty$1.call(val, key);
+const hasOwnProperty$2 = Object.prototype.hasOwnProperty;
+const hasOwn$1 = (val, key) => hasOwnProperty$2.call(val, key);
 const isArray = Array.isArray;
 const isMap = (val) => toTypeString(val) === "[object Map]";
 const isSet = (val) => toTypeString(val) === "[object Set]";
 const isFunction = (val) => typeof val === "function";
 const isString = (val) => typeof val === "string";
 const isSymbol = (val) => typeof val === "symbol";
-const isObject = (val) => val !== null && typeof val === "object";
+const isObject$1 = (val) => val !== null && typeof val === "object";
 const isPromise = (val) => {
-  return isObject(val) && isFunction(val.then) && isFunction(val.catch);
+  return isObject$1(val) && isFunction(val.then) && isFunction(val.catch);
 };
 const objectToString = Object.prototype.toString;
 const toTypeString = (value) => objectToString.call(value);
@@ -362,11 +384,96 @@ E.prototype = {
   }
 };
 var E$1 = E;
+const isObject = (val) => val !== null && typeof val === "object";
+const defaultDelimiters = ["{", "}"];
+class BaseFormatter {
+  constructor() {
+    this._caches = /* @__PURE__ */ Object.create(null);
+  }
+  interpolate(message, values, delimiters = defaultDelimiters) {
+    if (!values) {
+      return [message];
+    }
+    let tokens = this._caches[message];
+    if (!tokens) {
+      tokens = parse(message, delimiters);
+      this._caches[message] = tokens;
+    }
+    return compile$1(tokens, values);
+  }
+}
+const RE_TOKEN_LIST_VALUE = /^(?:\d)+/;
+const RE_TOKEN_NAMED_VALUE = /^(?:\w)+/;
+function parse(format, [startDelimiter, endDelimiter]) {
+  const tokens = [];
+  let position = 0;
+  let text = "";
+  while (position < format.length) {
+    let char = format[position++];
+    if (char === startDelimiter) {
+      if (text) {
+        tokens.push({ type: "text", value: text });
+      }
+      text = "";
+      let sub = "";
+      char = format[position++];
+      while (char !== void 0 && char !== endDelimiter) {
+        sub += char;
+        char = format[position++];
+      }
+      const isClosed = char === endDelimiter;
+      const type = RE_TOKEN_LIST_VALUE.test(sub) ? "list" : isClosed && RE_TOKEN_NAMED_VALUE.test(sub) ? "named" : "unknown";
+      tokens.push({ value: sub, type });
+    } else {
+      text += char;
+    }
+  }
+  text && tokens.push({ type: "text", value: text });
+  return tokens;
+}
+function compile$1(tokens, values) {
+  const compiled = [];
+  let index2 = 0;
+  const mode = Array.isArray(values) ? "list" : isObject(values) ? "named" : "unknown";
+  if (mode === "unknown") {
+    return compiled;
+  }
+  while (index2 < tokens.length) {
+    const token = tokens[index2];
+    switch (token.type) {
+      case "text":
+        compiled.push(token.value);
+        break;
+      case "list":
+        compiled.push(values[parseInt(token.value, 10)]);
+        break;
+      case "named":
+        if (mode === "named") {
+          compiled.push(values[token.value]);
+        } else {
+          {
+            console.warn(`Type of token '${token.type}' and format of value '${mode}' don't match!`);
+          }
+        }
+        break;
+      case "unknown":
+        {
+          console.warn(`Detect 'unknown' type of token!`);
+        }
+        break;
+    }
+    index2++;
+  }
+  return compiled;
+}
 const LOCALE_ZH_HANS = "zh-Hans";
 const LOCALE_ZH_HANT = "zh-Hant";
 const LOCALE_EN = "en";
 const LOCALE_FR = "fr";
 const LOCALE_ES = "es";
+const hasOwnProperty$1 = Object.prototype.hasOwnProperty;
+const hasOwn = (val, key) => hasOwnProperty$1.call(val, key);
+const defaultFormatter = new BaseFormatter();
 function include(str, parts) {
   return !!parts.find((part) => str.indexOf(part) !== -1);
 }
@@ -406,6 +513,161 @@ function normalizeLocale(locale, messages) {
     return lang;
   }
 }
+class I18n {
+  constructor({ locale, fallbackLocale, messages, watcher, formater }) {
+    this.locale = LOCALE_EN;
+    this.fallbackLocale = LOCALE_EN;
+    this.message = {};
+    this.messages = {};
+    this.watchers = [];
+    if (fallbackLocale) {
+      this.fallbackLocale = fallbackLocale;
+    }
+    this.formater = formater || defaultFormatter;
+    this.messages = messages || {};
+    this.setLocale(locale || LOCALE_EN);
+    if (watcher) {
+      this.watchLocale(watcher);
+    }
+  }
+  setLocale(locale) {
+    const oldLocale = this.locale;
+    this.locale = normalizeLocale(locale, this.messages) || this.fallbackLocale;
+    if (!this.messages[this.locale]) {
+      this.messages[this.locale] = {};
+    }
+    this.message = this.messages[this.locale];
+    if (oldLocale !== this.locale) {
+      this.watchers.forEach((watcher) => {
+        watcher(this.locale, oldLocale);
+      });
+    }
+  }
+  getLocale() {
+    return this.locale;
+  }
+  watchLocale(fn) {
+    const index2 = this.watchers.push(fn) - 1;
+    return () => {
+      this.watchers.splice(index2, 1);
+    };
+  }
+  add(locale, message, override = true) {
+    const curMessages = this.messages[locale];
+    if (curMessages) {
+      if (override) {
+        Object.assign(curMessages, message);
+      } else {
+        Object.keys(message).forEach((key) => {
+          if (!hasOwn(curMessages, key)) {
+            curMessages[key] = message[key];
+          }
+        });
+      }
+    } else {
+      this.messages[locale] = message;
+    }
+  }
+  f(message, values, delimiters) {
+    return this.formater.interpolate(message, values, delimiters).join("");
+  }
+  t(key, locale, values) {
+    let message = this.message;
+    if (typeof locale === "string") {
+      locale = normalizeLocale(locale, this.messages);
+      locale && (message = this.messages[locale]);
+    } else {
+      values = locale;
+    }
+    if (!hasOwn(message, key)) {
+      console.warn(`Cannot translate the value of keypath ${key}. Use the value of keypath as default.`);
+      return key;
+    }
+    return this.formater.interpolate(message[key], values).join("");
+  }
+}
+function watchAppLocale(appVm, i18n) {
+  if (appVm.$watchLocale) {
+    appVm.$watchLocale((newLocale) => {
+      i18n.setLocale(newLocale);
+    });
+  } else {
+    appVm.$watch(() => appVm.$locale, (newLocale) => {
+      i18n.setLocale(newLocale);
+    });
+  }
+}
+function getDefaultLocale() {
+  if (typeof index !== "undefined" && index.getLocale) {
+    return index.getLocale();
+  }
+  if (typeof global !== "undefined" && global.getLocale) {
+    return global.getLocale();
+  }
+  return LOCALE_EN;
+}
+function initVueI18n(locale, messages = {}, fallbackLocale, watcher) {
+  if (typeof locale !== "string") {
+    [locale, messages] = [
+      messages,
+      locale
+    ];
+  }
+  if (typeof locale !== "string") {
+    locale = getDefaultLocale();
+  }
+  if (typeof fallbackLocale !== "string") {
+    fallbackLocale = typeof __uniConfig !== "undefined" && __uniConfig.fallbackLocale || LOCALE_EN;
+  }
+  const i18n = new I18n({
+    locale,
+    fallbackLocale,
+    messages,
+    watcher
+  });
+  let t2 = (key, values) => {
+    if (typeof getApp !== "function") {
+      t2 = function(key2, values2) {
+        return i18n.t(key2, values2);
+      };
+    } else {
+      let isWatchedAppLocale = false;
+      t2 = function(key2, values2) {
+        const appVm = getApp().$vm;
+        if (appVm) {
+          appVm.$locale;
+          if (!isWatchedAppLocale) {
+            isWatchedAppLocale = true;
+            watchAppLocale(appVm, i18n);
+          }
+        }
+        return i18n.t(key2, values2);
+      };
+    }
+    return t2(key, values);
+  };
+  return {
+    i18n,
+    f(message, values, delimiters) {
+      return i18n.f(message, values, delimiters);
+    },
+    t(key, values) {
+      return t2(key, values);
+    },
+    add(locale2, message, override = true) {
+      return i18n.add(locale2, message, override);
+    },
+    watch(fn) {
+      return i18n.watchLocale(fn);
+    },
+    getLocale() {
+      return i18n.getLocale();
+    },
+    setLocale(newLocale) {
+      return i18n.setLocale(newLocale);
+    }
+  };
+}
 function getBaseSystemInfo() {
   return wx.getSystemInfoSync();
 }
@@ -417,7 +679,7 @@ function validateProtocol(name, data, protocol, onFail) {
     onFail = validateProtocolFail;
   }
   for (const key in protocol) {
-    const errMsg = validateProp$1(key, data[key], protocol[key], !hasOwn(data, key));
+    const errMsg = validateProp$1(key, data[key], protocol[key], !hasOwn$1(data, key));
     if (isString(errMsg)) {
       onFail(name, errMsg);
     }
@@ -474,13 +736,13 @@ function assertType$1(value, type) {
   let valid;
   const expectedType = getType$1(type);
   if (isSimpleType$1(expectedType)) {
-    const t = typeof value;
-    valid = t === expectedType.toLowerCase();
-    if (!valid && t === "object") {
+    const t2 = typeof value;
+    valid = t2 === expectedType.toLowerCase();
+    if (!valid && t2 === "object") {
       valid = value instanceof type;
     }
   } else if (expectedType === "Object") {
-    valid = isObject(value);
+    valid = isObject$1(value);
   } else if (expectedType === "Array") {
     valid = isArray(value);
   } else {
@@ -736,7 +998,7 @@ function formatApiArgs(args, options) {
         return errMsg;
       }
     } else {
-      if (!hasOwn(params, name)) {
+      if (!hasOwn$1(params, name)) {
         params[name] = formatterOrDefaultValue;
       }
     }
@@ -1104,7 +1366,7 @@ function initWrapper(protocols2) {
         argsOption = argsOption(fromArgs, toArgs) || {};
       }
       for (const key in fromArgs) {
-        if (hasOwn(argsOption, key)) {
+        if (hasOwn$1(argsOption, key)) {
           let keyOption = argsOption[key];
           if (isFunction(keyOption)) {
             keyOption = keyOption(fromArgs[key], fromArgs, toArgs);
@@ -1122,7 +1384,7 @@ function initWrapper(protocols2) {
             toArgs[key] = processCallback(methodName, callback, returnValue);
           }
         } else {
-          if (!keepFromArgs && !hasOwn(toArgs, key)) {
+          if (!keepFromArgs && !hasOwn$1(toArgs, key)) {
             toArgs[key] = fromArgs[key];
           }
         }
@@ -1140,7 +1402,7 @@ function initWrapper(protocols2) {
     return processArgs(methodName, res, returnValue, {}, keepReturnValue);
   }
   return function wrapper(methodName, method) {
-    if (!hasOwn(protocols2, methodName)) {
+    if (!hasOwn$1(protocols2, methodName)) {
       return method;
     }
     const protocol = protocols2[methodName];
@@ -1434,13 +1696,13 @@ function initUni(api, protocols2, platform = wx) {
   const wrapper = initWrapper(protocols2);
   const UniProxyHandlers = {
     get(target, key) {
-      if (hasOwn(target, key)) {
+      if (hasOwn$1(target, key)) {
         return target[key];
       }
-      if (hasOwn(api, key)) {
+      if (hasOwn$1(api, key)) {
         return promisify(key, api[key]);
       }
-      if (hasOwn(baseApis, key)) {
+      if (hasOwn$1(baseApis, key)) {
         return promisify(key, baseApis[key]);
       }
       return promisify(key, wrapper(key, platform[key]));
@@ -1941,7 +2203,7 @@ function createGetter(isReadonly2 = false, shallow = false) {
     }
     const targetIsArray = isArray(target);
     if (!isReadonly2) {
-      if (targetIsArray && hasOwn(arrayInstrumentations, key)) {
+      if (targetIsArray && hasOwn$1(arrayInstrumentations, key)) {
         return Reflect.get(arrayInstrumentations, key, receiver);
       }
       if (key === "hasOwnProperty") {
@@ -1961,7 +2223,7 @@ function createGetter(isReadonly2 = false, shallow = false) {
     if (isRef(res)) {
       return targetIsArray && isIntegerKey(key) ? res : res.value;
     }
-    if (isObject(res)) {
+    if (isObject$1(res)) {
       return isReadonly2 ? readonly(res) : reactive(res);
     }
     return res;
@@ -1985,7 +2247,7 @@ function createSetter(shallow = false) {
         return true;
       }
     }
-    const hadKey = isArray(target) && isIntegerKey(key) ? Number(key) < target.length : hasOwn(target, key);
+    const hadKey = isArray(target) && isIntegerKey(key) ? Number(key) < target.length : hasOwn$1(target, key);
     const result = Reflect.set(target, key, value, receiver);
     if (target === toRaw(receiver)) {
       if (!hadKey) {
@@ -1998,7 +2260,7 @@ function createSetter(shallow = false) {
   };
 }
 function deleteProperty(target, key) {
-  const hadKey = hasOwn(target, key);
+  const hadKey = hasOwn$1(target, key);
   const oldValue = target[key];
   const result = Reflect.deleteProperty(target, key);
   if (result && hadKey) {
@@ -2315,7 +2577,7 @@ function createInstrumentationGetter(isReadonly2, shallow) {
     } else if (key === "__v_raw") {
       return target;
     }
-    return Reflect.get(hasOwn(instrumentations, key) && key in target ? instrumentations : target, key, receiver);
+    return Reflect.get(hasOwn$1(instrumentations, key) && key in target ? instrumentations : target, key, receiver);
   };
 }
 const mutableCollectionHandlers = {
@@ -2377,7 +2639,7 @@ function shallowReadonly(target) {
   return createReactiveObject(target, true, shallowReadonlyHandlers, shallowReadonlyCollectionHandlers, shallowReadonlyMap);
 }
 function createReactiveObject(target, isReadonly2, baseHandlers, collectionHandlers, proxyMap) {
-  if (!isObject(target)) {
+  if (!isObject$1(target)) {
     {
       console.warn(`value cannot be made reactive: ${String(target)}`);
     }
@@ -2442,8 +2704,8 @@ function markRaw(value) {
   def(value, "__v_skip", true);
   return value;
 }
-const toReactive = (value) => isObject(value) ? reactive(value) : value;
-const toReadonly = (value) => isObject(value) ? readonly(value) : value;
+const toReactive = (value) => isObject$1(value) ? reactive(value) : value;
+const toReadonly = (value) => isObject$1(value) ? readonly(value) : value;
 function trackRefValue(ref2) {
   if (shouldTrack && activeEffect) {
     ref2 = toRaw(ref2);
@@ -3235,7 +3497,7 @@ function normalizeEmitsOptions(comp, appContext, asMixin = false) {
     }
   }
   if (!raw && !hasExtends) {
-    if (isObject(comp)) {
+    if (isObject$1(comp)) {
       cache.set(comp, null);
     }
     return null;
@@ -3245,7 +3507,7 @@ function normalizeEmitsOptions(comp, appContext, asMixin = false) {
   } else {
     extend(normalized, raw);
   }
-  if (isObject(comp)) {
+  if (isObject$1(comp)) {
     cache.set(comp, normalized);
   }
   return normalized;
@@ -3255,7 +3517,7 @@ function isEmitListener(options, key) {
     return false;
   }
   key = key.slice(2).replace(/Once$/, "");
-  return hasOwn(options, key[0].toLowerCase() + key.slice(1)) || hasOwn(options, hyphenate(key)) || hasOwn(options, key);
+  return hasOwn$1(options, key[0].toLowerCase() + key.slice(1)) || hasOwn$1(options, hyphenate(key)) || hasOwn$1(options, key);
 }
 let currentRenderingInstance = null;
 function setCurrentRenderingInstance(instance) {
@@ -3472,7 +3734,7 @@ function createPathGetter(ctx, path) {
   };
 }
 function traverse(value, seen) {
-  if (!isObject(value) || value[
+  if (!isObject$1(value) || value[
     "__v_skip"
     /* ReactiveFlags.SKIP */
   ]) {
@@ -3687,7 +3949,7 @@ const publicPropertiesMap = (
   })
 );
 const isReservedPrefix = (key) => key === "_" || key === "$";
-const hasSetupBinding = (state, key) => state !== EMPTY_OBJ && !state.__isScriptSetup && hasOwn(state, key);
+const hasSetupBinding = (state, key) => state !== EMPTY_OBJ && !state.__isScriptSetup && hasOwn$1(state, key);
 const PublicInstanceProxyHandlers = {
   get({ _: instance }, key) {
     const { ctx, setupState, data, props, accessCache, type, appContext } = instance;
@@ -3711,17 +3973,17 @@ const PublicInstanceProxyHandlers = {
       } else if (hasSetupBinding(setupState, key)) {
         accessCache[key] = 1;
         return setupState[key];
-      } else if (data !== EMPTY_OBJ && hasOwn(data, key)) {
+      } else if (data !== EMPTY_OBJ && hasOwn$1(data, key)) {
         accessCache[key] = 2;
         return data[key];
       } else if (
         // only cache other properties when instance has declared (thus stable)
         // props
-        (normalizedProps = instance.propsOptions[0]) && hasOwn(normalizedProps, key)
+        (normalizedProps = instance.propsOptions[0]) && hasOwn$1(normalizedProps, key)
       ) {
         accessCache[key] = 3;
         return props[key];
-      } else if (ctx !== EMPTY_OBJ && hasOwn(ctx, key)) {
+      } else if (ctx !== EMPTY_OBJ && hasOwn$1(ctx, key)) {
         accessCache[key] = 4;
         return ctx[key];
       } else if (shouldCacheAccess) {
@@ -3740,12 +4002,12 @@ const PublicInstanceProxyHandlers = {
       (cssModule = type.__cssModules) && (cssModule = cssModule[key])
     ) {
       return cssModule;
-    } else if (ctx !== EMPTY_OBJ && hasOwn(ctx, key)) {
+    } else if (ctx !== EMPTY_OBJ && hasOwn$1(ctx, key)) {
       accessCache[key] = 4;
       return ctx[key];
     } else if (
       // global properties
-      globalProperties = appContext.config.globalProperties, hasOwn(globalProperties, key)
+      globalProperties = appContext.config.globalProperties, hasOwn$1(globalProperties, key)
     ) {
       {
         return globalProperties[key];
@@ -3753,7 +4015,7 @@ const PublicInstanceProxyHandlers = {
     } else if (currentRenderingInstance && (!isString(key) || // #1091 avoid internal isRef/isVNode checks on component instance leading
     // to infinite warning loop
     key.indexOf("__v") !== 0)) {
-      if (data !== EMPTY_OBJ && isReservedPrefix(key[0]) && hasOwn(data, key)) {
+      if (data !== EMPTY_OBJ && isReservedPrefix(key[0]) && hasOwn$1(data, key)) {
         warn(`Property ${JSON.stringify(key)} must be accessed via $data because it starts with a reserved character ("$" or "_") and is not proxied on the render context.`);
       } else if (instance === currentRenderingInstance) {
         warn(`Property ${JSON.stringify(key)} was accessed during render but is not defined on instance.`);
@@ -3765,13 +4027,13 @@ const PublicInstanceProxyHandlers = {
     if (hasSetupBinding(setupState, key)) {
       setupState[key] = value;
       return true;
-    } else if (setupState.__isScriptSetup && hasOwn(setupState, key)) {
+    } else if (setupState.__isScriptSetup && hasOwn$1(setupState, key)) {
       warn(`Cannot mutate <script setup> binding "${key}" from Options API.`);
       return false;
-    } else if (data !== EMPTY_OBJ && hasOwn(data, key)) {
+    } else if (data !== EMPTY_OBJ && hasOwn$1(data, key)) {
       data[key] = value;
       return true;
-    } else if (hasOwn(instance.props, key)) {
+    } else if (hasOwn$1(instance.props, key)) {
       warn(`Attempting to mutate prop "${key}". Props are readonly.`);
       return false;
     }
@@ -3793,12 +4055,12 @@ const PublicInstanceProxyHandlers = {
   },
   has({ _: { data, setupState, accessCache, ctx, appContext, propsOptions } }, key) {
     let normalizedProps;
-    return !!accessCache[key] || data !== EMPTY_OBJ && hasOwn(data, key) || hasSetupBinding(setupState, key) || (normalizedProps = propsOptions[0]) && hasOwn(normalizedProps, key) || hasOwn(ctx, key) || hasOwn(publicPropertiesMap, key) || hasOwn(appContext.config.globalProperties, key);
+    return !!accessCache[key] || data !== EMPTY_OBJ && hasOwn$1(data, key) || hasSetupBinding(setupState, key) || (normalizedProps = propsOptions[0]) && hasOwn$1(normalizedProps, key) || hasOwn$1(ctx, key) || hasOwn$1(publicPropertiesMap, key) || hasOwn$1(appContext.config.globalProperties, key);
   },
   defineProperty(target, key, descriptor) {
     if (descriptor.get != null) {
       target._.accessCache[key] = 0;
-    } else if (hasOwn(descriptor, "value")) {
+    } else if (hasOwn$1(descriptor, "value")) {
       this.set(target, key, descriptor.value, null);
     }
     return Reflect.defineProperty(target, key, descriptor);
@@ -3956,7 +4218,7 @@ function applyOptions$1(instance) {
     if (isPromise(data)) {
       warn(`data() returned a Promise - note data() cannot be async; If you intend to perform data fetching before component renders, use async setup() + <Suspense>.`);
     }
-    if (!isObject(data)) {
+    if (!isObject$1(data)) {
       warn(`data() should return an object.`);
     } else {
       instance.data = reactive(data);
@@ -4077,7 +4339,7 @@ function resolveInjections(injectOptions, ctx, checkDuplicateProperties = NOOP,
   for (const key in injectOptions) {
     const opt = injectOptions[key];
     let injected;
-    if (isObject(opt)) {
+    if (isObject$1(opt)) {
       if ("default" in opt) {
         injected = inject(
           opt.from || key,
@@ -4127,7 +4389,7 @@ function createWatcher(raw, ctx, publicThis, key) {
     }
   } else if (isFunction(raw)) {
     watch(getter, raw.bind(publicThis));
-  } else if (isObject(raw)) {
+  } else if (isObject$1(raw)) {
     if (isArray(raw)) {
       raw.forEach((r) => createWatcher(r, ctx, publicThis, key));
     } else {
@@ -4161,7 +4423,7 @@ function resolveMergedOptions(instance) {
     }
     mergeOptions(resolved, base, optionMergeStrategies);
   }
-  if (isObject(base)) {
+  if (isObject$1(base)) {
     cache.set(base, resolved);
   }
   return resolved;
@@ -4307,7 +4569,7 @@ function updateProps(instance, rawProps, rawPrevProps, optimized) {
         }
         const value = rawProps[key];
         if (options) {
-          if (hasOwn(attrs, key)) {
+          if (hasOwn$1(attrs, key)) {
             if (value !== attrs[key]) {
               attrs[key] = value;
               hasAttrsChanged = true;
@@ -4339,9 +4601,9 @@ function updateProps(instance, rawProps, rawPrevProps, optimized) {
     let kebabKey;
     for (const key in rawCurrentProps) {
       if (!rawProps || // for camelCase
-      !hasOwn(rawProps, key) && // it's possible the original props was passed in as kebab-case
+      !hasOwn$1(rawProps, key) && // it's possible the original props was passed in as kebab-case
       // and converted to camelCase (#955)
-      ((kebabKey = hyphenate(key)) === key || !hasOwn(rawProps, kebabKey))) {
+      ((kebabKey = hyphenate(key)) === key || !hasOwn$1(rawProps, kebabKey))) {
         if (options) {
           if (rawPrevProps && // for camelCase
           (rawPrevProps[key] !== void 0 || // for kebab-case
@@ -4363,7 +4625,7 @@ function updateProps(instance, rawProps, rawPrevProps, optimized) {
     }
     if (attrs !== rawCurrentProps) {
       for (const key in attrs) {
-        if (!rawProps || !hasOwn(rawProps, key) && true) {
+        if (!rawProps || !hasOwn$1(rawProps, key) && true) {
           delete attrs[key];
           hasAttrsChanged = true;
         }
@@ -4388,7 +4650,7 @@ function setFullProps(instance, rawProps, props, attrs) {
       }
       const value = rawProps[key];
       let camelKey;
-      if (options && hasOwn(options, camelKey = camelize(key))) {
+      if (options && hasOwn$1(options, camelKey = camelize(key))) {
         if (!needCastKeys || !needCastKeys.includes(camelKey)) {
           props[camelKey] = value;
         } else {
@@ -4407,7 +4669,7 @@ function setFullProps(instance, rawProps, props, attrs) {
     const castValues = rawCastValues || EMPTY_OBJ;
     for (let i = 0; i < needCastKeys.length; i++) {
       const key = needCastKeys[i];
-      props[key] = resolvePropValue(options, rawCurrentProps, key, castValues[key], instance, !hasOwn(castValues, key));
+      props[key] = resolvePropValue(options, rawCurrentProps, key, castValues[key], instance, !hasOwn$1(castValues, key));
     }
   }
   return hasAttrsChanged;
@@ -4415,7 +4677,7 @@ function setFullProps(instance, rawProps, props, attrs) {
 function resolvePropValue(options, props, key, value, instance, isAbsent) {
   const opt = options[key];
   if (opt != null) {
-    const hasDefault = hasOwn(opt, "default");
+    const hasDefault = hasOwn$1(opt, "default");
     if (hasDefault && value === void 0) {
       const defaultValue = opt.default;
       if (opt.type !== Function && isFunction(defaultValue)) {
@@ -4476,7 +4738,7 @@ function normalizePropsOptions(comp, appContext, asMixin = false) {
     }
   }
   if (!raw && !hasExtends) {
-    if (isObject(comp)) {
+    if (isObject$1(comp)) {
       cache.set(comp, EMPTY_ARR);
     }
     return EMPTY_ARR;
@@ -4492,7 +4754,7 @@ function normalizePropsOptions(comp, appContext, asMixin = false) {
       }
     }
   } else if (raw) {
-    if (!isObject(raw)) {
+    if (!isObject$1(raw)) {
       warn(`invalid props options`, raw);
     }
     for (const key in raw) {
@@ -4511,7 +4773,7 @@ function normalizePropsOptions(comp, appContext, asMixin = false) {
             1
             /* BooleanFlags.shouldCastTrue */
           ] = stringIndex < 0 || booleanIndex < stringIndex;
-          if (booleanIndex > -1 || hasOwn(prop, "default")) {
+          if (booleanIndex > -1 || hasOwn$1(prop, "default")) {
             needCastKeys.push(normalizedKey);
           }
         }
@@ -4519,7 +4781,7 @@ function normalizePropsOptions(comp, appContext, asMixin = false) {
     }
   }
   const res = [normalized, needCastKeys];
-  if (isObject(comp)) {
+  if (isObject$1(comp)) {
     cache.set(comp, res);
   }
   return res;
@@ -4541,7 +4803,7 @@ function isSameType(a, b) {
 }
 function getTypeIndex(type, expectedTypes) {
   if (isArray(expectedTypes)) {
-    return expectedTypes.findIndex((t) => isSameType(t, type));
+    return expectedTypes.findIndex((t2) => isSameType(t2, type));
   } else if (isFunction(expectedTypes)) {
     return isSameType(expectedTypes, type) ? 0 : -1;
   }
@@ -4554,7 +4816,7 @@ function validateProps(rawProps, props, instance) {
     let opt = options[key];
     if (opt == null)
       continue;
-    validateProp(key, resolvedValues[key], opt, !hasOwn(rawProps, key) && !hasOwn(rawProps, hyphenate(key)));
+    validateProp(key, resolvedValues[key], opt, !hasOwn$1(rawProps, key) && !hasOwn$1(rawProps, hyphenate(key)));
   }
 }
 function validateProp(name, value, prop, isAbsent) {
@@ -4589,13 +4851,13 @@ function assertType(value, type) {
   let valid;
   const expectedType = getType(type);
   if (isSimpleType(expectedType)) {
-    const t = typeof value;
-    valid = t === expectedType.toLowerCase();
-    if (!valid && t === "object") {
+    const t2 = typeof value;
+    valid = t2 === expectedType.toLowerCase();
+    if (!valid && t2 === "object") {
       valid = value instanceof type;
     }
   } else if (expectedType === "Object") {
-    valid = isObject(value);
+    valid = isObject$1(value);
   } else if (expectedType === "Array") {
     valid = isArray(value);
   } else if (expectedType === "null") {
@@ -4666,7 +4928,7 @@ function createAppAPI(render, hydrate) {
     if (!isFunction(rootComponent)) {
       rootComponent = Object.assign({}, rootComponent);
     }
-    if (rootProps != null && !isObject(rootProps)) {
+    if (rootProps != null && !isObject$1(rootProps)) {
       warn(`root props passed to app.mount() must be an object.`);
       rootProps = null;
     }
@@ -4974,7 +5236,7 @@ function handleSetupResult(instance, setupResult, isSSR) {
     {
       instance.render = setupResult;
     }
-  } else if (isObject(setupResult)) {
+  } else if (isObject$1(setupResult)) {
     if (isVNode(setupResult)) {
       warn(`setup() should not return VNodes directly - return a render function instead.`);
     }
@@ -5269,7 +5531,7 @@ function clone(src, seen) {
       copy = {};
       seen.set(src, copy);
       for (const name in src) {
-        if (hasOwn(src, name)) {
+        if (hasOwn$1(src, name)) {
           copy[name] = clone(src[name], seen);
         }
       }
@@ -5377,7 +5639,7 @@ function setRef$1(instance, isUnmount = false) {
   }
 }
 function toSkip(value) {
-  if (isObject(value)) {
+  if (isObject$1(value)) {
     markRaw(value);
   }
   return value;
@@ -5416,7 +5678,7 @@ function setTemplateRef({ r, f: f2 }, refValue, setupState) {
           onBeforeUnmount(() => remove(existing, refValue), refValue.$);
         }
       } else if (_isString) {
-        if (hasOwn(setupState, r)) {
+        if (hasOwn$1(setupState, r)) {
           setupState[r] = refValue;
         }
       } else if (isRef(r)) {
@@ -5947,14 +6209,14 @@ function patchMPEvent(event) {
     event.preventDefault = NOOP;
     event.stopPropagation = NOOP;
     event.stopImmediatePropagation = NOOP;
-    if (!hasOwn(event, "detail")) {
+    if (!hasOwn$1(event, "detail")) {
       event.detail = {};
     }
-    if (hasOwn(event, "markerId")) {
+    if (hasOwn$1(event, "markerId")) {
       event.detail = typeof event.detail === "object" ? event.detail : {};
       event.detail.markerId = event.markerId;
     }
-    if (isPlainObject$1(event.detail) && hasOwn(event.detail, "checked") && !hasOwn(event.detail, "value")) {
+    if (isPlainObject$1(event.detail) && hasOwn$1(event.detail, "checked") && !hasOwn$1(event.detail, "value")) {
       event.detail.value = event.detail.checked;
     }
     if (isPlainObject$1(event.detail)) {
@@ -5990,7 +6252,7 @@ function vFor(source, renderItem) {
     for (let i = 0; i < source; i++) {
       ret[i] = renderItem(i + 1, i, i);
     }
-  } else if (isObject(source)) {
+  } else if (isObject$1(source)) {
     if (source[Symbol.iterator]) {
       ret = Array.from(source, (item, i) => renderItem(item, i, i));
     } else {
@@ -6031,6 +6293,7 @@ const f = (source, renderItem) => vFor(source, renderItem);
 const s = (value) => stringifyStyle(value);
 const e = (target, ...sources) => extend(target, ...sources);
 const n = (value) => normalizeClass(value);
+const t = (val) => toDisplayString(val);
 const p = (props) => renderProps(props);
 const sr = (ref2, id, opts) => setRef(ref2, id, opts);
 function createApp$1(rootComponent, rootProps = null) {
@@ -6099,7 +6362,7 @@ function initComponentInstance(instance, options) {
 function initMocks(instance, mpInstance, mocks2) {
   const ctx = instance.ctx;
   mocks2.forEach((mock) => {
-    if (hasOwn(mpInstance, mock)) {
+    if (hasOwn$1(mpInstance, mock)) {
       instance[mock] = ctx[mock] = mpInstance[mock];
     }
   });
@@ -6155,7 +6418,7 @@ function findHooks(vueOptions, hooks = /* @__PURE__ */ new Set()) {
   return hooks;
 }
 function initHook(mpOptions, hook, excludes) {
-  if (excludes.indexOf(hook) === -1 && !hasOwn(mpOptions, hook)) {
+  if (excludes.indexOf(hook) === -1 && !hasOwn$1(mpOptions, hook)) {
     mpOptions[hook] = function(args) {
       return this.$vm && this.$vm.$callHook(hook, args);
     };
@@ -6188,7 +6451,7 @@ const findMixinRuntimeHooks = /* @__PURE__ */ once(() => {
       const hooks = Object.keys(MINI_PROGRAM_PAGE_RUNTIME_HOOKS);
       mixins.forEach((mixin) => {
         hooks.forEach((hook) => {
-          if (hasOwn(mixin, hook) && !runtimeHooks.includes(hook)) {
+          if (hasOwn$1(mixin, hook) && !runtimeHooks.includes(hook)) {
             runtimeHooks.push(hook);
           }
         });
@@ -6258,13 +6521,13 @@ function initCreateSubpackageApp(parseAppOptions) {
     const globalData = app.globalData;
     if (globalData) {
       Object.keys(appOptions.globalData).forEach((name) => {
-        if (!hasOwn(globalData, name)) {
+        if (!hasOwn$1(globalData, name)) {
           globalData[name] = appOptions.globalData[name];
         }
       });
     }
     Object.keys(appOptions).forEach((name) => {
-      if (!hasOwn(app, name)) {
+      if (!hasOwn$1(app, name)) {
         app[name] = appOptions[name];
       }
     });
@@ -6314,7 +6577,7 @@ function initVueIds(vueIds, mpInstance) {
 const EXTRAS = ["externalClasses"];
 function initExtraOptions(miniProgramComponentOptions, vueOptions) {
   EXTRAS.forEach((name) => {
-    if (hasOwn(vueOptions, name)) {
+    if (hasOwn$1(vueOptions, name)) {
       miniProgramComponentOptions[name] = vueOptions[name];
     }
   });
@@ -6621,7 +6884,7 @@ function applyOptions(componentOptions, vueOptions) {
   componentOptions.data = initData();
   componentOptions.behaviors = initBehaviors(vueOptions);
 }
-function parseComponent(vueOptions, { parse, mocks: mocks2, isPage: isPage2, initRelation: initRelation2, handleLink: handleLink2, initLifetimes: initLifetimes2 }) {
+function parseComponent(vueOptions, { parse: parse2, mocks: mocks2, isPage: isPage2, initRelation: initRelation2, handleLink: handleLink2, initLifetimes: initLifetimes2 }) {
   vueOptions = vueOptions.default || vueOptions;
   const options = {
     multipleSlots: true,
@@ -6631,7 +6894,7 @@ function parseComponent(vueOptions, { parse, mocks: mocks2, isPage: isPage2, ini
   };
   if (isArray(vueOptions.mixins)) {
     vueOptions.mixins.forEach((item) => {
-      if (isObject(item.options)) {
+      if (isObject$1(item.options)) {
         extend(options, item.options);
       }
     });
@@ -6667,8 +6930,8 @@ function parseComponent(vueOptions, { parse, mocks: mocks2, isPage: isPage2, ini
   {
     initWorkletMethods(mpComponentOptions.methods, vueOptions.methods);
   }
-  if (parse) {
-    parse(mpComponentOptions, { handleLink: handleLink2 });
+  if (parse2) {
+    parse2(mpComponentOptions, { handleLink: handleLink2 });
   }
   return mpComponentOptions;
 }
@@ -6696,7 +6959,7 @@ function $destroyComponent(instance) {
   return $destroyComponentFn(instance);
 }
 function parsePage(vueOptions, parseOptions2) {
-  const { parse, mocks: mocks2, isPage: isPage2, initRelation: initRelation2, handleLink: handleLink2, initLifetimes: initLifetimes2 } = parseOptions2;
+  const { parse: parse2, mocks: mocks2, isPage: isPage2, initRelation: initRelation2, handleLink: handleLink2, initLifetimes: initLifetimes2 } = parseOptions2;
   const miniProgramPageOptions = parseComponent(vueOptions, {
     mocks: mocks2,
     isPage: isPage2,
@@ -6719,7 +6982,7 @@ function parsePage(vueOptions, parseOptions2) {
   }
   initRuntimeHooks(methods, vueOptions.__runtimeHooks);
   initMixinRuntimeHooks(methods);
-  parse && parse(miniProgramPageOptions, { handleLink: handleLink2 });
+  parse2 && parse2(miniProgramPageOptions, { handleLink: handleLink2 });
   return miniProgramPageOptions;
 }
 function initCreatePage(parseOptions2) {
@@ -7458,6 +7721,7 @@ This will fail in production.`);
 const createHook = (lifecycle) => (hook, target = getCurrentInstance()) => {
   !isInSSRComponentSetup && injectHook(lifecycle, hook, target);
 };
+const onShow = /* @__PURE__ */ createHook(ON_SHOW);
 const onLoad = /* @__PURE__ */ createHook(ON_LOAD);
 exports._export_sfc = _export_sfc;
 exports.createPinia = createPinia;
@@ -7466,12 +7730,15 @@ exports.defineStore = defineStore;
 exports.e = e;
 exports.f = f;
 exports.index = index;
+exports.initVueI18n = initVueI18n;
 exports.n = n;
 exports.o = o;
 exports.onLoad = onLoad;
+exports.onShow = onShow;
 exports.p = p;
 exports.ref = ref;
 exports.resolveComponent = resolveComponent;
 exports.s = s;
 exports.sr = sr;
+exports.t = t;
 exports.watch = watch;
diff --git a/unpackage/dist/dev/mp-weixin/config/index.js b/unpackage/dist/dev/mp-weixin/config/index.js
index 3dfd790..6b6825a 100644
--- a/unpackage/dist/dev/mp-weixin/config/index.js
+++ b/unpackage/dist/dev/mp-weixin/config/index.js
@@ -1,6 +1,6 @@
 "use strict";
 const isdev = true;
-const baseUrl = "https://71e86bc1.r15.cpolar.top";
+const baseUrl = "http://2580c89.r18.cpolar.top/";
 const shareUrl = "https://h5.gwkjxb.com/";
 const teacher_admin_url = "http://teacher.gwkjxb.com/#/login";
 const config = {
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js
index 8be768c..7faad92 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -12,8 +12,10 @@ if (!Array) {
 const _easycom_uni_icons = () => "../../uni_modules/uni-icons/components/uni-icons/uni-icons.js";
 const _easycom_uni_popup = () => "../../uni_modules/uni-popup/components/uni-popup/uni-popup.js";
 if (!Math) {
-  (mySwiper + _easycom_uni_icons + _easycom_uni_popup)();
+  (mySwiper + _easycom_uni_icons + uniDatetimePicker + uniEasyinput + _easycom_uni_popup)();
 }
+const uniDatetimePicker = () => "../../uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.js";
+const uniEasyinput = () => "../../uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js";
 const mySwiper = () => "../../components/mySwiper.js";
 const _sfc_main = {
   __name: "index",
@@ -21,12 +23,17 @@ const _sfc_main = {
     const store = store_index.useStore();
     common_vendor.onLoad((e) => {
       var _a;
-      if (!((_a = store.userInfo) == null ? void 0 : _a.has_operation))
-        ;
+      if (!((_a = store.userInfo) == null ? void 0 : _a.has_operation)) {
+        operation_flag.value = true;
+        setTimeout(() => {
+          console.log(inputDialog.value);
+          inputDialog.value.open();
+        }, 0);
+      }
     });
     const inputDialog = common_vendor.ref();
     common_vendor.ref();
-    common_vendor.ref(false);
+    const operation_flag = common_vendor.ref(false);
     const lbt_list = common_vendor.ref([
       {
         banner_name: "首页轮播2",
@@ -51,6 +58,21 @@ const _sfc_main = {
         weigh: 6
       }
     ]);
+    function toClose() {
+      inputDialog.value.close();
+    }
+    function radioChange(e) {
+      console.log(e);
+    }
+    const single = common_vendor.ref("");
+    function maskClick(e) {
+      console.log("maskClick事件:", e);
+    }
+    const hValue = common_vendor.ref("");
+    common_vendor.ref("");
+    function onClickH(e) {
+      console.log(hValue.value);
+    }
     return (_ctx, _cache) => {
       return {
         a: common_vendor.p({
@@ -74,10 +96,27 @@ const _sfc_main = {
           color: "#8fdc8a",
           size: "20"
         }),
-        e: common_vendor.sr(inputDialog, "1cf27b2a-4", {
+        e: common_vendor.o(radioChange),
+        f: common_vendor.o(maskClick),
+        g: common_vendor.o(($event) => single.value = $event),
+        h: common_vendor.p({
+          type: "date",
+          ["clear-icon"]: false,
+          modelValue: single.value
+        }),
+        i: common_vendor.o(onClickH),
+        j: common_vendor.o(($event) => hValue.value = $event),
+        k: common_vendor.p({
+          suffixIcon: "search",
+          focus: true,
+          placeholder: "请输入内容",
+          modelValue: hValue.value
+        }),
+        l: common_vendor.o(toClose),
+        m: common_vendor.sr(inputDialog, "1cf27b2a-4", {
           "k": "inputDialog"
         }),
-        f: common_vendor.p({
+        n: common_vendor.p({
           ["is-mask-click"]: false
         })
       };
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.json b/unpackage/dist/dev/mp-weixin/pages/index/index.json
index f7cd24c..c044358 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.json
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.json
@@ -3,6 +3,8 @@
   "usingComponents": {
     "uni-icons": "../../uni_modules/uni-icons/components/uni-icons/uni-icons",
     "uni-popup": "../../uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "uni-datetime-picker": "../../uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker",
+    "uni-easyinput": "../../uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
     "my-swiper": "../../components/mySwiper"
   }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
index 927fc81..d932a8b 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
@@ -1 +1 @@
-<view class="content page-box data-v-1cf27b2a"><my-swiper wx:if="{{a}}" class="index-siwper margin-b-card data-v-1cf27b2a" style="width:100%" u-i="1cf27b2a-0" bind:__l="__l" u-p="{{a}}"/><view class="main-cards data-v-1cf27b2a"><view class="mc-part data-v-1cf27b2a" style="margin-left:0"><view class="mc-part-text data-v-1cf27b2a">已完成事项</view><image class="data-v-1cf27b2a" src="/static/done.png" mode="widthFix"></image></view><view class="mc-part mc-part2 data-v-1cf27b2a" style="margin-right:0"><view class="mc-part-text data-v-1cf27b2a">待完成事项</view><image class="data-v-1cf27b2a" style="transform:rotate(0deg)" src="/static/undone.png" mode="widthFix"></image></view></view><view class="attention-card data-v-1cf27b2a"><view class="part-title data-v-1cf27b2a"> 注意事项 </view><view class="ac-parts data-v-1cf27b2a"><view class="ac-part data-v-1cf27b2a" style="background:linear-gradient(45deg, #ffa2a2,#ffd3d3, #ffffff00)"> 术前注意事项 <uni-icons wx:if="{{b}}" class="data-v-1cf27b2a" u-i="1cf27b2a-1" bind:__l="__l" u-p="{{b}}"></uni-icons></view><view class="ac-part data-v-1cf27b2a" style="background:linear-gradient(45deg, #f9b275,#fff3e9, #ffffff00)"> 术中注意事项 <uni-icons wx:if="{{c}}" class="data-v-1cf27b2a" u-i="1cf27b2a-2" bind:__l="__l" u-p="{{c}}"></uni-icons></view><view class="ac-part data-v-1cf27b2a" style="background:linear-gradient(45deg, #8fdc8a,#fdfdfd, #ffffff00)"> 术后注意事项 <uni-icons wx:if="{{d}}" class="data-v-1cf27b2a" u-i="1cf27b2a-3" bind:__l="__l" u-p="{{d}}"></uni-icons></view></view></view><uni-popup wx:if="{{f}}" class="r data-v-1cf27b2a" u-s="{{['d']}}" u-r="inputDialog" u-i="1cf27b2a-4" bind:__l="__l" u-p="{{f}}"><view class="pop-box data-v-1cf27b2a"><view class="pb-title data-v-1cf27b2a">手术信息</view></view><view class="pop-close data-v-1cf27b2a"> 关闭 </view></uni-popup></view>
\ No newline at end of file
+<view class="content page-box data-v-1cf27b2a"><my-swiper wx:if="{{a}}" class="index-siwper margin-b-card data-v-1cf27b2a" style="width:100%" u-i="1cf27b2a-0" bind:__l="__l" u-p="{{a}}"/><view class="main-cards data-v-1cf27b2a"><view class="mc-part data-v-1cf27b2a" style="margin-left:0"><view class="mc-part-text data-v-1cf27b2a">已完成事项</view><image class="data-v-1cf27b2a" src="/static/done.png" mode="widthFix"></image></view><view class="mc-part mc-part2 data-v-1cf27b2a" style="margin-right:0"><view class="mc-part-text data-v-1cf27b2a">待完成事项</view><image class="data-v-1cf27b2a" style="transform:rotate(0deg)" src="/static/undone.png" mode="widthFix"></image></view></view><view class="attention-card data-v-1cf27b2a"><view class="part-title data-v-1cf27b2a"> 注意事项 </view><view class="ac-parts data-v-1cf27b2a"><view class="ac-part data-v-1cf27b2a" style="background:linear-gradient(45deg, #ffa2a2,#ffd3d3, #ffffff00)"> 术前注意事项 <uni-icons wx:if="{{b}}" class="data-v-1cf27b2a" u-i="1cf27b2a-1" bind:__l="__l" u-p="{{b}}"></uni-icons></view><view class="ac-part data-v-1cf27b2a" style="background:linear-gradient(45deg, #f9b275,#fff3e9, #ffffff00)"> 术中注意事项 <uni-icons wx:if="{{c}}" class="data-v-1cf27b2a" u-i="1cf27b2a-2" bind:__l="__l" u-p="{{c}}"></uni-icons></view><view class="ac-part data-v-1cf27b2a" style="background:linear-gradient(45deg, #8fdc8a,#fdfdfd, #ffffff00)"> 术后注意事项 <uni-icons wx:if="{{d}}" class="data-v-1cf27b2a" u-i="1cf27b2a-3" bind:__l="__l" u-p="{{d}}"></uni-icons></view></view></view><uni-popup wx:if="{{n}}" class="r data-v-1cf27b2a" u-s="{{['d']}}" u-r="inputDialog" u-i="1cf27b2a-4" bind:__l="__l" u-p="{{n}}"><view class="pop-box data-v-1cf27b2a"><view class="pb-title data-v-1cf27b2a">完善手术信息</view><view class="pb-content data-v-1cf27b2a"><view class="pb-item data-v-1cf27b2a"><view class="pb-item-left data-v-1cf27b2a">已经手术</view><view class="pb-item-right data-v-1cf27b2a"><radio-group class="data-v-1cf27b2a" bindchange="{{e}}"><label class="radio data-v-1cf27b2a"><radio class="data-v-1cf27b2a" value="1"/>是</label><label class="radio data-v-1cf27b2a"><radio class="data-v-1cf27b2a" value="0"/>否</label></radio-group></view></view><view class="pb-item data-v-1cf27b2a"><view class="pb-item-left data-v-1cf27b2a">手术时间</view><view class="pb-item-right data-v-1cf27b2a"><uni-datetime-picker wx:if="{{h}}" class="data-v-1cf27b2a" bindmaskClick="{{f}}" u-i="1cf27b2a-5,1cf27b2a-4" bind:__l="__l" bindupdateModelValue="{{g}}" u-p="{{h}}"></uni-datetime-picker></view></view><view class="pb-item data-v-1cf27b2a"><view class="pb-item-left data-v-1cf27b2a">医院名称</view><view class="pb-item-right data-v-1cf27b2a"><uni-easyinput wx:if="{{k}}" class="data-v-1cf27b2a" bindiconClick="{{i}}" u-i="1cf27b2a-6,1cf27b2a-4" bind:__l="__l" bindupdateModelValue="{{j}}" u-p="{{k}}"></uni-easyinput></view></view></view></view><view class="pop-close data-v-1cf27b2a" bindtap="{{l}}"> 关闭 </view></uni-popup></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
index 1b03592..1ebea22 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxss
@@ -23,6 +23,24 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.radio.data-v-1cf27b2a {
+  margin-right: 20rpx;
+}
+.pb-item.data-v-1cf27b2a {
+  display: flex;
+  align-items: center;
+  margin-bottom: 40rpx;
+}
+.pb-item .pb-item-left.data-v-1cf27b2a {
+  width: 30%;
+}
+.pb-item .pb-item-right.data-v-1cf27b2a {
+  margin-left: 10rpx;
+  width: 75%;
+}
+.data-v-1cf27b2a  .uni-popup__wrapper {
+  width: 100%;
+}
 .part-title.data-v-1cf27b2a {
   border-left: 10rpx solid #fe915d;
   padding-left: 20rpx;
@@ -82,6 +100,18 @@
 .pop-box.data-v-1cf27b2a {
   background-color: white;
   padding: 20rpx;
+  width: 80%;
+  margin: 0 auto;
+  border-radius: 20rpx;
+}
+.pop-box .pb-title.data-v-1cf27b2a {
+  text-align: center;
+  margin-bottom: 40rpx;
+}
+.pop-close.data-v-1cf27b2a {
+  text-align: center;
+  color: white;
+  margin-top: 20rpx;
 }
 .page-box.data-v-1cf27b2a {
   padding: 20rpx;
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.js b/unpackage/dist/dev/mp-weixin/pages/login/login.js
new file mode 100644
index 0000000..7b78532
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.js
@@ -0,0 +1,111 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+const store_index = require("../../store/index.js");
+const api_index = require("../../api/index.js");
+const utils_index = require("../../utils/index.js");
+require("../../api/request.js");
+require("../../config/index.js");
+if (!Array) {
+  const _easycom_uni_icons2 = common_vendor.resolveComponent("uni-icons");
+  _easycom_uni_icons2();
+}
+const _easycom_uni_icons = () => "../../uni_modules/uni-icons/components/uni-icons/uni-icons.js";
+if (!Math) {
+  _easycom_uni_icons();
+}
+const _sfc_main = {
+  __name: "login",
+  setup(__props) {
+    store_index.useStore();
+    common_vendor.onLoad(() => {
+    });
+    const avatarUrl = common_vendor.ref(null);
+    const nickname = common_vendor.ref("");
+    const res_form = common_vendor.ref(null);
+    common_vendor.watch(nickname, (v1, v2) => {
+      console.log("watch", v1);
+    });
+    function onChooseAvatar(e) {
+      avatarUrl.value = e.detail.avatarUrl;
+    }
+    function getPhoneNumber(e) {
+      getAccess_token({ code: e.detail.code });
+    }
+    async function getAccess_token(params = {}) {
+      const data = {
+        username: params.code,
+        //手机号按钮获取的code
+        type: "wechat_mini_app",
+        identity: "user",
+        password: "111",
+        avatarUrl: avatarUrl.value,
+        nickName: nickname.value
+      };
+      const res = await api_index.API.getToken(data);
+      if (res.code === 200) {
+        common_vendor.index.setStorageSync("avatarUrl", avatarUrl.value);
+        res_form.value = res.data;
+        res_form.value.access_token = "Bearer " + res.data.access_token;
+        let userId = res.data.userId;
+        common_vendor.index.setStorageSync("access_token", res_form.value.access_token);
+        wx_login(userId);
+      }
+    }
+    async function wx_login(userId) {
+      let res = await new Promise((resolve) => {
+        common_vendor.index.login({
+          provider: "weixin",
+          //使用微信登录
+          success: function(loginRes) {
+            resolve(loginRes);
+            console.log(loginRes, "微信登录返回信息");
+          }
+        });
+      });
+      let res2 = await api_index.API.wx_login({ code: res.code }, userId);
+      if (res2.code === 0) {
+        common_vendor.index.setStorageSync("userInfo", JSON.stringify(res_form.value));
+        utils_index.custom.uploadImage(avatarUrl.value, async (file) => {
+          avatarUrl.value = file.data.file.url;
+          common_vendor.index.setStorageSync("avatarUrl", file.data.file.url);
+          await updateFunc();
+          common_vendor.index.switchTab({
+            url: "/pages/user/index"
+          });
+        });
+      } else {
+        common_vendor.index.clearStorage();
+      }
+    }
+    async function updateFunc() {
+      let user_info = JSON.parse(common_vendor.index.getStorageSync("userInfo"));
+      user_info.avatar = avatarUrl.value;
+      user_info.id = user_info.userId;
+      return await api_index.API.userinfoUpdae(user_info);
+    }
+    function nameInput(e) {
+      nickname.value = e.detail.value;
+    }
+    return (_ctx, _cache) => {
+      return common_vendor.e({
+        a: avatarUrl.value
+      }, avatarUrl.value ? {
+        b: avatarUrl.value
+      } : {
+        c: common_vendor.p({
+          type: "person-filled",
+          color: "white",
+          size: "60"
+        })
+      }, {
+        d: common_vendor.o(onChooseAvatar),
+        e: common_vendor.o(nameInput),
+        f: nickname.value,
+        g: common_vendor.o(($event) => nickname.value = $event.detail.value),
+        h: common_vendor.o(getPhoneNumber)
+      });
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-e4e4508d"], ["__file", "F:/项目2023/视力表/vision-record/pages/login/login.vue"]]);
+wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.json b/unpackage/dist/dev/mp-weixin/pages/login/login.json
new file mode 100644
index 0000000..0ea6551
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.json
@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "登录",
+  "usingComponents": {
+    "uni-icons": "../../uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.wxml b/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
new file mode 100644
index 0000000..d6daa93
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
@@ -0,0 +1 @@
+<view class="loginBox page-box img-part card-part data-v-e4e4508d" style="text-align:center"><view class="base-info data-v-e4e4508d"><button class="avatar-wrapper data-v-e4e4508d" open-type="chooseAvatar" bindchooseavatar="{{d}}" style="border-radius:50%"><image wx:if="{{a}}" class="avatar data-v-e4e4508d" mode="aspectFill" src="{{b}}"></image><uni-icons wx:else class="data-v-e4e4508d" u-i="e4e4508d-0" bind:__l="__l" u-p="{{c||''}}"></uni-icons></button><input type="nickname" bindblur="{{e}}" class="weui-input data-v-e4e4508d" placeholder="请输入昵称" value="{{f}}" bindinput="{{g}}"/></view><view class="btn-part data-v-e4e4508d"><button class="buy-btn data-v-e4e4508d" open-type="getPhoneNumber" bindgetphonenumber="{{h}}">立即登录</button></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.wxss b/unpackage/dist/dev/mp-weixin/pages/login/login.wxss
new file mode 100644
index 0000000..86461c4
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.wxss
@@ -0,0 +1,75 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.base-info.data-v-e4e4508d {
+  padding: 50rpx 0;
+}
+
+/* pages/login/login.wxss */
+page.data-v-e4e4508d {
+  height: 100%;
+}
+.container.data-v-e4e4508d {
+  align-items: center;
+}
+.title.data-v-e4e4508d {
+  font-weight: bolder;
+  font-size: 40rpx;
+}
+.more-info.data-v-e4e4508d {
+  color: gray;
+  font-size: 24rpx;
+  margin-top: 1rem;
+}
+.buy-btn.data-v-e4e4508d {
+  display: inline-block;
+  margin-top: 1rem;
+  background-color: #26758d;
+  color: white;
+  border-radius: 50rpx;
+  font-weight: 200;
+  font-size: 24rpx;
+  width: 50%;
+  padding: 10rpx 0;
+}
+.title-part.data-v-e4e4508d {
+  text-align: center;
+}
+.avatar-wrapper.data-v-e4e4508d {
+  width: 160rpx !important;
+  height: 160rpx;
+  padding: 0px;
+  margin: 0 auto;
+  overflow: hidden;
+  margin-bottom: 40rpx;
+  background: #ececec;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.avatar.data-v-e4e4508d {
+  width: 160rpx;
+  height: 160rpx;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/user/index.js b/unpackage/dist/dev/mp-weixin/pages/user/index.js
index c892d6f..8fa3115 100644
--- a/unpackage/dist/dev/mp-weixin/pages/user/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/user/index.js
@@ -1,48 +1,41 @@
 "use strict";
 const common_vendor = require("../../common/vendor.js");
 const store_index = require("../../store/index.js");
-const api_index = require("../../api/index.js");
+const utils_index = require("../../utils/index.js");
+require("../../api/index.js");
 require("../../api/request.js");
 require("../../config/index.js");
 const _sfc_main = {
   __name: "index",
   setup(__props) {
     store_index.useStore();
-    function getPhoneNumber(e) {
-      console.log(e);
-      getAccess_token({ code: e.detail.code });
-    }
-    async function getAccess_token(params = {}) {
-      const data = {
-        username: params.code,
-        //手机号按钮获取的code
-        type: "wechat_mini_app",
-        identity: "user",
-        password: "111"
-      };
-      await api_index.API.getToken(data);
-      wx_login();
-    }
-    async function wx_login(token_res) {
-      let res = await new Promise((resolve) => {
-        common_vendor.index.login({
-          provider: "weixin",
-          //使用微信登录
-          success: function(loginRes) {
-            resolve(loginRes);
-            console.log(loginRes, "微信登录返回信息");
-          }
-        });
+    common_vendor.onShow(() => {
+      is_login.value = utils_index.custom.checkLogin();
+      if (is_login.value) {
+        userinfo.value = common_vendor.index.getStorageSync("userInfo");
+        avatar.value = common_vendor.index.getStorageSync("avatarUrl");
+        userinfo.value = JSON.parse(userinfo.value);
+      }
+    });
+    const avatar = common_vendor.ref("");
+    common_vendor.ref(null);
+    const is_login = common_vendor.ref(null);
+    const userinfo = common_vendor.ref(null);
+    function toLogin() {
+      common_vendor.index.navigateTo({
+        url: "/pages/login/login"
       });
-      let userId = "";
-      await api_index.API.wx_login({ code: res.code }, userId);
     }
     return (_ctx, _cache) => {
-      return {
-        a: common_vendor.o(getPhoneNumber)
-      };
+      return common_vendor.e({
+        a: is_login.value ? avatar.value : "../../static/avatar.png",
+        b: common_vendor.t(is_login.value ? userinfo.value.nickname : "未登录"),
+        c: !is_login.value
+      }, !is_login.value ? {
+        d: common_vendor.o(toLogin)
+      } : {});
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "F:/项目2023/视力表/vision-record/pages/user/index.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-79e6a490"], ["__file", "F:/项目2023/视力表/vision-record/pages/user/index.vue"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/user/index.wxml b/unpackage/dist/dev/mp-weixin/pages/user/index.wxml
index 40aea7f..2409198 100644
--- a/unpackage/dist/dev/mp-weixin/pages/user/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/user/index.wxml
@@ -1 +1 @@
-<view class="user-box page-box"><button class="submit-btn" open-type="getPhoneNumber" bindgetphonenumber="{{a}}"><text>登录</text></button></view>
\ No newline at end of file
+<view class="user-box page-box data-v-79e6a490"><view class="userinfo-box data-v-79e6a490"><image class="data-v-79e6a490" src="{{a}}" mode=""></image><view class=" data-v-79e6a490">{{b}}</view></view><view wx:if="{{c}}" class="btn-box data-v-79e6a490" bindtap="{{d}}"><view class="btn data-v-79e6a490">登录</view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/user/index.wxss b/unpackage/dist/dev/mp-weixin/pages/user/index.wxss
index e69de29..12517e9 100644
--- a/unpackage/dist/dev/mp-weixin/pages/user/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/user/index.wxss
@@ -0,0 +1,51 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.btn-box.data-v-79e6a490 {
+  text-align: center;
+  margin-top: 40rpx;
+}
+.btn-box .btn.data-v-79e6a490 {
+  display: inline-block;
+  padding: 10px 20px;
+  background: #e2e2e2;
+  color: #26758d;
+  border-radius: 10px;
+  width: 50%;
+}
+.userinfo-box.data-v-79e6a490 {
+  color: white;
+  background-color: #26758d;
+  display: flex;
+  align-items: center;
+  padding: 40rpx 20rpx;
+}
+.userinfo-box image.data-v-79e6a490 {
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 50%;
+  background: white;
+  margin-right: 20rpx;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/static/avatar.png b/unpackage/dist/dev/mp-weixin/static/avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..c552c1fd953a5eb51ade2d075b94491ce143ff58
GIT binary patch
literal 7203
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

literal 0
HcmV?d00001

diff --git a/unpackage/dist/dev/mp-weixin/store/index.js b/unpackage/dist/dev/mp-weixin/store/index.js
index f9bbc82..cec017e 100644
--- a/unpackage/dist/dev/mp-weixin/store/index.js
+++ b/unpackage/dist/dev/mp-weixin/store/index.js
@@ -59,7 +59,6 @@ const useStore = common_vendor.defineStore("main2", {
       if (access_token) {
         this.access_token = access_token;
         this.isLogin = true;
-        this.getUserInfo();
       }
     },
     async getUserInfo() {
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.js
new file mode 100644
index 0000000..f4720e5
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.js
@@ -0,0 +1,58 @@
+"use strict";
+const common_vendor = require("../../../../common/vendor.js");
+const _sfc_main = {
+  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);
+    }
+  }
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: $props.selected && $props.weeks.extraInfo
+  }, $props.selected && $props.weeks.extraInfo ? {} : {}, {
+    b: common_vendor.t($props.weeks.date),
+    c: $props.calendar.fullDate === $props.weeks.fullDate && ($props.calendar.userChecked || !$props.checkHover) ? 1 : "",
+    d: $props.checkHover ? 1 : "",
+    e: $props.weeks.beforeMultiple ? 1 : "",
+    f: $props.weeks.multiple ? 1 : "",
+    g: $props.weeks.afterMultiple ? 1 : "",
+    h: $props.weeks.disable ? 1 : "",
+    i: $props.weeks.isToday ? 1 : "",
+    j: $props.weeks.disable ? 1 : "",
+    k: $props.weeks.beforeMultiple ? 1 : "",
+    l: $props.weeks.multiple ? 1 : "",
+    m: $props.weeks.afterMultiple ? 1 : "",
+    n: common_vendor.o(($event) => $options.choiceDate($props.weeks)),
+    o: common_vendor.o(($event) => $options.handleMousemove($props.weeks))
+  });
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "F:/项目2023/视力表/vision-record/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.json b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.wxml
new file mode 100644
index 0000000..3057b99
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.wxml
@@ -0,0 +1 @@
+<view class="{{['uni-calendar-item__weeks-box', j && 'uni-calendar-item--disable', k && 'uni-calendar-item--before-checked-x', l && 'uni-calendar-item--multiple', m && 'uni-calendar-item--after-checked-x']}}" bindtap="{{n}}" bindmouseenter="{{o}}"><view class="{{['uni-calendar-item__weeks-box-item', c && 'uni-calendar-item--checked', d && 'uni-calendar-item--checked-range-text', e && 'uni-calendar-item--before-checked', f && 'uni-calendar-item--multiple', g && 'uni-calendar-item--after-checked', h && 'uni-calendar-item--disable']}}"><text wx:if="{{a}}" 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">{{b}}</text></view><view class="{{[i && 'uni-calendar-item--today']}}"></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.wxss
new file mode 100644
index 0000000..7461b1b
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.wxss
@@ -0,0 +1,113 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.uni-calendar-item__weeks-box {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  margin: 1px 0;
+  position: relative;
+}
+.uni-calendar-item__weeks-box-text {
+  font-size: 14px;
+  font-weight: bold;
+  color: #001833;
+}
+.uni-calendar-item__weeks-box-item {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 40px;
+  height: 40px;
+}
+.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: #007aff;
+  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;
+}
+.uni-calendar-item--multiple .uni-calendar-item--before-checked,
+.uni-calendar-item--multiple .uni-calendar-item--after-checked {
+  background-color: #007aff;
+  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;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js
new file mode 100644
index 0000000..05aa1b3
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js
@@ -0,0 +1,597 @@
+"use strict";
+const uni_modules_uniDatetimePicker_components_uniDatetimePicker_util = require("./util.js");
+const common_vendor = require("../../../../common/vendor.js");
+const uni_modules_uniDatetimePicker_components_uniDatetimePicker_i18n_index = require("./i18n/index.js");
+const calendarItem = () => "./calendar-item.js";
+const timePicker = () => "./time-picker.js";
+const { t } = common_vendor.initVueI18n(uni_modules_uniDatetimePicker_components_uniDatetimePicker_i18n_index.i18nMessages);
+const _sfc_main = {
+  components: {
+    calendarItem,
+    timePicker
+  },
+  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) {
+      if (!this.cale) {
+        return;
+      }
+      this.cale.setStartDate(val);
+      this.cale.setDate(this.nowDate.fullDate);
+      this.weeks = this.cale.weeks;
+    },
+    endDate(val) {
+      if (!this.cale) {
+        return;
+      }
+      this.cale.setEndDate(val);
+      this.cale.setDate(this.nowDate.fullDate);
+      this.weeks = this.cale.weeks;
+    },
+    selected(newVal) {
+      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 {
+            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 uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.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;
+      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(/* @__PURE__ */ new Date());
+    },
+    bindDateChange(e) {
+      const value = e.detail.value + "-1";
+      this.setDate(value);
+    },
+    /**
+     * 初始化日期显示
+     * @param {Object} date
+     */
+    init(date) {
+      if (!this.cale) {
+        return;
+      }
+      this.cale.setDate(date || /* @__PURE__ */ new Date());
+      this.weeks = this.cale.weeks;
+      this.nowDate = this.cale.getInfo(date);
+      this.calendar = { ...this.nowDate };
+      if (!date) {
+        this.calendar.fullDate = "";
+        if (this.defaultValue && !this.range) {
+          const defaultDate = new Date(this.defaultValue);
+          const fullDate = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDate(defaultDate);
+          const year = defaultDate.getFullYear();
+          const month = defaultDate.getMonth() + 1;
+          const date2 = defaultDate.getDate();
+          const day = defaultDate.getDay();
+          this.calendar = {
+            fullDate,
+            year,
+            month,
+            date: date2,
+            day
+          }, this.tempSingleDate = fullDate;
+          this.time = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.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() {
+      if (!this.insert)
+        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(/* @__PURE__ */ new Date());
+          this.tempSingleDate = this.calendar.fullDate;
+        }
+        if (this.hasTime && !this.time) {
+          this.time = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getTime(/* @__PURE__ */ 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();
+    },
+    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);
+    }
+  }
+};
+if (!Array) {
+  const _component_calendar_item = common_vendor.resolveComponent("calendar-item");
+  const _component_time_picker = common_vendor.resolveComponent("time-picker");
+  const _easycom_uni_icons2 = common_vendor.resolveComponent("uni-icons");
+  (_component_calendar_item + _component_time_picker + _easycom_uni_icons2)();
+}
+const _easycom_uni_icons = () => "../../../uni-icons/components/uni-icons/uni-icons.js";
+if (!Math) {
+  _easycom_uni_icons();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: !$props.insert && $data.show
+  }, !$props.insert && $data.show ? {
+    b: $data.aniMaskShow ? 1 : "",
+    c: common_vendor.o((...args) => $options.maskClick && $options.maskClick(...args))
+  } : {}, {
+    d: $props.insert || $data.show
+  }, $props.insert || $data.show ? common_vendor.e({
+    e: common_vendor.o(($event) => $options.changeMonth("pre")),
+    f: common_vendor.t(($data.nowDate.year || "") + $options.yearText + ($data.nowDate.month || "") + $options.monthText),
+    g: $props.date,
+    h: common_vendor.o((...args) => $options.bindDateChange && $options.bindDateChange(...args)),
+    i: common_vendor.o(($event) => $options.changeMonth("next")),
+    j: !$props.insert
+  }, !$props.insert ? {
+    k: common_vendor.o((...args) => $options.close && $options.close(...args))
+  } : {}, {
+    l: !$props.insert ? 1 : "",
+    m: $props.showMonth
+  }, $props.showMonth ? {
+    n: common_vendor.t($data.nowDate.month)
+  } : {}, {
+    o: common_vendor.t($options.SUNText),
+    p: common_vendor.t($options.MONText),
+    q: common_vendor.t($options.TUEText),
+    r: common_vendor.t($options.WEDText),
+    s: common_vendor.t($options.THUText),
+    t: common_vendor.t($options.FRIText),
+    v: common_vendor.t($options.SATText),
+    w: common_vendor.f($data.weeks, (item, weekIndex, i0) => {
+      return {
+        a: common_vendor.f(item, (weeks, weeksIndex, i1) => {
+          return {
+            a: common_vendor.o($options.choiceDate, weeksIndex),
+            b: common_vendor.o($options.handleMouse, weeksIndex),
+            c: "691a75e6-0-" + i0 + "-" + i1,
+            d: common_vendor.p({
+              weeks,
+              calendar: $data.calendar,
+              selected: $props.selected,
+              checkHover: $props.range
+            }),
+            e: weeksIndex
+          };
+        }),
+        b: weekIndex
+      };
+    }),
+    x: !$props.insert && !$props.range && $props.hasTime
+  }, !$props.insert && !$props.range && $props.hasTime ? {
+    y: common_vendor.t($data.tempSingleDate ? $data.tempSingleDate : $options.selectDateText),
+    z: common_vendor.o(($event) => $data.time = $event),
+    A: common_vendor.p({
+      type: "time",
+      start: $options.timepickerStartTime,
+      end: $options.timepickerEndTime,
+      disabled: !$data.tempSingleDate,
+      border: false,
+      ["hide-second"]: $props.hideSecond,
+      modelValue: $data.time
+    })
+  } : {}, {
+    B: !$props.insert && $props.range && $props.hasTime
+  }, !$props.insert && $props.range && $props.hasTime ? {
+    C: common_vendor.t($data.tempRange.before ? $data.tempRange.before : $options.startDateText),
+    D: common_vendor.o(($event) => $data.timeRange.startTime = $event),
+    E: common_vendor.p({
+      type: "time",
+      start: $options.timepickerStartTime,
+      border: false,
+      ["hide-second"]: $props.hideSecond,
+      disabled: !$data.tempRange.before,
+      modelValue: $data.timeRange.startTime
+    }),
+    F: common_vendor.p({
+      type: "arrowthinright",
+      color: "#999"
+    }),
+    G: common_vendor.t($data.tempRange.after ? $data.tempRange.after : $options.endDateText),
+    H: common_vendor.o(($event) => $data.timeRange.endTime = $event),
+    I: common_vendor.p({
+      type: "time",
+      end: $options.timepickerEndTime,
+      border: false,
+      ["hide-second"]: $props.hideSecond,
+      disabled: !$data.tempRange.after,
+      modelValue: $data.timeRange.endTime
+    })
+  } : {}, {
+    J: !$props.insert
+  }, !$props.insert ? {
+    K: common_vendor.t($options.confirmText),
+    L: common_vendor.o((...args) => $options.confirm && $options.confirm(...args))
+  } : {}, {
+    M: !$props.insert ? 1 : "",
+    N: $data.aniMaskShow ? 1 : "",
+    O: $data.aniMaskShow ? 1 : ""
+  }) : {}, {
+    P: common_vendor.o((...args) => $options.leaveCale && $options.leaveCale(...args))
+  });
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "F:/项目2023/视力表/vision-record/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.json b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.json
new file mode 100644
index 0000000..e3b1a24
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.json
@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "calendar-item": "./calendar-item",
+    "time-picker": "./time-picker",
+    "uni-icons": "../../../uni-icons/components/uni-icons/uni-icons"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.wxml
new file mode 100644
index 0000000..a0bd35e
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.wxml
@@ -0,0 +1 @@
+<view class="uni-calendar" bindmouseleave="{{P}}"><view wx:if="{{a}}" class="{{['uni-calendar__mask', b && 'uni-calendar--mask-show']}}" bindtap="{{c}}"></view><view wx:if="{{d}}" class="{{['uni-calendar__content', M && 'uni-calendar--fixed', N && 'uni-calendar--ani-show', O && 'uni-calendar__content-mobile']}}"><view class="{{['uni-calendar__header', l && 'uni-calendar__header-mobile']}}"><view class="uni-calendar__header-btn-box" catchtap="{{e}}"><view class="uni-calendar__header-btn uni-calendar--left"></view></view><picker mode="date" value="{{g}}" fields="month" bindchange="{{h}}"><text class="uni-calendar__header-text">{{f}}</text></picker><view class="uni-calendar__header-btn-box" catchtap="{{i}}"><view class="uni-calendar__header-btn uni-calendar--right"></view></view><view wx:if="{{j}}" class="dialog-close" bindtap="{{k}}"><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 wx:if="{{m}}" class="uni-calendar__box-bg"><text class="uni-calendar__box-bg-text">{{n}}</text></view><view class="uni-calendar__weeks" style="padding-bottom:7px"><view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">{{o}}</text></view><view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">{{p}}</text></view><view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">{{q}}</text></view><view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">{{r}}</text></view><view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">{{s}}</text></view><view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">{{t}}</text></view><view class="uni-calendar__weeks-day"><text class="uni-calendar__weeks-day-text">{{v}}</text></view></view><view wx:for="{{w}}" wx:for-item="item" wx:key="b" class="uni-calendar__weeks"><view wx:for="{{item.a}}" wx:for-item="weeks" wx:key="e" class="uni-calendar__weeks-item"><calendar-item wx:if="{{weeks.d}}" class="uni-calendar-item--hook" bindchange="{{weeks.a}}" bindhandleMouse="{{weeks.b}}" u-i="{{weeks.c}}" bind:__l="__l" u-p="{{weeks.d}}"></calendar-item></view></view></view><view wx:if="{{x}}" class="uni-date-changed uni-calendar--fixed-top" style="padding:0 80px"><view class="uni-date-changed--time-date">{{y}}</view><time-picker wx:if="{{A}}" class="time-picker-style" u-i="691a75e6-1" bind:__l="__l" bindupdateModelValue="{{z}}" u-p="{{A}}"></time-picker></view><view wx:if="{{B}}" class="uni-date-changed uni-calendar--fixed-top"><view class="uni-date-changed--time-start"><view class="uni-date-changed--time-date">{{C}}</view><time-picker wx:if="{{E}}" class="time-picker-style" u-i="691a75e6-2" bind:__l="__l" bindupdateModelValue="{{D}}" u-p="{{E}}"></time-picker></view><view style="line-height:50px"><uni-icons wx:if="{{F}}" u-i="691a75e6-3" bind:__l="__l" u-p="{{F}}"></uni-icons></view><view class="uni-date-changed--time-end"><view class="uni-date-changed--time-date">{{G}}</view><time-picker wx:if="{{I}}" class="time-picker-style" u-i="691a75e6-4" bind:__l="__l" bindupdateModelValue="{{H}}" u-p="{{I}}"></time-picker></view></view><view wx:if="{{J}}" class="uni-date-changed uni-date-btn--ok"><view class="uni-datetime-picker--btn" bindtap="{{L}}">{{K}}</view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.wxss
new file mode 100644
index 0000000..573e1db
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.wxss
@@ -0,0 +1,251 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.uni-calendar {
+  display: flex;
+  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;
+  z-index: 99;
+}
+.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);
+  z-index: 99;
+}
+.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;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  height: 50px;
+}
+.uni-calendar__header-mobile {
+  padding: 10px;
+  padding-bottom: 0;
+}
+.uni-calendar--fixed-top {
+  display: flex;
+  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: #007aff;
+  letter-spacing: 3px;
+}
+.uni-calendar__header-btn-box {
+  display: flex;
+  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;
+  display: flex;
+  flex-direction: row;
+}
+.uni-calendar__weeks-item {
+  flex: 1;
+}
+.uni-calendar__weeks-day {
+  flex: 1;
+  display: flex;
+  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-bottom: 7px;
+}
+.uni-calendar__box-bg {
+  display: flex;
+  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;
+  line-height: 1;
+}
+.uni-date-changed {
+  padding: 0 10px;
+  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 {
+  display: flex;
+  align-items: center;
+}
+.uni-date-changed--time-end {
+  display: flex;
+  align-items: center;
+}
+.uni-date-changed--time-date {
+  color: #999;
+  line-height: 50px;
+  margin-right: 5px;
+}
+.time-picker-style {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.mr-10 {
+  margin-right: 10px;
+}
+.dialog-close {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  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: #007aff;
+  color: #fff;
+  font-size: 16px;
+  letter-spacing: 2px;
+}
+.uni-datetime-picker--btn:active {
+  opacity: 0.7;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
new file mode 100644
index 0000000..4c60647
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
@@ -0,0 +1,73 @@
+"use strict";
+const en = {
+  "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"
+};
+const zhHans = {
+  "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": "确认"
+};
+const zhHant = {
+  "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": "確認"
+};
+const i18nMessages = {
+  en,
+  "zh-Hans": zhHans,
+  "zh-Hant": zhHant
+};
+exports.i18nMessages = i18nMessages;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.js
new file mode 100644
index 0000000..23568aa
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.js
@@ -0,0 +1,696 @@
+"use strict";
+const common_vendor = require("../../../../common/vendor.js");
+const uni_modules_uniDatetimePicker_components_uniDatetimePicker_i18n_index = require("./i18n/index.js");
+const uni_modules_uniDatetimePicker_components_uniDatetimePicker_util = require("./util.js");
+const { t } = common_vendor.initVueI18n(uni_modules_uniDatetimePicker_components_uniDatetimePicker_i18n_index.i18nMessages);
+const _sfc_main = {
+  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
+    };
+  },
+  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: {
+    modelValue: {
+      handler(newVal) {
+        if (newVal) {
+          this.parseValue(uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.fixIosDateFormat(newVal));
+          this.initTime(false);
+        } else {
+          this.time = "";
+          this.parseValue(Date.now());
+        }
+      },
+      immediate: true
+    },
+    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(uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.fixIosDateFormat(newVal), "start");
+      },
+      immediate: true
+    },
+    end: {
+      handler(newVal) {
+        this.parseDatetimeRange(uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.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() {
+  },
+  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 = /* @__PURE__ */ 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);
+        }
+        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) {
+      return new Date(year, month, 0).getDate();
+    },
+    //兼容 iOS、safari 日期格式
+    fixIosDateFormat(value) {
+      if (typeof value === "string") {
+        value = value.replace(/-/g, "/");
+      }
+      return value;
+    },
+    /**
+     * 生成时间戳
+     * @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 = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.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();
+    }
+  }
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: common_vendor.t($data.time),
+    b: !$data.time
+  }, !$data.time ? {
+    c: common_vendor.t($options.selectTimeText)
+  } : {}, {
+    d: $props.disabled ? 1 : "",
+    e: $props.border ? 1 : "",
+    f: common_vendor.o((...args) => $options.initTimePicker && $options.initTimePicker(...args)),
+    g: $data.visible
+  }, $data.visible ? {
+    h: common_vendor.o((...args) => $options.tiggerTimePicker && $options.tiggerTimePicker(...args))
+  } : {}, {
+    i: $data.visible
+  }, $data.visible ? common_vendor.e({
+    j: common_vendor.t($options.selectTimeText),
+    k: $data.dateShow
+  }, $data.dateShow ? {
+    l: common_vendor.f($options.years, (item, index, i0) => {
+      return {
+        a: common_vendor.t($options.lessThanTen(item)),
+        b: index
+      };
+    }),
+    m: common_vendor.f($options.months, (item, index, i0) => {
+      return {
+        a: common_vendor.t($options.lessThanTen(item)),
+        b: index
+      };
+    }),
+    n: common_vendor.f($options.days, (item, index, i0) => {
+      return {
+        a: common_vendor.t($options.lessThanTen(item)),
+        b: index
+      };
+    }),
+    o: $data.indicatorStyle,
+    p: $options.ymd,
+    q: common_vendor.o((...args) => $options.bindDateChange && $options.bindDateChange(...args))
+  } : {}, {
+    r: $data.timeShow
+  }, $data.timeShow ? common_vendor.e({
+    s: common_vendor.f($options.hours, (item, index, i0) => {
+      return {
+        a: common_vendor.t($options.lessThanTen(item)),
+        b: index
+      };
+    }),
+    t: common_vendor.f($options.minutes, (item, index, i0) => {
+      return {
+        a: common_vendor.t($options.lessThanTen(item)),
+        b: index
+      };
+    }),
+    v: !$props.hideSecond
+  }, !$props.hideSecond ? {
+    w: common_vendor.f($options.seconds, (item, index, i0) => {
+      return {
+        a: common_vendor.t($options.lessThanTen(item)),
+        b: index
+      };
+    })
+  } : {}, {
+    x: common_vendor.n($props.hideSecond ? "time-hide-second" : ""),
+    y: $data.indicatorStyle,
+    z: $options.hms,
+    A: common_vendor.o((...args) => $options.bindTimeChange && $options.bindTimeChange(...args)),
+    B: common_vendor.n($props.hideSecond ? "sign-center" : "sign-left"),
+    C: !$props.hideSecond
+  }, !$props.hideSecond ? {} : {}) : {}, {
+    D: common_vendor.t($options.clearText),
+    E: common_vendor.o((...args) => $options.clearTime && $options.clearTime(...args)),
+    F: common_vendor.t($options.cancelText),
+    G: common_vendor.o((...args) => $options.tiggerTimePicker && $options.tiggerTimePicker(...args)),
+    H: common_vendor.t($options.okText),
+    I: common_vendor.o((...args) => $options.setTime && $options.setTime(...args)),
+    J: common_vendor.n($data.dateShow && $data.timeShow ? "" : "fix-nvue-height"),
+    K: common_vendor.s($data.fixNvueBug)
+  }) : {});
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "F:/项目2023/视力表/vision-record/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.json b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.wxml
new file mode 100644
index 0000000..d747813
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.wxml
@@ -0,0 +1 @@
+<view class="uni-datetime-picker"><view bindtap="{{f}}"><block wx:if="{{$slots.d}}"><slot></slot></block><block wx:else><view class="{{['uni-datetime-picker-timebox-pointer', d && 'uni-datetime-picker-disabled', e && 'uni-datetime-picker-timebox']}}"><text class="uni-datetime-picker-text">{{a}}</text><view wx:if="{{b}}" class="uni-datetime-picker-time"><text class="uni-datetime-picker-text">{{c}}</text></view></view></block></view><view wx:if="{{g}}" id="mask" class="uni-datetime-picker-mask" bindtap="{{h}}"></view><view wx:if="{{i}}" class="{{['uni-datetime-picker-popup', J]}}" style="{{K}}"><view class="uni-title"><text class="uni-datetime-picker-text">{{j}}</text></view><view wx:if="{{k}}" class="uni-datetime-picker__container-box"><picker-view class="uni-datetime-picker-view" indicator-style="{{o}}" value="{{p}}" bindchange="{{q}}"><picker-view-column><view wx:for="{{l}}" wx:for-item="item" wx:key="b" class="uni-datetime-picker-item"><text class="uni-datetime-picker-item">{{item.a}}</text></view></picker-view-column><picker-view-column><view wx:for="{{m}}" wx:for-item="item" wx:key="b" class="uni-datetime-picker-item"><text class="uni-datetime-picker-item">{{item.a}}</text></view></picker-view-column><picker-view-column><view wx:for="{{n}}" wx:for-item="item" wx:key="b" class="uni-datetime-picker-item"><text class="uni-datetime-picker-item">{{item.a}}</text></view></picker-view-column></picker-view><text class="uni-datetime-picker-sign sign-left">-</text><text class="uni-datetime-picker-sign sign-right">-</text></view><view wx:if="{{r}}" class="uni-datetime-picker__container-box"><picker-view class="{{['uni-datetime-picker-view', x]}}" indicator-style="{{y}}" value="{{z}}" bindchange="{{A}}"><picker-view-column><view wx:for="{{s}}" wx:for-item="item" wx:key="b" class="uni-datetime-picker-item"><text class="uni-datetime-picker-item">{{item.a}}</text></view></picker-view-column><picker-view-column><view wx:for="{{t}}" wx:for-item="item" wx:key="b" class="uni-datetime-picker-item"><text class="uni-datetime-picker-item">{{item.a}}</text></view></picker-view-column><picker-view-column wx:if="{{v}}"><view wx:for="{{w}}" wx:for-item="item" wx:key="b" class="uni-datetime-picker-item"><text class="uni-datetime-picker-item">{{item.a}}</text></view></picker-view-column></picker-view><text class="{{['uni-datetime-picker-sign', B]}}">:</text><text wx:if="{{C}}" class="uni-datetime-picker-sign sign-right">:</text></view><view class="uni-datetime-picker-btn"><view bindtap="{{E}}"><text class="uni-datetime-picker-btn-text">{{D}}</text></view><view class="uni-datetime-picker-btn-group"><view class="uni-datetime-picker-cancel" bindtap="{{G}}"><text class="uni-datetime-picker-btn-text">{{F}}</text></view><view bindtap="{{I}}"><text class="uni-datetime-picker-btn-text">{{H}}</text></view></view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.wxss
new file mode 100644
index 0000000..431c6e4
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.wxss
@@ -0,0 +1,127 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.uni-datetime-picker {
+  /* width: 100%; */
+}
+.uni-datetime-picker-view {
+  height: 130px;
+  width: 270px;
+  cursor: pointer;
+}
+.uni-datetime-picker-item {
+  height: 50px;
+  line-height: 50px;
+  text-align: center;
+  font-size: 14px;
+}
+.uni-datetime-picker-btn {
+  margin-top: 60px;
+  display: flex;
+  cursor: pointer;
+  flex-direction: row;
+  justify-content: space-between;
+}
+.uni-datetime-picker-btn-text {
+  font-size: 14px;
+  color: #007aff;
+}
+.uni-datetime-picker-btn-group {
+  display: flex;
+  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;
+  background-color: #fff;
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  transition-duration: 0.3s;
+  z-index: 999;
+}
+.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;
+  box-sizing: border-box;
+  cursor: pointer;
+}
+.uni-datetime-picker-timebox-pointer {
+  cursor: pointer;
+}
+.uni-datetime-picker-disabled {
+  opacity: 0.4;
+}
+.uni-datetime-picker-text {
+  font-size: 14px;
+  line-height: 50px;
+}
+.uni-datetime-picker-sign {
+  position: absolute;
+  top: 53px;
+  /* 减掉 10px 的元素高度，兼容nvue */
+  color: #999;
+}
+.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;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.js
new file mode 100644
index 0000000..832b398
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.js
@@ -0,0 +1,828 @@
+"use strict";
+const common_vendor = require("../../../../common/vendor.js");
+const uni_modules_uniDatetimePicker_components_uniDatetimePicker_i18n_index = require("./i18n/index.js");
+const uni_modules_uniDatetimePicker_components_uniDatetimePicker_util = require("./util.js");
+const Calendar = () => "./calendar.js";
+const TimePicker = () => "./time-picker.js";
+const _sfc_main = {
+  name: "UniDatetimePicker",
+  options: {
+    virtualHost: true
+  },
+  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;
+      }
+    },
+    modelValue: {
+      immediate: true,
+      handler(newVal) {
+        if (this.isEmitValue) {
+          this.isEmitValue = false;
+          return;
+        }
+        this.initPicker(newVal);
+      }
+    },
+    start: {
+      immediate: true,
+      handler(newVal) {
+        if (!newVal)
+          return;
+        this.calendarRange.startDate = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDate(newVal);
+        if (this.hasTime) {
+          this.calendarRange.startTime = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getTime(newVal);
+        }
+      }
+    },
+    end: {
+      immediate: true,
+      handler(newVal) {
+        if (!newVal)
+          return;
+        this.calendarRange.endDate = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDate(newVal);
+        if (this.hasTime) {
+          this.calendarRange.endTime = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.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() {
+      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 = common_vendor.initVueI18n(uni_modules_uniDatetimePicker_components_uniDatetimePicker_i18n_index.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 = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDate(newVal);
+          if (this.hasTime) {
+            this.pickerTime = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getTime(newVal, this.hideSecond);
+            this.displayValue = `${this.displayValue} ${this.pickerTime}`;
+          }
+        } else if (this.defaultValue) {
+          this.inputDate = this.calendarDate = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDate(this.defaultValue);
+          if (this.hasTime) {
+            this.pickerTime = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getTime(this.defaultValue, this.hideSecond);
+          }
+        }
+      } else {
+        const [before, after] = newVal;
+        if (!before && !after)
+          return;
+        const beforeDate = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDate(before);
+        const beforeTime = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getTime(before, this.hideSecond);
+        const afterDate = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDate(after);
+        const afterTime = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.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;
+      }
+      const { windowWidth } = common_vendor.index.getSystemInfoSync();
+      this.isPhone = windowWidth <= 500;
+      this.windowWidth = windowWidth;
+    },
+    show() {
+      if (this.disabled) {
+        return;
+      }
+      this.platform();
+      if (this.isPhone) {
+        setTimeout(() => {
+          this.$refs.mobile.open();
+        }, 0);
+        return;
+      }
+      this.pickerPositionStyle = {
+        top: "10px"
+      };
+      const dateEditor = common_vendor.index.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");
+            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 = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.fixIosDateFormat(date);
+      return Date.parse(new Date(date));
+    },
+    singleChange(e) {
+      this.calendarDate = this.inputDate = e.fulldate;
+      if (this.hasTime)
+        return;
+      this.confirmSingleChange();
+    },
+    confirmSingleChange() {
+      if (!uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.checkDate(this.inputDate)) {
+        const now = /* @__PURE__ */ new Date();
+        this.calendarDate = this.inputDate = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDate(now);
+        this.pickerTime = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getTime(now, this.hideSecond);
+      }
+      let startLaterInputDate = false;
+      let startDate, startTime;
+      if (this.start) {
+        let startString = this.start;
+        if (typeof this.start === "number") {
+          startString = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDateTime(this.start, this.hideSecond);
+        }
+        [startDate, startTime] = startString.split(" ");
+        if (this.start && !uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.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 = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDateTime(this.end, this.hideSecond);
+        }
+        [endDate, endTime] = endString.split(" ");
+        if (this.end && !uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.dateCompare(this.inputDate, endDate)) {
+          endEarlierInputDate = true;
+          this.inputDate = endDate;
+        }
+      }
+      if (this.hasTime) {
+        if (startLaterInputDate) {
+          this.pickerTime = startTime || uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDefaultSecond(this.hideSecond);
+        }
+        if (endEarlierInputDate) {
+          this.pickerTime = endTime || uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDefaultSecond(this.hideSecond);
+        }
+        if (!this.pickerTime) {
+          this.pickerTime = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.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);
+    },
+    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);
+    },
+    mobileChange(e) {
+      if (this.isRange) {
+        const { before, after } = e.range;
+        if (!before || !after) {
+          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.$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 (!uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.checkDate(this.tempRange.startDate)) {
+        this.tempRange.startDate = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDate(Date.now());
+      }
+      if (!uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.checkDate(this.tempRange.endDate)) {
+        this.tempRange.endDate = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDate(Date.now());
+      }
+      let start, end;
+      let startDateLaterRangeStartDate = false;
+      let startDateLaterRangeEndDate = false;
+      let startDate, startTime;
+      if (this.start) {
+        let startString = this.start;
+        if (typeof this.start === "number") {
+          startString = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDateTime(this.start, this.hideSecond);
+        }
+        [startDate, startTime] = startString.split(" ");
+        if (this.start && !uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.dateCompare(this.start, this.tempRange.startDate)) {
+          startDateLaterRangeStartDate = true;
+          this.tempRange.startDate = startDate;
+        }
+        if (this.start && !uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.dateCompare(this.start, this.tempRange.endDate)) {
+          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 = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDateTime(this.end, this.hideSecond);
+        }
+        [endDate, endTime] = endString.split(" ");
+        if (this.end && !uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.dateCompare(this.tempRange.startDate, this.end)) {
+          endDateEarlierRangeStartDate = true;
+          this.tempRange.startDate = endDate;
+        }
+        if (this.end && !uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.dateCompare(this.tempRange.endDate, 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 || uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDefaultSecond(this.hideSecond);
+        } else if (endDateEarlierRangeStartDate) {
+          this.tempRange.startTime = endTime || uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDefaultSecond(this.hideSecond);
+        }
+        if (!this.tempRange.startTime) {
+          this.tempRange.startTime = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getTime(Date.now(), this.hideSecond);
+        }
+        if (startDateLaterRangeEndDate) {
+          this.tempRange.endTime = startTime || uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDefaultSecond(this.hideSecond);
+        } else if (endDateEarlierRangeEndDate) {
+          this.tempRange.endTime = endTime || uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.getDefaultSecond(this.hideSecond);
+        }
+        if (!this.tempRange.endTime) {
+          this.tempRange.endTime = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.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 (!uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.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 && after))
+        return;
+      const type = temp ? "tempRange" : "range";
+      const isStartEarlierEnd = uni_modules_uniDatetimePicker_components_uniDatetimePicker_util.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 * 1e3);
+      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", []);
+        }
+      }
+    }
+  }
+};
+if (!Array) {
+  const _easycom_uni_icons2 = common_vendor.resolveComponent("uni-icons");
+  const _component_time_picker = common_vendor.resolveComponent("time-picker");
+  const _component_Calendar = common_vendor.resolveComponent("Calendar");
+  (_easycom_uni_icons2 + _component_time_picker + _component_Calendar)();
+}
+const _easycom_uni_icons = () => "../../../uni-icons/components/uni-icons/uni-icons.js";
+if (!Math) {
+  _easycom_uni_icons();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: !$data.isRange
+  }, !$data.isRange ? {
+    b: common_vendor.p({
+      type: "calendar",
+      color: "#c0c4cc",
+      size: "22"
+    }),
+    c: common_vendor.t($data.displayValue || $options.singlePlaceholderText)
+  } : {
+    d: common_vendor.p({
+      type: "calendar",
+      color: "#c0c4cc",
+      size: "22"
+    }),
+    e: common_vendor.t($data.displayRangeValue.startDate || $options.startPlaceholderText),
+    f: common_vendor.t($props.rangeSeparator),
+    g: common_vendor.t($data.displayRangeValue.endDate || $options.endPlaceholderText)
+  }, {
+    h: $options.showClearIcon
+  }, $options.showClearIcon ? {
+    i: common_vendor.p({
+      type: "clear",
+      color: "#c0c4cc",
+      size: "22"
+    }),
+    j: common_vendor.o((...args) => $options.clear && $options.clear(...args))
+  } : {}, {
+    k: $props.disabled ? 1 : "",
+    l: $props.border ? 1 : "",
+    m: common_vendor.o((...args) => $options.show && $options.show(...args)),
+    n: $data.pickerVisible,
+    o: common_vendor.o((...args) => $options.close && $options.close(...args)),
+    p: !$data.isPhone
+  }, !$data.isPhone ? common_vendor.e({
+    q: !$data.isRange
+  }, !$data.isRange ? common_vendor.e({
+    r: $data.hasTime
+  }, $data.hasTime ? {
+    s: $options.selectDateText,
+    t: $data.inputDate,
+    v: common_vendor.o(($event) => $data.inputDate = $event.detail.value),
+    w: $options.selectTimeText,
+    x: !$data.inputDate,
+    y: $data.pickerTime,
+    z: common_vendor.o(($event) => $data.pickerTime = $event.detail.value),
+    A: common_vendor.o(($event) => $data.pickerTime = $event),
+    B: common_vendor.p({
+      type: "time",
+      border: false,
+      disabled: !$data.inputDate,
+      start: $options.timepickerStartTime,
+      end: $options.timepickerEndTime,
+      hideSecond: $props.hideSecond,
+      modelValue: $data.pickerTime
+    })
+  } : {}, {
+    C: common_vendor.sr("pcSingle", "08def278-4"),
+    D: common_vendor.o($options.singleChange),
+    E: common_vendor.p({
+      showMonth: false,
+      ["start-date"]: $data.calendarRange.startDate,
+      ["end-date"]: $data.calendarRange.endDate,
+      date: $data.calendarDate,
+      ["default-value"]: $props.defaultValue
+    }),
+    F: $data.hasTime
+  }, $data.hasTime ? {
+    G: common_vendor.t($options.okText),
+    H: common_vendor.o((...args) => $options.confirmSingleChange && $options.confirmSingleChange(...args))
+  } : {}, {
+    I: common_vendor.s($data.pickerPositionStyle)
+  }) : common_vendor.e({
+    J: $data.hasTime
+  }, $data.hasTime ? {
+    K: $options.startDateText,
+    L: $data.tempRange.startDate,
+    M: common_vendor.o(($event) => $data.tempRange.startDate = $event.detail.value),
+    N: $options.startTimeText,
+    O: !$data.tempRange.startDate,
+    P: $data.tempRange.startTime,
+    Q: common_vendor.o(($event) => $data.tempRange.startTime = $event.detail.value),
+    R: common_vendor.o(($event) => $data.tempRange.startTime = $event),
+    S: common_vendor.p({
+      type: "time",
+      start: $options.timepickerStartTime,
+      border: false,
+      disabled: !$data.tempRange.startDate,
+      hideSecond: $props.hideSecond,
+      modelValue: $data.tempRange.startTime
+    }),
+    T: common_vendor.p({
+      type: "arrowthinright",
+      color: "#999"
+    }),
+    U: $options.endDateText,
+    V: $data.tempRange.endDate,
+    W: common_vendor.o(($event) => $data.tempRange.endDate = $event.detail.value),
+    X: $options.endTimeText,
+    Y: !$data.tempRange.endDate,
+    Z: $data.tempRange.endTime,
+    aa: common_vendor.o(($event) => $data.tempRange.endTime = $event.detail.value),
+    ab: common_vendor.o(($event) => $data.tempRange.endTime = $event),
+    ac: common_vendor.p({
+      type: "time",
+      end: $options.timepickerEndTime,
+      border: false,
+      disabled: !$data.tempRange.endDate,
+      hideSecond: $props.hideSecond,
+      modelValue: $data.tempRange.endTime
+    })
+  } : {}, {
+    ad: common_vendor.sr("left", "08def278-8"),
+    ae: common_vendor.o($options.leftChange),
+    af: common_vendor.o($options.updateRightCale),
+    ag: common_vendor.p({
+      showMonth: false,
+      ["start-date"]: $data.calendarRange.startDate,
+      ["end-date"]: $data.calendarRange.endDate,
+      range: true,
+      pleStatus: $data.endMultipleStatus
+    }),
+    ah: common_vendor.sr("right", "08def278-9"),
+    ai: common_vendor.o($options.rightChange),
+    aj: common_vendor.o($options.updateLeftCale),
+    ak: common_vendor.p({
+      showMonth: false,
+      ["start-date"]: $data.calendarRange.startDate,
+      ["end-date"]: $data.calendarRange.endDate,
+      range: true,
+      pleStatus: $data.startMultipleStatus
+    }),
+    al: $data.hasTime
+  }, $data.hasTime ? {
+    am: common_vendor.t($options.clearText),
+    an: common_vendor.o((...args) => $options.clear && $options.clear(...args)),
+    ao: common_vendor.t($options.okText),
+    ap: common_vendor.o((...args) => $options.confirmRangeChange && $options.confirmRangeChange(...args))
+  } : {}, {
+    aq: common_vendor.s($data.pickerPositionStyle)
+  }), {
+    ar: $data.pickerVisible
+  }) : {}, {
+    as: $data.isPhone
+  }, $data.isPhone ? {
+    at: common_vendor.sr("mobile", "08def278-10"),
+    av: common_vendor.o($options.mobileChange),
+    aw: common_vendor.o($options.close),
+    ax: common_vendor.p({
+      clearDate: false,
+      date: $data.calendarDate,
+      defTime: $options.mobileCalendarTime,
+      ["start-date"]: $data.calendarRange.startDate,
+      ["end-date"]: $data.calendarRange.endDate,
+      selectableTimes: $options.mobSelectableTime,
+      startPlaceholder: $props.startPlaceholder,
+      endPlaceholder: $props.endPlaceholder,
+      ["default-value"]: $props.defaultValue,
+      pleStatus: $data.endMultipleStatus,
+      showMonth: false,
+      range: $data.isRange,
+      hasTime: $data.hasTime,
+      insert: false,
+      hideSecond: $props.hideSecond
+    })
+  } : {});
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "F:/项目2023/视力表/vision-record/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.json b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.json
new file mode 100644
index 0000000..14c1a84
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.json
@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "calendar": "./calendar",
+    "time-picker": "./time-picker",
+    "uni-icons": "../../../uni-icons/components/uni-icons/uni-icons"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.wxml
new file mode 100644
index 0000000..46c0503
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.wxml
@@ -0,0 +1 @@
+<view class="uni-date"><view class="uni-date-editor" bindtap="{{m}}"><block wx:if="{{$slots.d}}"><slot></slot></block><block wx:else><view class="{{['uni-date-editor--x', k && 'uni-date-editor--x__disabled', l && 'uni-date-x--border']}}"><view wx:if="{{a}}" class="uni-date-x uni-date-single"><uni-icons wx:if="{{b}}" class="icon-calendar" u-i="08def278-0" bind:__l="__l" u-p="{{b}}"></uni-icons><view class="uni-date__x-input">{{c}}</view></view><view wx:else class="uni-date-x uni-date-range"><uni-icons wx:if="{{d}}" class="icon-calendar" u-i="08def278-1" bind:__l="__l" u-p="{{d}}"></uni-icons><view class="uni-date__x-input text-center">{{e}}</view><view class="range-separator">{{f}}</view><view class="uni-date__x-input text-center">{{g}}</view></view><view wx:if="{{h}}" class="uni-date__icon-clear" catchtap="{{j}}"><uni-icons wx:if="{{i}}" u-i="08def278-2" bind:__l="__l" u-p="{{i}}"></uni-icons></view></view></block></view><view hidden="{{!n}}" class="uni-date-mask--pc" bindtap="{{o}}"></view><view wx:if="{{p}}" hidden="{{!ar}}" ref="datePicker" class="uni-date-picker__container"><view wx:if="{{q}}" class="uni-date-single--x" style="{{I}}"><view class="uni-popper__arrow"></view><view wx:if="{{r}}" class="uni-date-changed popup-x-header"><input class="uni-date__input text-center" type="text" placeholder="{{s}}" value="{{t}}" bindinput="{{v}}"/><time-picker wx:if="{{B}}" u-s="{{['d']}}" style="width:100%" u-i="08def278-3" bind:__l="__l" bindupdateModelValue="{{A}}" u-p="{{B}}"><input class="uni-date__input text-center" type="text" placeholder="{{w}}" disabled="{{x}}" value="{{y}}" bindinput="{{z}}"/></time-picker></view><calendar wx:if="{{E}}" class="r" u-r="pcSingle" bindchange="{{D}}" style="padding:0 8px" u-i="08def278-4" bind:__l="__l" u-p="{{E}}"/><view wx:if="{{F}}" class="popup-x-footer"><text class="confirm-text" bindtap="{{H}}">{{G}}</text></view></view><view wx:else class="uni-date-range--x" style="{{aq}}"><view class="uni-popper__arrow"></view><view wx:if="{{J}}" class="popup-x-header uni-date-changed"><view class="popup-x-header--datetime"><input class="uni-date__input uni-date-range__input" type="text" placeholder="{{K}}" value="{{L}}" bindinput="{{M}}"/><time-picker wx:if="{{S}}" u-s="{{['d']}}" u-i="08def278-5" bind:__l="__l" bindupdateModelValue="{{R}}" u-p="{{S}}"><input class="uni-date__input uni-date-range__input" type="text" placeholder="{{N}}" disabled="{{O}}" value="{{P}}" bindinput="{{Q}}"/></time-picker></view><uni-icons wx:if="{{T}}" style="line-height:40px" u-i="08def278-6" bind:__l="__l" u-p="{{T}}"></uni-icons><view class="popup-x-header--datetime"><input class="uni-date__input uni-date-range__input" type="text" placeholder="{{U}}" value="{{V}}" bindinput="{{W}}"/><time-picker wx:if="{{ac}}" u-s="{{['d']}}" u-i="08def278-7" bind:__l="__l" bindupdateModelValue="{{ab}}" u-p="{{ac}}"><input class="uni-date__input uni-date-range__input" type="text" placeholder="{{X}}" disabled="{{Y}}" value="{{Z}}" bindinput="{{aa}}"/></time-picker></view></view><view class="popup-x-body"><calendar wx:if="{{ag}}" class="r" u-r="left" bindchange="{{ae}}" bindfirstEnterCale="{{af}}" style="padding:0 8px" u-i="08def278-8" bind:__l="__l" u-p="{{ag}}"/><calendar wx:if="{{ak}}" class="r" u-r="right" bindchange="{{ai}}" bindfirstEnterCale="{{aj}}" style="padding:0 8px;border-left:1px solid #F1F1F1" u-i="08def278-9" bind:__l="__l" u-p="{{ak}}"/></view><view wx:if="{{al}}" class="popup-x-footer"><text bindtap="{{an}}">{{am}}</text><text class="confirm-text" bindtap="{{ap}}">{{ao}}</text></view></view></view><calendar wx:if="{{as}}" class="r" u-r="mobile" bindconfirm="{{av}}" bindmaskClose="{{aw}}" u-i="08def278-10" bind:__l="__l" u-p="{{ax}}"/></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.wxss
new file mode 100644
index 0000000..7cbef14
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.wxss
@@ -0,0 +1,201 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.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;
+}
+.uni-date-x .icon-calendar {
+  padding-left: 3px;
+}
+.uni-date-x .range-separator {
+  height: 35px;
+  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;
+}
+.uni-date__x-input {
+  width: auto;
+  height: 35px;
+  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 {
+  display: flex;
+  flex-direction: row;
+}
+.popup-x-header--datetime {
+  display: flex;
+  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: #007aff;
+  cursor: pointer;
+  opacity: 0.8;
+}
+.popup-x-footer .confirm-text {
+  margin-left: 20px;
+  color: #007aff;
+}
+.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;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
new file mode 100644
index 0000000..2fcc6da
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
@@ -0,0 +1,406 @@
+"use strict";
+class Calendar {
+  constructor({
+    selected,
+    startDate,
+    endDate,
+    range
+  } = {}) {
+    this.date = this.getDateObj(/* @__PURE__ */ 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 ? dateObj.month - 1 : 12;
+      const year = month === 12 ? dateObj.year - 1 : dateObj.year;
+      const date = new Date(year, month, -i).getDate();
+      const fullDate = `${year}-${addZero(month)}-${addZero(date)}`;
+      let multiples = this.multipleStatus.data;
+      let multiplesStatus = -1;
+      if (this.range && multiples) {
+        multiplesStatus = multiples.findIndex((item) => {
+          return this.dateEqual(item, fullDate);
+        });
+      }
+      const checked = multiplesStatus !== -1;
+      const extraInfo = this.selected && this.selected.find((item) => {
+        if (this.dateEqual(fullDate, item.date)) {
+          return item;
+        }
+      });
+      result.push({
+        fullDate,
+        year,
+        month,
+        date,
+        multiple: this.range ? checked : false,
+        beforeMultiple: this.isLogicBefore(fullDate, this.multipleStatus.before, this.multipleStatus.after),
+        afterMultiple: this.isLogicAfter(fullDate, this.multipleStatus.before, this.multipleStatus.after),
+        disable: this.startDate && !dateCompare(this.startDate, fullDate) || this.endDate && !dateCompare(fullDate, this.endDate),
+        isToday: fullDate === this.date.fullDate,
+        userChecked: false,
+        extraInfo
+      });
+    }
+    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 extraInfo = this.selected && this.selected.find((item) => {
+        if (this.dateEqual(currentDate, item.date)) {
+          return item;
+        }
+      });
+      if (this.startDate) {
+        dateCompare(this.startDate, currentDate);
+      }
+      if (this.endDate) {
+        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,
+        month: dateObj.month,
+        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),
+        disable: this.startDate && !dateCompare(this.startDate, currentDate) || this.endDate && !dateCompare(currentDate, this.endDate),
+        isToday,
+        userChecked: false,
+        extraInfo
+      });
+    }
+    return result;
+  }
+  /**
+   * 获取下一个月日期集合
+   */
+  _getNextMonthDays(amount, dateObj) {
+    const result = [];
+    dateObj.month + 1;
+    for (let i = 1; i <= amount; i++) {
+      const month = dateObj.month === 12 ? 1 : dateObj.month * 1 + 1;
+      const year = month === 1 ? dateObj.year + 1 : dateObj.year;
+      const fullDate = `${year}-${addZero(month)}-${addZero(i)}`;
+      let multiples = this.multipleStatus.data;
+      let multiplesStatus = -1;
+      if (this.range && multiples) {
+        multiplesStatus = multiples.findIndex((item) => {
+          return this.dateEqual(item, fullDate);
+        });
+      }
+      const checked = multiplesStatus !== -1;
+      const extraInfo = this.selected && this.selected.find((item) => {
+        if (this.dateEqual(fullDate, item.date)) {
+          return item;
+        }
+      });
+      result.push({
+        fullDate,
+        year,
+        date: i,
+        month,
+        multiple: this.range ? checked : false,
+        beforeMultiple: this.isLogicBefore(fullDate, this.multipleStatus.before, this.multipleStatus.after),
+        afterMultiple: this.isLogicAfter(fullDate, this.multipleStatus.before, this.multipleStatus.after),
+        disable: this.startDate && !dateCompare(this.startDate, fullDate) || this.endDate && !dateCompare(fullDate, this.endDate),
+        isToday: fullDate === this.date.fullDate,
+        userChecked: false,
+        extraInfo
+      });
+    }
+    return result;
+  }
+  /**
+   * 获取当前日期详情
+   * @param {Object} date
+   */
+  getInfo(date) {
+    if (!date) {
+      date = /* @__PURE__ */ new Date();
+    }
+    return this.calendar.find((item) => item.fullDate === this.getDateObj(date).fullDate);
+  }
+  /**
+   * 比较时间是否相等
+   */
+  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 = /* @__PURE__ */ new Date();
+    db.setFullYear(ab[0], ab[1] - 1, ab[2]);
+    var de = /* @__PURE__ */ new Date();
+    de.setFullYear(ae[0], ae[1] - 1, ae[2]);
+    var unixDb = db.getTime() - 24 * 60 * 60 * 1e3;
+    var unixDe = de.getTime() - 24 * 60 * 60 * 1e3;
+    for (var k = unixDb; k <= unixDe; ) {
+      k = k + 24 * 60 * 60 * 1e3;
+      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.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) {
+    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);
+  }
+  /**
+   * 更新默认值多选状态
+   */
+  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);
+}
+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;
+}
+exports.Calendar = Calendar;
+exports.checkDate = checkDate;
+exports.dateCompare = dateCompare;
+exports.fixIosDateFormat = fixIosDateFormat;
+exports.getDate = getDate;
+exports.getDateTime = getDateTime;
+exports.getDefaultSecond = getDefaultSecond;
+exports.getTime = getTime;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js
new file mode 100644
index 0000000..0ca40d8
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js
@@ -0,0 +1,448 @@
+"use strict";
+const common_vendor = require("../../../../common/vendor.js");
+function obj2strClass(obj) {
+  let classess = "";
+  for (let key in obj) {
+    const val = obj[key];
+    if (val) {
+      classess += `${key} `;
+    }
+  }
+  return classess;
+}
+function obj2strStyle(obj) {
+  let style = "";
+  for (let key in obj) {
+    const val = obj[key];
+    style += `${key}:${val};`;
+  }
+  return style;
+}
+const _sfc_main = {
+  name: "uni-easyinput",
+  emits: ["click", "iconClick", "update:modelValue", "input", "focus", "blur", "confirm", "clear", "eyes", "change", "keyboardheightchange"],
+  model: {
+    prop: "modelValue",
+    event: "update:modelValue"
+  },
+  options: {
+    virtualHost: true
+  },
+  inject: {
+    form: {
+      from: "uniForm",
+      default: null
+    },
+    formItem: {
+      from: "uniFormItem",
+      default: null
+    }
+  },
+  props: {
+    name: String,
+    value: [Number, String],
+    modelValue: [Number, String],
+    type: {
+      type: String,
+      default: "text"
+    },
+    clearable: {
+      type: Boolean,
+      default: true
+    },
+    autoHeight: {
+      type: Boolean,
+      default: false
+    },
+    placeholder: {
+      type: String,
+      default: " "
+    },
+    placeholderStyle: String,
+    focus: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    maxlength: {
+      type: [Number, String],
+      default: 140
+    },
+    confirmType: {
+      type: String,
+      default: "done"
+    },
+    clearSize: {
+      type: [Number, String],
+      default: 24
+    },
+    inputBorder: {
+      type: Boolean,
+      default: true
+    },
+    prefixIcon: {
+      type: String,
+      default: ""
+    },
+    suffixIcon: {
+      type: String,
+      default: ""
+    },
+    trim: {
+      type: [Boolean, String],
+      default: false
+    },
+    cursorSpacing: {
+      type: Number,
+      default: 0
+    },
+    passwordIcon: {
+      type: Boolean,
+      default: true
+    },
+    primaryColor: {
+      type: String,
+      default: "#2979ff"
+    },
+    styles: {
+      type: Object,
+      default() {
+        return {
+          color: "#333",
+          backgroundColor: "#fff",
+          disableColor: "#F7F6F6",
+          borderColor: "#e5e5e5"
+        };
+      }
+    },
+    errorMessage: {
+      type: [String, Boolean],
+      default: ""
+    }
+  },
+  data() {
+    return {
+      focused: false,
+      val: "",
+      showMsg: "",
+      border: false,
+      isFirstBorder: false,
+      showClearIcon: false,
+      showPassword: false,
+      focusShow: false,
+      localMsg: "",
+      isEnter: false
+      // 用于判断当前是否是使用回车操作
+    };
+  },
+  computed: {
+    // 输入框内是否有值
+    isVal() {
+      const val = this.val;
+      if (val || val === 0) {
+        return true;
+      }
+      return false;
+    },
+    msg() {
+      return this.localMsg || this.errorMessage;
+    },
+    // 因为uniapp的input组件的maxlength组件必须要数值，这里转为数值，用户可以传入字符串数值
+    inputMaxlength() {
+      return Number(this.maxlength);
+    },
+    // 处理外层样式的style
+    boxStyle() {
+      return `color:${this.inputBorder && this.msg ? "#e43d33" : this.styles.color};`;
+    },
+    // input 内容的类和样式处理
+    inputContentClass() {
+      return obj2strClass({
+        "is-input-border": this.inputBorder,
+        "is-input-error-border": this.inputBorder && this.msg,
+        "is-textarea": this.type === "textarea",
+        "is-disabled": this.disabled,
+        "is-focused": this.focusShow
+      });
+    },
+    inputContentStyle() {
+      const focusColor = this.focusShow ? this.primaryColor : this.styles.borderColor;
+      const borderColor = this.inputBorder && this.msg ? "#dd524d" : focusColor;
+      return obj2strStyle({
+        "border-color": borderColor || "#e5e5e5",
+        "background-color": this.disabled ? this.styles.disableColor : this.styles.backgroundColor
+      });
+    },
+    // input右侧样式
+    inputStyle() {
+      const paddingRight = this.type === "password" || this.clearable || this.prefixIcon ? "" : "10px";
+      return obj2strStyle({
+        "padding-right": paddingRight,
+        "padding-left": this.prefixIcon ? "" : "10px"
+      });
+    }
+  },
+  watch: {
+    value(newVal) {
+      this.val = newVal;
+    },
+    modelValue(newVal) {
+      this.val = newVal;
+    },
+    focus(newVal) {
+      this.$nextTick(() => {
+        this.focused = this.focus;
+        this.focusShow = this.focus;
+      });
+    }
+  },
+  created() {
+    this.init();
+    if (this.form && this.formItem) {
+      this.$watch("formItem.errMsg", (newVal) => {
+        this.localMsg = newVal;
+      });
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.focused = this.focus;
+      this.focusShow = this.focus;
+    });
+  },
+  methods: {
+    /**
+     * 初始化变量值
+     */
+    init() {
+      if (this.value || this.value === 0) {
+        this.val = this.value;
+      } else if (this.modelValue || this.modelValue === 0 || this.modelValue === "") {
+        this.val = this.modelValue;
+      } else {
+        this.val = null;
+      }
+    },
+    /**
+     * 点击图标时触发
+     * @param {Object} type
+     */
+    onClickIcon(type) {
+      this.$emit("iconClick", type);
+    },
+    /**
+     * 显示隐藏内容，密码框时生效
+     */
+    onEyes() {
+      this.showPassword = !this.showPassword;
+      this.$emit("eyes", this.showPassword);
+    },
+    /**
+     * 输入时触发
+     * @param {Object} event
+     */
+    onInput(event) {
+      let value = event.detail.value;
+      if (this.trim) {
+        if (typeof this.trim === "boolean" && this.trim) {
+          value = this.trimStr(value);
+        }
+        if (typeof this.trim === "string") {
+          value = this.trimStr(value, this.trim);
+        }
+      }
+      if (this.errMsg)
+        this.errMsg = "";
+      this.val = value;
+      this.$emit("input", value);
+      this.$emit("update:modelValue", value);
+    },
+    /**
+     * 外部调用方法
+     * 获取焦点时触发
+     * @param {Object} event
+     */
+    onFocus() {
+      this.$nextTick(() => {
+        this.focused = true;
+      });
+      this.$emit("focus", null);
+    },
+    _Focus(event) {
+      this.focusShow = true;
+      this.$emit("focus", event);
+    },
+    /**
+     * 外部调用方法
+     * 失去焦点时触发
+     * @param {Object} event
+     */
+    onBlur() {
+      this.focused = false;
+      this.$emit("focus", null);
+    },
+    _Blur(event) {
+      event.detail.value;
+      this.focusShow = false;
+      this.$emit("blur", event);
+      if (this.isEnter === false) {
+        this.$emit("change", this.val);
+      }
+      if (this.form && this.formItem) {
+        const { validateTrigger } = this.form;
+        if (validateTrigger === "blur") {
+          this.formItem.onFieldChange();
+        }
+      }
+    },
+    /**
+     * 按下键盘的发送键
+     * @param {Object} e
+     */
+    onConfirm(e) {
+      this.$emit("confirm", this.val);
+      this.isEnter = true;
+      this.$emit("change", this.val);
+      this.$nextTick(() => {
+        this.isEnter = false;
+      });
+    },
+    /**
+     * 清理内容
+     * @param {Object} event
+     */
+    onClear(event) {
+      this.val = "";
+      this.$emit("input", "");
+      this.$emit("update:modelValue", "");
+      this.$emit("clear");
+    },
+    /**
+     * 键盘高度发生变化的时候触发此事件
+     * 兼容性：微信小程序2.7.0+、App 3.1.0+
+     * @param {Object} event
+     */
+    onkeyboardheightchange(event) {
+      this.$emit("keyboardheightchange", event);
+    },
+    /**
+     * 去除空格
+     */
+    trimStr(str, pos = "both") {
+      if (pos === "both") {
+        return str.trim();
+      } else if (pos === "left") {
+        return str.trimLeft();
+      } else if (pos === "right") {
+        return str.trimRight();
+      } else if (pos === "start") {
+        return str.trimStart();
+      } else if (pos === "end") {
+        return str.trimEnd();
+      } else if (pos === "all") {
+        return str.replace(/\s+/g, "");
+      } else if (pos === "none") {
+        return str;
+      }
+      return str;
+    }
+  }
+};
+if (!Array) {
+  const _easycom_uni_icons2 = common_vendor.resolveComponent("uni-icons");
+  _easycom_uni_icons2();
+}
+const _easycom_uni_icons = () => "../../../uni-icons/components/uni-icons/uni-icons.js";
+if (!Math) {
+  _easycom_uni_icons();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: $props.prefixIcon
+  }, $props.prefixIcon ? {
+    b: common_vendor.o(($event) => $options.onClickIcon("prefix")),
+    c: common_vendor.p({
+      type: $props.prefixIcon,
+      color: "#c0c4cc",
+      size: "22"
+    })
+  } : {}, {
+    d: $props.type === "textarea"
+  }, $props.type === "textarea" ? {
+    e: $props.inputBorder ? 1 : "",
+    f: $props.name,
+    g: $data.val,
+    h: $props.placeholder,
+    i: $props.placeholderStyle,
+    j: $props.disabled,
+    k: $options.inputMaxlength,
+    l: $data.focused,
+    m: $props.autoHeight,
+    n: $props.cursorSpacing,
+    o: common_vendor.o((...args) => $options.onInput && $options.onInput(...args)),
+    p: common_vendor.o((...args) => $options._Blur && $options._Blur(...args)),
+    q: common_vendor.o((...args) => $options._Focus && $options._Focus(...args)),
+    r: common_vendor.o((...args) => $options.onConfirm && $options.onConfirm(...args)),
+    s: common_vendor.o((...args) => $options.onkeyboardheightchange && $options.onkeyboardheightchange(...args))
+  } : {
+    t: $props.type === "password" ? "text" : $props.type,
+    v: common_vendor.s($options.inputStyle),
+    w: $props.name,
+    x: $data.val,
+    y: !$data.showPassword && $props.type === "password",
+    z: $props.placeholder,
+    A: $props.placeholderStyle,
+    B: $props.disabled,
+    C: $options.inputMaxlength,
+    D: $data.focused,
+    E: $props.confirmType,
+    F: $props.cursorSpacing,
+    G: common_vendor.o((...args) => $options._Focus && $options._Focus(...args)),
+    H: common_vendor.o((...args) => $options._Blur && $options._Blur(...args)),
+    I: common_vendor.o((...args) => $options.onInput && $options.onInput(...args)),
+    J: common_vendor.o((...args) => $options.onConfirm && $options.onConfirm(...args)),
+    K: common_vendor.o((...args) => $options.onkeyboardheightchange && $options.onkeyboardheightchange(...args))
+  }, {
+    L: $props.type === "password" && $props.passwordIcon
+  }, $props.type === "password" && $props.passwordIcon ? common_vendor.e({
+    M: $options.isVal
+  }, $options.isVal ? {
+    N: $props.type === "textarea" ? 1 : "",
+    O: common_vendor.o($options.onEyes),
+    P: common_vendor.p({
+      type: $data.showPassword ? "eye-slash-filled" : "eye-filled",
+      size: 22,
+      color: $data.focusShow ? $props.primaryColor : "#c0c4cc"
+    })
+  } : {}) : $props.suffixIcon ? common_vendor.e({
+    R: $props.suffixIcon
+  }, $props.suffixIcon ? {
+    S: common_vendor.o(($event) => $options.onClickIcon("suffix")),
+    T: common_vendor.p({
+      type: $props.suffixIcon,
+      color: "#c0c4cc",
+      size: "22"
+    })
+  } : {}) : common_vendor.e({
+    U: $props.clearable && $options.isVal && !$props.disabled && $props.type !== "textarea"
+  }, $props.clearable && $options.isVal && !$props.disabled && $props.type !== "textarea" ? {
+    V: $props.type === "textarea" ? 1 : "",
+    W: common_vendor.o($options.onClear),
+    X: common_vendor.p({
+      type: "clear",
+      size: $props.clearSize,
+      color: $options.msg ? "#dd524d" : $data.focusShow ? $props.primaryColor : "#c0c4cc"
+    })
+  } : {}), {
+    Q: $props.suffixIcon,
+    Y: common_vendor.n($options.inputContentClass),
+    Z: common_vendor.s($options.inputContentStyle),
+    aa: $options.msg ? 1 : "",
+    ab: common_vendor.s($options.boxStyle)
+  });
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "F:/项目2023/视力表/vision-record/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.json b/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.json
new file mode 100644
index 0000000..1e21d00
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uni-icons": "../../../uni-icons/components/uni-icons/uni-icons"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxml
new file mode 100644
index 0000000..961d6bd
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxml
@@ -0,0 +1 @@
+<view class="{{['uni-easyinput', aa && 'uni-easyinput-error']}}" style="{{ab}}"><view class="{{['uni-easyinput__content', Y]}}" style="{{Z}}"><uni-icons wx:if="{{a}}" class="content-clear-icon" bindclick="{{b}}" u-i="0ef993ec-0" bind:__l="__l" u-p="{{c}}"></uni-icons><textarea wx:if="{{d}}" class="{{['uni-easyinput__content-textarea', e && 'input-padding']}}" name="{{f}}" value="{{g}}" placeholder="{{h}}" placeholderStyle="{{i}}" disabled="{{j}}" placeholder-class="uni-easyinput__placeholder-class" maxlength="{{k}}" focus="{{l}}" autoHeight="{{m}}" cursor-spacing="{{n}}" bindinput="{{o}}" bindblur="{{p}}" bindfocus="{{q}}" bindconfirm="{{r}}" bindkeyboardheightchange="{{s}}"></textarea><block wx:else><input wx:if="{{r0}}" type="{{t}}" class="uni-easyinput__content-input" style="{{v}}" name="{{w}}" value="{{x}}" password="{{y}}" placeholder="{{z}}" placeholderStyle="{{A}}" placeholder-class="uni-easyinput__placeholder-class" disabled="{{B}}" maxlength="{{C}}" focus="{{D}}" confirmType="{{E}}" cursor-spacing="{{F}}" bindfocus="{{G}}" bindblur="{{H}}" bindinput="{{I}}" bindconfirm="{{J}}" bindkeyboardheightchange="{{K}}"/></block><block wx:if="{{L}}"><uni-icons wx:if="{{M}}" class="{{['content-clear-icon', N && 'is-textarea-icon']}}" bindclick="{{O}}" u-i="0ef993ec-1" bind:__l="__l" u-p="{{P}}"></uni-icons></block><block wx:elif="{{Q}}"><uni-icons wx:if="{{R}}" class="content-clear-icon" bindclick="{{S}}" u-i="0ef993ec-2" bind:__l="__l" u-p="{{T}}"></uni-icons></block><block wx:else><uni-icons wx:if="{{U}}" class="{{['content-clear-icon', V && 'is-textarea-icon']}}" bindclick="{{W}}" u-i="0ef993ec-3" bind:__l="__l" u-p="{{X}}"></uni-icons></block><slot name="right"></slot></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxss
new file mode 100644
index 0000000..1b947d4
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxss
@@ -0,0 +1,133 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.uni-easyinput {
+  width: 100%;
+  flex: 1;
+  position: relative;
+  text-align: left;
+  color: #333;
+  font-size: 14px;
+}
+.uni-easyinput__content {
+  flex: 1;
+  width: 100%;
+  display: flex;
+  box-sizing: border-box;
+  flex-direction: row;
+  align-items: center;
+  border-color: #fff;
+  transition-property: border-color;
+  transition-duration: 0.3s;
+}
+.uni-easyinput__content-input {
+  width: auto;
+  position: relative;
+  overflow: hidden;
+  flex: 1;
+  line-height: 1;
+  font-size: 14px;
+  height: 35px;
+}
+.uni-easyinput__placeholder-class {
+  color: #999;
+  font-size: 12px;
+}
+.is-textarea {
+  align-items: flex-start;
+}
+.is-textarea-icon {
+  margin-top: 5px;
+}
+.uni-easyinput__content-textarea {
+  position: relative;
+  overflow: hidden;
+  flex: 1;
+  line-height: 1.5;
+  font-size: 14px;
+  margin: 6px;
+  margin-left: 0;
+  height: 80px;
+  min-height: 80px;
+  min-height: 80px;
+  width: auto;
+}
+.input-padding {
+  padding-left: 10px;
+}
+.content-clear-icon {
+  padding: 0 5px;
+}
+.label-icon {
+  margin-right: 5px;
+  margin-top: -1px;
+}
+.is-input-border {
+  display: flex;
+  box-sizing: border-box;
+  flex-direction: row;
+  align-items: center;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+}
+.uni-error-message {
+  position: absolute;
+  bottom: -17px;
+  left: 0;
+  line-height: 12px;
+  color: #e43d33;
+  font-size: 12px;
+  text-align: left;
+}
+.uni-error-msg--boeder {
+  position: relative;
+  bottom: 0;
+  line-height: 22px;
+}
+.is-input-error-border {
+  border-color: #e43d33;
+}
+.is-input-error-border .uni-easyinput__placeholder-class {
+  color: #f29e99;
+}
+.uni-easyinput--border {
+  margin-bottom: 0;
+  padding: 10px 15px;
+  border-top: 1px #eee solid;
+}
+.uni-easyinput-error {
+  padding-bottom: 0;
+}
+.is-first-border {
+  border: none;
+}
+.is-disabled {
+  background-color: #f7f6f6;
+  color: #d5d5d5;
+}
+.is-disabled .uni-easyinput__placeholder-class {
+  color: #d5d5d5;
+  font-size: 12px;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/utils/index.js b/unpackage/dist/dev/mp-weixin/utils/index.js
new file mode 100644
index 0000000..68a5ab7
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/utils/index.js
@@ -0,0 +1,101 @@
+"use strict";
+const common_vendor = require("../common/vendor.js");
+const config_index = require("../config/index.js");
+const custom = {
+  // 控制字符长度
+  controlLength: (str, len = 10) => {
+    if (!str)
+      return "";
+    if (str.length > len)
+      return str.slice(0, len) + "...";
+    return str;
+  },
+  uploadFile: (chooseImageRes) => {
+    const tempFilePaths = chooseImageRes.tempFilePaths;
+    common_vendor.index.uploadFile({
+      url: `${config_index.config.baseUrl}/user/upload`,
+      filePath: tempFilePaths[0],
+      name: "file",
+      header: {
+        "Authorization": token,
+        "x-token": token
+      },
+      success: (res) => {
+        JSON.parse(res.data);
+      }
+    });
+  },
+  uploadImage: (img, callfunc) => {
+    const token2 = common_vendor.index.getStorageSync("access_token");
+    const tempFilePaths = img;
+    common_vendor.index.uploadFile({
+      url: `${config_index.config.baseUrl}/user/upload`,
+      filePath: tempFilePaths,
+      name: "file",
+      header: {
+        "Authorization": token2,
+        "x-token": token2,
+        "token": token2
+        // 'content-type': 'multipart/form-data',
+      },
+      success: (res) => {
+        var f_res = JSON.parse(res.data);
+        callfunc(f_res);
+      }
+    });
+  },
+  timestampToDate(stamp) {
+    var time = new Date(stamp);
+    var y = time.getFullYear();
+    var m = time.getMonth() + 1;
+    var d = time.getDate();
+    const date = `${y}-${m}-${d}`;
+    return date;
+  },
+  datatime(time) {
+    var myDate = /* @__PURE__ */ new Date();
+    myDate.setDate(myDate.getDate());
+    var dateArray = [];
+    var dateTemp;
+    var flag = 1;
+    for (var i = 0; i < time; i++) {
+      let month = 0;
+      if (myDate.getMonth() + 1 < 10) {
+        month = "0" + (myDate.getMonth() + 1);
+      } else {
+        month = myDate.getMonth() + 1;
+      }
+      let day = 0;
+      if (myDate.getDate() < 10) {
+        day = "0" + myDate.getDate();
+      } else {
+        day = myDate.getDate();
+      }
+      dateTemp = myDate.getFullYear() + "-" + month + "-" + day;
+      dateArray.push(dateTemp);
+      myDate.setDate(myDate.getDate() + flag);
+    }
+    return dateArray;
+  },
+  getDistances(lat1, lng1, lat2, lng2) {
+    let EARTH_RADIUS = 6378.137;
+    let radLat1 = lat1 * Math.PI / 180;
+    let radLat2 = lat2 * Math.PI / 180;
+    let a = radLat1 - radLat2;
+    let b = lng1 * Math.PI / 180 - lng2 * Math.PI / 180;
+    let s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)));
+    s = s * EARTH_RADIUS;
+    s = Math.round(s * 1e4) / 1e4;
+    return { m: s * 1e3, km: Number(s.toFixed(2)) };
+  },
+  checkLogin() {
+    let token2 = common_vendor.index.getStorageSync("access_token");
+    console.log(token2);
+    if (token2) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+};
+exports.custom = custom;
diff --git a/utils/index.js b/utils/index.js
index 4f17dc7..a81973a 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -9,12 +9,12 @@ export default {
 	uploadFile:(chooseImageRes) => {
 		const tempFilePaths = chooseImageRes.tempFilePaths;
 		uni.uploadFile({
-			url:`${config.baseUrl}/upload`,
+			url:`${config.baseUrl}/user/upload`,
 			filePath: tempFilePaths[0],
 			name: 'file',
 			header:{
-				'Authorization':token.value,
-				'x-token':token.value
+				'Authorization':token,
+				'x-token':token
 			},
 			success: (res) => {
 				var f_res = JSON.parse(res.data)
@@ -24,6 +24,30 @@ export default {
 			}
 		});
 	},
+	uploadImage:(img,callfunc) => {
+		const token = uni.getStorageSync('access_token')
+		// console.log('uploadImage:',img)
+		const tempFilePaths = img;
+		uni.uploadFile({
+			url:`${config.baseUrl}/user/upload`,
+			filePath: tempFilePaths,
+			name: 'file',
+			header:{
+				'Authorization':token,
+				'x-token':token,
+				'token':token,
+				// 'content-type': 'multipart/form-data',
+			},
+			success: (res) => {
+				var f_res = JSON.parse(res.data)
+				// console.log(f_res)
+				callfunc(f_res)
+				// if(f_res.code === 0){
+				// 	userInfo.value.avatar = f_res.data
+				// }
+			}
+		});
+	},
 	timestampToDate(stamp) { // 时间戳转日期
 	      var time = new Date(stamp);
 	      var y = time.getFullYear();
@@ -77,5 +101,15 @@ export default {
 		s = s * EARTH_RADIUS; 
 		s = Math.round(s * 10000) / 10000;// 输出为公里
 		return { m: s * 1000, km: Number(s.toFixed(2)) }
+	},
+	checkLogin(){
+	 let token = uni.getStorageSync('access_token')
+	 console.log(token)
+	 if(token){
+		 return true
+	 }
+	 else{
+		 return false
+	 }
 	}
 }
\ No newline at end of file