修改完成

common/config.js

@@ -3,7 +3,8 @@
  */
 
 const config = {
-	DEVE_URL: "http://localhost:8085",
+	// DEVE_URL: "http://192.168.101.15:8085",
+	DEVE_URL: "https://api.ndtk.site/api",
 	// PRODUCT_URL: "http://localhost:8085",
 	PRODUCT_URL: "https://api.ndtk.site/api",
 	IMG_URL: 'https://abinmalm.oss-cn-shenzhen.aliyuncs.com/icon/',

common/global.css

@@ -17,7 +17,7 @@ page {
 	box-sizing: border-box;
 }
 
-body,
+/* body,
 div,
 dl,
 dt,
@@ -53,7 +53,7 @@ footer,
 header,
 hgroup,
 menu,
-nav,
+nav, */
 section {
 	margin: 0;
 	padding: 0;

manifest.json

@@ -1,121 +1,121 @@
 {
-	"name": "hjmy-app",
-	"appid": "__UNI__68AB107",
-	"description": "",
-	"versionName": "1.0.1",
-	"versionCode": "100",
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {
-			"Bluetooth": {},
-			"Camera": {},
-			"VideoPlayer": {},
-			"Payment": {}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {
-				"dSYMs": false
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"payment": {},
-				"push": {
-					"unipush": {}
-				}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wx13733f809956c2c1",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true,
-		// 添加这一行
-		"requiredPrivateInfos": ["chooseAddress"]
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "3",
-	"h5": {
-		"title": "知己访客"
-	}
-}
+    "name" : "hjmy-app",
+    "appid" : "__UNI__68AB107",
+    "description" : "",
+    "versionName" : "1.0.1",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "Bluetooth" : {},
+            "Camera" : {},
+            "VideoPlayer" : {},
+            "Payment" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "dSYMs" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "payment" : {},
+                "push" : {
+                    "unipush" : {}
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx92248fd01a23c150",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        // 添加这一行
+        "requiredPrivateInfos" : [ "chooseAddress" ]
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "3",
+    "h5" : {
+        "title" : "知己访客"
+    }
+}

pages.json

@@ -68,6 +68,18 @@
 					"style": {
 						"navigationBarTitleText": "用户信息"
 					}
+				},
+				{
+					"path": "task/edit",
+					"style": {
+						"navigationBarTitleText": "申请访问"
+					}
+				},
+				{
+					"path": "task/detail",
+					"style": {
+						"navigationBarTitleText": "访客详情"
+					}
 				}
 			]
 		}

pages/index/index.vue

@@ -1,36 +1,58 @@
 <template>
+	
+	<!-- 我的任务 -->
 	<view class="container">
-		<!-- Visit list -->
-		<scroll-view scroll-y class="visit-list" @scrolltolower="onReachBottom">
-			<view class="visit-item" v-for="(item, index) in taskList" :key="index">
-				<view class="visit-date">
-					<text class="date-num">{{item.date}}</text>
-					<text class="date-month">{{item.year}}</text>
-				</view>
-				<view class="visit-content">
-					<view class="visit-header">
-						<view class="visitor-info">
-							<text class="visitor-label">对接人 </text>
-							<text class="visitor-name">{{item.visitorName}}</text>
+		<template v-if="!isLogin">
+			<!-- 未登录状态 -->
+			<view class="no-login">
+				<image src="/static/images/no-login.png" mode="aspectFit" class="no-login-image"></image>
+				<text class="no-login-text">登录后查看更多内容</text>
+				<button class="login-btn" @click="goToLogin">去登录</button>
+			</view>
+		</template>
+		<template v-else>
+			<!-- Visit list -->
+			<scroll-view scroll-y class="visit-list" @scrolltolower="onReachBottom">
+				<template v-if="taskList.length > 0">
+					<view class="visit-item" v-for="(item, index) in taskList" :key="index" @click="goToDetail(item)">
+						<view class="visit-date">
+							<text class="date-num">{{item.date}}</text>
+							<text class="date-month">{{item.year}}</text>
+						</view>
+						<view class="visit-content">
+							<view class="visit-header">
+								<view class="visitor-info">
+									<text class="visitor-label">对接人 </text>
+									<text class="visitor-name">{{item.employeeName}}</text>
+								</view>
+								<text class="visit-status" :class="getStatusClass(item.status)">{{item.status}}</text>
+							</view>
+							<view class="visit-desc">{{item.visitReason}}</view>
+							<view class="visit-time">
+								<u-icon name="clock" size="12" color="#999"></u-icon>
+								<text>{{item.time}}</text>
+							</view>
 						</view>
-						<text class="visit-status">{{item.status}}</text>
 					</view>
-					<view class="visit-desc">{{item.description}}</view>
-					<view class="visit-time">
-						<u-icon name="clock" size="12" color="#999"></u-icon>
-						<text>{{item.time}}</text>
+					<!-- Loading more -->
+					<u-loadmore :status="loadMoreStatus" />
+				</template>
+				<template v-else>
+					<!-- 暂无数据 -->
+					<view class="flex-items-plus">
+						<image src="../../static/images/empty.png" class="empty "></image>
 					</view>
-				</view>
-			</view>
-
-			<!-- Loading more -->
-			<u-loadmore :status="loadMoreStatus" />
-		</scroll-view>
+					<view class="font28 font-gray flex-items-plus">
+						数据为空
+					</view>
+				</template>
+			</scroll-view>
 
-		<!-- Floating button -->
-		<view class="floating-button" @click="showApplyPopup">
-			<text class="floating-text">申请<br>访问</text>
-		</view>
+			<!-- Floating button -->
+			<view class="floating-button" @click="showApplyPopup">
+				<text class="floating-text">申请<br>访问</text>
+			</view>
+		</template>
 
 		<!-- Application method popup -->
 		<uni-popup ref="popup" type="center" border-radius="16rpx">
@@ -61,10 +83,10 @@
 <script>
 	import {
 		orderList,
+		userLogin
 	} from '@/config/api.js';
 	import {
-		mapGetters,
-		mapActions
+		mapGetters
 	} from 'vuex';
 	import {
 		shareImg
@@ -138,7 +160,6 @@
 
 
 		methods: {
-			...mapActions(['setToken', 'setUserInfo']),
 
 			// Refresh list
 			refresh() {
@@ -170,24 +191,22 @@
 
 			// Handle apply method selection
 			handleApply(type) {
+				if (!this.isLogin) {
+					uni.navigateTo({
+						url: '/pagesA/public/login'
+					});
+					return
+				}
 				console.log('选择申请方式:', type);
 				this.$refs.popup.close()
 				if (type === 'self') {
-					uni.showToast({
-						title: '跳转到发起申请页面',
-						icon: 'none'
-					});
-					// uni.navigateTo({
-					// 	url: '/pagesA/public/visit-apply'
-					// })
+					uni.navigateTo({
+						url: '/pagesA/task/edit?type=1'
+					})
 				} else {
-					uni.showToast({
-						title: '跳转到代客申请页面',
-						icon: 'none'
-					});
-					// uni.navigateTo({
-					// 	url: '/pagesA/public/proxy-visit-apply'
-					// })
+					uni.navigateTo({
+						url: '/pagesA/task/edit?type=2'
+					})
 				}
 			},
 
@@ -226,7 +245,7 @@
 						const date = new Date();
 						date.setDate(date.getDate() - currentIndex); // 每条数据日期递减
 
-						const statusList = ['待审核', '已通过', '已拒绝'];
+						const statusList = ['待访问', '待审核', '已拒绝'];
 						const descList = [
 							'我是访问事由我是访问事由我是访问事由...',
 							'需要进行业务对接商谈...',
@@ -236,10 +255,10 @@
 
 						return {
 							id: currentIndex,
-							visitorName: `范海洋${currentIndex + 1}`,
+							employeeName: `范海洋${currentIndex + 1}`,
 							createTime: date,
 							status: statusList[Math.floor(Math.random() * statusList.length)],
-							description: descList[Math.floor(Math.random() * descList.length)]
+							visitReason: descList[Math.floor(Math.random() * descList.length)]
 						};
 					});
 
@@ -266,6 +285,30 @@
 				}, 500); // 增加500ms延迟模拟网络请求
 			},
 
+			// Get status class for styling
+			getStatusClass(status) {
+				const statusMap = {
+					'待访问': 'status-pending-visit',
+					'待审核': 'status-pending-review',
+					'已拒绝': 'status-rejected'
+				}
+				return statusMap[status] || 'status-default'
+			},
+
+			// 跳转到详情页面
+			goToDetail(item) {
+				uni.navigateTo({
+					url: `/pagesA/task/detail?id=${item.id}&status=${item.status}`
+				});
+			},
+
+			// 跳转到登录页面
+			goToLogin() {
+				uni.navigateTo({
+					url: '/pagesA/public/login'
+				});
+			},
+
 		},
 	}
 </script>
