From 09ee8475e358087073e70b7f6649a58ade93c957 Mon Sep 17 00:00:00 2001
From: white <1293616053@qq.com>
Date: Wed, 10 Jul 2024 00:33:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |  81 ++-
 common/api.js                                 |  13 +-
 manifest.json                                 |  62 +--
 pages.json                                    |   4 +
 pages/device/device.vue                       |  15 +-
 pages/index/detail.vue                        | 186 +++++++
 pages/index/index.vue                         |  48 +-
 pages/login/register.vue                      |   3 +-
 pages/my/my.vue                               |  12 +-
 store/modules/api.js                          |  10 +
 uni_modules/punch-calendar/changelog.md       |  14 +
 .../punch-calendar/punch-calendar.vue         | 464 ++++++++++++++++++
 uni_modules/punch-calendar/package.json       |  81 +++
 uni_modules/punch-calendar/readme.md          |  86 ++++
 .../static/images/cakebdar-open.png           | Bin 0 -> 271 bytes
 .../static/images/calendar-next-active.png    | Bin 0 -> 262 bytes
 .../static/images/calendar-next.png           | Bin 0 -> 166 bytes
 .../static/images/calendar-prev.png           | Bin 0 -> 168 bytes
 18 files changed, 1014 insertions(+), 65 deletions(-)
 create mode 100644 pages/index/detail.vue
 create mode 100644 uni_modules/punch-calendar/changelog.md
 create mode 100644 uni_modules/punch-calendar/components/punch-calendar/punch-calendar.vue
 create mode 100644 uni_modules/punch-calendar/package.json
 create mode 100644 uni_modules/punch-calendar/readme.md
 create mode 100644 uni_modules/punch-calendar/static/images/cakebdar-open.png
 create mode 100644 uni_modules/punch-calendar/static/images/calendar-next-active.png
 create mode 100644 uni_modules/punch-calendar/static/images/calendar-next.png
 create mode 100644 uni_modules/punch-calendar/static/images/calendar-prev.png

diff --git a/App.vue b/App.vue
index 5c6e1f3..d6a28f2 100644
--- a/App.vue
+++ b/App.vue
@@ -7,9 +7,7 @@
 			plus.navigator.closeSplashscreen(); 
 			// #endif 
 		},
-		onLaunch: function() {
-			
-			console.log('App Launch')
+		onLaunch: async function() {
 			uni.getSystemInfo({
 				success: function(e) {
 					// #ifndef MP
@@ -33,13 +31,88 @@
 					Vue.prototype.CustomBar = e.statusBarHeight + e.titleBarHeight;
 					// #endif
 				}
-			})
+			});
+			
+			// 是否更新APP
+			// #ifdef APP-PLUS
+			await this.getIsUpdata();
+			// #endif
 		},
 		onShow: function() {
 			console.log('App 开启')
 		},
 		onHide: function() {
 			console.log('App 关闭')
+		},
+		methods: {
+			getIsUpdata() {
+				// 获取本地应用资源版本号
+				plus.runtime.getProperty(plus.runtime.appid, (info) => {
+					this.version = info.version;  // 版本号 1.0.0
+					this.versionCode = info.versionCode ;  // 版本号名称 100
+					let params = {
+						version: info.version
+					};
+					this.$store.dispatch('api/getVersion', params).then(res => {
+						if (this.compareVersions(res.data.version, params.version) == 1) {
+							uni.showModal({
+								title: "版本更新",
+								content: '有新的版本发布，是否立即进行新版本下载？',
+								confirmText:'立即更新',
+								cancelText:'稍后进行',
+								success: function (res) {
+									if (res.confirm) {
+										//#ifdef APP-PLUS
+										// encodeURI要大写
+										plus.runtime.openURL(encodeURI(`http://ydy.baimajingxuan.com`));
+										//#endif
+									} else if (res.cancel) {
+										console.log('稍后更新');
+									}
+								}
+							})
+						}
+						
+						// 下面执行需要更新的安卓端热更新代码
+						// var data = {
+						//     // 版本更新内容 支持<br>自动换行
+						//     describe: "1.修复已知问题2.优化用户体验3.新增聊天室4.修复部分bug4.修复部分bug14.", 
+						//     edition_url: 'https://img.agrimedia.cn/bmsc/apps/1.1.8s.wgt', //apk、wgt包下载地址或者应用市场地址  安卓应用市场 market://details?id=xxxx 苹果store itms-apps://itunes.apple.com/cn/app/xxxxxx
+						//     edition_force: 0, //是否强制更新 0代表否 1代表是, 弹窗关闭
+						//     package_type: 1, //0是整包升级（apk或者appstore或者安卓应用市场） 1是wgt升级
+						//     edition_number: 100, //版本号 最重要的manifest里的版本号 （检查更新主要以服务器返回的edition_number版本号是否大于当前app的版本号来实现是否更新）
+						//     edition_name: '1.0.0', // 版本名称 manifest里的版本名称
+						// }
+						
+						// // 这里也可以让前端判断本地和接口返回的版本号是否一致
+						// if (Number(this.versionCode) == 117) {
+						// 	//跳转更新页面 （注意！！！如果pages.json第一页的代码里有一打开就跳转其他页面的操作，下面这行代码最好写在setTimeout里面设置延时3到5秒再执行）
+						// 	uni.navigateTo({
+						// 	    url: `/uni_modules/rt-uni-update/components/rt-uni-update/rt-uni-update?obj=${JSON.stringify(data)}`
+						// 	});
+						// }
+					})
+				})
+			},
+			
+			compareVersions(v1, v2) {
+			    const v1Parts = v1.split('.').map(Number);
+			    const v2Parts = v2.split('.').map(Number);
+			
+			    for (let i = 0; i < Math.max(v1Parts.length, v2Parts.length); i++) {
+			        const v1Part = v1Parts[i] || 0;
+			        const v2Part = v2Parts[i] || 0;
+			
+			        if (v1Part > v2Part) {
+			            return 1;
+			        }
+			        if (v1Part < v2Part) {
+			            return -1;
+			        }
+			    }
+			
+			    return 0;
+			}
 		}
 	}
 </script>
diff --git a/common/api.js b/common/api.js
index 331b02b..5cdf8a0 100644
--- a/common/api.js
+++ b/common/api.js
@@ -30,6 +30,15 @@ export const getDayInfo = (data) => {
 	return post('watch/device/getDayInfo', data)
 }
 
+export const getDeviceListDays = (data) => {
+	return post('watch/device/getDeviceListDays', data)
+}
+
+// 获取版本号
+export const getVersion = (data) => {
+	return post('watch/version/index', data)
+}
+
 
 export default {
 	code,
@@ -37,5 +46,7 @@ export default {
 	sendSms,
 	register,
 	getBindUserDeviceId,
-	getDayInfo
+	getDayInfo,
+	getDeviceListDays,
+	getVersion
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index f4f7332..d4cdde1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "family-app",
+    "name" : "中鼎云医",
     "appid" : "__UNI__24DA8DD",
     "description" : "",
     "versionName" : "1.0.0",
@@ -70,34 +70,34 @@
     },
     "vueVersion" : "2",
     "h5" : {
-		"async" : {
-			"delay" : "10000" // 这个时间内页面js已经加载了，所以不展示默认的loading  
-		},
-		"router" : {
-			"base" : "./"
-		},
-		"devServer" : {
-			"disableHostCheck" : true, // 开启可以用自己的域名
-			"proxy": {
-				"/watch": {
-					"target": "http://test.sc2.agrimedia.cn",
-					"changeOrigin": true,
-					"secure": false
-					// "pathRewrite": { //重写url
-					// 	"^/watch": ""
-					// }
-				}
-			}
-		},
-		"title" : "智能终端",
-		"optimization" : {
-			"treeShaking" : {
-				"enable" : false
-			}
-		},
-		"template" : "template.h5.html",
-		"uniStatistics" : {
-			"enable" : true
-		}
-	}
+        "async" : {
+            "delay" : "10000" // 这个时间内页面js已经加载了，所以不展示默认的loading  
+        },
+        "router" : {
+            "base" : "./"
+        },
+        "devServer" : {
+            "disableHostCheck" : true, // 开启可以用自己的域名
+            "proxy" : {
+                "/watch" : {
+                    "target" : "http://test.sc2.agrimedia.cn",
+                    "changeOrigin" : true,
+                    "secure" : false
+                }
+            }
+        },
+        // "pathRewrite": { //重写url
+        // 	"^/watch": ""
+        // }
+        "title" : "智能终端",
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : false
+            }
+        },
+        "template" : "template.h5.html",
+        "uniStatistics" : {
+            "enable" : true
+        }
+    }
 }
diff --git a/pages.json b/pages.json
index d1d8946..5c853cd 100644
--- a/pages.json
+++ b/pages.json
@@ -3,6 +3,10 @@
 		{
 			"path": "pages/login/login",
 			"style": {}
+		},
+		{
+			"path": "pages/index/detail",
+			"style": {}
 		},
 		{
 			"path": "pages/login/forget",
diff --git a/pages/device/device.vue b/pages/device/device.vue
index c59491b..c147b39 100644
--- a/pages/device/device.vue
+++ b/pages/device/device.vue
@@ -4,11 +4,8 @@
 		<view class="content">
 			<view class="content-header">
 				<view class="title">设备</view>
-				<!-- <view class="add" @click="toAdd()">
-					<image src="/static/image/add-icon.png" mode=""></image>
-				</view> -->
 			</view>
-			<view class="content-item" v-for="(item, index) in deviceList">
+			<view class="content-item" v-for="(item, index) in deviceList" v-if="item.user">
 				<view class="title">
 					<text>绑定人: {{item.user.mobile}}</text>
 				</view>
@@ -36,16 +33,14 @@
 				console.log(this.deviceList)
 			})
 		},