@@ -274,6 +317,39 @@
 	.container {
 		min-height: 100vh;
 		background-color: #f5f5f5;
+
+		.no-login {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			padding-top: 30vh;
+
+			.no-login-image {
+				width: 240rpx;
+				height: 240rpx;
+				margin-bottom: 40rpx;
+			}
+
+			.no-login-text {
+				font-size: 32rpx;
+				color: #999;
+				margin-bottom: 60rpx;
+			}
+
+			.login-btn {
+				width: 320rpx;
+				height: 88rpx;
+				background: #FF6B00;
+				border-radius: 44rpx;
+				color: #fff;
+				font-size: 32rpx;
+				font-weight: 500;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
 	}
 
 	.visit-list {
@@ -340,10 +416,23 @@
 
 			.visit-status {
 				font-size: 28rpx;
-				color: #4CAF50;
-				background-color: rgba(76, 175, 80, 0.1);
 				padding: 4rpx 12rpx;
 				border-radius: 12rpx;
+
+				&.status-pending-visit {
+					color: #4CAF50;
+					background-color: rgba(76, 175, 80, 0.1);
+				}
+
+				&.status-pending-review {
+					color: #2196F3;
+					background-color: rgba(33, 150, 243, 0.1);
+				}
+
+				&.status-rejected {
+					color: #F44336;
+					background-color: rgba(244, 67, 54, 0.1);
+				}
 			}
 		}
 

pages/tabbar/my.vue

@@ -1,4 +1,6 @@
 <template>
+	
+	<!-- 个人信息 -->
 	<view class="page-container">
 		<!-- 背景图片 -->
 
@@ -59,7 +61,6 @@
 		getOrderStatusCounts,
 	} from '../../config/api';
 	import {
-		mapMutations,
 		mapActions,
 		mapGetters
 	} from 'vuex';

pages/tabbar/visitor.vue

@@ -1,759 +1,330 @@
 <template>
-	<view :style="{ paddingTop: statusBarHeight + 'px' }" class="bg-white">
-		<view>
-			<!-- 新的头部搜索栏 -->
-			<view class="header-container">
-				<view class="search-container">
-					<view class="search-icon">
-						<uni-icons type="search" size="18" color="#666"></uni-icons>
-					</view>
-					<input class="search-input" type="text" placeholder="Search ROMIDO" @input="onInput"
-						@confirm="onSearch" />
-					<view class="barcode-icon">
-						<uni-icons type="scan" size="20" color="#666"></uni-icons>
-					</view>
-				</view>
-				<view class="cart-container">
-					<view class="message-icon" @tap="goChat">
-						<uni-icons type="chat-filled" size="25" color="#1351D8"></uni-icons>
-						<view class="unread-badge" v-if="unreadMessageCount > 0">{{unreadMessageCount}}</view>
-					</view>
-					<view class="cart-icon" @tap="goCart">
-						<uni-icons type="cart-filled" size="25" color="#1351D8"></uni-icons>
-						<view class="cart-badge" v-if="cartCount > 0">{{cartCount}}</view>
-					</view>
-				</view>
+	<!-- 访客记录 -->
+	<view class="container">
+		<template v-if="!isLogin">
+			<!-- 未登录状态 -->
+			<view class="no-login">
+				<image src="/static/images/no-login.png" mode="aspectFit" class="no-login-image"></image>
+				<text class="no-login-text">登录后查看更多内容</text>
+				<button class="login-btn" @click="goToLogin">去登录</button>
 			</view>
-
-			<view class="bg-index-image">
-				<swiper class="swiper" :indicator-dots="true" :autoplay="true" :interval="3000" :duration="500">
-					<!-- swiper-item组件，每个item代表一张轮播图 -->
-					<swiper-item v-for="(item, index) in bannerList" :key="index">
-						<image class="swiper-image" :src="item.image" mode="scaleToFill"></image>
-					</swiper-item>
-				</swiper>
-
-				<!-- 新品上市 -->
-				<view class="product-xinpin-bg">
-					<view class="product">
-						<view class="font-def pad-t-20 flex-sp-between flex-items">
-							<view class="mar-l-20 font32 font-bold">
-								New Arrivals
-							</view>
-							<view class="view-all" @click="goAll">
-								<text>View All</text>
-								<uni-icons type="right" size="14" color="#666"></uni-icons>
-							</view>
+		</template>
+		<template v-else>
+			<!-- Visit list -->
+			<scroll-view scroll-y class="visit-list" @scrolltolower="onReachBottom">
+				<template v-if="visitList.length > 0">
+					<view class="visit-item" v-for="(item, index) in visitList" :key="index" @click="goToDetail(item)">
+						<view class="visit-date">
+							<text class="date-num">{{item.date}}</text>
+							<text class="date-month">{{item.year}}</text>
 						</view>
-						<view class="xinpin">
-							<view class="new-product-module">
-								<!-- 商品列表 -->
-								<view class="product-list">
-									<view class="product-item" v-for="(product, index) in currentProductList"
-										:key="index" @click="detail(product.id)">
-										<!-- 商品图片 -->
-										<image :src=" product.images" mode="aspectFill" class="product-image">
-										</image>
-										<!-- 商品名称 -->
-										<view class="product-name">{{ product.name }}</view>
-										<!-- 商品价格 -->
-										<view class="product-price">￥{{ product.price }}</view>
-									</view>
-								</view>
-								<!-- 换一批按钮 -->
-
-								<view class="change-button" @click="changeProducts">
-									<view class="pad-r-10">
-										<uni-icons color="#007aff" type="refreshempty" size="18"></uni-icons>
-									</view>
-									<view>
-										refresh
-									</view>
+						<view class="visit-content">
+							<view class="visit-header">
+								<view class="visitor-info">
+									<text class="visitor-label">对接人 </text>
+									<text class="visitor-name">{{item.employeeName}}</text>
 								</view>
+								<text class="visit-status" :class="getStatusClass(item.status)">{{item.status}}</text>
 							</view>
-						</view>
-					</view>
-
-				</view>
-
-				<!-- 限时秒杀 -->
-				<!-- <view class="product-miaosha-bg">
-					<view class="product">
-						<view class="font-def pad-t-20 flex-sp-between flex-items">
-							<view class="mar-l-20 font32 font-bold">
-								限时秒杀
-							</view>
-							<view class="mar-r-20 font26" @click="goAll">
-									查看全部>
-							</view>
-						</view>
-						<view class="xinpin">
-							<view class="new-product-module">
-								<view class="product-list">
-									<view class="product-item"
-										v-for="(product, index) in indexProductList.killTimeProductList" :key="index"
-										@click="detail(product.id)" v-if="index<3">
-										<view class="product-image-container">
-											<image :src="product.images" mode="aspectFill" class="product-image">
-											</image>
-											<view class="countdown">{{ getCountdown(product.killTime) }}</view>
-										</view>
-										<view class="product-name">{{ product.name }}</view>
-										<view class="product-price">￥{{ product.price }}</view>
-										<view class="product-stock">剩余{{ product.stock }}件</view>
-									</view>
-								</view>
+							<view class="visit-desc">{{item.visitReason}}</view>
+							<view class="visit-time">
+								<u-icon name="clock" size="12" color="#999"></u-icon>
+								<text>{{item.time}}</text>
 							</view>
 						</view>
 					</view>
-				</view> -->
-
-				<!-- 更多商品 -->
-				<view class="product-gengduo-bg">
-					<view class="font-def pad-t-20 flex-sp-between flex-items">
-						<view class="mar-l-20 font32 font-bold">
-							More Products
-						</view>
-						<view class="view-all" @click="goAll">
-							<text>View All</text>
-							<uni-icons type="right" size="14" color="#666"></uni-icons>
-						</view>
+					<!-- Loading more -->
+					<u-loadmore :status="loadMoreStatus" />
+				</template>
+				<template v-else>
+					<!-- 暂无数据 -->
+					<view class="flex-items-plus">
+						<image src="../../static/images/empty.png" class="empty "></image>
 					</view>
-
-					<view class="goods-list-container">
-						<!-- 商品列表 -->
-						<view class="goods-list">
-							<view class="goods-item" v-for="(item, index) in goodsList" :key="index"
-								@tap="detail(item.id)">
-								<!-- 商品图片 -->
-								<image :src="item.images" mode="aspectFill" class="gd-goods-image"></image>
-								<!-- 商品详情 -->
-								<view class="goods-info">
-
-									<!-- 商品名称 -->
-									<view class="goods-name">{{ item.name }}</view>
-									<view class="flex-items">
-										<text>
-											{{item.productAvg}}
-										</text>
-										<uni-rate readonly allow-half :value="item.productAvg" />
-										<text class="commentCount">
-											({{item.commentCount}})
-										</text>
-									</view>
-									<!-- 商品价格 -->
-									<view class="goods-price">
-										￥{{ item.price }}
-										<text class="original-price"
-											v-if="item.originalPrice">￥{{ item.originalPrice }}</text>
-									</view>
-									<!-- 商品销量 -->
-									<view class="goods-sales">sales:{{ item.salesTotal }}</view>
-
-									<!-- 加号图标 -->
-									<!-- <view class="add-icon" @click.stop="handleAdd(item)">
-										<uni-icons color="#1BA4F0" type="plus-filled" size="30"></uni-icons>
-									</view> -->
-								</view>
-							</view>
-						</view>
-						<!-- 加载提示 -->
-						<view v-if="isLoading" class="loading-tip">加载中...</view>
-						<!-- 没有更多数据提示 -->
-						<view v-if="!isLoading && noMoreData" class="no-more-tip">——没有更多商品了——</view>
+					<view class="font28 font-gray flex-items-plus">
+						数据为空
 					</view>
-
-				</view>
-			</view>
-		</view>
+					<no-data text="暂无访问记录" mode="list"></no-data>
+				</template>
+			</scroll-view>
+		</template>
 	</view>
 </template>
 
 <script>
 	import {
-		carouselQueryAll,
-		getShopIndexList,
-		productList,
-		productCartCount,
-		unreadCount,
-		markMessagesRead
-	} from '@/config/api.js';
+		mapGetters
+	} from 'vuex';
 
 	export default {
 		data() {
 			return {
-				statusBarHeight: 0, // 状态栏高度
-				cartCount: 0, // 购物车数量
-				goodsList: [], // 商品列表
+				visitList: [],
+				loadMoreStatus: 'loadmore', // loadmore, loading, nomore
 				params: {
 					current: 1,
 					size: 10,
-					categoriesId: "",
-					name: "",
-					sort: "",
-					arrow: "",
 				},
-				isLoading: false, // 是否正在加载
-				noMoreData: false, // 是否没有更多数据
-				searchValue: "",
-				bannerList: [],
-				indexProductList: [],
-				currentIndex: 0, // 当前显示的商品起始索引
-				currentProductList: [], // 当前显示的商品列表
-				newProductList: [],
-				user: {},
-				unreadMessageCount: 0, // Added for unread message count
-				hasLoaded: false, // 标记页面是否已经加载过
+				hasMore: true
 			};
 		},
-		onLoad() {
-			// 获取状态栏高度
-			const systemInfo = uni.getSystemInfoSync();
-			this.statusBarHeight = systemInfo.statusBarHeight;
-			this.init();
-			// 获取购物车数量
-			this.getCartCount();
-			// 获取未读消息数量
-			this.getUnreadMessageCount();
+		computed: {
+			...mapGetters(['isLogin'])
 		},
-		onReachBottom() {
-			if (!this.isLoading && !this.noMoreData) {
-				this.loadGoods();
-			}
+		onLoad() {
+			this.getList();
 		},
-
 		onShow() {
-			// 每次显示页面时获取最新的购物车数量
-			// 只有不是首次加载时才更新未读消息数量（避免与onLoad重复调用）
-			if (this.hasLoaded) {
-				this.getCartCount();
-				this.getUnreadMessageCount();
-			} else {
-				this.hasLoaded = true;
-			}
+
+		},
+		onPullDownRefresh() {
+			this.refresh()
+			uni.stopPullDownRefresh();
 		},
 		methods: {
-			goCart() {
-				this.$route('/pages/shop/cart');
+			// Refresh list
+			refresh() {
+				this.visitList = []
+				this.params.current = 1
+				this.hasMore = true
+				this.loadMoreStatus = 'loadmore'
+				this.getList()
 			},
-			goChat() {
-				// 先将所有消息标记为已读
-				const userInfo = uni.getStorageSync("userInfo");
-				if (userInfo && userInfo.user_id) {
-					markMessagesRead({
-						userId: userInfo.user_id
-					}).then(res => {
-						// 标记成功后，将未读消息数量清零
-						if(res.success) {
-							this.unreadMessageCount = 0;
-						}
-					}).catch(err => {
-						console.error('标记消息已读失败:', err);
-					});
-				}
-				
-				// 然后跳转到聊天页面
-				this.$route('/pages/chat/index');
+
+			// Handle reaching bottom of scroll
+			onReachBottom() {
+				if (!this.hasMore || this.loadMoreStatus === 'loading') return
+
+				this.params.current++
+				this.getList(true)
 			},
-			// 获取购物车数量
-			getCartCount() {
-				productCartCount().then((res) => {
-					this.cartCount = res.data;
-				}).catch(err => {
-					console.error('获取购物车数量失败:', err);
-				});
+
+			// Get status class for styling
+			getStatusClass(status) {
+				const statusMap = {
+					'待访问': 'status-pending-visit',
+					'待审核': 'status-pending-review',
+					'已拒绝': 'status-rejected'
+				}
+				return statusMap[status] || 'status-default'
 			},
-			// 获取未读消息数量
-			getUnreadMessageCount() {
-				// 确保用户信息已加载
-				const userInfo = uni.getStorageSync("userInfo");
-				if (userInfo && userInfo.user_id) {
-					unreadCount({
-						userId: userInfo.user_id
-					}).then(res => {
-						this.unreadMessageCount = res.data;
-					}).catch(err => {
-						console.error('获取未读消息数量失败:', err);
+
+			// Get visit list with mock data
+			getList(loadMore = false) {
+				if (!loadMore) {
+					uni.showLoading({
+						title: '加载中...'
 					});
 				}
-			},
-			goBack() {
-				uni.navigateBack()
-			},
-			detail(id) {
-				this.$route('/packageShop/pages/detail/index?id=' + id)
-			},
-			onInput() {
 
-			},
-			onSearch() {
-				this.$route('/pages/order/search?type=1&searchKey=' + this.params.name);
-			},
-			goAll() {
-				this.$route('/pages/shop/product-type-list')
-			},
-			init() {
-				this.user = uni.getStorageInfoSync("userInfo")
-				this.getShufflingList();
-				this.getIndexList();
-				// 开启倒计时定时器
-				this.startCountdown();
-				this.loadGoods();
+				this.loadMoreStatus = 'loading'
+
+				// 模拟接口延迟
+				setTimeout(() => {
+					// 模拟数据
+					const mockData = Array(10).fill(0).map((_, index) => {
+						const currentIndex = (this.params.current - 1) * 10 + index;
+						const date = new Date();
+						date.setDate(date.getDate() - currentIndex); // 每条数据日期递减
+
+						const statusList = ['待访问', '待审核', '已拒绝'];
+						const contactPersons = ['范海洋', '张河嘉', '李明', '王芳'];
+						const descList = [
+							'我是访问事由我是访问事由我是访问事由...',
+							'需要进行业务对接商谈...',
+							'产品展示与技术交流...',
+							'项目合作洽谈...'
+						];
+
+						return {
+							id: currentIndex,
+							contactPerson: contactPersons[Math.floor(Math.random() * contactPersons
+								.length)],
+							createTime: date,
+							status: statusList[Math.floor(Math.random() * statusList.length)],
+							visitReason: descList[Math.floor(Math.random() * descList.length)]
+						};
+					});
 
-			},
-			async loadGoods() {
-				uni.showLoading({
-					title: '加载中...',
-					mask: true
-				});
-				this.isLoading = true;
-				try {
+					const list = mockData.map(item => ({
+						...item,
+						date: this.$u.timeFormat(item.createTime, 'DD'),
+						year: this.$u.timeFormat(item.createTime, 'YYYY/MM'),
+						time: this.$u.timeFormat(item.createTime, 'hh:mm')
+					}));
 
-					const response = await productList(this.params);
-					const newGoods = response.data.records;
-					if (newGoods.length === 0) {
-						this.noMoreData = true;
+					if (loadMore) {
+						this.visitList = [...this.visitList, ...list];
 					} else {
-						this.goodsList = this.goodsList.concat(newGoods);
-						this.params.current++;
+						this.visitList = list;
 					}
-				} catch (error) {
-					console.error('加载商品数据失败:', error);
-				} finally {
-					uni.hideLoading()
-					this.isLoading = false;
-				}
-			},
-
-			// 处理加号点击事件
-			handleAdd(item) {
-				console.log('点击了加号，商品信息:', item);
-				// 这里可以添加你需要的业务逻辑，比如添加到购物车等
-			},
-			// 开启倒计时定时器
-			startCountdown() {
-				setInterval(() => {
-					this.$forceUpdate(); // 强制更新组件，重新计算倒计时
-				}, 1000);
-			},
-			// 计算倒计时
-			getCountdown(endTime) {
-				const now = new Date().getTime();
-				const end = new Date(endTime).getTime();
-				const diff = end - now;
-
-				if (diff <= 0) {
-					return '已结束';
-				}
 
-				const days = Math.floor(diff / (1000 * 60 * 60 * 24));
-				const hours = Math.floor((diff % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
-				const minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60));
-				const seconds = Math.floor((diff % (1000 * 60)) / 1000);
+					// 模拟总共有5页数据
+					this.hasMore = this.params.current < 5;
+					this.loadMoreStatus = this.hasMore ? 'loadmore' : 'nomore';
 
-				if (days > 0) {
-					return `${days} 天 ${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
-				} else {
-					return `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
-				}
+					if (!loadMore) {
+						uni.hideLoading();
+					}
+				}, 500); // 增加500ms延迟模拟网络请求
 			},
-			getIndexList() {
 
-				getShopIndexList({
-					type: 2
-				}).then(res => {
-					this.indexProductList = res.data;
-					this.newProduct();
+			// 跳转到详情页面
+			goToDetail(item) {
+				uni.navigateTo({
+					url: `/pagesA/task/detail?id=${item.id}&status=${item.status}`
 				});
-
 			},
-			newProduct() {
-				this.currentProductList = this.indexProductList.newProductList.slice(this.currentIndex, this.currentIndex +
-					3);
-			},
-			// 换一批商品
-			changeProducts() {
-				if (this.currentIndex + 3 < this.indexProductList.newProductList.length) {
-					this.currentIndex += 3;
-				} else {
-					this.currentIndex = 0;
-				}
-				this.newProduct();
-			},
-			getShufflingList() {
-				carouselQueryAll().then(res => {
-					this.bannerList = res.data;
-					this.bannerList = this.bannerList.filter((item) => item.type == 2);
+
+			// 跳转到登录页面
+			goToLogin() {
+				uni.navigateTo({
+					url: '/pagesA/public/login'
 				});
 			},
 		}
 	};
 </script>
 
-<style>
-	.goods-list-container {
-		padding: 20rpx;
-	}
-
-	.goods-list {
-		display: flex;
-		flex-direction: column;
-	}
-
-	.goods-item {
-		width: 100%;
-		background-color: #fff;
-		border-radius: 16rpx;
-		margin-bottom: 20rpx;
-		padding: 20rpx;
-		box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.05);
-		position: relative;
-		box-sizing: border-box;
-		display: flex;
-	}
-
-	.gd-goods-image {
-		width: 240rpx;
-		height: 240rpx;
-		border-radius: 8rpx;
-		margin-right: 20rpx;
-		flex-shrink: 0;
-	}
-
-	.goods-info {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		padding-right: 40rpx;
-	}
-
-	.goods-name {
-		font-size: 28rpx;
-		color: #333;
-		margin-bottom: 10rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 2;
-		-webkit-box-orient: vertical;
-		line-height: 1.4;
-	}
-
-	.goods-price {
-		font-size: 36rpx;
-		color: #FF4B4B;
-		font-weight: bold;
-		margin: 10rpx 0;
-	}
-
-	.original-price {
-		font-size: 24rpx;
-		color: #999;
-		text-decoration: line-through;
-		margin-left: 10rpx;
-	}
-
-	.goods-tag {
-		display: inline-block;
-		background-color: #FFF5F5;
-		color: #FF4B4B;
-		font-size: 20rpx;
-		padding: 4rpx 12rpx;
-		border-radius: 6rpx;
-		margin-bottom: 10rpx;
-	}
-
-	.goods-sales {
-		font-size: 24rpx;
-		color: #999;
-		margin-top: auto;
-	}
-
-	.add-icon {
-		position: absolute;
-		bottom: 20rpx;
-		right: 20rpx;
-		width: 40rpx;
-		height: 40rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 32rpx;
-	}
-
-	.loading-tip {
-		text-align: center;
-		font-size: 24rpx;
-		color: #999;
-		margin: 20rpx 0;
-	}
+<style lang="scss" scoped>
+	.container {
+		min-height: 100vh;
+		background-color: #f5f5f5;
+
+		.no-login {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			padding-top: 30vh;
+
+			.no-login-image {
+				width: 240rpx;
+				height: 240rpx;
+				margin-bottom: 40rpx;
+			}
 
-	.no-more-tip {
-		text-align: center;
-		font-size: 24rpx;
-		color: #999;
-		margin: 20rpx 0;
-	}
+			.no-login-text {
+				font-size: 32rpx;
+				color: #999;
+				margin-bottom: 60rpx;
+			}
 
-	.product-image-container {
-		position: relative;
+			.login-btn {
+				width: 320rpx;
+				height: 88rpx;
+				background: #FF6B00;
+				border-radius: 44rpx;
+				color: #fff;
+				font-size: 32rpx;
+				font-weight: 500;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
 	}
 
-	.countdown {
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		background-color: red;
-		color: white;
-		text-align: center;
-		font-size: 24rpx;
-		padding: 5rpx;
+	.visit-list {
+		height: 100vh;
 	}
 
-	.new-product-module {
+	.visit-item {
 		background-color: #fff;
-		padding: 40rpx 40rpx 20rpx 40rpx;
-	}
-
-	.product-list {
-		display: flex;
-		justify-content: flex-start;
-		/* 修改为靠左对齐 */
-		flex-wrap: wrap;
-	}
-
-	.product-item {
-		width: calc((100% - 40rpx) / 3);
-		margin-bottom: 20rpx;
-		margin-right: 20rpx;
-		/* 添加右边距，使商品之间有间隔 */
-	}
-
-	/* 去除最后一个商品的右边距 */
-	.product-item:nth-child(3n) {
-		margin-right: 0;
-	}
-
-	.product-image {
-		width: 100%;
-		height: 200rpx;
-		border-radius: 8rpx;
-	}
-
-	.product-name {
-		font-size: 30rpx;
-		color: #333;
-		line-height: 32rpx;
-		height: 64rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 2;
-		-webkit-box-orient: vertical;
-		margin-top: 10rpx;
-	}
-
-	.product-price {
-		padding-top: 20rpx;
-		font-size: 30rpx;
-		color: #f60;
-	}
-
-	.product-stock {
-		color: #333333;
-		padding-top: 10rpx;
-		font-size: 26rpx;
-	}
-
-	.change-button {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 28rpx;
-		color: #007aff;
-		cursor: pointer;
-	}
-
-	.search-container {
-		flex: 1;
+		margin: 16rpx 20rpx;
+		border-radius: 16rpx;
+		padding: 24rpx;
 		display: flex;
-		align-items: center;
-		background-color: #F6F7F9;
-		border-radius: 40rpx;
-		padding: 8rpx 20rpx;
-		margin: 0 15rpx;
+		align-items: flex-start;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
 	}
 
-	.header-container {
+	.visit-date {
 		display: flex;
+		flex-direction: column;
 		align-items: center;
-		padding: 10rpx 20rpx 20rpx 20rpx;
-		background-color: #fff;
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		z-index: 100;
-		padding-top: v-bind('statusBarHeight + "px"');
-		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-	}
-
-	.back-button {
-		padding: 10rpx;
-		margin-right: 10rpx;
-	}
+		margin-right: 24rpx;
+		min-width: 80rpx;
+
+		.date-num {
+			font-size: 48rpx;
+			font-weight: bold;
+			color: #333;
+			line-height: 1;
+		}
 
-	.search-icon {
-		margin-right: 10rpx;
+		.date-month {
+			font-size: 24rpx;
+			color: #999;
+			margin-top: 4rpx;
+		}
 	}
 
-	.search-input {
+	.visit-content {
 		flex: 1;
-		height: 60rpx;
-		line-height: 60rpx;
-		font-size: 28rpx;
-		color: #333;
-		padding: 0 10rpx;
-	}
-
-	.barcode-icon {
-		margin-left: 10rpx;
-		padding: 5rpx;
-	}
 
-	.cart-container {
-		display: flex;
-		align-items: center;
-	}
-
-	.message-icon {
-		margin-right: 20rpx;
-		position: relative; /* 添加相对定位，以便角标可以相对于图标定位 */
-	}
-
-	.cart-icon {
-		position: relative;
-	}
-
-	.cart-badge {
-		position: absolute;
-		top: -10rpx;
-		right: -10rpx;
-		background-color: #FF4B4B;
-		color: #fff;
-		font-size: 20rpx;
-		padding: 2rpx 8rpx;
-		border-radius: 20rpx;
-		min-width: 28rpx;
-		height: 28rpx;
-		text-align: center;
-		line-height: 28rpx;
-	}
-
-	.unread-badge {
-		position: absolute;
-		top: -10rpx;
-		right: -10rpx;
-		background-color: #FF4B4B;
-		color: #fff;
-		font-size: 20rpx;
-		padding: 2rpx 8rpx;
-		border-radius: 20rpx;
-		min-width: 28rpx;
-		height: 28rpx;
-		text-align: center;
-		line-height: 28rpx;
-	}
-
-	.commentCount {
-		font-size: 28rpx;
-		color: #666;
-	}
-
-	.product-xinpin-bg {
-		position: absolute;
-		background: linear-gradient(to bottom, #f8f9fc, #ffffff);
-		top: 650rpx;
-		min-height: 100vh;
-		width: 100%;
-	}
-
-	.product-miaosha-bg {
-		position: absolute;
-		top: 1180rpx;
-		/* 调整位置：新品上市区域位置(650) + 预估高度(530) */
-		min-height: 100vh;
-		width: 100%;
-	}
-
-	.product-gengduo-bg {
-		position: absolute;
-		top: 1210rpx;
-		background: linear-gradient(to bottom, #f8f9fc, #ffffff);
-		min-height: 100vh;
-		width: 100%;
-	}
-
-	.xinpin {
-		margin: 20rpx;
-		background-color: #FFF;
-		border-radius: 16rpx;
-		box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.05);
-	}
+		.visit-header {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 12rpx;
+
+			.visitor-info {
+				display: flex;
+				align-items: center;
+
+				.visitor-label {
+					margin-right: 10rpx;
+					font-size: 32rpx;
+					color: #333;
+					font-weight: normal;
+				}
 
-	.product {
-		margin-top: 30rpx;
-		min-height: 100vh;
-		background: linear-gradient(to bottom, #f8f9fc, #ffffff);
-		border-radius: 40rpx;
-	}
+				.visitor-name {
+					font-size: 36rpx;
+					color: #333;
+					font-weight: bold;
+				}
+			}
 
-	.product-bg {
-		position: absolute;
-		background-color: white;
-		top: 500rpx;
-		min-height: 100vh;
-		width: 100%;
-	}
+			.visit-status {
+				font-size: 28rpx;
+				padding: 4rpx 12rpx;
+				border-radius: 12rpx;
 
-	.bg-index-image {
-		background: linear-gradient(to bottom, #f8f9fc, #ffffff);
-		background-size: cover;
-		height: 500rpx;
-		position: relative;
-		/* margin-top: v-bind('(statusBarHeight + 84) + "px"'); */
-	}
+				&.status-pending-visit {
+					color: #4CAF50;
+					background-color: rgba(76, 175, 80, 0.1);
+				}
 
-	.swiper {
-		width: 100%;
-		height: 550rpx;
-		position: absolute;
-		/* 设置为绝对定位 */
-		top: 106rpx;
-		/* 调整顶部距离 */
-	}
+				&.status-pending-review {
+					color: #2196F3;
+					background-color: rgba(33, 150, 243, 0.1);
+				}
 
-	.swiper-image {
-		width: 100%;
-		height: 100%;
-	}
+				&.status-rejected {
+					color: #F44336;
+					background-color: rgba(244, 67, 54, 0.1);
+				}
+			}
+		}
 
-	.message-icon,
-	.cart-icon {
-		color: #5C6B8A;
-	}
+		.visit-desc {
+			color: #666;
+			font-size: 28rpx;
+			line-height: 1.4;
+			margin-bottom: 12rpx;
+		}
 
-	.view-all {
-		display: flex;
-		align-items: center;
-		margin-right: 20rpx;
-		font-size: 26rpx;
-		color: #666;
-	}
+		.visit-time {
+			display: flex;
+			align-items: center;
+			gap: 8rpx;
 
-	.view-all text {
-		margin-right: 4rpx;
+			text {
+				color: #999;
+				font-size: 24rpx;
+			}
+		}
 	}
 </style>

pagesA/public/login.vue

@@ -1,5 +1,7 @@
 <template>
+	<!-- 手机登录界面+微信快捷登录 -->
 	<view class="login-page">
+
 		<!-- 状态栏占位 -->
 		<view class="status-bar"></view>
 
@@ -19,908 +21,911 @@
 
 		<!-- Logo和标题 -->
 		<view class="header">
-			<view class="logo-container">
-				<view class="logo-circle">
-					<image class="logo" src="/static/images/logo.png" mode="aspectFit"></image>
-				</view>
-				<view class="logo-shadow"></view>
-			</view>
-			<view class="title-section">
-				<text class="title">知己</text>
-				<view class="title-underline"></view>
+ <view class="logo-circle">
+				<image class="logo" src="/static/images/logo.png" mode="aspectFill"></image>
 			</view>
-			<text class="subtitle">访客记录软件</text>
+			
+		
+			<view class="logo-shadow"></view>
 		</view>
+		<view class="title-section">
+			<text class="title">知己</text>
+			<view class="title-underline"></view>
+		</view>
+		<text class="subtitle">访客记录软件</text>
+	</view>
 
-		<!-- 登录按钮 -->
-		<view class="login-section">
-			<view class="btn-container">
-				<button class="wechat-btn" @tap="handleWxLogin" :class="{ 'btn-loading': isLoading }">
-					<u-icon name="weixin-fill" size="20" color="#fff" style="margin-right: 12rpx;"></u-icon>
-					<text>授权快捷登录</text>
-				</button>
-			</view>
+	<!-- 登录按钮 -->
+	<view class="login-section">
+		<view class="btn-container">
+			<button class="wechat-btn" @tap="handleWxLogin" :class="{ 'btn-loading': isLoading }">
+				<u-icon name="weixin-fill" size="20" color="#fff" style="margin-right: 12rpx;"></u-icon>
+				<text>授权快捷登录</text>
+			</button>
+		</view>
 
-			<view class="divider">
-				<view class="divider-line"></view>
-				<text class="divider-text">或</text>
-				<view class="divider-line"></view>
-			</view>
+		<view class="divider">
+			<view class="divider-line"></view>
+			<text class="divider-text">或</text>
+			<view class="divider-line"></view>
+		</view>
 
-			<view class="btn-container">
-				<button class="phone-btn" @tap="handlePhoneLogin">
-					<u-icon name="phone" size="20" color="#e28669" style="margin-right: 12rpx;"></u-icon>
-					<text>手机号登录</text>
+		<view class="btn-container">
+			<button class="phone-btn" @tap="handlePhoneLogin">
+				<u-icon name="phone" size="20" color="#e28669" style="margin-right: 12rpx;"></u-icon>
+				<text>手机号登录</text>
 
-				</button>
-			</view>
+			</button>
+		</view>
 
-			<view class="btn-container">
-				<button class="browse-btn" @tap="handleBrowse">
-					<text>暂不登录，先去看看</text>
-				</button>
-			</view>
+		<view class="btn-container">
+			<button class="browse-btn" @tap="handleBrowse">
+				<text>暂不登录，先去看看</text>
+			</button>
+		</view>
 
-			<view class="agreement">
-				<view class="checkbox-wrapper" @tap="toggleAgreement">
-					<view class="zen-checkbox" :class="{ 'checked': isAgree }">
-						<view class="zen-circle-inner" v-if="isAgree"></view>
-					</view>
+		<view class="agreement">
+			<view class="checkbox-wrapper" @tap="toggleAgreement">
+				<view class="zen-checkbox" :class="{ 'checked': isAgree }">
+					<view class="zen-circle-inner" v-if="isAgree"></view>
 				</view>
-				<text class="agreement-text">
-					登录即代表您已同意
-					<text class="link" @tap="goToPrivacy">《隐私政策》</text>
-					和
-					<text class="link" @tap="goToService">《服务协议》</text>
-				</text>
 			</view>
+			<text class="agreement-text">
+				登录即代表您已同意
+				<text class="link" @tap="goToPrivacy">《隐私政策》</text>
+				和
+				<text class="link" @tap="goToService">《服务协议》</text>
+			</text>
 		</view>
+	</view>
 
-		<!-- 底部装饰 -->
-		<view class="bottom-decoration">
-			<view class="company-info">
-				<text class="company-name">知己访客记录系统</text>
-				<text class="version">v1.0.0</text>
-			</view>
+	<!-- 底部装饰 -->
+	<view class="bottom-decoration">
+		<view class="company-info">
+			<text class="company-name">知己访客记录系统</text>
+			<text class="version">v1.0.0</text>
 		</view>
+	</view>
 
-		<!-- 首次登录设置弹框 -->
-		<u-popup :show="showProfileModal">
-			<view class="profile-modal">
-				<view class="modal-header">
-					<text class="modal-title">完善个人信息</text>
-					<text class="modal-subtitle">请设置您的账号和头像</text>
-				</view>
+	<!-- 首次登录设置弹框 -->
+	<u-popup :show="showProfileModal">
+		<view class="profile-modal">
+			<view class="modal-header">
+				<text class="modal-title">完善个人信息</text>
+				<text class="modal-subtitle">请设置您的账号和头像</text>
+			</view>
 
-				<view class="modal-content">
-					<!-- 头像选择 -->
-					<view class="avatar-section">
-						<text class="section-label">头像</text>
-						<button class="avatar-button" open-type="chooseAvatar" @chooseavatar="onChooseAvatar"
-							:disabled="isUploadingAvatar">
-							<view class="avatar-container">
-								<image class="avatar-preview" :src="tempAvatar || '/static/images/avatar.png'"
-									mode="aspectFill"></image>
-								<view class="avatar-overlay">
-									<u-icon v-if="!isUploadingAvatar" name="camera" size="24" color="#fff"></u-icon>
-									<u-loading-icon v-else mode="spinner" size="24" color="#fff"></u-loading-icon>
-								</view>
+			<view class="modal-content">
+				<!-- 头像选择 -->
+				<view class="avatar-section">
+					<text class="section-label">头像</text>
+					<button class="avatar-button" open-type="chooseAvatar" @chooseavatar="onChooseAvatar"
+						:disabled="isUploadingAvatar">
+						<view class="avatar-container">
+							<image class="avatar-preview" :src="tempAvatar || '/static/images/avatar.png'"
+								mode="aspectFill"></image>
+							<view class="avatar-overlay">
+								<u-icon v-if="!isUploadingAvatar" name="camera" size="24" color="#fff"></u-icon>
+								<u-loading-icon v-else mode="spinner" size="24" color="#fff"></u-loading-icon>
 							</view>
-						</button>
-					</view>
-
-					<!-- 账号输入 -->
-					<view class="account-section">
-						<text class="section-label">用户名</text>
-						<u-input v-model="tempAccount" placeholder="请输入用户名" :maxlength="20" :clearable="true"
-							border="surround"></u-input>
-					</view>
+						</view>
+					</button>
 				</view>
 
-				<view class="modal-actions">
-					<button class="confirm-btn" @tap="confirmProfile"
-						:disabled="!tempAccount.trim() || isUploadingAvatar">
-						<text v-if="!isUploadingAvatar">确认</text>
-						<text v-else>头像上传中...</text>
-					</button>
+				<!-- 账号输入 -->
+				<view class="account-section">
+					<text class="section-label">用户名</text>
+					<u-input v-model="tempAccount" placeholder="请输入用户名" :maxlength="20" :clearable="true"
+						border="surround"></u-input>
 				</view>
 			</view>
-		</u-popup>
-	</view>
+
+			<view class="modal-actions">
+				<button class="confirm-btn" @tap="confirmProfile" :disabled="!tempAccount.trim() || isUploadingAvatar">
+					<text v-if="!isUploadingAvatar">确认</text>
+					<text v-else>头像上传中...</text>
+				</button>
+			</view>
+		</view>
+	</u-popup>
+
+
 </template>
 
 <script>
-	import {
-		wxLogin,
-		updateProfile
-	} from '@/config/api.js';
-	import {
-		UPLOAD_URL
-	} from '@/common/config.js';
-
-	export default {
-		data() {
-			return {
-				isAgree: false,
-				isLoading: false,
-				redirectUrl: '', // 登录成功后的重定向地址
-				showProfileModal: false, // 显示个人信息设置弹框
-				tempAccount: '', // 临时账号
-				tempAvatar: '', // 临时头像
-				loginData: null, // 临时保存登录数据
-				isUploadingAvatar: false // 头像上传状态
-			}
-		},
-		onLoad(options) {
-			// 获取重定向地址
-			if (options.redirect) {
-				this.redirectUrl = decodeURIComponent(options.redirect);
-			}
-		},
-		methods: {
-			// 处理微信登录
-			async handleWxLogin() {
-				if (!this.isAgree) {
-					let that = this
-					// 弹出确认弹框询问用户是否同意协议
-					uni.showModal({
-						title: '提示',
-						content: '登录需要您同意《隐私政策》和《服务协议》，是否同意？',
-						success: function(res) {
-							if (res.confirm) {
-								// 用户点击同意，自动勾选协议并执行登录
-								that.isAgree = true;
-								that.executeLogin();
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
+import {
+	wxLogin,
+	updateProfile
+} from '@/config/api.js';
+import {
+	UPLOAD_URL
+} from '@/common/config.js';
+
+export default {
+	data() {
+		return {
+			isAgree: false,
+			isLoading: false,
+			redirectUrl: '', // 登录成功后的重定向地址
+			showProfileModal: false, // 显示个人信息设置弹框
+			tempAccount: '', // 临时账号
+			tempAvatar: '', // 临时头像
+			loginData: null, // 临时保存登录数据
+			isUploadingAvatar: false // 头像上传状态
+		}
+	},
+	onLoad(options) {
+		// 获取重定向地址
+		if (options.redirect) {
+			this.redirectUrl = decodeURIComponent(options.redirect);
+		}
+	},
+	methods: {
+		// 处理微信登录
+		async handleWxLogin() {
+			if (!this.isAgree) {
+				let that = this
+				// 弹出确认弹框询问用户是否同意协议
+				uni.showModal({
+					title: '提示',
+					content: '登录需要您同意《隐私政策》和《服务协议》，是否同意？',
+					success: function (res) {
+						if (res.confirm) {
+							// 用户点击同意，自动勾选协议并执行登录
+							that.isAgree = true;
+							that.executeLogin();
+						} else if (res.cancel) {
+							console.log('用户点击取消');
 						}
-					});
+					}
+				});
 
-					return;
-				}
+				return;
+			}
 
-				this.executeLogin();
-			},
-
-			// 执行登录逻辑
-			async executeLogin() {
-				uni.showLoading({
-					mask: true
-				})
-				this.isLoading = true;
-
-				uni.getUserProfile({
-					desc: '用于完善会员资料',
-					success: (profileRes) => {
-						uni.login({
-							provider: 'weixin',
-							success: async (loginRes) => {
-								try {
-									const loginData = await wxLogin({
-										code: loginRes.code,
-										account: profileRes.userInfo.nickName,
-										avatarUrl: profileRes.userInfo.avatarUrl,
-										grant_type: 'wechat'
-									});
+			this.executeLogin();
+		},
 
-									if (loginData.code === 200) {
-										// 检查是否为首次登录
-										if (loginData.isFirstLogin) {
-											// 首次登录，显示个人信息设置弹框
-											this.loginData = loginData;
-											this.tempAccount = loginData.account || '';
-											this.tempAvatar = loginData.avatar || '';
-											this.showProfileModal = true;
-											this.isLoading = false;
-											uni.setStorageSync('access_token', loginData
-												.access_token);
-											uni.setStorageSync('refresh_token', loginData
-												.refresh_token);
-											uni.setStorageSync('user', loginData);
-
-											this.$store.commit('isLogin', true);
-											this.$store.commit('refresh_token', loginData
-												.refresh_token);
-											uni.hideLoading();
-										} else {
-											// 非首次登录，直接保存并跳转
-											this.saveLoginDataAndRedirect(loginData);
-										}
+		// 执行登录逻辑
+		async executeLogin() {
+			uni.showLoading({
+				mask: true
+			})
+			this.isLoading = true;
+
+			uni.getUserProfile({
+				desc: '用于完善会员资料',
+				success: (profileRes) => {
+					uni.login({
+						provider: 'weixin',
+						success: async (loginRes) => {
+							console.log('loginRes:', loginRes.code);
+
+							try {
+								const loginData = await wxLogin({
+									code: loginRes.code,
+									account: profileRes.userInfo.nickName,
+									avatarUrl: profileRes.userInfo.avatarUrl,
+									grant_type: 'wechat'
+								});
+
+								if (loginData.code === 200) {
+									// 检查是否为首次登录
+									if (loginData.isFirstLogin) {
+										// 首次登录，显示个人信息设置弹框
+										this.loginData = loginData;
+										this.tempAccount = loginData.account || '';
+										this.tempAvatar = loginData.avatar || '';
+										this.showProfileModal = true;
+										this.isLoading = false;
+										uni.setStorageSync('access_token', loginData
+											.access_token);
+										uni.setStorageSync('refresh_token', loginData
+											.refresh_token);
+										uni.setStorageSync('user', loginData);
+
+										this.$store.commit('isLogin', true);
+										this.$store.commit('refresh_token', loginData
+											.refresh_token);
+										uni.hideLoading();
 									} else {
-										uni.showToast({
-											title: loginData.msg || '登录失败',
-											icon: 'none'
-										});
+										// 非首次登录，直接保存并跳转
+										this.saveLoginDataAndRedirect(loginData);
 									}
-								} catch (e) {
-									console.error('登录错误:', e);
+								} else {
 									uni.showToast({
-										title: '登录失败，请重试',
+										title: loginData.msg || '登录失败',
 										icon: 'none'
 									});
-								} finally {
-									this.isLoading = false;
 								}
-							},
-							fail: () => {
+							} catch (e) {
+								console.error('登录错误:', e);
+								uni.showToast({
+									title: '登录失败，请重试',
+									icon: 'none'
+								});
+							} finally {
 								this.isLoading = false;
 							}
-						});
-					},
-					fail: (err) => {
-						this.isLoading = false;
-						if (err.errMsg.includes('cancel')) {
-							return; // 用户取消，不显示提示
+						},
+						fail: () => {
+							this.isLoading = false;
 						}
-						uni.showToast({
-							title: '获取用户信息失败',
-							icon: 'none'
-						});
+					});
+				},
+				fail: (err) => {
+					this.isLoading = false;
+					if (err.errMsg.includes('cancel')) {
+						return; // 用户取消，不显示提示
 					}
-				});
-			},
-
-			// 切换协议同意状态
-			toggleAgreement() {
-				this.isAgree = !this.isAgree;
-			},
-
-			// 返回上一页
-			goBack() {
-				uni.navigateBack();
-			},
-
-			// 跳转到隐私政策
-			goToPrivacy() {
-				uni.navigateTo({
-					url: '/pagesA/public/richtext'
-				});
-			},
+					uni.showToast({
+						title: '获取用户信息失败',
+						icon: 'none'
+					});
+				}
+			});
+		},
 
-			// 跳转到服务协议
-			goToService() {
-				uni.navigateTo({
-					url: '/pagesA/public/richtext'
-				});
-			},
+		// 切换协议同意状态
+		toggleAgreement() {
+			this.isAgree = !this.isAgree;
+		},
 
-			handleBrowse() {
-				// 直接返回首页
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-			},
+		// 返回上一页
+		goBack() {
+			uni.navigateBack();
+		},
 
-			// 跳转到手机登录页面
-			handlePhoneLogin() {
-				uni.navigateTo({
-					url: '/pagesA/public/phone-login'
-				});
-			},
+		// 跳转到隐私政策
+		goToPrivacy() {
+			uni.navigateTo({
+				url: '/pagesA/public/richtext'
+			});
+		},
 
-			// 保存登录数据并跳转
-			saveLoginDataAndRedirect(loginData) {
-				uni.setStorageSync('access_token', loginData.access_token);
-				uni.setStorageSync('refresh_token', loginData.refresh_token);
-				uni.setStorageSync('user', loginData);
+		// 跳转到服务协议
+		goToService() {
+			uni.navigateTo({
+				url: '/pagesA/public/richtext'
+			});
+		},
 
-				this.$store.commit('isLogin', true);
-				this.$store.commit('refresh_token', loginData.refresh_token);
+		handleBrowse() {
+			// 直接返回首页
+			uni.switchTab({
+				url: '/pages/index/index'
+			});
+		},
 
-				uni.showToast({
-					title: '登录成功',
-					icon: 'success',
-					duration: 1000
-				});
+		// 跳转到手机登录页面
+		handlePhoneLogin() {
+			uni.navigateTo({
+				url: '/pagesA/public/phone-login'
+			});
+		},
 
-				// 登录成功后的跳转
-				setTimeout(() => {
-					if (this.redirectUrl) {
-						uni.redirectTo({
-							url: this.redirectUrl
+		// 保存登录数据并跳转
+		saveLoginDataAndRedirect(loginData) {
+			uni.setStorageSync('access_token', loginData.access_token);
+			uni.setStorageSync('refresh_token', loginData.refresh_token);
+			uni.setStorageSync('user', loginData);
+
+			this.$store.commit('isLogin', true);
+			this.$store.commit('refresh_token', loginData.refresh_token);
+
+			uni.showToast({
+				title: '登录成功',
+				icon: 'success',
+				duration: 1000
+			});
+
+			// 登录成功后的跳转
+			setTimeout(() => {
+				if (this.redirectUrl) {
+					uni.redirectTo({
+						url: this.redirectUrl
+					});
+				} else {
+					// 检查是否有待处理的邀请，如果有则跳转到首页触发邀请弹框
+					const pendingInvitation = uni.getStorageSync('pendingInvitation');
+					if (pendingInvitation && pendingInvitation.inviterId) {
+						console.log('登录成功，发现待处理邀请，跳转到首页');
+						// 使用 reLaunch 确保首页能重新加载并检查邀请
+						uni.reLaunch({
+							url: '/pages/index/index'
 						});
 					} else {
-						// 检查是否有待处理的邀请，如果有则跳转到首页触发邀请弹框
-						const pendingInvitation = uni.getStorageSync('pendingInvitation');
-						if (pendingInvitation && pendingInvitation.inviterId) {
-							console.log('登录成功，发现待处理邀请，跳转到首页');
-							// 使用 reLaunch 确保首页能重新加载并检查邀请
-							uni.reLaunch({
-								url: '/pages/index/index'
-							});
-						} else {
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-						}
-					}
-				}, 1000);
-			},
-
-			// 微信小程序头像选择回调
-			async onChooseAvatar(e) {
-				console.log('选择头像:', e.detail.avatarUrl);
-
-				// 显示上传状态
-				this.isUploadingAvatar = true;
-				uni.showLoading({
-					title: '上传头像中...',
-					mask: true
-				});
-
-				try {
-					// 上传头像到服务器
-					const uploadResult = await this.uploadFilePromise(e.detail.avatarUrl);
-					if (uploadResult && uploadResult.data && uploadResult.data.link) {
-						this.tempAvatar = uploadResult.data.link;
-						uni.showToast({
-							title: '头像上传成功',
-							icon: 'success'
+						uni.switchTab({
+							url: '/pages/index/index'
 						});
-					} else {
-						throw new Error('上传失败');
 					}
-				} catch (error) {
-					console.error('头像上传失败:', error);
-					uni.showToast({
-						title: '头像上传失败，请重试',
-						icon: 'none'
-					});
-				} finally {
-					this.isUploadingAvatar = false;
-					uni.hideLoading();
 				}
-			},
-
-			// 上传文件到服务器
-			uploadFilePromise(filePath) {
-				return new Promise((resolve, reject) => {
-					// 优先使用登录数据中的token，如果没有则使用本地存储的token
-					const token = (this.loginData && this.loginData.access_token) || uni.getStorageSync(
-						'access_token');
-
-					if (!token) {
-						reject(new Error('未找到访问令牌'));
-						return;
-					}
+			}, 1000);
+		},
 
-					uni.uploadFile({
-						url: UPLOAD_URL,
-						filePath: filePath,
-						header: {
-							"Blade-Auth": token
-						},
-						name: 'file',
-						formData: {
-							user: 'avatar'
-						},
-						success: (res) => {
-							try {
-								const result = JSON.parse(res.data);
-								if (result.success || result.code === 200) {
-									resolve(result);
-								} else {
-									reject(new Error(result.msg || '上传失败'));
-								}
-							} catch (e) {
-								reject(new Error('解析响应失败'));
-							}
-						},
-						fail: (error) => {
-							reject(error);
-						}
+		// 微信小程序头像选择回调
+		async onChooseAvatar(e) {
+			console.log('选择头像:', e.detail.avatarUrl);
+
+			// 显示上传状态
+			this.isUploadingAvatar = true;
+			uni.showLoading({
+				title: '上传头像中...',
+				mask: true
+			});
+
+			try {
+				// 上传头像到服务器
+				const uploadResult = await this.uploadFilePromise(e.detail.avatarUrl);
+				if (uploadResult && uploadResult.data && uploadResult.data.link) {
+					this.tempAvatar = uploadResult.data.link;
+					uni.showToast({
+						title: '头像上传成功',
+						icon: 'success'
 					});
+				} else {
+					throw new Error('上传失败');
+				}
+			} catch (error) {
+				console.error('头像上传失败:', error);
+				uni.showToast({
+					title: '头像上传失败，请重试',
+					icon: 'none'
 				});
-			},
+			} finally {
+				this.isUploadingAvatar = false;
+				uni.hideLoading();
+			}
+		},
 
-			// 确认个人信息设置
-			async confirmProfile() {
-				if (!this.tempAccount.trim()) {
-					uni.showToast({
-						title: '请输入账号',
-						icon: 'none'
-					});
+		// 上传文件到服务器
+		uploadFilePromise(filePath) {
+			return new Promise((resolve, reject) => {
+				// 优先使用登录数据中的token，如果没有则使用本地存储的token
+				const token = (this.loginData && this.loginData.access_token) || uni.getStorageSync(
+					'access_token');
+
+				if (!token) {
+					reject(new Error('未找到访问令牌'));
 					return;
 				}
 
-				uni.showLoading({
-					title: '保存中...',
-					mask: true
+				uni.uploadFile({
+					url: UPLOAD_URL,
+					filePath: filePath,
+					header: {
+						"Blade-Auth": token
+					},
+					name: 'file',
+					formData: {
+						user: 'avatar'
+					},
+					success: (res) => {
+						try {
+							const result = JSON.parse(res.data);
+							if (result.success || result.code === 200) {
+								resolve(result);
+							} else {
+								reject(new Error(result.msg || '上传失败'));
+							}
+						} catch (e) {
+							reject(new Error('解析响应失败'));
+						}
+					},
+					fail: (error) => {
+						reject(error);
+					}
 				});
+			});
+		},
 
-				try {
-					// 调用更新用户信息接口
-					const updateRes = await updateProfile({
-						account: this.tempAccount.trim(),
-						avatar: this.tempAvatar
-					});
+		// 确认个人信息设置
+		async confirmProfile() {
+			if (!this.tempAccount.trim()) {
+				uni.showToast({
+					title: '请输入账号',
+					icon: 'none'
+				});
+				return;
+			}
 
-					if (updateRes.code == 200) {
-						// 更新登录数据中的用户信息
-						this.loginData.account = this.tempAccount.trim();
-						if (this.tempAvatar) {
-							this.loginData.avatar = this.tempAvatar;
-							this.loginData.avatarUrl = this.tempAvatar; // 同时更新 avatarUrl 字段
-						}
+			uni.showLoading({
+				title: '保存中...',
+				mask: true
+			});
 
-						// 更新本地存储的用户信息
-						uni.setStorageSync('user', this.loginData);
+			try {
+				// 调用更新用户信息接口
+				const updateRes = await updateProfile({
+					account: this.tempAccount.trim(),
+					avatar: this.tempAvatar
+				});
 
-						// 保存登录数据并跳转
-						this.saveLoginDataAndRedirect(this.loginData);
-						this.showProfileModal = false;
-					} else {
-						uni.showToast({
-							title: updateRes.msg || '保存失败，请重试',
-							icon: 'none'
-						});
+				if (updateRes.code == 200) {
+					// 更新登录数据中的用户信息
+					this.loginData.account = this.tempAccount.trim();
+					if (this.tempAvatar) {
+						this.loginData.avatar = this.tempAvatar;
+						this.loginData.avatarUrl = this.tempAvatar; // 同时更新 avatarUrl 字段
 					}
-				} catch (error) {
-					console.error('更新用户信息错误:', error);
+
+					// 更新本地存储的用户信息
+					uni.setStorageSync('user', this.loginData);
+
+					// 保存登录数据并跳转
+					this.saveLoginDataAndRedirect(this.loginData);
+					this.showProfileModal = false;
+				} else {
 					uni.showToast({
-						title: '保存失败，请重试',
+						title: updateRes.msg || '保存失败，请重试',
 						icon: 'none'
 					});
-				} finally {
-					uni.hideLoading();
 				}
+			} catch (error) {
+				console.error('更新用户信息错误:', error);
+				uni.showToast({
+					title: '保存失败，请重试',
+					icon: 'none'
+				});
+			} finally {
+				uni.hideLoading();
 			}
 		}
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.login-page {
-		min-height: 100vh;
-		background: #F5F5F5;
-		position: relative;
-		overflow: hidden;
-	}
-
-	.status-bar {
-		height: var(--status-bar-height);
-		width: 100%;
-	}
-
-	// 现代化背景
-	.modern-bg {
+.login-page {
+	min-height: 100vh;
+	background: #F5F5F5;
+	position: relative;
+	overflow: hidden;
+}
+
+.status-bar {
+	height: var(--status-bar-height);
+	width: 100%;
+}
+
+// 现代化背景
+.modern-bg {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	pointer-events: none;
+	z-index: 1;
+
+	.bg-shape {
 		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		pointer-events: none;
-		z-index: 1;
-
-		.bg-shape {
-			position: absolute;
-			border-radius: 50%;
-
-			&.shape-1 {
-				width: 300rpx;
-				height: 300rpx;
-				top: 15%;
-				right: -80rpx;
-				background: linear-gradient(135deg, rgba(255, 91, 5, 0.1) 0%, transparent 70%);
-			}
-
-			&.shape-2 {
-				width: 200rpx;
-				height: 200rpx;
-				top: 50%;
-				left: -60rpx;
-				background: linear-gradient(135deg, rgba(41, 44, 53, 0.08) 0%, transparent 70%);
-			}
-
-			&.shape-3 {
-				width: 150rpx;
-				height: 150rpx;
-				bottom: 25%;
-				right: 15%;
-				background: linear-gradient(135deg, rgba(255, 91, 5, 0.06) 0%, transparent 70%);
-			}
+		border-radius: 50%;
+
+		&.shape-1 {
+			width: 300rpx;
+			height: 300rpx;
+			top: 15%;
+			right: -80rpx;
+			background: linear-gradient(135deg, rgba(255, 91, 5, 0.1) 0%, transparent 70%);
 		}
-	}
-
-	.nav-back {
-		position: fixed;
-		left: 30rpx;
-		top: calc(var(--status-bar-height) + 20rpx);
-		z-index: 100;
-
-		.back-btn {
-			width: 80rpx;
-			height: 80rpx;
-			background: #FFFFFF;
-			border: 1rpx solid rgba(255, 91, 5, 0.2);
-			border-radius: 50%;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			transition: all 0.3s ease;
-			box-shadow: 0 4rpx 16rpx rgba(41, 44, 53, 0.1);
 
-			&:active {
-				transform: scale(0.95);
-				background: rgba(255, 91, 5, 0.1);
-			}
+		&.shape-2 {
+			width: 200rpx;
+			height: 200rpx;
+			top: 50%;
+			left: -60rpx;
+			background: linear-gradient(135deg, rgba(41, 44, 53, 0.08) 0%, transparent 70%);
 		}
 
-		.back-icon {
-			font-family: "iconfont";
-			font-size: 36rpx;
-			color: #292C35;
+		&.shape-3 {
+			width: 150rpx;
+			height: 150rpx;
+			bottom: 25%;
+			right: 15%;
+			background: linear-gradient(135deg, rgba(255, 91, 5, 0.06) 0%, transparent 70%);
 		}
 	}
-
-	.header {
+}
+
+.nav-back {
+	position: fixed;
+	left: 30rpx;
+	top: calc(var(--status-bar-height) + 20rpx);
+	z-index: 100;
+
+	.back-btn {
+		width: 80rpx;
+		height: 80rpx;
+		background: #FFFFFF;
+		border: 1rpx solid rgba(255, 91, 5, 0.2);
+		border-radius: 50%;
 		display: flex;
-		flex-direction: column;
 		align-items: center;
-		padding-top: 120rpx;
-		position: relative;
-		z-index: 2;
-
-		.logo-container {
-			position: relative;
-			margin-bottom: 60rpx;
-
-			.logo-circle {
-				width: 200rpx;
-				height: 200rpx;
-				border-radius: 20rpx;
-				background: #FFFFFF;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				box-shadow: 0 8rpx 24rpx rgba(41, 44, 53, 0.1);
-				border: 2rpx solid rgba(255, 91, 5, 0.2);
-
-				.logo {
-					width: 160rpx;
-					height: 160rpx;
-					border-radius: 16rpx;
-				}
-			}
+		justify-content: center;
+		transition: all 0.3s ease;
+		box-shadow: 0 4rpx 16rpx rgba(41, 44, 53, 0.1);
 
-			.logo-shadow {
-				position: absolute;
-				bottom: -20rpx;
-				left: 50%;
-				transform: translateX(-50%);
-				width: 160rpx;
-				height: 20rpx;
-				background: radial-gradient(ellipse, rgba(255, 91, 5, 0.1) 0%, transparent 70%);
-				border-radius: 50%;
-			}
+		&:active {
+			transform: scale(0.95);
+			background: rgba(255, 91, 5, 0.1);
 		}
+	}
 
-		.title-section {
-			text-align: center;
-			margin-bottom: 20rpx;
-			position: relative;
-
-			.title {
-				font-size: 64rpx;
-				font-weight: 600;
-				color: #292C35;
-				letter-spacing: 8rpx;
-				font-family: 'PingFang SC', 'Helvetica Neue', Arial, sans-serif;
-				text-shadow: 0 2rpx 8rpx rgba(41, 44, 53, 0.1);
-			}
-
-			.title-underline {
-				position: absolute;
-				bottom: -10rpx;
-				left: 50%;
-				transform: translateX(-50%);
-				width: 80rpx;
-				height: 4rpx;
-				background: linear-gradient(90deg, transparent, #FF5B05, transparent);
-				border-radius: 2rpx;
+	.back-icon {
+		font-family: "iconfont";
+		font-size: 36rpx;
+		color: #292C35;
+	}
+}
+
+.header {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding-top: 120rpx;
+	position: relative;
+	z-index: 2;
+
+	.logo-container {
+		position: relative; // 设置为相对定位，作为子元素的定位参考
+		margin-bottom: 60rpx; // 底部外边距60rpx，与标题保持间距
+
+		.logo-circle {
+			width: 100rpx; // Logo容器宽度100rpx
+			height: 100rpx; // Logo容器高度100rpx
+			border-radius: 20rpx; // 圆角20rpx，让容器呈圆角矩形
+			background: #FFFFFF; // 背景色为白色
+			display: flex; // 使用弹性布局
+			align-items: center; // 垂直居中对齐
+			justify-content: center; // 水平居中对齐
+			box-shadow: 0 8rpx 24rpx rgba(41, 44, 53, 0.1); // 添加阴影效果，让容器有浮起感
+			border: 2rpx solid rgba(255, 91, 5, 0.2); // 边框2rpx，橙色半透明
+
+			.logo {
+				width: 40rpx; // Logo图片宽度40rpx
+				height: 40rpx; // Logo图片高度40rpx
+				border-radius: 16rpx; // Logo图片圆角16rpx
 			}
 		}
 
-		.subtitle {
-			font-size: 28rpx;
-			color: rgba(41, 44, 53, 0.7);
-			font-weight: 300;
-			letter-spacing: 4rpx;
-			font-family: inherit;
+		.logo-shadow {
+			position: absolute; // 绝对定位，相对于logo-container定位
+			bottom: -20rpx; // 距离底部-20rpx，创建阴影向下延伸效果
+			left: 50%; // 距离左边50%
+			transform: translateX(-50%); // 水平居中，通过左移自身宽度的一半来实现
+			width: 160rpx; // 阴影宽度160rpx
+			height: 20rpx; // 阴影高度20rpx
+			background: radial-gradient(ellipse, rgba(255, 91, 5, 0.1) 0%, transparent 70%); // 径向渐变，从中心向外逐渐透明
+			border-radius: 50%; // 完全圆形
 		}
 	}
 
-	.login-section {
-		padding: 80rpx 60rpx;
+	.title-section {
+		text-align: center;
+		margin-bottom: 20rpx;
 		position: relative;
-		z-index: 2;
 
-		.btn-container {
-			margin-bottom: 40rpx;
+		.title {
+			font-size: 64rpx;
+			font-weight: 600;
+			color: #292C35;
+			letter-spacing: 8rpx;
+			font-family: 'PingFang SC', 'Helvetica Neue', Arial, sans-serif;
+			text-shadow: 0 2rpx 8rpx rgba(41, 44, 53, 0.1);
 		}
 
-		.wechat-btn {
-			position: relative;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 100%;
-			height: 96rpx;
-			background: linear-gradient(135deg, #FF5B05 0%, #FF8E3C 100%);
-			border: none;
-			border-radius: 48rpx;
-			color: #fff;
-			font-size: 32rpx;
-			font-weight: 500;
-			transition: all 0.3s ease;
-			box-shadow: 0 4rpx 16rpx rgba(255, 91, 5, 0.3);
+		.title-underline {
+			position: absolute;
+			bottom: -10rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			width: 80rpx;
+			height: 4rpx;
+			background: linear-gradient(90deg, transparent, #FF5B05, transparent);
+			border-radius: 2rpx;
+		}
+	}
 
-			&:active {
-				transform: translateY(2rpx);
-				box-shadow: 0 2rpx 8rpx rgba(255, 91, 5, 0.4);
-			}
+	.subtitle {
+		font-size: 28rpx;
+		color: rgba(41, 44, 53, 0.7);
+		font-weight: 300;
+		letter-spacing: 4rpx;
+		font-family: inherit;
+	}
+}
 
-			&.btn-loading {
-				background: linear-gradient(135deg, #FFB088 0%, #FFA573 100%);
-				color: rgba(255, 255, 255, 0.8);
-			}
+.login-section {
+	padding: 80rpx 60rpx;
+	position: relative;
+	z-index: 2;
+
+	.btn-container {
+		margin-bottom: 40rpx;
+	}
+
+	.wechat-btn {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 96rpx;
+		background: linear-gradient(135deg, #FF5B05 0%, #FF8E3C 100%);
+		border: none;
+		border-radius: 48rpx;
+		color: #fff;
+		font-size: 32rpx;
+		font-weight: 500;
+		transition: all 0.3s ease;
+		box-shadow: 0 4rpx 16rpx rgba(255, 91, 5, 0.3);
+
+		&:active {
+			transform: translateY(2rpx);
+			box-shadow: 0 2rpx 8rpx rgba(255, 91, 5, 0.4);
 		}
 
-		.phone-btn {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 100%;
-			height: 96rpx;
-			background: #FFFFFF;
-			border: 2rpx solid #FF5B05;
-			border-radius: 48rpx;
-			color: #FF5B05;
-			font-size: 32rpx;
-			font-weight: 500;
-			transition: all 0.3s ease;
-			box-shadow: 0 4rpx 16rpx rgba(41, 44, 53, 0.1);
+		&.btn-loading {
+			background: linear-gradient(135deg, #FFB088 0%, #FFA573 100%);
+			color: rgba(255, 255, 255, 0.8);
+		}
+	}
 
-			&:active {
-				transform: translateY(2rpx);
-				background: rgba(255, 91, 5, 0.05);
-			}
+	.phone-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 96rpx;
+		background: #FFFFFF;
+		border: 2rpx solid #FF5B05;
+		border-radius: 48rpx;
+		color: #FF5B05;
+		font-size: 32rpx;
+		font-weight: 500;
+		transition: all 0.3s ease;
+		box-shadow: 0 4rpx 16rpx rgba(41, 44, 53, 0.1);
+
+		&:active {
+			transform: translateY(2rpx);
+			background: rgba(255, 91, 5, 0.05);
 		}
+	}
 
-		.divider {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			margin: 40rpx 0;
+	.divider {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin: 40rpx 0;
 
-			.divider-line {
-				flex: 1;
-				height: 1rpx;
-				background: linear-gradient(90deg, transparent, rgba(41, 44, 53, 0.1), transparent);
-			}
+		.divider-line {
+			flex: 1;
+			height: 1rpx;
+			background: linear-gradient(90deg, transparent, rgba(41, 44, 53, 0.1), transparent);
+		}
 
-			.divider-text {
-				margin: 0 30rpx;
-				font-size: 26rpx;
-				color: rgba(41, 44, 53, 0.5);
-			}
+		.divider-text {
+			margin: 0 30rpx;
+			font-size: 26rpx;
+			color: rgba(41, 44, 53, 0.5);
 		}
+	}
 
-		.browse-btn {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 100%;
-			height: 88rpx;
-			background: transparent;
-			border: 1rpx solid rgba(41, 44, 53, 0.2);
-			border-radius: 44rpx;
-			color: #292C35;
-			font-size: 28rpx;
-			transition: all 0.3s ease;
+	.browse-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 88rpx;
+		background: transparent;
+		border: 1rpx solid rgba(41, 44, 53, 0.2);
+		border-radius: 44rpx;
+		color: #292C35;
+		font-size: 28rpx;
+		transition: all 0.3s ease;
+
+		&:active {
+			background: rgba(41, 44, 53, 0.05);
+			transform: translateY(1rpx);
+		}
+	}
 
-			&:active {
-				background: rgba(41, 44, 53, 0.05);
-				transform: translateY(1rpx);
-			}
+	.agreement {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 60rpx;
+
+		.checkbox-wrapper {
+			margin-right: 16rpx;
 		}
 
-		.agreement {
+		.zen-checkbox {
+			width: 36rpx;
+			height: 36rpx;
+			border: 2rpx solid rgba(255, 91, 5, 0.4);
+			border-radius: 18rpx;
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			margin-top: 60rpx;
+			transition: all 0.3s ease;
+			background: rgba(255, 255, 255, 0.9);
 
-			.checkbox-wrapper {
-				margin-right: 16rpx;
+			&.checked {
+				background: #FF5B05;
+				border-color: #FF5B05;
 			}
 
-			.zen-checkbox {
-				width: 36rpx;
-				height: 36rpx;
-				border: 2rpx solid rgba(255, 91, 5, 0.4);
-				border-radius: 18rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				transition: all 0.3s ease;
-				background: rgba(255, 255, 255, 0.9);
-
-				&.checked {
-					background: #FF5B05;
-					border-color: #FF5B05;
-				}
-
-				.zen-circle-inner {
-					width: 16rpx;
-					height: 16rpx;
-					border-radius: 50%;
-					background: #fff;
-				}
+			.zen-circle-inner {
+				width: 16rpx;
+				height: 16rpx;
+				border-radius: 50%;
+				background: #fff;
 			}
+		}
 
-			.agreement-text {
-				font-size: 24rpx;
-				color: rgba(41, 44, 53, 0.6);
-				line-height: 1.5;
+		.agreement-text {
+			font-size: 24rpx;
+			color: rgba(41, 44, 53, 0.6);
+			line-height: 1.5;
 
-				.link {
-					color: #FF5B05;
-					text-decoration: none;
-				}
+			.link {
+				color: #FF5B05;
+				text-decoration: none;
 			}
 		}
 	}
+}
+
+// 底部装饰
+.bottom-decoration {
+	position: absolute;
+	bottom: 40rpx;
+	left: 50%;
+	transform: translateX(-50%);
+	z-index: 1;
+
+	.company-info {
+		text-align: center;
+
+		.company-name {
+			display: block;
+			font-size: 24rpx;
+			color: rgba(41, 44, 53, 0.6);
+			margin-bottom: 8rpx;
+			font-weight: 400;
+		}
 
-	// 底部装饰
-	.bottom-decoration {
-		position: absolute;
-		bottom: 40rpx;
-		left: 50%;
-		transform: translateX(-50%);
-		z-index: 1;
-
-		.company-info {
-			text-align: center;
-
-			.company-name {
-				display: block;
-				font-size: 24rpx;
-				color: rgba(41, 44, 53, 0.6);
-				margin-bottom: 8rpx;
-				font-weight: 400;
-			}
+		.version {
+			font-size: 20rpx;
+			color: rgba(41, 44, 53, 0.4);
+			font-weight: 300;
+		}
+	}
+}
+
+// 个人信息设置弹框样式
+.profile-modal {
+	width: 750rpx;
+	background: #fff;
+	border-radius: 20rpx;
+	overflow: hidden;
+
+	.modal-header {
+		text-align: center;
+		padding: 60rpx 40rpx 40rpx;
+		background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%);
+
+		.modal-title {
+			display: block;
+			font-size: 36rpx;
+			font-weight: 600;
+			color: #2c3e50;
+			margin-bottom: 12rpx;
+		}
 
-			.version {
-				font-size: 20rpx;
-				color: rgba(41, 44, 53, 0.4);
-				font-weight: 300;
-			}
+		.modal-subtitle {
+			font-size: 26rpx;
+			color: rgba(44, 62, 80, 0.7);
 		}
 	}
 
-	// 个人信息设置弹框样式
-	.profile-modal {
-		width: 750rpx;
-		background: #fff;
-		border-radius: 20rpx;
-		overflow: hidden;
+	.modal-content {
+		padding: 40rpx;
 
-		.modal-header {
+		.avatar-section {
+			margin-bottom: 40rpx;
 			text-align: center;
-			padding: 60rpx 40rpx 40rpx;
-			background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%);
 
-			.modal-title {
+			.section-label {
 				display: block;
-				font-size: 36rpx;
-				font-weight: 600;
+				font-size: 28rpx;
 				color: #2c3e50;
-				margin-bottom: 12rpx;
-			}
-
-			.modal-subtitle {
-				font-size: 26rpx;
-				color: rgba(44, 62, 80, 0.7);
+				margin-bottom: 20rpx;
+				font-weight: 500;
 			}
-		}
 
-		.modal-content {
-			padding: 40rpx;
+			.avatar-button {
+				background: none;
+				border: none;
+				padding: 0;
+				margin: 0 auto;
+				display: block;
+				width: 160rpx;
+				height: 160rpx;
 
-			.avatar-section {
-				margin-bottom: 40rpx;
-				text-align: center;
+				&::after {
+					border: none;
+				}
 
-				.section-label {
-					display: block;
-					font-size: 28rpx;
-					color: #2c3e50;
-					margin-bottom: 20rpx;
-					font-weight: 500;
+				&:disabled {
+					opacity: 0.7;
 				}
+			}
 
-				.avatar-button {
-					background: none;
-					border: none;
-					padding: 0;
-					margin: 0 auto;
-					display: block;
-					width: 160rpx;
-					height: 160rpx;
-
-					&::after {
-						border: none;
-					}
+			.avatar-container {
+				position: relative;
+				width: 160rpx;
+				height: 160rpx;
+				border-radius: 50%;
+				overflow: hidden;
+				border: 3rpx solid #4A90E2;
 
-					&:disabled {
-						opacity: 0.7;
-					}
+				.avatar-preview {
+					width: 100%;
+					height: 100%;
 				}
 
-				.avatar-container {
-					position: relative;
-					width: 160rpx;
-					height: 160rpx;
-					border-radius: 50%;
-					overflow: hidden;
-					border: 3rpx solid #4A90E2;
-
-					.avatar-preview {
-						width: 100%;
-						height: 100%;
-					}
-
-					.avatar-overlay {
-						position: absolute;
-						bottom: 0;
-						left: 0;
-						right: 0;
-						height: 50rpx;
-						background: rgba(0, 0, 0, 0.5);
-						display: flex;
-						align-items: center;
-						justify-content: center;
-					}
+				.avatar-overlay {
+					position: absolute;
+					bottom: 0;
+					left: 0;
+					right: 0;
+					height: 50rpx;
+					background: rgba(0, 0, 0, 0.5);
+					display: flex;
+					align-items: center;
+					justify-content: center;
 				}
 			}
+		}
 
-			.account-section {
-				.section-label {
-					display: block;
-					font-size: 28rpx;
-					color: #2c3e50;
-					margin-bottom: 20rpx;
-					font-weight: 500;
-				}
+		.account-section {
+			.section-label {
+				display: block;
+				font-size: 28rpx;
+				color: #2c3e50;
+				margin-bottom: 20rpx;
+				font-weight: 500;
 			}
 		}
+	}
 
-		.modal-actions {
-			padding: 0 40rpx 40rpx;
+	.modal-actions {
+		padding: 0 40rpx 40rpx;
 
-			.confirm-btn {
-				width: 100%;
-				height: 80rpx;
-				background: linear-gradient(135deg, #4A90E2 0%, #357ABD 100%);
-				color: #fff;
-				border-radius: 12rpx;
-				font-size: 32rpx;
-				font-weight: 500;
-				border: none;
-				transition: all 0.3s ease;
+		.confirm-btn {
+			width: 100%;
+			height: 80rpx;
+			background: linear-gradient(135deg, #4A90E2 0%, #357ABD 100%);
+			color: #fff;
+			border-radius: 12rpx;
+			font-size: 32rpx;
+			font-weight: 500;
+			border: none;
+			transition: all 0.3s ease;
 
-				&:disabled {
-					background: #bdc3c7;
-					color: rgba(255, 255, 255, 0.7);
-				}
+			&:disabled {
+				background: #bdc3c7;
+				color: rgba(255, 255, 255, 0.7);
+			}
 
-				&:not(:disabled):active {
-					transform: translateY(2rpx);
-					box-shadow: 0 2rpx 8rpx rgba(74, 144, 226, 0.3);
-				}
+			&:not(:disabled):active {
+				transform: translateY(2rpx);
+				box-shadow: 0 2rpx 8rpx rgba(74, 144, 226, 0.3);
 			}
 		}
 	}
+}
 </style>

pagesA/public/phone-login.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 手机登录 -->
 	<view class="page-container">
 		<!-- 顶部标题区域 -->
 		<image class="bg-image " src="@/static/images/bg.png" mode="aspectFill"></image>

pagesA/public/richtext.vue

@@ -1,9 +1,10 @@
 <!-- 富文本 -->
 <template>
+	<!-- 协议 -->
 	<view class="bg-FFF pad-24">
 		<text>
 			知己访客用户协议​
-			欢迎您使用清远市宏匠贸易有限公司（以下简称 “我们”）提供的 “知己访客” 小程序（以下简称 “本服务”）。为了保障您的合法权益，请您仔细阅读并同意本《用户协议》（以下简称 “本协议”）。​
+			欢迎您使用知己有限公司（以下简称 “我们”）提供的 “知己访客” 小程序（以下简称 “本服务”）。为了保障您的合法权益，请您仔细阅读并同意本《用户协议》（以下简称 “本协议”）。​
 			一、定义​
 			用户：指同意本协议并使用本服务的个人或组织。​
 			服务：指我们通过 “知己访客” 小程序向用户提供的各项功能及服务。​
@@ -53,7 +54,7 @@
 			撤回同意权：您有权随时撤回对我们收集和使用您信息的同意，但可能影响服务的正常提供。​
 			七、协议变更​
 			我们有权根据法律法规及业务发展需要对本协议进行变更，并在小程序中公布。变更后的协议自公布之日起生效。​
-			如您对本协议有任何疑问或建议，请联系我们的客服人员。联系方式：18602013598。
+			如您对本协议有任何疑问或建议，请联系我们的客服人员。联系方式：18912407233。
 		</text>
 	</view>
 </template>

pagesA/task/detail.vue

@@ -0,0 +1,470 @@
+<template>
+	
+	<!-- 任务详情 -->
+	<view class="container">
+
+		<!-- 详情内容 -->
+		<view class="detail-container">
+			<!-- 对接信息 -->
+			<view class="section">
+
+				<view class="section-title">
+					<image class="title-icon" src="/static/images/person.png" mode="aspectFit"></image>
+					<view class="title">
+						对接信息
+					</view>
+				</view>
+				<view class="info-item">
+					<text class="label">所属部门</text>
+					<text class="value">{{visitDetail.department}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">员工姓名</text>
+					<text class="value">{{visitDetail.employeeName}}</text>
+				</view>
+			</view>
+
+			<!-- 访问信息 -->
+			<view class="section">
+				<view class="section-title">
+					<image class="title-icon" src="/static/images/calendar.png" mode="aspectFit"></image>
+					<view class="title">
+						访问信息
+					</view>
+				</view>
+				<view class="info-item">
+					<text class="label">访问事由</text>
+					<text class="value">{{visitDetail.visitReason}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">到访时间</text>
+					<text class="value">{{visitDetail.visitTime}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">访客姓名</text>
+					<text class="value">{{visitDetail.visitorName}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">访客单位</text>
+					<text class="value">{{visitDetail.visitorCompany}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">手机号</text>
+					<text class="value">{{visitDetail.visitorPhone}}</text>
+				</view>
+			</view>
+
+			<!-- 随行人员 -->
+			<view class="section" v-if="visitDetail.accompanyPersons && visitDetail.accompanyPersons.length > 0">
+				<view class="section-title">
+					<image class="title-icon" src="/static/images/person.png" mode="aspectFit"></image>
+					<view class="title">
+						随行人员
+					</view>
+				</view>
+				<view class="accompany-list">
+					<view class="info-item" v-for="(person, index) in visitDetail.accompanyPersons" :key="index">
+						<text class="label">随行人员{{index + 1}}</text>
+						<view class="accompany-info">
+							<text class="value">{{person.name}}</text>
+							<text class="phone">{{person.phone}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 使用车辆 -->
+			<view class="section" v-if="visitDetail.useVehicle">
+				<view class="section-title">
+					<image class="title-icon" src="/static/images/cart.png" mode="aspectFit"></image>
+					<view class="title">
+						车辆信息
+					</view>
+					<text class="vehicle-number">{{visitDetail.vehicleNumber}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">接客时间</text>
+					<text class="value">{{visitDetail.pickupTime}}</text>
+				</view>
+				<view class="info-item">
+					<text class="label">接客地点</text>
+					<text class="value">{{visitDetail.pickupLocation}}</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 操作按钮 - 仅待审核状态显示 -->
+		<view class="action-container" v-if="visitDetail.status === '待审核'">
+			<button class="reject-btn" @click="handleReject">拒绝</button>
+			<button class="approve-btn" @click="handleApprove">通过</button>
+		</view>
+
+		<!-- 确认弹框 -->
+		<uni-popup ref="confirmPopup" type="center">
+			<view class="confirm-popup">
+				<view class="popup-content">
+					<view class="popup-title">{{confirmAction === 'approve' ? '确认通过' : '确认拒绝'}}</view>
+					<view class="popup-message">
+						{{confirmAction === 'approve' ? '确定要通过这个访问申请吗？' : '确定要拒绝这个访问申请吗？'}}
+					</view>
+					<view class="popup-buttons">
+						<button class="cancel-btn" @click="cancelAction">取消</button>
+						<button class="confirm-btn"
+							@click="confirmAction === 'approve' ? approveVisit() : rejectVisit()">
+							确定
+						</button>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<!-- 结果提示弹框 -->
+		<uni-popup ref="resultPopup" type="center">
+			<view class="result-popup">
+				<view class="popup-content">
+					<view class="result-icon" :class="resultType">
+						<uni-icons :type="resultType === 'success' ? 'checkmarkempty' : 'closeempty'" size="60"
+							:color="resultType === 'success' ? '#52c41a' : '#ff4757'"></uni-icons>
+					</view>
+					<view class="popup-title">{{resultTitle}}</view>
+					<view class="popup-message">{{resultMessage}}</view>
+					<button class="close-btn" @click="closeResultPopup">确定</button>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				visitId: '',
+				visitDetail: {
+					id: '',
+					department: '',
+					employeeName: '',
+					visitReason: '',
+					visitTime: '',
+					visitorName: '',
+					visitorCompany: '',
+					visitorPhone: '',
+					status: '',
+					useVehicle: false,
+					vehicleNumber: '',
+					pickupTime: '',
+					pickupLocation: '',
+					accompanyPersons: []
+				},
+				confirmAction: '', // 'approve' 或 'reject'
+				resultType: '', // 'success' 或 'error'
+				resultTitle: '',
+				resultMessage: ''
+			}
+		},
+		onLoad(options) {
+			if (options.id) {
+				this.visitId = options.id;
+				this.visitDetail.status = options.status || '待审核';
+				this.getVisitDetail();
+			}
+		},
+		methods: {
+			// 获取访问详情
+			getVisitDetail() {
+				// 模拟数据，实际应该调用接口
+				const mockDetail = {
+					id: this.visitId,
+					department: '技术部',
+					employeeName: '张河嘉',
+					visitReason: '参加业务研究计划',
+					visitTime: '2025-08-09',
+					visitorName: '安晓伟',
+					visitorCompany: '某某某公司',
+					visitorPhone: '13012345678',
+					status: this.visitDetail.status, // 从上一页传来的状态
+					useVehicle: true,
+					vehicleNumber: '冀A·12345',
+					pickupTime: '2025-08-09 16:30',
+					pickupLocation: '石家庄新华区',
+					accompanyPersons: [{
+							name: '李四',
+							phone: '13987654321'
+						},
+						{
+							name: '王五',
+							phone: '13876543210'
+						}
+					]
+				};
+
+				this.visitDetail = mockDetail;
+			},
+
+			// 处理拒绝
+			handleReject() {
+				this.confirmAction = 'reject';
+				this.$refs.confirmPopup.open();
+			},
+
+			// 处理通过
+			handleApprove() {
+				this.confirmAction = 'approve';
+				this.$refs.confirmPopup.open();
+			},
+
+			// 取消操作
+			cancelAction() {
+				this.$refs.confirmPopup.close();
+				this.confirmAction = '';
+			},
+
+			// 确认通过
+			approveVisit() {
+				this.$refs.confirmPopup.close();
+
+				// 模拟接口调用
+				uni.showLoading({
+					title: '处理中...'
+				});
+
+				setTimeout(() => {
+					uni.hideLoading();
+
+					// 更新状态
+					this.visitDetail.status = '待访问';
+
+					// 显示成功提示
+					this.resultType = 'success';
+					this.resultTitle = '审核通过';
+					this.resultMessage = '访问申请已通过，访客将收到通知';
+					this.$refs.resultPopup.open();
+				}, 1000);
+			},
+
+			// 确认拒绝
+			rejectVisit() {
+				this.$refs.confirmPopup.close();
+
+				// 模拟接口调用
+				uni.showLoading({
+					title: '处理中...'
+				});
+
+				setTimeout(() => {
+					uni.hideLoading();
+
+					// 更新状态
+					this.visitDetail.status = '已拒绝';
+
+					// 显示成功提示
+					this.resultType = 'success';
+					this.resultTitle = '审核完成';
+					this.resultMessage = '访问申请已拒绝，访客将收到通知';
+					this.$refs.resultPopup.open();
+				}, 1000);
+			},
+
+			// 关闭结果弹框
+			closeResultPopup() {
+				this.$refs.resultPopup.close();
+				// 返回上一页
+				uni.navigateBack();
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		min-height: 100vh;
+		background-color: #f5f5f5;
+		padding-bottom: 140rpx;
+	}
+
+	.detail-container {
+		padding: 20rpx;
+	}
+
+	.section {
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-bottom: 20rpx;
+		padding: 30rpx;
+	}
+
+	.section-title {
+
+		margin-bottom: 30rpx;
+		display: flex;
+		align-items: center;
+
+	}
+
+	.title {
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+	}
+
+	.title-icon {
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 15rpx;
+	}
+
+	.vehicle-number {
+		font-size: 28rpx;
+		color: #666;
+		font-weight: normal;
+		margin-left: auto;
+	}
+
+	.info-item {
+		display: flex;
+		align-items: flex-start;
+		margin-bottom: 24rpx;
+
+		&:last-child {
+			margin-bottom: 0;
+		}
+	}
+
+	.label {
+		width: 160rpx;
+		font-size: 28rpx;
+		color: #666;
+		flex-shrink: 0;
+		line-height: 1.5;
+	}
+
+	.value {
+		flex: 1;
+		font-size: 28rpx;
+		color: #333;
+		line-height: 1.5;
+		word-break: break-all;
+	}
+
+	.accompany-info {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		gap: 8rpx;
+
+		.value {
+			font-size: 28rpx;
+			color: #333;
+		}
+
+		.phone {
+			font-size: 24rpx;
+			color: #666;
+		}
+	}
+
+	.action-container {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 20rpx;
+		background-color: #fff;
+		box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.1);
+		display: flex;
+		gap: 20rpx;
+	}
+
+	.reject-btn,
+	.approve-btn {
+		flex: 1;
+		height: 88rpx;
+		border-radius: 44rpx;
+		border: none;
+		font-size: 32rpx;
+		font-weight: 600;
+	}
+
+	.reject-btn {
+		background-color: #fff;
+		color: #ff4757;
+		border: 2rpx solid #ff4757;
+	}
+
+	.approve-btn {
+		background: #39833b;
+		color: #fff;
+	}
+
+	// 弹框样式
+	.confirm-popup,
+	.result-popup {
+		.popup-content {
+			background-color: #fff;
+			border-radius: 20rpx;
+			padding: 60rpx 40rpx 40rpx;
+			width: 560rpx;
+			text-align: center;
+		}
+
+		.popup-title {
+			font-size: 36rpx;
+			font-weight: 600;
+			color: #333;
+			margin-bottom: 20rpx;
+		}
+
+		.popup-message {
+			font-size: 28rpx;
+			color: #666;
+			line-height: 1.6;
+			margin-bottom: 40rpx;
+		}
+	}
+
+	.popup-buttons {
+		display: flex;
+		gap: 20rpx;
+
+		.cancel-btn,
+		.confirm-btn {
+			flex: 1;
+			height: 80rpx;
+			border-radius: 40rpx;
+			font-size: 28rpx;
+			border: none;
+		}
+
+		.cancel-btn {
+			background-color: #f5f5f5;
+			color: #666;
+		}
+
+		.confirm-btn {
+			background: linear-gradient(135deg, #ff6b35 0%, #ff9500 100%);
+			color: #fff;
+		}
+	}
+
+	.result-icon {
+		margin-bottom: 30rpx;
+
+		&.success {
+			// success icon styling handled by uni-icons color
+		}
+
+		&.error {
+			// error icon styling handled by uni-icons color  
+		}
+	}
+
+	.close-btn {
+		width: 100%;
+		height: 80rpx;
+		background: linear-gradient(135deg, #ff6b35 0%, #ff9500 100%);
+		border-radius: 40rpx;
+		color: #fff;
+		font-size: 28rpx;
+		border: none;
+	}
+</style>

pagesA/task/edit.vue

@@ -0,0 +1,806 @@
+<template>
+	<!-- 访客申请 -->
+	<view class="container">
+		<!-- 导航栏 -->
+		<custom-navbar title="访客申请" :showBack="true"></custom-navbar>
+
+		<!-- 表单内容 -->
+		<view class="form-container">
+			<!-- 第一块：对接人信息 -->
+			<view class="section">
+				<view class="section-title">
+					<image class="title-icon" src="/static/images/person.png" mode="aspectFit"></image>
+					对接人信息
+				</view>
+				<view class="form-item" @tap="showDepartmentPicker" style="z-index: 999;">
+					<text class="label">所属部门</text>
+					<view class="input-wrapper" @tap="showDepartmentPicker">
+						<text class="placeholder" v-if="!formData.department">请选择所属部门</text>
+						<text v-else>{{ formData.department }}</text>
+						<uni-icons type="right" size="16" color="#c0c4cc"></uni-icons>
+					</view>
+				</view>
+				<view class="form-item">
+					<text class="label">员工姓名</text>
+					<input class="input" v-model="formData.employeeName" placeholder="请输入员工姓名"
+						placeholder-style="color: #c0c4cc" />
+				</view>
+			</view>
+
+			<!-- 第二块：访问信息 -->
+			<view class="section">
+				<view class="section-title">
+					<image class="title-icon" src="/static/images/calendar.png" mode="aspectFit"></image>
+					访问信息
+				</view>
+				<view class="form-item">
+					<text class="label">访问事由</text>
+					<input class="input" v-model="formData.visitReason" placeholder="请输入访问事由"
+						placeholder-style="color: #c0c4cc" />
+				</view>
+				<view class="form-item">
+					<text class="label">到访时间</text>
+					<uni-datetime-picker type="datetime" v-model="formData.visitTime" @change="onVisitTimeChange"
+						:clear-icon="false" placeholder="请选择到访时间" format="YYYY-MM-DD HH:mm" :hide-second="true">
+						<view class="input-wrapper">
+							<text class="placeholder" v-if="!formData.visitTime">请选择到访时间</text>
+							<text v-else>{{ formData.visitTime }}</text>
+							<uni-icons type="calendar" size="16" color="#c0c4cc"></uni-icons>
+						</view>
+					</uni-datetime-picker>
+				</view>
+				<view class="form-item">
+					<text class="label">访客姓名</text>
+					<input class="input" v-model="formData.visitorName" placeholder="请输入访客姓名"
+						placeholder-style="color: #c0c4cc" />
+				</view>
+				<view class="form-item">
+					<text class="label">访客单位</text>
+					<input class="input" v-model="formData.visitorCompany" placeholder="请输入访客单位"
+						placeholder-style="color: #c0c4cc" />
+				</view>
+				<view class="form-item">
+					<text class="label">手机号</text>
+					<input class="input" v-model="formData.visitorPhone" placeholder="请输入手机号"
+						placeholder-style="color: #c0c4cc" type="number" />
+				</view>
+			</view>
+
+			<!-- 第三块：随行人员 -->
+			<view class="section">
+				<view class="section-title">随行人员</view>
+				<view class="accompany-list">
+					<view class="accompany-item" v-for="(item, index) in formData.accompanyPersons" :key="index">
+						<view class="form-item">
+							<text class="label">随行人员</text>
+							<input class="input" v-model="item.name" placeholder="请输入随行人员姓名"
+								placeholder-style="color: #c0c4cc" />
+						</view>
+						<view class="form-item">
+							<text class="label">手机号</text>
+							<input class="input" v-model="item.phone" placeholder="请输入手机号"
+								placeholder-style="color: #c0c4cc" type="number" />
+						</view>
+						<view class="delete-btn" v-if="formData.accompanyPersons.length > 1"
+							@click="removeAccompany(index)">
+							<uni-icons type="trash" size="18" color="#ff4757"></uni-icons>
+						</view>
+					</view>
+				</view>
+				<view class="add-accompany-btn" @click="addAccompany">
+					<uni-icons type="plus" size="16" color="#007aff"></uni-icons>
+					<text>添加随行人员</text>
+				</view>
+			</view>
+
+			<!-- 第四块：使用车辆 -->
+			<view class="section">
+				<view class="vehicle-header">
+					<view class="section-title">
+						<image class="title-icon" src="/static/images/cart.png" mode="aspectFit"></image>
+						使用车辆
+					</view>
+					<switch :checked="formData.useVehicle" @change="onVehicleChange" color="#007aff" />
+				</view>
+
+				<view v-if="formData.useVehicle" class="vehicle-content">
+					<view class="form-item">
+						<text class="label">接客时间</text>
+						<uni-datetime-picker type="datetime" v-model="formData.pickupTime" @change="onPickupTimeChange"
+							:clear-icon="false" placeholder="请选择接客时间" format="YYYY-MM-DD HH:mm" :hide-second="true">
+							<view class="input-wrapper">
+								<text class="placeholder" v-if="!formData.pickupTime">请选择接客时间</text>
+								<text v-else>{{ formData.pickupTime }}</text>
+								<uni-icons type="calendar" size="16" color="#c0c4cc"></uni-icons>
+							</view>
+						</uni-datetime-picker>
+					</view>
+					<view class="form-item">
+						<text class="label">接客地点</text>
+						<input class="input" v-model="formData.pickupLocation" placeholder="请输入接客地点"
+							placeholder-style="color: #c0c4cc" />
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 提交按钮 -->
+		<view class="submit-container">
+			<button class="submit-btn" @click="submitForm">提交</button>
+		</view>
+
+		<!-- 部门选择器 -->
+		<uni-popup ref="departmentPopup" type="bottom" style="z-index: 999;">
+			<view class="picker-container">
+				<view class="picker-header">
+					<text @click="$refs.departmentPopup.close()">取消</text>
+					<text class="picker-title">选择所属部门</text>
+					<text @click="confirmDepartment">确定</text>
+				</view>
+				<picker-view class="picker-view" :value="departmentIndex" @change="onDepartmentChange">
+					<picker-view-column>
+						<view class="picker-item" v-for="(item, index) in departments" :key="index">
+							{{ item }}
+						</view>
+					</picker-view-column>
+				</picker-view>
+			</view>
+		</uni-popup>
+
+		<!-- 提交成功弹框 -->
+		<uni-popup ref="successPopup" type="center" :mask-click="false">
+			<view class="success-popup">
+				<view class="popup-content">
+					<view class="success-icon">
+						<uni-icons type="checkmarkempty" size="60" color="#52c41a"></uni-icons>
+					</view>
+					<view class="popup-title">申请提交成功</view>
+					<view class="popup-message">您的申请已成功提交，请关注公众号即时查询审核结果</view>
+					<view class="popup-buttons">
+						<button class="cancel-btn" @click="closeSuccessPopup">取消</button>
+						<button class="follow-btn" @click="showQRCode">关注</button>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<!-- 二维码弹框 -->
+		<uni-popup ref="qrcodePopup" type="center" :mask-click="false">
+			<view class="qrcode-popup">
+				<view class="qrcode-content">
+					<view class="qrcode-title">扫描二维码关注公众号</view>
+					<view class="qrcode-image" @click="previewQRCode">
+						<image src="/static/images/qrcode.png" mode="aspectFit"></image>
+						<view class="preview-tip">
+							<uni-icons type="search" size="16" color="#fff"></uni-icons>
+							<text>点击查看大图</text>
+						</view>
+					</view>
+					<view class="qrcode-tip">扫描上方二维码，关注公众号获取审核结果</view>
+					<button class="qrcode-close-btn" @click="closeQRCode">我知道了</button>
+				</view>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				type: '', // 从上一页传递过来的参数
+				formData: {
+					department: '',
+					employeeName: '',
+					visitReason: '',
+					visitTime: '',
+					visitorName: '',
+					visitorCompany: '',
+					visitorPhone: '',
+					accompanyPersons: [{
+						name: '',
+						phone: ''
+					}],
+					useVehicle: false,
+					pickupTime: '',
+					pickupLocation: ''
+				},
+				// 部门假数据
+				departments: [
+					'技术部',
+					'市场部',
+					'人事部',
+					'财务部',
+					'运营部',
+					'产品部',
+					'设计部',
+					'客服部'
+				],
+				departmentIndex: [0],
+				tempDepartmentIndex: [0]
+			}
+		},
+		onLoad(options) {
+			// 获取传递过来的参数
+			if (options.type) {
+				this.type = options.type;
+			}
+		},
+		methods: {
+			// 显示部门选择器
+			showDepartmentPicker() {
+				this.$refs.departmentPopup.open();
+			},
+
+			// 部门选择改变
+			onDepartmentChange(e) {
+				this.tempDepartmentIndex = e.detail.value;
+			},
+
+			// 确认选择部门
+			confirmDepartment() {
+				this.departmentIndex = [...this.tempDepartmentIndex];
+				this.formData.department = this.departments[this.departmentIndex[0]];
+				this.$refs.departmentPopup.close();
+			},
+
+			// 到访时间改变
+			onVisitTimeChange(e) {
+				this.formData.visitTime = e;
+			},
+
+			// 接客时间改变
+			onPickupTimeChange(e) {
+				this.formData.pickupTime = e;
+			},
+
+			// 获取当前日期时间
+			getCurrentDatetime() {
+				const now = new Date();
+				const year = now.getFullYear();
+				const month = String(now.getMonth() + 1).padStart(2, '0');
+				const day = String(now.getDate()).padStart(2, '0');
+				const hour = String(now.getHours()).padStart(2, '0');
+				const minute = String(now.getMinutes()).padStart(2, '0');
+				return `${year}-${month}-${day} ${hour}:${minute}`;
+			},
+
+			// 添加随行人员
+			addAccompany() {
+				this.formData.accompanyPersons.push({
+					name: '',
+					phone: ''
+				});
+			},
+
+			// 删除随行人员
+			removeAccompany(index) {
+				if (this.formData.accompanyPersons.length > 1) {
+					this.formData.accompanyPersons.splice(index, 1);
+				}
+			},
+
+			// 车辆开关改变
+			onVehicleChange(e) {
+				this.formData.useVehicle = e.detail.value;
+				if (!this.formData.useVehicle) {
+					// 关闭车辆使用时清空相关信息
+					this.formData.pickupTime = '';
+					this.formData.pickupLocation = '';
+				}
+			},
+
+
+			// 手机号格式校验
+			validatePhone(phone) {
+				const phoneRegex = /^1[3-9]\d{9}$/;
+				return phoneRegex.test(phone);
+			},
+
+			// 表单验证
+			validateForm() {
+				if (!this.formData.department) {
+					uni.showToast({
+						title: '请选择所属部门',
+						icon: 'none'
+					});
+					return false;
+				}
+				if (!this.formData.employeeName) {
+					uni.showToast({
+						title: '请输入员工姓名',
+						icon: 'none'
+					});
+					return false;
+				}
+				if (!this.formData.visitReason) {
+					uni.showToast({
+						title: '请输入访问事由',
+						icon: 'none'
+					});
+					return false;
+				}
+				if (!this.formData.visitTime) {
+					uni.showToast({
+						title: '请选择到访时间',
+						icon: 'none'
+					});
+					return false;
+				}
+				if (!this.formData.visitorName) {
+					uni.showToast({
+						title: '请输入访客姓名',
+						icon: 'none'
+					});
+					return false;
+				}
+				if (!this.formData.visitorCompany) {
+					uni.showToast({
+						title: '请输入访客单位',
+						icon: 'none'
+					});
+					return false;
+				}
+				if (!this.formData.visitorPhone) {
+					uni.showToast({
+						title: '请输入手机号',
+						icon: 'none'
+					});
+					return false;
+				}
+
+				// 校验访客手机号格式
+				if (!this.validatePhone(this.formData.visitorPhone)) {
+					uni.showToast({
+						title: '请输入正确的手机号格式',
+						icon: 'none'
+					});
+					return false;
+				}
+
+				// 验证随行人员信息
+				for (let i = 0; i < this.formData.accompanyPersons.length; i++) {
+					const person = this.formData.accompanyPersons[i];
+					if (person.name && !person.phone) {
+						uni.showToast({
+							title: `请输入第${i + 1}个随行人员的手机号`,
+							icon: 'none'
+						});
+						return false;
+					}
+					if (!person.name && person.phone) {
+						uni.showToast({
+							title: `请输入第${i + 1}个随行人员的姓名`,
+							icon: 'none'
+						});
+						return false;
+					}
+					// 校验随行人员手机号格式
+					if (person.phone && !this.validatePhone(person.phone)) {
+						uni.showToast({
+							title: `第${i + 1}个随行人员手机号格式不正确`,
+							icon: 'none'
+						});
+						return false;
+					}
+				}
+
+				// 验证车辆使用信息
+				if (this.formData.useVehicle) {
+					if (!this.formData.pickupTime) {
+						uni.showToast({
+							title: '请选择接客时间',
+							icon: 'none'
+						});
+						return false;
+					}
+					if (!this.formData.pickupLocation) {
+						uni.showToast({
+							title: '请选择接客地点',
+							icon: 'none'
+						});
+						return false;
+					}
+				}
+
+				return true;
+			},
+
+			// 提交表单
+			submitForm() {
+				if (!this.validateForm()) {
+					return;
+				}
+
+				// 过滤空的随行人员
+				const validAccompanyPersons = this.formData.accompanyPersons.filter(person =>
+					person.name && person.phone
+				);
+
+				const submitData = {
+					...this.formData,
+					accompanyPersons: validAccompanyPersons,
+					type: this.type
+				};
+
+				console.log('提交数据:', submitData);
+
+				// TODO: 这里调用后端接口提交数据
+				// this.submitToServer(submitData);
+
+				// 显示提交成功弹框
+				this.$refs.successPopup.open();
+			},
+
+			// 关闭成功弹框
+			closeSuccessPopup() {
+				this.$refs.successPopup.close();
+				// 返回上一页
+				uni.navigateBack();
+			},
+
+			// 显示二维码
+			showQRCode() {
+				this.$refs.successPopup.close();
+				this.$refs.qrcodePopup.open();
+			},
+
+			// 关闭二维码弹框
+			closeQRCode() {
+				this.$refs.qrcodePopup.close();
+				// 返回上一页
+				uni.navigateBack();
+			},
+
+			// 预览二维码
+			previewQRCode() {
+				uni.previewImage({
+					urls: ['/static/images/qrcode.png'],
+					current: 0
+				});
+			},
+
+			// 提交到服务器的方法（预留）
+			async submitToServer(data) {
+				// 这里是后端接口调用的预留方法
+				// try {
+				//     const response = await this.$request.post('/api/visit/apply', data);
+				//     return response;
+				// } catch (error) {
+				//     console.error('提交失败:', error);
+				//     throw error;
+				// }
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		background-color: #f5f5f5;
+		min-height: 100vh;
+		padding-bottom: 120rpx;
+	}
+
+	.form-container {
+		padding: 20rpx;
+	}
+
+	.section {
+		background-color: #fff;
+		border-radius: 12rpx;
+		margin-bottom: 20rpx;
+		padding: 30rpx;
+	}
+
+	.section-title {
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+		margin-bottom: 30rpx;
+		display: flex;
+		align-items: center;
+	}
+
+	.title-icon {
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 15rpx;
+	}
+
+	.form-item {
+		display: flex;
+		align-items: center;
+		margin-bottom: 30rpx;
+		position: relative;
+
+		&:last-child {
+			margin-bottom: 0;
+		}
+	}
+
+	.label {
+		width: 160rpx;
+		font-size: 28rpx;
+		color: #666;
+		flex-shrink: 0;
+	}
+
+	.input {
+		flex: 1;
+		height: 70rpx;
+		padding: 0 20rpx;
+		background-color: #f8f8f8;
+		border-radius: 8rpx;
+		font-size: 28rpx;
+		color: #333;
+	}
+
+	.input-wrapper {
+		flex: 1;
+		height: 70rpx;
+		padding: 0 20rpx;
+		background-color: #f8f8f8;
+		border-radius: 8rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.placeholder {
+		color: #c0c4cc;
+		font-size: 28rpx;
+	}
+
+	.accompany-list {
+		.accompany-item {
+			position: relative;
+			padding: 20rpx;
+			background-color: #f8f8f8;
+			border-radius: 8rpx;
+			margin-bottom: 20rpx;
+
+			&:last-child {
+				margin-bottom: 0;
+			}
+
+			.form-item {
+				margin-bottom: 20rpx;
+
+				&:last-child {
+					margin-bottom: 0;
+				}
+			}
+		}
+	}
+
+	.delete-btn {
+		position: absolute;
+		top: 10rpx;
+		right: 10rpx;
+		width: 60rpx;
+		height: 60rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #fff;
+		border-radius: 50%;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+	}
+
+	.add-accompany-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 80rpx;
+		background-color: #f8f9fa;
+		border: 2rpx dashed #c0c4cc;
+		border-radius: 8rpx;
+		color: #909399;
+		font-size: 28rpx;
+
+		text {
+			margin-left: 10rpx;
+		}
+	}
+
+	.vehicle-header {
+		display: flex;
+		align-items: center;
+		margin-bottom: 30rpx;
+
+		.section-title {
+			flex: 1;
+			margin-bottom: 0;
+			margin-left: 15rpx;
+		}
+	}
+
+	.vehicle-content {
+		padding-top: 20rpx;
+		border-top: 1rpx solid #eee;
+	}
+
+	.submit-container {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 20rpx;
+		background-color: #fff;
+		box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.1);
+	}
+
+	.submit-btn {
+		width: 100%;
+		height: 88rpx;
+		background: linear-gradient(135deg, #ff6b35 0%, #ff9500 100%);
+		border-radius: 44rpx;
+		border: none;
+		color: #fff;
+		font-size: 32rpx;
+		font-weight: 600;
+	}
+
+	.picker-container {
+		background-color: #fff;
+		border-radius: 20rpx 20rpx 0 0;
+	}
+
+	.picker-header {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 30rpx;
+		border-bottom: 1rpx solid #eee;
+
+		text {
+			color: #007aff;
+			font-size: 28rpx;
+		}
+	}
+
+	.picker-title {
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333 !important;
+	}
+
+	.picker-view {
+		height: 400rpx;
+	}
+
+	.picker-item {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 80rpx;
+		font-size: 28rpx;
+		color: #333;
+	}
+
+	// 提交成功弹框样式
+	.success-popup {
+		.popup-content {
+			background-color: #fff;
+			border-radius: 20rpx;
+			padding: 60rpx 40rpx 40rpx;
+			width: 560rpx;
+			text-align: center;
+		}
+
+		.success-icon {
+			margin-bottom: 30rpx;
+		}
+
+		.popup-title {
+			font-size: 36rpx;
+			font-weight: 600;
+			color: #333;
+			margin-bottom: 20rpx;
+		}
+
+		.popup-message {
+			font-size: 28rpx;
+			color: #666;
+			line-height: 1.6;
+			margin-bottom: 50rpx;
+		}
+
+		.popup-buttons {
+			display: flex;
+			gap: 20rpx;
+
+			button {
+				flex: 1;
+				height: 80rpx;
+				border-radius: 40rpx;
+				font-size: 28rpx;
+				border: none;
+			}
+
+			.cancel-btn {
+				background-color: #f5f5f5;
+				color: #666;
+			}
+
+			.follow-btn {
+				background: linear-gradient(135deg, #ff6b35 0%, #ff9500 100%);
+				color: #fff;
+			}
+		}
+	}
+
+	// 二维码弹框样式
+	.qrcode-popup {
+		.qrcode-content {
+			background-color: #fff;
+			border-radius: 20rpx;
+			padding: 50rpx 40rpx;
+			width: 560rpx;
+			text-align: center;
+		}
+
+		.qrcode-title {
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #333;
+			margin-bottom: 40rpx;
+		}
+
+			.qrcode-image {
+				width: 400rpx;
+				height: 400rpx;
+				margin: 0 auto 30rpx;
+				border: 1rpx solid #eee;
+				border-radius: 12rpx;
+				overflow: hidden;
+				position: relative;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+
+				.preview-tip {
+					position: absolute;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					height: 60rpx;
+					background: rgba(0, 0, 0, 0.5);
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					color: #fff;
+					font-size: 24rpx;
+
+					text {
+						margin-left: 10rpx;
+					}
+				}
+
+				&:active {
+					opacity: 0.8;
+				}
+			}
+
+		.qrcode-tip {
+			font-size: 26rpx;
+			color: #999;
+			margin-bottom: 40rpx;
+			line-height: 1.5;
+		}
+
+		.qrcode-close-btn {
+			width: 100%;
+			height: 80rpx;
+			background: linear-gradient(135deg, #ff6b35 0%, #ff9500 100%);
+			border-radius: 40rpx;
+			color: #fff;
+			font-size: 28rpx;
+			border: none;
+		}
+	}
+</style>

pagesA/user/index.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 个人信息 -->
 	<view>
 		<!-- 头像区域 -->
 		<view class="avatar-region">

uni_modules/uni-datetime-picker/changelog.md

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

uni_modules/uni-datetime-picker/package.json

@@ -0,0 +1,107 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.42",
+  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
+  "keywords": [
+    "uni-datetime-picker",
+    "uni-ui",
+    "uniui",
+    "日期时间选择器",
+    "日期时间"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "",
+    "uni-app": "^4.07",
+    "uni-app-x": ""
+  },
+  "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",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-scss",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "x",
+        "aliyun": "x",
+        "alipay": "x"
+      },
+      "client": {
+        "uni-app": {
+          "vue": {
+            "vue2": "√",
+            "vue3": "√"
+          },
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "vue": "√",
+            "nvue": "√",
+            "android": "√",
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√",
+            "alipay": "√",
+            "toutiao": "√",
+            "baidu": "√",
+            "kuaishou": "-",
+            "jd": "-",
+            "harmony": "-",
+            "qq": "√",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "√",
+            "union": "√"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
+        }
+      }
+    }
+  }
+}

uni_modules/uni-datetime-picker/readme.md

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

uni_modules/uni-icons/changelog.md

@@ -1,5 +1,7 @@
-## 2.0.10（2024-06-07）
-- 优化 uni-app x 中，size 属性的类型
+## 2.0.12（2025-08-26）
+- 优化 uni-app x 下 size 类型问题
+## 2.0.11（2025-08-18）
+- 修复 图标点击事件返回
 ## 2.0.9（2024-01-12）
 fix: 修复图标大小默认值错误的问题
 ## 2.0.8（2023-12-14）

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

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

uni_modules/uni-icons/components/uni-icons/uni-icons.vue

@@ -85,8 +85,8 @@
 			}
 		},
 		methods: {
-			_onClick() {
-				this.$emit('click')
+			_onClick(e) {
+				this.$emit('click', e)
 			}
 		}
 	}
@@ -107,4 +107,4 @@
 		text-decoration: none;
 		text-align: center;
 	}
-</style>
+</style>

uni_modules/uni-icons/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",
@@ -11,12 +11,14 @@
 ],
   "repository": "https://github.com/dcloudio/uni-ui",
   "engines": {
-    "HBuilderX": "^3.2.14"
+    "HBuilderX": "^3.2.14",
+    "uni-app": "^4.08",
+    "uni-app-x": "^4.61"
   },
   "directories": {
     "example": "../../temps/example_temps"
   },
-"dcloudext": {
+  "dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -34,56 +36,76 @@
       "permissions": "无"
     },
     "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
-    "type": "component-vue"
+    "type": "component-vue",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
   },
   "uni_modules": {
-    "dependencies": ["uni-scss"],
+    "dependencies": [
+      "uni-scss"
+    ],
     "encrypt": [],
     "platforms": {
       "cloud": {
-        "tcb": "y",
-        "aliyun": "y",
-        "alipay": "n"
+        "tcb": "x",
+        "aliyun": "x",
+        "alipay": "x"
       },
       "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y",
-          "app-uvue": "y"
+        "uni-app": {
+          "vue": {
+            "vue2": "√",
+            "vue3": "√"
+          },
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "vue": "√",
+            "nvue": "-",
+            "android": {
+                "extVersion": "",
+                "minVersion": "29"
+            },
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√",
+            "alipay": "√",
+            "toutiao": "√",
+            "baidu": "√",
+            "kuaishou": "-",
+            "jd": "-",
+            "harmony": "-",
+            "qq": "√",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "√",
+            "union": "√"
+          }
         },
-        "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",
-					"钉钉": "y",
-					"快手": "y",
-					"飞书": "y",
-					"京东": "y"
-        },
-        "快应用": {
-          "华为": "y",
-          "联盟": "y"
-        },
-        "Vue": {
-            "vue2": "y",
-            "vue3": "y"
+        "uni-app-x": {
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "android": {
+                "extVersion": "",
+                "minVersion": "29"
+            },
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√"
+          }
         }
       }
     }
   }
-}
+}