-		methods: {
-			// toAdd() {
-			// 	uni.navigateTo({
-			// 		url: '/pages/device/adddevice'
-			// 	})
-			// },
+		methods: {
 			clickLeft() {
 				uni.navigateBack({
 					delta: 1
 				})
+			},
+			getNameByKey(key) {
+			    return this.keyNameMap[key] || "Key not found";
 			}
 		}
 	}
diff --git a/pages/index/detail.vue b/pages/index/detail.vue
new file mode 100644
index 0000000..d5d45ec
--- /dev/null
+++ b/pages/index/detail.vue
@@ -0,0 +1,186 @@
+<template>
+	<z-paging ref="paging" v-model="dataList" @query="queryList">
+		<tm-nav-bar left-icon="arrow-left" :title="desc? getNameByKey(desc) : getNameByKey(type)" @clickLeft="back" />
+		<view class="content">
+			<view class="over" style="margin-top: 30rpx" @click="flag = !flag">
+				<text>日期筛选</text>
+				<uni-icons type="down" size="24"></uni-icons>
+			</view>
+			<view class="time" v-show="flag">
+				<punch-calendar @switchMonth="switchMonth" @chooseDay="chooseDay" :errorList="errorList" :successList="successList" ref="calendar"></punch-calendar>
+			</view>
+			<view class="list" v-if="dataList.length">
+				<view class="row" v-for="(item, index) in dataList" :key="index">
+					<view class="data">
+						<image src="https://img.agrimedia.cn/apptest/%E6%89%8B%E8%A1%A8-%E7%BA%BF%E6%80%A73-0.png" mode="widthFix"></image>						
+						<view v-if="type == 'step'">
+							疲劳：{{item.data_msg.wear}}
+							运动量：{{item.data_msg.amountOfExercise}}
+						</view>
+						<view v-if="type == 'bloodPressure'">
+							{{item.data_msg.bloodPressureHigh}}/{{item.data_msg.bloodPressureLow}}
+						</view>
+						<view v-if="type == 'bloodGlucose'">
+							{{item.data_msg}}
+						</view>
+						<view v-if="type == 'bloodLiquid' && desc == 'uricAcidVal'">
+							{{item.data_msg.uricAcidVal}}
+						</view>
+						<view v-if="type == 'bloodLiquid' && desc !== 'uricAcidVal'" style="font-size: 24rpx;">
+							<view>胆固醇：{{item.data_msg.cholesterol/100}} 三酰甘油：{{item.data_msg.triacylglycerol/100}}</view>
+							<view>高密度脂蛋白：{{item.data_msg.highDensity/100}}低密度脂蛋白：{{item.data_msg.lowDensity}}</view>
+						</view>
+						<view v-else>
+							{{getArrMaxValue(item.data_msg)}}
+						</view>
+					</view>
+					<view class="time">
+						{{item.date_str}} {{item.hour_minute}} 
+					</view>
+				</view>
+			</view>
+		</view>
+	</z-paging>
+</template>
+
+<script>
+	import { getArrMaxValue } from '@/utils/utils.js'
+	export default {
+		data() {
+			return {
+				type: '',
+				desc: '',
+				dataList: [],
+				keyNameMap: {
+				    bloodGlucose: "血糖",
+					bloodOxygen: "血氧",
+					bloodPressure: '血压',
+					heartReat: '心率',
+				    bloodLiquid: "血液",
+					uricAcidVal: '尿酸',
+					meiTuo: '梅拖',
+					pulseReat: '脉率',
+					updataDate: '更新时间',
+					step: '步数'
+				},
+				time: '',
+				flag: false,
+				successList: ['1676995200000'],
+				errorList: ['1676908800000'],
+			}
+		},
+		
+		mounted() {
+			// 初始化
+			this.$refs.calendar.initCalendar()
+
+			// 模拟异步赋值
+			let timer = setTimeout(()=>{
+				this.addTimer()
+			},2000)
+		},
+		
+		// onLoad() {
+		// 	// 初始化
+		// 	this.$refs.calendar.initCalendar()
+
+		// 	// 模拟异步赋值
+		// 	let timer = setTimeout(()=>{
+		// 		this.addTimer()
+		// 	},2000)
+		// },
+		
+		onShow(e) {
+			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+			let curRoute = routes[routes.length - 1].route //获取当前页面路由
+			let curParam = routes[routes.length - 1].options; //获取路由参数
+			// 拼接参数
+			let param = ''
+			for (let key in curParam) {
+			    param += '&' + key + '=' + curParam[key]
+			}
+			this.type = curParam.type;
+			this.desc = curParam.desc;
+		},
+		
+		
+		methods: {
+			getArrMaxValue,
+			queryList(pageNo, pageSize) {
+				this.$store.dispatch('api/getDeviceListDays', { 
+					type: this.type,
+					device_real_time: this.time
+				}).then(res => {
+					this.$refs.paging.completeByTotal(res.data, res.total);
+				});
+			},
+			
+			getNameByKey(key) {
+			    return this.keyNameMap[key] || "Key not found";
+			},
+			
+			addTimer() {
+				this.successList = [...this.successList, '1681920000000']
+			},
+
+			// 点击某一天
+			chooseDay(val) {
+				this.time = val.year + '-' + val.month + '-' + val.day;
+				this.$refs.paging.reload();
+			},
+			
+			back() {
+				uni.navigateBack({
+					delta: 1
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		.over {
+			margin: 0rpx 30rpx;
+			background-color: #fff;
+			padding: 30rpx;
+			border-radius: 20rpx;
+			font-weight: 800;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border-radius: 20rpx;
+		}
+		.time {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+		.list {
+			background-color: #fff;
+			overflow: hidden;
+			padding: 30rpx;
+			margin: 30rpx 30rpx;
+			border-radius: 30rpx;
+			.row {
+				height: 100rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+			}
+			.data {
+				display: flex;
+				align-items: center;
+				font-weight: 500;
+				font-size: 36rpx;
+				image {
+					width: 50rpx;
+				}
+			}
+			.time {
+				font-weight: 300;
+				font-size: 24rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ebdc14c..ae1bbc1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -15,34 +15,37 @@
 						</view>
 					</view>
 				</view>
-				<view class="content-item row">
+				<view class="content-item row" @click="toPage('/pages/index/detail?type=step')">
 					<view class="item">
 						<view class="title">卡路里</view>
 						<view class="row-date">
-							{{dataLists.step.calorie}}
+							{{dataLists.step? dataLists.step.calorie/10 : '--'}}
+							<text>千卡</text>
 						</view>
 					</view>
 					<view class="item">
 						<view class="title">步数</view>
 						<view class="row-date">
-							{{dataLists.step.step}}
+							{{dataLists.step? dataLists.step.step : '--'}}
+							<text>步</text>
 						</view>
 					</view>
 					<view class="item">
 						<view class="title">距离</view>
 						<view class="row-date">
-							{{dataLists.step.distance}}
+							{{dataLists.step? dataLists.step.distance/100 : '--'}}
+							<text>公里</text>
 						</view>
 					</view>
 					
 					<view class="row-time">
-						{{dataLists.updataDate}}
+						{{formatDateTime(dataLists.updataDate)}}
 					</view>
 					<view class="bg">
-						<image src="../../static/icon/血糖.png" mode="widthFix"></image>
+						<!-- <image src="../../static/icon/血糖.png" mode="widthFix"></image> -->
 					</view>
 				</view>
-				<view class="content-item">
+				<view class="content-item" @click="toPage('/pages/index/detail?type=bloodGlucose')">
 					<view class="title">
 						{{getNameByKey('bloodGlucose')}}
 					</view>
@@ -57,7 +60,7 @@
 						<image src="../../static/icon/血糖.png" mode="widthFix"></image>
 					</view>
 				</view>
-				<view class="content-item">
+				<view class="content-item" @click="toPage('/pages/index/detail?type=bloodOxygen')">
 					<view class="title">
 						{{getNameByKey('bloodOxygen')}}
 					</view>
@@ -72,7 +75,7 @@
 						<image src="../../static/icon/血氧.png" mode="widthFix"></image>
 					</view>
 				</view>
-				<view class="content-item">
+				<view class="content-item" @click="toPage('/pages/index/detail?type=bloodPressure')">
 					<view class="title">
 						{{getNameByKey('bloodPressure')}}
 					</view>
@@ -87,7 +90,7 @@
 						<image src="../../static/icon/血压.png" mode="widthFix"></image>
 					</view>
 				</view>
-				<view class="content-item">
+				<view class="content-item" @click="toPage('/pages/index/detail?type=heartReat')">
 					<view class="title">
 						{{getNameByKey('heartReat')}}
 					</view>
@@ -102,7 +105,7 @@
 						<image src="../../static/icon/脉率.png" mode="widthFix"></image>
 					</view>
 				</view>
-				<view class="content-item">
+				<view class="content-item" @click="toPage('/pages/index/detail?type=meiTuo')">
 					<view class="title">
 						{{getNameByKey('meiTuo')}}
 					</view>
@@ -117,7 +120,7 @@
 						<image src="../../static/icon/心率.png" mode="widthFix"></image>
 					</view>
 				</view>
-				<view class="content-item">
+				<view class="content-item" @click="toPage('/pages/index/detail?type=bloodLiquid&desc=uricAcidVal')">
 					<view class="title">
 						尿酸
 					</view>
@@ -133,7 +136,7 @@
 					</view>
 				</view>
 				
-				<view class="content-item" style="height: 360rpx">
+				<view class="content-item" style="height: 430rpx"  @click="toPage('/pages/index/detail?type=bloodLiquid')">
 					<view class="title">
 						{{getNameByKey('bloodLiquid')}}
 					</view>
@@ -215,10 +218,20 @@
 					this.dataLists = res.data_msg;
 					this.$refs.paging.complete();
 				});
+			},
+			toPage(url) {
+				uni.navigateTo({
+					url
+				})
 			},
 			getNameByKey(key) {
 			    return this.keyNameMap[key] || "Key not found";
-			}
+			},
+			formatDateTime(dateTimeStr) {
+				if (dateTimeStr) {
+					return dateTimeStr.replace(/-/g, ' ').replace(' ', ' ', 2).replace(' ', ':');
+				}
+			}  
 		}
 	}
 </script>
@@ -291,6 +304,7 @@
 			.title {
 				font-size: 38rpx;
 				font-weight: 800;
+				margin-bottom: 14rpx;
 			}
 			.row-time {
 				position: absolute;
@@ -320,6 +334,12 @@
 				display: flex;
 				align-items: baseline;
 				justify-content: center;
+				text {
+					opacity: .5;
+					font-size: 24rpx;
+					font-weight: 500;
+					padding-left: 10rpx;
+				}
 			}
 			
 			.date {
diff --git a/pages/login/register.vue b/pages/login/register.vue
index 6f8c958..9a950b9 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -68,8 +68,7 @@
 	export default {
 		data() {
 			return {
-				//logo图片 base64
-				logoImage: 'data:image/png;base64,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2GMaO3asXnvtNe6VAI6Ab+ME/kvPnj01ZcoUzZ07V9dccw3jIQalpKTopptu0pIlSzRu3Dh16NDBOgnwHc5AAJJKly6tq666SgMHDlTVqlWtc+Aj/7lXYt26dXruuec0YcIEua5rnQWY4wwEYtoJJ5ygAQMGaMmSJfrb3/7GeMAR1atXTy+88IIWLlyo3r17Ky6Ot0/ENn4CEJMSExM1cOBALV26VA899JCqVKlinYSAOOWUU/Tcc89p8eLF6tOnD99jgpjFgEBMSUhI0A033KAlS5boL3/5Cw9+wnGrWbOmBg8erMWLF//8CG0gljAgEDN69OihRYsW6ZFHHmE4IGJq1KihF154QTNmzFDz5s2tc4CoYUAg9Nq0aaMZM2bon//8p2rUqGGdg5A644wzNGHCBL399tuqX7++dQ7gOQYEQqtu3boaO3asxowZozPOOMM6BzHi/PPP15w5czR06FClpqZa5wCeYUAgdJKSkvToo4/q448/VuvWra1zEKMuu+wyLVy4UDfddBM3WiKUGBAIld69e2vx4sXq16+fEhJ4zAlsJSUl6YEHHtCcOXPUokUL6xwgohgQCIX09HRNmzZNzz33nCpXrmydA/xK3bp19e6772r48OE6+eSTrXOAiGBAINBOOOEEPfbYY5o7d64aNWpknQP8rs6dO2vZsmW66aabrFOAEmNAILDOO+88zZ8/X9dff711ClAsDzzwgKZNm6Y6depYpwDHjQGBwElKStLgwYM1ceJEVa9e3ToHOC6NGjXSxx9/rFtvvZWbLBFIDAgESuvWrbVw4UL16dPHOgUosdKlS+uee+7RRx99pNNOO806BygWBgQCoWzZsnruuec0duxYPluP0GnYsKFmz56tQYMGWacAx4wBAd8788wzNWfOHPXu3ds6BfDUfffdp9GjRys5Odk6BTgqBgR8y3EcDRo0SB9++CGPoEbMuOCCC/Txxx+rYcOG1inA72JAwJcqV66sCRMm6L777uOBUIg51atX14cffqhrr73WOgU4IgYEfKddu3aaP3++mjVrZp0CmCldurSeeOIJvfLKKypbtqx1DvA/GBDwlRtvvFGjRo3SiSeeaJ0C+MIll1yijz76SDVr1rROAX6FAQFfiIuL0z//+U89+OCDiovjX0vgl+rWrauZM2fq/PPPt04BfsY7NcxVqFBB77//vnr06GGdAvhWuXLlNGbMGP35z3+2TgEkMSBg7NRTT9XMmTPVtGlT6xTA9xzH0R133KG33npLSUlJ1jmIcQwImGnTpo2mTZumatWqWacAgdK2bVvNmDFDp5xyinUKYhgDAiYuu+wyHpgDlMApp5yiKVOmqEmTJtYpiFEMCETd/fffr6FDh/IFQkAJVaxYUe+99546d+5snYIYxIBA1CQkJOjVV1/VzTffbJ0ChEaZMmU0bNgw3XTTTdYpiDEMCERF+fLlNXHiRHXq1Mk6BQgdx3H0wAMP6Nlnn7VOQQxhQMBzVapU0dSpU7lWC3jsiiuu0GuvvcblQUQFAwKeqlGjhqZMmaI6depYpwAx4aKLLtKYMWNUpkwZ6xSEHAMCnqldu7Y+/PBDVa9e3ToFiCmZmZl69913lZiYaJ2CEGNAwBMNGjTQlClTdNJJJ1mnADHpnHPO0YQJE1SuXDnrFIQUAwIRd/bZZ2vSpEmqVKmSdQoQ0xo1aqQPPvhAFSpUsE5BCDEgEFFnnnmm3n33Xf7UA/hEenq6Jk6cyDfcIuIYEIiYBg0aaPz48Vx3BXwmPT1d7733Hk9+RUQ5Xr1wWlqa69Vrw3/S09M1YcIELlsY2rZtmzZu3KgNGzZo06ZNWrFihRYvXmzalJGRobPPPlu1atXSqaeeqjp16qhq1aqmTbFs2bJl6tmzpwoKCqxTEEVZWVme/K5nQKDEatSooalTpyolJcU6JWYUFRXpq6++0qJFi7R48WItWrRI+/bts846JuXLl1fz5s3VokULtWjRQg0bNlRcHCdDo2Xx4sW6/PLLdfDgQesURAkDAr5UvXp1TZw4USeffLJ1Suh9+eWXWrhwoRYtWqRFixYpLy/POikifjkoWrVqpYYNG1onhd7s2bPVp08f6wxECQMCvlOpUiV98MEHfKWwR7KysjR58mQtWLBAn3zyifbu3WudFBUVKlRQRkaGMjMz1aVLFz4K7JHJkyerf//+1hmIAgYEfKVMmTKaNGmSzjrrLOuUUPnqq6/00Ucfadq0afrqq6+sc3yhUaNG6tChgy6++GI1aNDAOidUXnzxRT366KPWGfAYAwK+Mnr0aF1wwQXWGaHw/fffa/z48Xr77be1efNm6xxfq1Onji6//HL16NGDy2YR8qc//Uljx461zoCHGBDwjYceekgDBgywzgi0/Px8TZ48WW+//bY++eQT65xAyszM1JVXXqkOHTrw0eES6tOnj2bPnm2dAY8wIOALffr00eDBg60zAqmoqEgLFy7U2LFj9cEHH+jAgQPWSaFQtmxZXXLJJbr88svVrFkz65xAys/PV6dOnbR69WrrFHiAAQFz7du316hRo6wzAmf37t0aMWKERo8erezsbOucUKtZs6auvvpq/fGPf1TZsmWtcwJlx44duuiii7Rt2zbrFEQYAwKmTj31VM2YMYNTxcWQk5OjV155Ra+++ioP7omyChUqqH///urXrx+PVS+GL774Qp07d9ahQ4esUxBBDAiYSU5O1vTp0/m45jHKycnR888/rzfeeEP79++3zolpJ554ogYMGKB+/frxGOdjNGbMGN1+++3WGYggBgTMjBo1Su3bt7fO8L1du3bppZde0ogRIzjj4DPly5fXjTfeqBtuuEFJSUnWOb535513avTo0dYZiBAGBEzcdtttuuuuu6wzfG3Pnj16+eWXNXz4cOXn51vn4HdUqFBBAwcO1HXXXcfluN9x6NAhdezYkWeRhAQDAlHXqlUrjRs3To7j2b8mgXb48GG99tprevrpp5Wbm2udg2KoUqWK7r//fl122WX8+30EWVlZatOmjX788UfrFJQQAwJRVaNGDc2aNYsb0I5gzpw5uu+++7Rx40brFJRAkyZN9MQTT/BE1SNYvHixunfvbp2BEvJqQPAVePhNw4cPZzz8hh9++EHXXHONrrjiCsZDCCxfvlwdOnTQn//8Z+3Zs8c6x3cyMjI0aNAg6wz4FAMC/+Ovf/2rGjVqZJ3hK67r6rXXXlPLli01ffp06xxE2FtvvaVWrVpp8uTJ1im+c9ddd+mMM86wzoAPcQkDv9KmTRuNGTPGOsNXNm3apBtvvFErVqywTkEUXHjhhRoyZIhSUlKsU3xj06ZNatu2LZ8uCiguYcBz1apV08svv2yd4SsvvviimjdvzniIITNmzFCrVq00YcIE6xTfqFWrlh555BHrDPgMZyAgSYqLi9OUKVPUuHFj6xRf2Lx5s/r376+VK1dap8DQhRdeqH/84x+qWLGidYov9O3bVzNnzrTOQDFxBgKeuv322xkPPxk2bJhat27NeIBmzJihzMxMTZ061TrFF4YOHaoqVapYZ8AnOAMB1atXT7Nnz1ZCQoJ1iqndu3erf//+WrBggXUKfOiqq67SY489pjJlylinmJo5c6b69u1rnYFi4AwEPPPiiy/G/HhYsWKF2rZty3jAEY0ePVqdOnXSli1brFNMtW/fXpdddpl1BnyAARHjbrjhhpj/iNbw4cPVpUsXvmobR/X111+rbdu2mjVrlnWKqb/97W98SgVcwohlqampWrx4ccx+J8ChQ4c0cOBATZo0yToFAXTPPffo1ltvtc4ww6WM4OASBiJu6NChMTse9uzZox49ejAecNyefPJJDRo0SIWFhdYpJriUAQZEjOrRo4cyMzOtM0x8//336tSpk5YsWWKdgoAbP368evXqFbNfpvb444/rpJNOss6AEQZEDEpKStJDDz1knWHiP9998O2331qnICQWLVqkzp0764cffrBOibpy5crp/vvvt86AEQZEDLrnnntUuXJl64yomzVrlrp168aXJiHi1q5dqz/84Q9as2aNdUrU9e7dm+/OiVEMiBhTp04d/fGPf7TOiLoxY8boqquu0sGDB61TEFI7d+5Ux44dtXjxYuuUqHv22WetE2CAARFjnnvuOcXHx1tnRNUzzzyj22+/3ToDMSA/P1/du3fXtGnTrFOi6vTTT9e1115rnYEoY0DEkMsuu0xNmza1zoiqxx57TIMHD7bOQIy5/vrr9dFHH1lnRNVf/vIXvjMkxjAgYkTZsmX18MMPW2dE1eOPP64XXnjBOgMxqKioSNdee62mTJlinRI1ycnJ3FAZYxgQMWLQoEEx9eS4xx57TEOHDrXOQIzr379/TJ2JuPzyy1WnTh3rDEQJAyIGpKSkaMCAAdYZUTN06FDOPMAXioqKdP3118fMjZVxcXF68MEHrTMQJQyIGHDHHXfohBNOsM6IismTJ+vxxx+3zgB+VlhYqL59++qbb76xTomKDh066KyzzrLOQBQwIEKuevXqMfO8+gULFsTUmRYER15ennr27BkzD5t65JFHrBMQBQyIkLv33ntj4mObq1at0jXXXKOioiLrFOA35eTkqHfv3tq7d691iueaNWumtm3bWmfAYwyIEEtPT1f37t2tMzy3fft29e7dW/n5+dYpwO9at26drrnmmpj4Aq4HHnjAOgEeY0CEWCx8pGr//v264oortHPnTusU4Jh88skn+vOf/2yd4bnTTjtNnTp1ss6AhxgQIZWenq4LL7zQOsNTRUVF6tevn1atWmWdAhTL2LFj9dJLL1lneI4nwIYbAyKkbrnlFusEzz322GOaNWuWdQZwXB555BHNnj3bOsNTp59+ujIzM60z4BEGRAhVq1ZN3bp1s87w1Jw5c2LiT3AItwEDBoT+kxmDBg2yToBHGBAhNHDgQMXFhfd/2i1btqh///7WGUCJ5ebm6o9//KMOHz5sneKZzMxMvu47pML7WyZGVaxYUVdeeaV1hmcOHTqkvn37Kjc31zoFiIjPP/889A8/GzhwoHUCPMCACJn+/furdOnS1hmeeeSRR7R69WrrDCCiXnrppVDfz9O5c2fVrl3bOgMRxoAIkVKlSqlfv37WGZ6ZN2+eXn31VesMwBO33HKLcnJyrDM883//93/WCYgwBkSI9OrVS8nJydYZnsjJyeEx1Qi1Xbt26aabbrLO8Ezv3r2VlJRknYEIYkCESJhvLBwwYIB2795tnQF4at68eRo5cqR1hicSExN1+eWXW2cgghgQIZGRkaH09HTrDE+8/vrrWrBggXUGEBUPP/ywNm7caJ3hiTBfYo1FDIiQuO6666wTPLFjxw799a9/tc4AoubAgQOhfdR17dq11aZNG+sMRAgDIgTS0tLUsWNH6wxP3HfffSooKLDOAKJq8eLFGjdunHWGJ66//nrrBEQIAyIErr322lA+OGrGjBn64IMPrDMAEw8//LD27NljnRFx7du3V40aNawzEAHh+60Tg/r06WOdEHEFBQW6++67rTMAM7t379bDDz9sneGJ3r17WycgAhgQAXf++efrpJNOss6IuCFDhoT+OwKAoxk7dqyWL19unRFxV1xxhXUCIoABEXC9evWyToi4rVu36sUXX7TOAHzhzjvvtE6IuJNPPlnNmjWzzkAJMSACLDExMZQ3T953330qLCy0zgB8YdWqVRo7dqx1RsT17NnTOgElxIAIsEsuuUQnnHCCdUZEzZ8/X9OnT7fOAHzlkUceCd2nkbp27ar4+HjrDJQAAyLAwngj0r333mudAPjOrl279MILL1hnRFRSUlIoz6DGEgZEQFWvXl0ZGRnWGRE1adIkbdiwwToD8KWXX35ZP/74o3VGRHEZI9gYEAHVpUsX64SIKioq0lNPPWWdAfhWXl6eXnrpJeuMiGrXrh1fsBVgDIiACtupvwkTJnD2ATiKYcOGheosRHx8vDp06GCdgePEgAig1NRUnXvuudYZEfXMM89YJwC+V1BQELp7IcL2h6FYwoAIoLD9wE2ePDm03z4IRNqIESO0b98+64yIadeuncqUKWOdgePAgAigzp07WydE1ODBg60TgMDIz8/X66+/bp0RMYmJibrgggusM3AcGBABc+KJJ4bq0xdz587V2rVrrTOAQHnppZd08OBB64yICdtZ1VjBgAiYjh07ynEc64yIef75560TgMDJyckJ1dd9X3TRRdYJOA4MiIAJ06m+NWvWaNGiRdYZQCC9+uqr1gkRk5SUpObNm1tnoJgYEAGTmZlpnRAxI0eOtE4AAmvNmjVatmyZdUbEhOm9LVYwIAKkcePGKl++vHVGRBw4cEDvvPOOdQYQaKNGjbJOiJjWrVtbJ6CYGBABEqYfsAkTJigvL886Awi09957T/n5+dYZEdGkSRMlJiZaZ6AYGBABEqYBEaaPoQFWDh06FJqv+o6Li1OrVq2sM1AMDIiAKFWqVGhuMtq0aZNWrlxpnQGEQpguBYbpD0mxgAEREC1btlR8fLx1RkSE5U9MgB+sWLEiNE9yZUAECwMiIMJy9kGSxowZY50AhMqECROsEyIiPT1dycnJ1hk4RgyIgGjSpIl1QkQsWbJEWVlZ1hlAqITpoVLnnXeedQKOEQMiIM4++2zrhIh47733rBOA0Nm0aZO++OIL64yICMt7XSxgQARAmE7rffDBB9YJQChNnTrVOiEiGBDBwYAIgLD8QC1fvlw7d+60zgBCKSwDomnTptYJOEYMiAAIy/0PH374oXUCEFpr1qzR5s2brTNKrHz58qpZs6Z1Bo4BAyIAwnIGIix3igN+FZZLhGH5Q1PYMSB8rkyZMjrzzDOtM0psw4YN2rZtm3UGEGozZsywToiIRo0aWSfgGDAgfK5evXrWCRGxcOFC6wQg9D799FPt37/fOqPETjvtNOsEHAMGhM/Vr1/fOiEiFixYYJ0AhF5RUVEovuI7LO97YceA8Lmw/CDNmTPHOgGICWE425eWlsY3cwYAA8LnwjAgVq9erdzcXOsMICaEYUBIUsOGDa0TcBQMCJ8Lw4BYtGiRdQIQMz777DPrhIgIy/1fYcaA8LGEhATVqlXLOqPE+OpuILpWrFhhnVBiDRo0sE7AUTAgfCwsp/CWL19unQDElDAMiDCcfQ07BoSPnXLKKdYJJZabm6sNGzZYZwAxJQxn/erUqWOdgKNgQPhYjRo1rBNKjLMPQPSF4QxE1apVrRNwFAwIH6tevbp1QomF5SuGgSBZv369CgoKrDNKJCEhgRHhcwwIHwvDGYh169ZZJwAxKQw/e2H4Q1SYMSB8LAw/PGF4EwOCaP369dYJJRaG98AwY0D4WBh+eNasWWOdAMSkMIz3MLwHhhkDwqdSUlIC/yjXbdu2Bf46LBBUnIGA1xgQPhWGH5wwvIEBQRWGn79q1apZJ+ATF3NZAAAgAElEQVR3MCB8qlKlStYJJfb9999bJwAx67vvvrNOKLEwvA+GGQPCpypWrGidUGJbtmyxTgBi1v79+/Xjjz9aZ5RIhQoVrBPwOxgQPhWGHxwGBGBr69at1gklEob3wTBjQPhUGE7dMSAAW0H/GTzxxBOtE/A7GBA+FYblHfQ3LyDogn4GIi4ujhHhYwwInwrDPRC7du2yTgBi2u7du60TSiwM74VhxYDwqaCfgXBdl2dAAMaCfhOlFPz3wjBjQPhUUlKSdUKJbN++3ToBiHlhOANRvnx56wQcAQPCp1zXtU4okT179lgnADEvDGcgypUrZ52AI2BA+FRhYaF1QomE4U8+QNCF4eewbNmy1gk4AgaETxUVFVknlEjQz6AAYRCGMxDJycnWCTgCBoRPBf0MRHx8vHUCEPPCcCkx6PeDhRkDwqeCPiASEhKsE4CYF4YBwRkI/2JA+FTQL2HExfGvFmDt4MGDgf84NWcg/It3eZ/iDASASAj6fRCcgfAvBoRPHThwwDqhREqXLm2dAEBSbm6udUKJlClTxjoBR8CA8KlDhw5ZJ5QIAwLwh6D/LAb9vTDMGBA+dfDgQeuEEgn6mxYQFqVKlbJOKJGgvxeGGQPCp4L+Q8OAAPwh6JcAgv5eGGYMCJ8K+mm7oP+pBwiLoP8s7t+/3zoBR8CA8Kmg30QZ9DctICyC/rMY9PfCMGNA+FTQz0Dw/HrAXkJCghITE60zSiTo74VhxoDwqTD80KSkpFgnADEtDD+DnIHwLwaET4Xhh6ZChQrWCUBMq1ixonVCiYXhvTCsGBA+FYZn2IfhzQsIskqVKlknlNi+ffusE3AEDAif2r17t3VCiTEgAFth+BncuXOndQKOgAHhU7t27bJOKLEw/OkHCLIqVapYJ5QYA8K/GBA+FYYzEFWrVrVOAGJa9erVrRNKLCcnxzoBR8CA8KkwDIgaNWpYJwAxLQw/gz/88IN1Ao6AAeFTO3bssE4osTC8eQFBFvSfwby8PBUWFlpn4AgYED4W9LuPg/7mBQRd0C9hcPnC3xgQPhb0H57atWtbJwAxq2zZsjrppJOsM0qEGyj9jQHhY2G49letWjXrBCAm1a9f3zqhxMJwKTfMGBA+tnnzZuuEEmvQoIF1AhCTwjAgNm3aZJ2A38GA8LHvv//eOqHETjvtNOsEICaFYbxv3LjROgG/gwHhY2E4A3H66adbJwAxKQxnIL777jvrBPwOBoSPhWFAcAYCsHHGGWdYJ5QYZyD8jQHhY2EYEOnp6UpISLDOAGJKtWrVAv8JjMLCwlBcxg0zBoSPbd68WYcPH7bOKJG4uLhQ/EkICJJzzz3XOqHENm/eLNd1rTPwOxgQPrd161brhBILw5sZECTnnHOOdUKJffvtt9YJOAoGhM+tX7/eOqHEzjvvPOsEIKY0bdrUOqHE+Ain/zEgfG7VqlXWCSXGgACiJzExUY0bN7bOKLG1a9daJ+AoGBA+t3r1auuEEktNTeWJlECUZGRkWCdExJdffmmdgKNgQPhcGM5ASJyFAKIlMzPTOiEiwvLeF2YMCJ9bvXq1ioqKrDNK7Pzzz7dOAGJCmzZtrBNKbN26dSooKLDOwFEwIAJg3bp11gkldsEFF1gnAKFXqVKlUDzC+quvvrJOwDFgQATAN998Y51QYieddFIoHq0L+Fm7du2sEyKCAREMDIgA+Prrr60TIiIMp1YBP/vDH/5gnRARX3zxhXUCjgEDIgBWrlxpnRARDAjAOwkJCWrfvr11RkSE5T0v7BgQAbB8+XLrhIho06aNkpOTrTOAUGrTpo0SExOtM0psy5Yt2rdvn3UGjgEDIgDy8/NDcxnj4osvtk4AQiksP1uLFi2yTsAxYkAExJIlS6wTIqJLly7WCUAodejQwTohIhYuXGidgGPEgAiIZcuWWSdExPnnn6+yZctaZwCh0rZtW6WkpFhnRMSsWbOsE3CMGBABsXTpUuuEiChdujRnIYAI69Gjh3VCRGzatEk5OTnWGThGDIiA+O6770Lzg9WtWzfrBCA0EhMT1bFjR+uMiJg/f751AoqBAREgn332mXVCRJx//vmqWbOmdQYQChdffHEoPn0hcf9D0DAgAmTevHnWCRHTt29f6wQgFLKysvTDDz9YZ0QEAyJYGBABEqabi6644grrBCAUFi1apIyMDA0ZMsQ6pUTWrFmjHTt2WGegGBgQAbJ58+ZQfLGWJKWkpOiSSy6xzgBC4cCBA3rqqafUpEkTTZkyxTrnuMyYMcM6AcXEgAiYmTNnWidEzLXXXmudAITKDz/8oH79+qlnz57auHGjdU6xTJ061ToBxcSACJgwXcbIyMgIxVcPA36zYMECZWZm6qGHHlJubq51zlHt2rUrNI/sjyUMiIBZtGiR8vPzrTMi5rbbbrNOAEKpsLBQw4YNU/PmzTV27Fi5rmuddEQfffSRdQKOAwMiYFzX1Zw5c6wzIqZz585KTU21zgBCa9euXfrTn/6kDh06+PY7daZNm2adgOPAgAig6dOnWydETFxcnG6++WbrDCD0vvzyS7Vv31633Xabdu3aZZ3zK2H6iHosYUAE0IcffmidEFFXXXWVKlWqZJ0BxIS3335bzZs317Bhw6xTJP375sn9+/dbZ+A4MCACKDc3N1SfxkhMTNSAAQOsM4CYkZubq4ceekiZmZnmD2/i/ofgYkAE1KRJk6wTIuq6665TuXLlrDOAmLJ+/XpddtlluuGGG7Rly5aoH//QoUOhey+LJQyIgJoyZYoOHjxonRExSUlJGjhwoHUGEJM++OADtWrVSs8880xULydMnz5dBQUFUTseIosBEVD5+fn6+OOPrTMi6vrrr+csBGDkwIEDGjx4sDIzM6P2UKf33nsvKseBNxgQAfb+++9bJ0RUUlKSbr31VusMIKZt2bJF1113nXr16uXp0yz37t0buhvCYw0DIsCmT58euruXb775Zr7qG/CB+fPnq0WLFrr//vs9eZrl5MmTI/6aiC4GRIDl5+eHcsE/9NBD1gkAfjJixAhlZGRo3LhxEX2aJZcvgo8BEXBjxoyxToi4jh07qnnz5tYZAH6Sk5OjW2+9NWJPs9y5c6cWLVoUgTJYYkAE3IIFC7R161brjIh7/PHHrRMA/Jf/PM3y7rvv1p49e477dd5+++0IVsEKAyIEwngW4rTTTtMNN9xgnQHgN7zxxhs677zzNGLECBUWFhbrv+u6rv71r395VIZocrx64bS0NP9+9VvIVKlSRStXrpTjePY/p4mCggK1bt3a5AE3AI7NqaeeqmeffVbnnXfeMf3zs2bN0lVXXeVxFX4pKyvLk18OnIEIge3bt4fyy2gSExP1/PPPW2cA+B0bNmzQpZdeqv79+x/T5dTXXnstClWIBgZESITxMoYkZWRkqE+fPtYZAI5i8uTJatmypYYMGaIDBw785j+zdetWzZo1K8pl8AoDIiQmTpyonJwc6wxPPPzww6patap1BoCjOHDggJ566illZmb+5kfMR4wYYVAFrzAgQmT48OHWCZ5ITk7WP//5T+sMAMdo8+bNuv7663XZZZfp22+/lfTvcfHWW28ZlyGS4r164eTk5Ie9em38ttWrV+v6669XqVKlrFMirkaNGtq7d6+WL19unQLgGG3evFn/+te/lJ+fr82bN2vKlCnWSTFp3759f/XidfkURsg88sgjof3448GDB9WuXTtt2LDBOgUAAoNPYeCYvPDCCzp8+LB1hidKly6tYcOGKSEhwToFAGIeAyJksrOzNWnSJOsMz5x++ul69NFHrTMAIOYxIEJo6NCh1gmeuvbaa9W1a1frDACIaQyIEFq9erVmzpxpneGpIUOGqGHDhtYZABCzGBAh9eSTT1oneOqEE07QyJEjlZycbJ0CHJdzzjlHM2bM0Nlnn22dAhwXBkRIff3115o2bZp1hqeqV6+ukSNHWmcAxVarVi2NGjVKZ5xxhj788EO98MILqlKlinUWUCwMiBAbPHiwXDfcn6Zt2bKlXn75ZesM4JglJSXprbfeUsWKFX/+e927d9eiRYt088038ykjBAYPkgqxHTt26LTTTlN6erp1iqcaNGigMmXKaP78+dYpwO9yHEdvv/22zjrrrP/5/5UuXVqtW7dWjx499M0332jz5s0GhQgjrx4kxRmIkHv66aetE6Ji0KBBuuaaa6wzgN/11FNPKSMj43f/mVq1amn8+PEaPXq0atasGaUyoPg4AxFyOTk5qlevnho0aGCd4rn27dvrm2++0bp166xTgP9x9913q3///sf8z9epU0c33HCDSpUqpWXLloX2AXHwHo+yxnE75ZRTtGjRIuuMqOndu7fmzZtnnQH87KabbtIDDzxw3P/9bdu26W9/+5vee++9CFYhVvAoaxy3jRs3atiwYdYZUTNy5Eg1atTIOgOQJF155ZUlGg+SdPLJJ+uFF17QxIkTdeqpp0aoDCgZzkDEiKSkJC1dulQVKlSwTomKH3/8UZdcconWrl1rnYIY1qVLF73yyitynMi91R4+fFgjR47Uk08+qby8vIi9LsKLMxAokby8PD3xxBPWGVFz4okn6t133w39J1DgX926ddOwYcMiOh4kKSEhQf369dOnn36qK664IqKvDRQHZyBiiOM4mjNnTkz9Ut2zZ4969OihVatWWacghvTu3VtDhgyJ+Hj4LV9//bVuu+02ffnll54fC8HEGQiUmOu6uvvuu60zoqpChQp6//33dc4551inIEb069dPzz33XFTGgyQ1bNhQH330kYYMGaJKlSpF5ZiAxICIOZ988knoH3H938qVK6d33nnnqJ+/B0rqvvvuM/m6ecdxdPnll2vx4sW64YYbFBfHWzu8xyWMGFS9enUtWbLEOsPEgAEDNHHiROsMhNDf//53XX311dYZkqT169frnnvu0cKFC61T4ANeXcLgQVIxaO/evTpw4IBat25tnRJ1nTt3VmFhoT755BPrFIREYmKi3nzzTV1yySXWKT+rVKmSevXqpfr162vp0qXat2+fdRIM8SApRFR8fLzmzJmjunXrWqeYeP/99zVw4EAVFhZapyDAqlatqrFjx6pevXrWKUdUUFCgoUOH6oUXXtDBgwetc2CAmygRUYWFhbrtttusM8x07dpV48eP/9U3IgLFcc4552jWrFm+Hg/Sv8+Q3HXXXVq4cKE6duxonYMQYUDEsKVLl+qtt96yzjDTvHlzzZw5Mya+JwSR1bNnT33wwQeBGqDVq1fXiBEj9Pbbb+uUU06xzkEIcAkjxpUrV06LFy9WSkqKdYqZgoICDRgwQNOnT7dOgc+VLl1aTz75ZOAf4HTo0CENHz5cgwcPVkFBgXUOPMZNlPDEwYMHtX379pg+tVmqVCl169ZNRUVF3FyJI6pdu7bGjx+vtm3bWqeUWHx8vJo2baorrrhCO3fu5EFrIcdNlPDUqFGj1L59e+sMc4sWLdKNN96o7du3W6fARzp16qTnn39eZcuWtU7xxPLly3XHHXfom2++sU6BB7iJEp66+eabtW3bNusMcy1atND8+fPVq1cv6xT4QGJiop5++mm9+uqroR0PktSkSRPNnj1bf//732PmC/dQcpyBwM+aNWumCRMmRO0RvH43a9Ys3XLLLdq1a5d1Cgyce+65evnll1WtWjXrlKjavXu3nnrqKb3++utyXd7Gw4AzEPDcp59+qn/84x/WGb5xwQUXaP78+erWrZt1CqKoTJkyevTRRzVp0qSYGw+SVLFiRT3xxBP6+OOP1bhxY+sc+BhnIPA/Jk+erHPPPdc6w1dmzZqlP//5z8rOzrZOgYcaN26sF198kY85/sLEiRM1YMAA6wyUAGcgEDX9+/fn0bf/5YILLtC8efMC//E9/Lby5ctr8ODB+vDDDxkP/4VLeDgSzkDgN11wwQUaPXq0dYYvccd6uPTp00f33XcfX4X9G5YtW6YuXbpwL0TA8RwIRNXGjRtVqlQpNW/e3DrFd6pWraq+ffuqatWqWrZsGQ/iCagGDRrojTfe0DXXXKPExETrHN/ZuXOnunbtqvz8fOsUlBDPgYCJN998U+3atbPO8K29e/fqqaee0ogRI6xTcIxOPfVU3Xnnnbr00kutU3ytS5cuWrp0qXUGIsCrMxAMCPyu5ORkzZgxQ7Vr17ZO8bUtW7bo2Wef1bhx4/iGT5869dRTddddd6lz586Ki+P2r99z7733auTIkdYZiBAGBMykp6dr2rRpnOY9Bps2bdLgwYM1fvx46xT8JD09XXfeeac6d+5snRII48aN06233mqdgQhiQMBUx44dOU1fDBs2bNArr7yiUaNGWafErEaNGum2225Thw4drFMC48svv1SXLl104MAB6xREEAMC5u666y7ddttt1hmBsnPnTv3rX//SyJEjtXv3buucmNCiRQvdeuutat26tXVKoGRlZalDhw58D0wIMSDgC8OHD+dU8HF6/fXXNXLkSK1evdo6JZS6du2qG264QU2aNLFOCZy8vDx16tRJa9assU6BBxgQ8IVSpUpp0qRJPOK2BD7//HO99dZbevfdd5WXl2edE2gNGjRQnz591L17d57jcJwOHz6s7t27a8mSJdYp8AgDAr5RqVIlTZ8+PSa/JyCS9u/fr4kTJ2rChAmaO3eudU5gVKhQQV27dtWVV16pM8880zon8AYNGsRNvyHHgICv1K1bVx999FGov+I4mnbt2qVp06Zp0qRJmj9/voqKiqyTfKVChQrq3LmzunTpohYtWighIcE6KRSeeuopDRkyxDoDHmNAwHfat2/Ppww88OOPP2r27NmaOnWq5s+frz179lgnmahRo4Zat26tSy+9VJmZmdY5oTNmzBjdfvvt1hmIAgYEfOmKK67Qs88+a50RasuXL9e8efM0b948LV682DrHM+np6WratKmaN2+uzMxMpaamWieF1scff6wrr7zSOgNRwoCAb1199dX6+9//bp0RM5YtW6bPPvtMy5Yt0yeffKKcnBzrpONy5plnqmnT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',
+				logoImage: 'https://img.agrimedia.cn/watch-app/logo.jpeg',
 				phoneData:'', // 用户/电话
 				passData:'', //密码
 				imgCode: '',
diff --git a/pages/my/my.vue b/pages/my/my.vue
index f1d3323..e3f223e 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -4,10 +4,10 @@
 		<view class="head"></view>
 		<!-- 个人信息模块 -->
 		<view class="user-info-box">
-			<view class="avatar-box" @click="logout()">
+			<view class="avatar-box">
 				<image class="avatar" src="../../static/a-ziyuan85.png"></image>
 				<view class="avatar-text">
-					<view class="name">登录</view>
+					<view class="name">{{getApiToken? '用户':'去登录'}}</view>
 					<view class="desc"></view>
 				</view>
 			</view>
@@ -97,7 +97,8 @@
 </template>
 
 <script>
-	import store from "@/store/index.js";
+	import store from "@/store/index.js";
+	import { mapGetters } from "vuex";
 	export default {
 		data() {
 			return {
@@ -106,6 +107,11 @@
 		},
 		onLoad() {
 
+		},
+		computed: {
+			...mapGetters({
+				getApiToken: "api/getApiToken"
+			}),
 		},
 		methods: {
 			logout() {
diff --git a/store/modules/api.js b/store/modules/api.js
index 43650ff..89e3698 100644
--- a/store/modules/api.js
+++ b/store/modules/api.js
@@ -5,6 +5,8 @@ import {
 	register,
 	getBindUserDeviceId,
 	getDayInfo,
+	getDeviceListDays,
+	getVersion
 } from '@/common/api.js';
 
 let state = {
@@ -58,6 +60,14 @@ let state = {
 		async getDayInfo({commit}, data) {
 			const res = await getDayInfo(data)
 			return res
+		},
+		async getDeviceListDays({commit}, data) {
+			const res = await getDeviceListDays(data)
+			return res
+		},
+		async getVersion({commit}, data) {
+			const res = await getVersion(data)
+			return res
 		}
 	}
 export default {
diff --git a/uni_modules/punch-calendar/changelog.md b/uni_modules/punch-calendar/changelog.md
new file mode 100644
index 0000000..166922d
--- /dev/null
+++ b/uni_modules/punch-calendar/changelog.md
@@ -0,0 +1,14 @@
+## 1.0.6（2023-04-20）
+更新ios端 date问题
+## 1.0.5（2023-04-20）
+添加切换方法，更新使用demo
+## 1.0.4（2023-03-30）
+修改初始化以及分阶段赋值
+## 1.0.3（2023-03-12）
+完善文档
+## 1.0.2（2023-03-11）
+修复异步赋值不展示问题
+## 1.0.1（2023-02-27）
+修改文档，添加github地址
+## 1.0.0（2023-02-24）
+第一版本，后续会持续优化
diff --git a/uni_modules/punch-calendar/components/punch-calendar/punch-calendar.vue b/uni_modules/punch-calendar/components/punch-calendar/punch-calendar.vue
new file mode 100644
index 0000000..9e6e0ef
--- /dev/null
+++ b/uni_modules/punch-calendar/components/punch-calendar/punch-calendar.vue
@@ -0,0 +1,464 @@
+<template>
+	<view class="punch-calendar-wrapper">
+		<view class="calendar">
+			<view class="top flex-bt padding-32">
+				<view class="prev flex-center" @click="switchMonth('prev')">
+					<image class="icon" src="../../static/images/calendar-prev.png"></image>
+				</view>
+				<text>{{calendarConfig.yearAndMonth}}</text>
+				<view class="next flex-center" @click="switchMonth('next')">
+					<image class="icon" :src="nextIconStyle"></image>
+				</view>
+			</view>
+			<view class="center">
+				<view class="week flex-bt">
+					<view class="items" v-for="item in calendarConfig.week" :key="item">{{item}}</view>
+				</view>
+				<view class="day">
+					<template v-for="(item,index) in calendarConfig.day">
+						<view class="flex-start" :key="index" v-if="item.open">
+							<view class="items flex-center" :class="[child.tag]" v-for="(child,childIndex) in item.list"
+								:key="childIndex">
+								<text :class="[child.className,child.active]" @click="chooseDay(item,child)">
+									{{child.value}}
+								</text>
+							</view>
+						</view>
+					</template>
+
+				</view>
+			</view>
+			<view class="bottom flex-center" @click="fold">
+				<image src="../../static/images/cakebdar-open.png" :class="[!calendarConfig.fold ? 'active' : '']"
+					class="icon"></image>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		name: 'punch-calendar',
+		props: {
+			// 成功打卡
+			successList: {
+				type: Array,
+				default: ()=> []
+			},
+			
+			// 打卡异常点
+			errorList: {
+				type: Array,
+				default: ()=>[]
+			},
+		},
+		data() {
+			return {
+				successArr: [],
+				errorArr: [],
+				calendarConfig: {
+					week: ['日', '一', '二', '三', '四', '五', '六'],
+					nowYear: '', //当前日历 年
+					nowMonth: '', //当前日历 月
+					nowDay: '', //当前日历 日
+					day: [], //日历列表
+					fold: false, // 展开/折叠状态
+					yearAndMonth: '', // 当前日历年月
+					needClock: true, //当天是否需要打卡
+				},
+				monthStatisticList: [],
+			}
+		},
+		computed: {
+			nextIconStyle: function() {
+				const {
+					year,
+					month
+				} = this.getNowDate()
+				const {
+					nowYear,
+					nowMonth
+				} = this.calendarConfig
+				if (nowYear == year && nowMonth == month) {
+					return '../../static/images/calendar-next.png';
+				} else {
+					return '../../static/images/calendar-next-active.png';
+				}
+			},
+		},
+		
+		watch: {
+			successList: {
+				handler(val) {
+					this.successArr = JSON.parse(JSON.stringify(val))
+					this.initCalendar(false)
+				},
+				immediate: true,
+				deep: true,
+			},
+			errorList: {
+				handler(val) {
+					this.errorArr = JSON.parse(JSON.stringify(val))
+					this.initCalendar(false)
+				},
+				immediate: true,
+				deep: true,
+			},
+		},
+
+		methods: {
+			//切换日历
+			switchMonth(type = 'next') {
+				let {nowYear, nowMonth} = this.calendarConfig
+				let {year, month, day} = this.getNowDate()
+				if(type == 'next' && nowYear == year && nowMonth == month)return false;
+				if(type == 'prev'){
+					if (nowMonth <= 1) {
+						nowMonth = 12
+						nowYear -= 1
+					} else {
+						nowMonth--;
+					}
+				}else{
+					if (nowMonth >= 12) {
+						nowMonth = 1
+						nowYear += 1
+					} else {
+						nowMonth++;
+					}
+				}
+				this.$emit('switchMonth', type, nowYear, nowMonth)
+				this.calendarConfig.nowYear = nowYear
+				this.calendarConfig.nowMonth = nowMonth
+				this.calendarConfig.nowDay = (nowYear == year && nowMonth == month) ? day : ''
+				this.calendarConfig.day = this.calendar(nowYear, nowMonth, this.calendarConfig.nowDay, this.calendarConfig.fold, this.successArr, this.errorArr)
+				this.calendarConfig.yearAndMonth = this.monDetail(nowYear, nowMonth)
+				
+			
+			},
+
+			chooseDay(item, child) {
+				if(child.className == 'last' || child.className == 'nextMonth')return false;
+				this.$emit('chooseDay',child)
+				this.calendarConfig.day.map(parent=>{
+					parent.list.map(child=>{
+						child.className == 'active' && (child.className = '')
+						return child
+					})
+					return parent
+				})
+				child.className = 'active'
+			},
+
+			// 展开/折叠
+			fold(){
+				const {now, year, month, day} = this.getNowDate()
+				const {nowYear, nowMonth} = this.calendarConfig
+				this.calendarConfig.day.map((parent,index)=>{
+					if(!this.calendarConfig.fold){
+						parent.open = true
+					}else{
+						if(nowYear == year && nowMonth == month){
+							parent.open = parent.list.reduce((result, child)=>{
+								if(child.value == day && child.className !== 'last' && child.className !== 'nextMonth'){
+									result = true
+								}
+								return result
+							}, false)
+						}else{
+							parent.open = index == 0 ? true : false
+						}
+					}
+					return parent
+				})
+				this.calendarConfig.fold = !this.calendarConfig.fold
+			},
+
+			// 初始化
+			initCalendar(nowDate = true) {
+				if(nowDate) {
+					const { year, month, day } = this.getNowDate()
+					this.calendarConfig.nowYear = year
+					this.calendarConfig.nowMonth = month
+					this.calendarConfig.nowDay = day
+				}
+				const {nowYear, nowMonth, nowDay} = this.calendarConfig
+				
+				// 渲染日历
+				this.calendarConfig.day = this.calendar(nowYear, nowMonth, nowDay, this.calendarConfig.fold, this.successArr, this.errorArr)
+				// 日历title
+				this.calendarConfig.yearAndMonth = this.monDetail(nowYear, nowMonth)
+			},
+			
+			// 获取当前年月日
+			getNowDate(){
+				let now = new Date()
+				let year = now.getFullYear()
+				let month = now.getMonth() + 1
+				let day = now.getDate()
+				return {now, year, month, day}
+			},
+			
+			// 显示当前年月
+			monDetail(ynow, mnow) {
+				return `${ynow}年${mnow}月`
+			},
+			
+			//判断是否为闰年
+			is_leap(year) { 
+				let res = year % 100 == 0 ? (year % 400 == 0 ? 1 : 0) : (year % 4 == 0 ? 1 : 0)
+			    return res
+			},
+			
+			/**
+			 * 渲染日历
+			 * ynow 年
+			 * mnow 月
+			 * dnow 日
+			 * fold 折叠状态
+			 * successArr 需要打卡
+			 * errorArr 异常标记
+			**/
+			calendar(ynow, mnow, dnow, fold, successArr = [], errorArr = []) {
+				let arr = []
+				var nlstr = new Date(ynow, mnow - 1, 1)
+				var firstday = nlstr.getDay()
+				const {now, year, month, day} = this.getNowDate()
+				//每个月的天数
+				var m_days = new Array(31, 28 + this.is_leap(ynow), 31, 30, 31, 31, 30, 31, 30, 31, 30, 31)  
+				//当前月天数+第一天是星期几的数值   获得 表格行数
+				var tr_str = Math.ceil((m_days[mnow-1] + firstday) / 7) 
+				var i, k, idx, date_str;
+				for (i = 0; i < tr_str; i++) {
+					//表格每行的单元格
+					let row = []
+					for (k = 0; k < 7; k++) {
+						//单元格自然序列号
+						idx = i * 7 + k;
+						//计算日期
+						date_str = idx - firstday + 1;
+						
+						if(date_str <= 0){ 
+							// 处理上月空缺
+							row.push({ value: '', className: '' })
+			
+						}else if(year == ynow && month == mnow){
+							if(date_str > m_days[mnow-1]) {
+								row.push({ value: '', className: 'nextMonth' })
+							}else if(date_str > dnow ){
+								row.push({ value: date_str, className: 'last', year: ynow, month: mnow, day: date_str})
+							}else{
+								row.push({ value: idx - firstday + 1, className: '', year: ynow, month: mnow, day: date_str})
+							}
+						}else{
+							if(date_str > m_days[mnow-1]) {
+								row.push({ value: '', className: 'nextMonth' })
+							}else if(date_str > dnow ){
+								row.push({ value: date_str, className: '', year: ynow, month: mnow, day: date_str})
+							}else{
+								row.push({ value: date_str, className: '', year: ynow, month: mnow, day: date_str})
+							}
+						}
+					}
+					
+					// 处理下月候补日期
+					let list = row.reduce((arr,item,index)=>{
+						if(item.className == 'nextMonth'){
+							if(arr[index-1].value == m_days[mnow-1]){
+								item.value = 1
+							}else{
+								item.value = arr[index-1].value + 1
+							}
+						}
+						// 判断是否为当日
+						item.className !== 'nextMonth' && item.year == year && item.month == month && item.day == day && (item.active = 'thatDay')
+						item.className !== 'nextMonth' && item.year == year && item.month == month && item.day == day && (item.className = 'active')
+						
+						// 处理需要打卡标记
+						if(item.year && item.month && item.day){
+							let nowDate = `${item.year}/${item.month}/${item.day}`
+							let timer = new Date(nowDate).getTime().toString()
+							successArr.includes(timer) && (item.tag = 'border')
+							errorArr.includes(timer) && (item.tag = 'error')
+						}
+						arr.push(item)
+						return arr
+					},[])
+					
+					arr.push({list, open: false})
+				}
+				
+				// 处理默认折叠状态
+				arr.forEach((parent,index)=>{
+					if(fold){
+						parent.open = true
+					}else{
+						parent.open = parent.list.reduce((result, child)=>{
+							if(ynow == year && mnow == month){
+								child.value == dnow && child.className !== 'nextMonth' && (result = true)
+							}else{
+								index == 0 && (result = true)
+							}
+							return result
+						}, false)
+					}
+				})
+				return arr
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.punch-calendar-wrapper {
+		.flex-center{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+		.flex-end{
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+		}
+		.flex-start{
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+		}
+		.flex-bt{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+		}
+		.calendar {
+			width: 686rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+			box-shadow: 0 10rpx 25rpx rgba(0,0,0,0.1);
+			.center {
+				.week {
+					padding-top: 32rpx;
+
+					.items {
+						font-size: 32rpx;
+						font-family: PingFangSC-Medium, PingFang SC;
+						font-weight: 600;
+						color: #8c8f94;
+						line-height: 32rpx;
+						width: 98rpx;
+						text-align: center;
+					}
+				}
+
+				.day {
+					width: 100%;
+					flex-wrap: wrap;
+
+					.items {
+						font-size: 32rpx;
+						font-family: PingFangSC-Medium, PingFang SC;
+						font-weight: 600;
+						color: #8c8f94;
+						line-height: 32rpx;
+						text-align: center;
+						padding-top: 24rpx;
+						padding-bottom: 32rpx;
+						width: 98rpx;
+						position: relative;
+
+						&.border ::before {
+							content: '';
+							width: 12rpx;
+							height: 12rpx;
+							background: #b6d1ff;
+							border-radius: 50%;
+							position: absolute;
+							left: 0;
+							right: 0;
+							margin: 0 auto;
+							bottom: 10rpx;
+							border-radius: 50%;
+						}
+
+						&.error::before {
+							content: '';
+							width: 12rpx;
+							height: 12rpx;
+							background: #ff5040;
+							position: absolute;
+							left: 0;
+							right: 0;
+							margin: 0 auto;
+							bottom: 10rpx;
+							border-radius: 50%;
+						}
+
+						text {
+							width: 48rpx;
+							height: 48rpx;
+							display: block;
+							transition: all 0.6s;
+							border-radius: 32rpx;
+							text-align: center;
+							line-height: 48rpx;
+							color: #474a50;
+
+							&.last,
+							&.nextMonth {
+								color: #c0c3c7;
+							}
+
+							&.thatDay {
+								background: #e6efff !important;
+								color: #474a50;
+							}
+
+							&.active {
+								background: #0D67FF !important;
+								color: #ffffff;
+							}
+						}
+					}
+				}
+			}
+
+			.bottom {
+				width: 100%;
+				height: 78rpx;
+				border-top: 1px solid #e6efff;
+
+				.icon {
+					width: 32rpx;
+					height: 32rpx;
+					transition: all 0.6s;
+
+					&.active {
+						transform: rotate(180deg);
+					}
+				}
+			}
+
+			.top {
+				width: 100%;
+				height: 112rpx;
+				border-bottom: 2px solid #e6efff;
+				text {
+					font-size: 32rpx;
+					font-family: PingFangSC-Medium, PingFang SC;
+					font-weight: 600;
+					color: #1a1a1a;
+					line-height: 32rpx;
+				}
+				.prev,
+				.next {
+					width: 100rpx;
+					height: 100%;
+					.icon {
+						width: 40rpx;
+						height: 40rpx;
+						display: block;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/uni_modules/punch-calendar/package.json b/uni_modules/punch-calendar/package.json
new file mode 100644
index 0000000..b095808
--- /dev/null
+++ b/uni_modules/punch-calendar/package.json
@@ -0,0 +1,81 @@
+{
+  "id": "punch-calendar",
+  "displayName": "punch-calendar 打卡日历 可在日历标记圆点，配置简单，长期维护",
+  "version": "1.0.6",
+  "description": "打卡日历，可在日历标记圆点，配置简单，长期维护。",
+  "keywords": [
+    "punch-calendar"
+],
+  "repository": "https://github.com/LonJinUp/punch-calendar",
+  "engines": {
+    "HBuilderX": "^3.6.10"
+  },
+  "dcloudext": {
+    "type": "component-vue",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "n",
+          "vue3": "n"
+        },
+        "App": {
+          "app-vue": "n",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "n",
+          "Android Browser": "n",
+          "微信浏览器(Android)": "n",
+          "QQ浏览器(Android)": "n"
+        },
+        "H5-pc": {
+          "Chrome": "n",
+          "IE": "n",
+          "Edge": "n",
+          "Firefox": "n",
+          "Safari": "n"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y",
+          "钉钉": "y",
+          "快手": "y",
+          "飞书": "y",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/punch-calendar/readme.md b/uni_modules/punch-calendar/readme.md
new file mode 100644
index 0000000..e999c68
--- /dev/null
+++ b/uni_modules/punch-calendar/readme.md
@@ -0,0 +1,86 @@
+# punch-calendar
+
+> [punch-calendar](https://github.com/LonJinUp/punch-calendar)为有打卡需求制作的日历，可标记小圆点。简单配置即可使用，代码体积小，无第三方引用。  
+> 任何问题可以评论联系我，第一时间处理，或者添加 🛰️:ljsw8686
+
+## 使用方法
+
+demo: 
+```html
+<template>
+	<view class="content">
+		<punch-calendar @switchMonth="switchMonth" @chooseDay="chooseDay" :errorList="errorList" :successList="successList" ref="calendar"></punch-calendar>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				successList: ['1676995200000'],
+				errorList: ['1676908800000'],
+				
+			}
+		},
+		onLoad() {
+			// 初始化
+			this.$refs.calendar.initCalendar()
+			
+			// 模拟异步赋值
+			let timer = setTimeout(()=>{
+				this.addTimer()
+			},2000)
+			
+		},
+		methods: {
+			// 点击某一天
+			chooseDay(val) {
+				console.log(val)
+			},
+			
+			addTimer() {
+				this.successList = [...this.successList, '1681920000000']
+			},
+			
+			/**
+			 * 切换事件
+			 * @param type 切换类型 prev next
+			 * @param nowYear 当前年
+			 * @param nowMonth 当前月
+			 * **/
+			switchMonth(type, nowYear, nowMonth){
+				//... doSomeThing
+				if(nowYear == '2023' && nowMonth == '3' && !this.successList.includes('1678204800000')){
+					uni.showLoading({})
+					let timer = setTimeout(()=>{
+						uni.hideLoading()
+						clearTimeout(timer)
+						this.successList = [...this.successList, '1678204800000']
+					},3000)
+				}
+				
+			}
+		}
+	}
+</script>
+```
+
+### 配置说明：
+
+参数说明：
+
+| 参数        | 说明                         | 默认值 | 类型  |
+| ----------- | ---------------------------- | ------ | ----- |
+| successList | 打卡成功标记，传入13位时间戳 | []     | Array |
+| errorList   | 打卡异常标记，传入13位时间戳 | []     | Array |
+
+
+回调方法
+
+| 方法名称   | 说明                 | 返回值                       |
+| ---------- | -------------------- | ---------------------------- |
+| @chooseDay | 点击某日时候执行函数 | 返回一个对象，包含年、月、日 |
+| @switchMonth | 切换日期时候执行 | 返回type（切换类型，prev｜｜next）, 当前年nowYear,当前月nowMonth |
+
+
+
diff --git a/uni_modules/punch-calendar/static/images/cakebdar-open.png b/uni_modules/punch-calendar/static/images/cakebdar-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a80951458099d3ea971cf79873bfffad808cf7b
GIT binary patch
literal 271
zcmV+q0r38bP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#$w@>(R9Hvtl)VkYKn#VS2O@ir5g;96DnthvA?%S1WaQ$c2+oP^6xaA_+wZ&Q
zA420tjrEZL=|DP=4ul<GX8J6+$RRtQFcJ|*j#>yn#HSe#0&XJ8z_aggk3hHqe#OhL
zqYy3tP5cOi8K5REzZUV*iby+50Ghb;T}0RO;Dy))*b*;8XNl1^WD~$s*b}>kQ2`<a
zBRML-H1idVmv_Ren?e}+j^4F4m;k&x{s$2OIC^TW`MX;Xx$mBw1V{(cfpnm`17BIO
VogrhZyXpV{002ovPDHLkV1i#AYHk1k

literal 0
HcmV?d00001

diff --git a/uni_modules/punch-calendar/static/images/calendar-next-active.png b/uni_modules/punch-calendar/static/images/calendar-next-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7e5e1cb9ebafea4626ea37794198f88846ce040
GIT binary patch
literal 262
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}2RvOILn7SY
zUOUKj$bg6KfqmTZxPZN#IsGPr`LDQ7tvk(8A#ih{XPu5y`MV$Xm&|$>d{UqK`69zw
zrarC}CCcB*GM;n#J4`8T=w`gTqJ8e8e|&rQ>RA{I1U6V|bR;n>xWvDM$)a|OU2g${
z&b0mlrXL*)4c#0}6&)-M%^pnK1iK$t_<z#K4EfJ@BL1`s>!*j?TpbzIZ8#pZvNPN%
zP;Zcb$5eBcd4GN1YJQb(BH^+py>4Zt_-^2LS+wncW<yw`=&p_`#rd;lcmVyv;OXk;
Jvd$@?2>=cPWQG6$

literal 0
HcmV?d00001

diff --git a/uni_modules/punch-calendar/static/images/calendar-next.png b/uni_modules/punch-calendar/static/images/calendar-next.png
new file mode 100644
index 0000000000000000000000000000000000000000..cca09262a405e277d1a47e0142bf972a64f87d51
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%Cx&(BWL^R}`~f~8u0Z<#
z|NjRM9zS^S*ntB_>+Zfx01B~`1o;IsFh<W2S{@z?<ePfBIEHAPPfl1MFA(G+98f6c
zAY5SRA}Ubk7<?$hNn6$L2dlxB1=3zSnS9<Svk15eT#{m7$bG`SQS3Dr$bJS-S3j3^
HP6<r_@$oSB

literal 0
HcmV?d00001

diff --git a/uni_modules/punch-calendar/static/images/calendar-prev.png b/uni_modules/punch-calendar/static/images/calendar-prev.png
new file mode 100644
index 0000000000000000000000000000000000000000..b212dacb6e9783595364975cc270654e1a308c2f
GIT binary patch
literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%Cx&(BWL^R}`~f~8u0WcB
z;XilAf8KNu`h7ZK8&H6yB*-tAfiZfH(DLwDAm7~6#W6(Vd~(79eSsjCr^d4^7IJay
zwpgfHVCWM3K*u4Ll}9Us%YfBjOM--#sj43f6NfTKCKp4-4epJ`;%)OlmUz1QxvX<a
GXaWF?)+{;z

literal 0
HcmV?d00001