diff --git a/common/css/public.scss b/common/css/public.scss
index d31fd26f98e15cc1efaef400cfbd4815082bd28a..b75f0dfb345e68e4141df3d075f4a10f38115774 100644
--- a/common/css/public.scss
+++ b/common/css/public.scss
@@ -157,7 +157,7 @@
 	
 	
 	// 外边距
-	@for $i from 5 through 100 {
+	@for $i from 5 through 200 {
 		.mar-#{$i} {
 			margin: $i + rpx;
 		}
diff --git a/components/attend-calendar/attend-calendar.vue b/components/attend-calendar/attend-calendar.vue
new file mode 100644
index 0000000000000000000000000000000000000000..046e7bc4df04cedad66b60643315dd74f1f6d39f
--- /dev/null
+++ b/components/attend-calendar/attend-calendar.vue
@@ -0,0 +1,363 @@
+<template>
+	<view class="calendar">
+		<view class="top-bar">
+			<image class="top-change-month" @click="turning('prev')" src="/static/attend-calendar/attendance_left.png">
+			</image>
+			<view class="top-bar-ym">
+				<text style="font-size: 45rpx;font-weight: 700;">{{ m + 1 }}{{ text.month }}</text>
+				<text style="font-size: 28rpx;">{{ y }}{{ text.year }}</text>
+			</view>
+			<image class="top-change-month" @click="turning('next')" src="/static/attend-calendar/attendance_right.png">
+			</image>
+		</view>
+
+		<view class="week">
+			<view class="week-day" v-for="(item, index) in weekDay" :key="index">{{ item }}</view>
+		</view>
+
+		<view :class="{ hide: !monthOpen }" class="content" :style="{ height: height }">
+			<view :style="{ top: positionTop + 'upx' }" class="days">
+				<view class="item" v-for="(item, index) in dates" :key="index">
+					<view class="day" @click="selectOne(item, $event)"
+						:class="{ choose: choose == `${item.year}-${item.month + 1}-${item.date}`, nolm: !item.lm }">
+						{{ item.date }}
+					</view>
+					<view class="late" v-if="isLateed(item.year, item.month + 1, item.date)"></view>
+					<view class="truancy" v-if="isTruancyed(item.year, item.month + 1, item.date)"></view>
+					<view class="today-text" v-if="isToday(item.year, item.month, item.date)">今</view>
+				</view>
+			</view>
+		</view>
+
+		<image src="/static/attend-calendar/attendance-arrow-up.png" mode="scaleToFill" @click="trgWeek()"
+			class="weektoggel" :class="{ down: !monthOpen }"></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'attend-calendar',
+		props: {
+			// 第一列星期几
+			weekstart: {
+				type: Number,
+				default: 1
+			},
+			// 只有迟到的日期
+			lateddates: {
+				type: Array,
+				default: () => []
+			},
+			// 有旷课的日期
+			truancyeddates: {
+				type: Array,
+				default: () => []
+			},
+			// 是否展开
+			open: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				text: {
+					year: '年',
+					month: '月',
+					week: ['一', '二', '三', '四', '五', '六', '日'],
+					today: '今'
+				},
+				y: new Date().getFullYear(), // 年
+				m: new Date().getMonth(), // 月
+				dates: [], // 当前月日期集合
+				positionTop: 0,
+				monthOpen: true,
+				choose: ''
+			}
+		},
+		created() {
+			this.dates = this.monthDay(this.y, this.m)
+			//!this.open && this.trgWeek()
+		},
+		mounted() {
+			let date = new Date()
+			let y = date.getFullYear()
+			let m = date.getMonth()
+			let d = date.getDate()
+			this.choose = `${y}-${m + 1}-${d}`
+			console.log(this.choose)
+		},
+		computed: {
+			// 顶部星期栏目
+			weekDay() {
+				return this.text.week.slice(this.weekstart - 1).concat(this.text.week.slice(0, this.weekstart - 1))
+			},
+			height() {
+				return (this.dates.length / 7) * 80 + 'upx'
+			}
+		},
+		methods: {
+			// 获取当前月份天数
+			monthDay(y, m) {
+				let firstDayOfMonth = new Date(y, m, 1).getDay() // 当月第一天星期几
+				let lastDateOfMonth = new Date(y, m + 1, 0).getDate() // 当月最后一天
+				let lastDayOfLastMonth = new Date(y, m, 0).getDate() // 上一月的最后一天
+				let dates = [] // 所有渲染日历
+				let weekstart = this.weekstart == 7 ? 0 : this.weekstart // 方便进行日期计算，默认星期从0开始
+				let startDay = (() => {
+					// 周初有几天是上个月的
+					if (firstDayOfMonth == weekstart) {
+						return 0
+					} else if (firstDayOfMonth > weekstart) {
+						return firstDayOfMonth - weekstart
+					} else {
+						return 7 - weekstart + firstDayOfMonth
+					}
+				})()
+				let endDay = 7 - ((startDay + lastDateOfMonth) % 7) // 结束还有几天是下个月的
+				for (let i = 1; i <= startDay; i++) {
+					dates.push({
+						date: lastDayOfLastMonth - startDay + i,
+						day: weekstart + i - 1 || 7,
+						month: m - 1 >= 0 ? m - 1 : 12,
+						year: m - 1 >= 0 ? y : y - 1
+					})
+				}
+				for (let j = 1; j <= lastDateOfMonth; j++) {
+					dates.push({
+						date: j,
+						day: (j % 7) + firstDayOfMonth - 1 || 7,
+						month: m,
+						year: y,
+						lm: true
+					})
+				}
+				for (let k = 1; k <= endDay; k++) {
+					dates.push({
+						date: k,
+						day: (lastDateOfMonth + startDay + weekstart + k - 1) % 7 || 7,
+						month: m + 1 <= 11 ? m + 1 : 0,
+						year: m + 1 <= 11 ? y : y + 1
+					})
+				}
+				return dates
+			},
+			// 迟到处理
+			isLateed(y, m, d) {
+				let flag = false
+				for (let i = 0; i < this.lateddates.length; i++) {
+					let dy = `${y}-${m}-${d}`
+					if (this.lateddates[i] == dy) {
+						flag = true
+						break
+					}
+				}
+				return flag
+			},
+			// 旷课处理
+			isTruancyed(y, m, d) {
+				let flag = false
+				for (let i = 0; i < this.truancyeddates.length; i++) {
+					let dy = `${y}-${m}-${d}`
+					if (this.truancyeddates[i] == dy) {
+						flag = true
+						break
+					}
+				}
+				return flag
+			},
+			isToday(y, m, d) {
+				let date = new Date()
+				return y == date.getFullYear() && m == date.getMonth() && d == date.getDate()
+			},
+			// 切换成周模式
+			trgWeek() {
+				this.monthOpen = !this.monthOpen
+				if (this.monthOpen) {
+					this.positionTop = 0
+				} else {
+					let index = -1
+					this.dates.forEach((i, x) => {
+						this.isToday(i.year, i.month, i.date) && (index = x)
+					})
+					this.positionTop = -((Math.ceil((index + 1) / 7) || 1) - 1) * 90
+				}
+			},
+			// 点击回调
+			selectOne(i, event) {
+				let date = `${i.year}-${i.month + 1}-${i.date}`
+				if (i.month != this.m) {
+					console.log('不在可选范围内')
+					return false
+				}
+				this.choose = date
+				this.$emit('on-click', date)
+			},
+			// 上个月，下个月
+			turning(_action) {
+				if (_action === 'next') {
+					if (this.m + 1 == 12) {
+						this.m = 0
+						this.y = this.y + 1
+					} else {
+						this.m = this.m + 1
+					}
+				} else {
+					if (this.m + 1 == 1) {
+						this.m = 11
+						this.y = this.y - 1
+					} else {
+						this.m = this.m - 1
+					}
+				}
+
+				this.dates = this.monthDay(this.y, this.m)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.calendar {
+		color: #000;
+		font-size: 28upx;
+		text-align: center;
+		padding-bottom: 10upx;
+
+		.top-bar {
+			display: flex;
+			justify-content: center;
+			padding-bottom: 50upx;
+
+
+			.top-bar-ym {
+				display: flex;
+				flex-direction: column;
+				margin: 0 40upx;
+			}
+
+			.top-change-month {
+				margin-top: 10upx;
+				height: 40upx;
+				width: 40upx;
+			}
+		}
+
+		.week {
+			display: flex;
+			align-items: center;
+			height: 80upx;
+			line-height: 80upx;
+			background-color: #fff;
+
+			view {
+				flex: 1;
+			}
+
+			.week-day {
+				font-size: 24upx;
+				color: #000;
+			}
+		}
+
+		.content {
+			position: relative;
+			overflow: hidden;
+			font-size: 24upx;
+			transition: height 0.4s ease;
+			background-color: #fff;
+
+			.days {
+				transition: top 0.3s;
+				display: flex;
+				align-items: center;
+				flex-wrap: wrap;
+				position: relative;
+
+				.item {
+					position: relative;
+					display: block;
+					height: 80upx;
+					line-height: 80upx;
+					width: calc(100% / 7);
+
+					.day {
+						font-style: normal;
+						display: inline-block;
+						vertical-align: middle;
+						width: 60upx;
+						height: 60upx;
+						line-height: 60upx;
+						overflow: hidden;
+						border-radius: 30upx;
+						background-color: #F0F0F0;
+
+						&.choose {
+							background-color: #3DB7BA;
+							color: #fff;
+						}
+
+						&.nolm {
+							color: #fff;
+							opacity: 0.3;
+						}
+					}
+
+					.late {
+						bottom: 0;
+						left: 50%;
+						font-style: normal;
+						width: 12upx;
+						height: 12upx;
+						background: #F7B300;
+						border-radius: 6upx;
+						position: absolute;
+						margin-left: -6upx;
+						margin-top: -6upx;
+						pointer-events: none;
+					}
+
+					.truancy {
+						bottom: 0;
+						left: 50%;
+						font-style: normal;
+						width: 12upx;
+						height: 12upx;
+						background: #FF2222;
+						border-radius: 6upx;
+						position: absolute;
+						margin-left: -6upx;
+						margin-top: -10upx;
+						pointer-events: none;
+					}
+
+					.today-text {
+						position: absolute;
+						font-size: 20upx;
+						font-weight: normal;
+						width: 20upx;
+						height: 20upx;
+						line-height: 20upx;
+						right: 0;
+						top: 10upx;
+						color: #fff;
+					}
+				}
+			}
+		}
+
+		.hide {
+			height: 80upx !important;
+		}
+
+		.weektoggel {
+			width: 80upx;
+			height: 40upx;
+			margin: 10upx auto 0;
+
+			&.down {
+				transform: rotate(180deg);
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/attend-calendar/readme.md b/components/attend-calendar/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..dbc184836967b333fb13c3c67f35e90ea89303b4
--- /dev/null
+++ b/components/attend-calendar/readme.md
@@ -0,0 +1,4 @@
+
+## attend-calendar使用帮助
+
+<attend-calendar :lateddates="[`2022-1-2`,`2022-1-4`]" :truancyeddates="[`2022-1-3`]"></attend-calendar>
diff --git a/components/upload-image.vue b/components/upload-image.vue
index 38b337c5adbebc2270d966ff501857f2214c186c..072d1a20ecacca9b389ab12bdf37aa0ddb1e128b 100644
--- a/components/upload-image.vue
+++ b/components/upload-image.vue
@@ -1,8 +1,8 @@
 <template>
 	<u-upload :capture="['album', 'camera']" :multiple="true" :fileList="fileList"
-		@afterRead="afterRead($event, 'fileList')" @delete="deletePic($event, 'fileList')" :maxCount="maxCount" :width="width"
-		:height="height">
-		<image :style="{'width': width + 'px', 'height': height + 'px'}" src="@/static/my/upload.png"></image>
+		@afterRead="afterRead($event, 'fileList')" @delete="deletePic($event, 'fileList')" :maxCount="maxCount"
+		:width="width" :height="height">
+		<image :style="{'width': width + 'px', 'height': height + 'px'}" src="@/static/icon_upload.png"></image>
 	</u-upload>
 </template>
 
@@ -42,11 +42,11 @@
 		watch: {
 			images: {
 				immediate: true,
-				handler(newVal, oldVal){
+				handler(newVal, oldVal) {
 					// console.log(newVal)
 					// console.log(this.fileList)
 					this.fileList = []
-					if(newVal){
+					if (newVal) {
 						const urlList = newVal.split(",")
 						urlList.forEach(item => {
 							// 防止直接传递全路径
@@ -66,7 +66,7 @@
 			// 删除图片
 			deletePic(event, type) {
 				this.fileList.splice(event.index, 1)
-				
+
 				this.uploadParseData()
 			},
 			// 新增图片
@@ -96,17 +96,17 @@
 				}
 				this.uploadParseData()
 			},
-			uploadParseData(){
+			uploadParseData() {
 				const images = this.fileList.map(item => item[this.type]).join(",")
 				this.$emit('upload', images)
 			},
-			removeUrl(str, urlToRemove) {  
-			    // 使用正则表达式匹配要删除的URL，确保匹配整个字符串  
-			    // 注意：这里我们假设urlToRemove不包含查询字符串或路径，如果包含，需要调整正则表达式  
-			    const regex = new RegExp(urlToRemove, 'g');  
-			  
-			    // 使用replace方法替换匹配的URL为空字符串，即删除它们  
-			    return str.replace(regex, '');  
+			removeUrl(str, urlToRemove) {
+				// 使用正则表达式匹配要删除的URL，确保匹配整个字符串  
+				// 注意：这里我们假设urlToRemove不包含查询字符串或路径，如果包含，需要调整正则表达式  
+				const regex = new RegExp(urlToRemove, 'g');
+
+				// 使用replace方法替换匹配的URL为空字符串，即删除它们  
+				return str.replace(regex, '');
 			}
 		}
 	}
diff --git a/components/wskj-model-close.vue b/components/wskj-model-close.vue
index e70a971ba5fcaaa589c50c9b6bb7e47361995b6d..8a3f9b2d222defe2fe4bc6301990c7db30194794 100644
--- a/components/wskj-model-close.vue
+++ b/components/wskj-model-close.vue
@@ -4,9 +4,9 @@
 			<view class="modal-content">
 				<slot></slot>
 			</view>
-			
+
 			<view @click="$emit('close')" class="close">
-				<image src="@/static/close.png"></image>
+				<image src="/static/close.png"></image>
 			</view>
 		</view>
 	</u-overlay>
@@ -33,17 +33,20 @@
 		width: 90%;
 		margin: auto;
 	}
+
 	.modal-content {
 		min-height: 500rpx;
 		padding: 32rpx 32rpx 48rpx;
 		background-color: #FFF;
 		border-radius: 16rpx;
 	}
+
 	.close {
 		margin-top: 48rpx;
 		text-align: center;
 	}
-	.close > image {
+
+	.close>image {
 		width: 64rpx;
 		height: 64rpx;
 	}
diff --git a/manifest.json b/manifest.json
index 190445c229e9cde8ae2355b9af8fefaa9e5ef371..e81e96980ffc8a7073902f1f965c64c1c9130d4f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -54,7 +54,13 @@
 		"setting": {
 			"urlCheck": false
 		},
-		"usingComponents": true
+		"usingComponents": true,
+		"requiredPrivateInfos": ["getLocation", "chooseLocation"],
+		"permission": {
+			"scope.userLocation": {
+				"desc": "你的位置信息将用于小程序位置定位"
+			}
+		}
 	},
 	"mp-alipay": {
 		"usingComponents": true
diff --git a/pages.json b/pages.json
index bcefb88b16b0e57e92e9714feaace9bbeb3207ce..425e8430fe15db64408ad6885b41218a79255351 100644
--- a/pages.json
+++ b/pages.json
@@ -17,121 +17,180 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/login/wechatlogin",
+			"style": {
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"subPackages": [{
-		"root": "pagesMain",
-		"pages": [{
-				"path": "pages/fkdj",
-				"style": {
-					"navigationStyle": "custom"
-				}
-			},
-			{
-				"path": "pages/shjf",
-				"style": {
-					"navigationStyle": "custom"
-				}
-			},
-			{
-				"path": "pages/bxbs",
-				"style": {
-					"navigationBarTitleText": "报修报事"
-				}
-			},
-			{
-				"path": "pages/bxbs_submit",
-				"style": {
-					"navigationStyle": "custom"
-				}
-			},
-			{
-				"path": "pages/bxbs_lsgd",
-				"style": {
-					"navigationStyle": "custom"
-				}
-			},
-			{
-				"path": "pages/tjsq",
-				"style": {
-					"navigationStyle": "custom"
-				}
-			},
+			"root": "pagesMain",
+			"pages": [{
+					"path": "pages/fkdj",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/shjf",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/bxbs",
+					"style": {
+						"navigationBarTitleText": "报修报事"
+					}
+				},
+				{
+					"path": "pages/bxbs_submit",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/bxbs_lsgd",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/tjsq",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
 
-			{
-				"path": "pages/bxxq",
-				"style": {
-					"navigationStyle": "custom"
-				}
-			},
-			{
-				"path": "pages/fwgz",
-				"style": {
-					"navigationStyle": "custom"
-				}
-			},
-			{
-				"path": "pages/cydh",
-				"style": {
-					"navigationStyle": "custom"
-				}
-			},
-			{
-				"path": "pages/tsby",
-				"style": {
-					"navigationBarTitleText": "投诉表扬"
-				}
-			},
-			{
-				"path": "pages/tsby_submit",
-				"style": {
-					"navigationStyle": "custom"
-				}
-			},
-			{
-				"path": "pages/tsby_lsgd",
-				"style": {
-					"navigationStyle": "custom"
-				}
-			},
-			{
-				"path": "pages/jnzd",
-				"style": {
-					"navigationBarTitleText": "缴纳账单"
-				}
-			},
-			{
-				"path": "pages/jnzd_ccc",
-				"style": {
-					"navigationBarTitleText": "缴纳账单"
-				}
-			},
-			{
-				"path": "pages/jnzd_qt",
-				"style": {
-					"navigationBarTitleText": "缴纳账单"
-				}
-			},
-			{
-				"path": "pages/jnzd_wyf",
-				"style": {
-					"navigationBarTitleText": "缴纳账单"
-				}
-			},
-			{
-				"path": "pages/jnzd_wyfmx",
-				"style": {
-					"navigationBarTitleText": "缴纳账单"
-				}
-			},
-			{
-				"path": "pages/jnzd_tcfmx",
-				"style": {
-					"navigationBarTitleText": "缴纳账单"
-				}
-			}
-		]
-	}],
+				{
+					"path": "pages/bxxq",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/fwgz",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/cydh",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/tsby",
+					"style": {
+						"navigationBarTitleText": "投诉表扬"
+					}
+				},
+				{
+					"path": "pages/tsby_submit",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/tsby_lsgd",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/jnzd",
+					"style": {
+						"navigationBarTitleText": "缴纳账单"
+					}
+				},
+				{
+					"path": "pages/jnzd_czf",
+					"style": {
+						"navigationBarTitleText": "缴纳账单"
+					}
+				},
+				{
+					"path": "pages/jnzd_qt",
+					"style": {
+						"navigationBarTitleText": "缴纳账单"
+					}
+				},
+				{
+					"path": "pages/jnzd_wyf",
+					"style": {
+						"navigationBarTitleText": "缴纳账单"
+					}
+				},
+				{
+					"path": "pages/jnzd_wyfmx",
+					"style": {
+						"navigationBarTitleText": "缴纳账单"
+					}
+				},
+				{
+					"path": "pages/jnzd_tcfmx",
+					"style": {
+						"navigationBarTitleText": "缴纳账单"
+					}
+				}
+			]
+		},
+		{
+			"root": "pagesMine",
+			"pages": [{
+					"path": "pages/fwxx",
+					"style": {
+						"navigationBarTitleText": "房屋信息"
+					}
+				},
+				{
+					"path": "pages/wdfw",
+					"style": {
+						"navigationBarTitleText": "我的房屋"
+					}
+				},
+				{
+					"path": "pages/zlbj",
+					"style": {
+						"navigationBarTitleText": "资料编辑"
+					}
+				},
+				{
+					"path": "pages/jtcy",
+					"style": {
+						"navigationBarTitleText": "家庭成员"
+					}
+				},
+				{
+					"path": "pages/yg_login",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/ygzy",
+					"style": {
+						"navigationBarTitleText": "员工入口"
+					}
+				},
+				{
+					"path": "pages/dk_submit",
+					"style": {
+						"navigationBarTitleText": "打卡"
+					}
+				},
+				{
+					"path": "pages/dkjl",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				}
+			]
+		}
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
@@ -140,8 +199,8 @@
 	},
 	/* 底部菜单 */
 	"tabBar": {
-		"color": "#000000", //菜单上的文字默认颜色
-		"selectedColor": "#FF6B89", //菜单上的文字选中时的颜色
+		"color": "#BFBFBF", //菜单上的文字默认颜色
+		"selectedColor": "#1FCA7B", //菜单上的文字选中时的颜色
 		"borderStyle": "white", //菜单上边框的颜色，仅支持 black/white
 		"list": [{
 				"pagePath": "pages/wy-home", //页面路径，必须在 pages 中先定义
@@ -151,8 +210,8 @@
 			},
 			{
 				"pagePath": "pages/wy-bmfw",
-				"iconPath": "static/tabbar/cart.png",
-				"selectedIconPath": "static/tabbar/cartHL.png",
+				"iconPath": "static/tabbar/bmfw.png",
+				"selectedIconPath": "static/tabbar/bmfwHL.png",
 				"text": "便民服务"
 			},
 			{
diff --git a/pages/login/wechatlogin.vue b/pages/login/wechatlogin.vue
index a0690f508754a0c5c75a2d953b3702928fba3dbb..1991a04ba7449fbcac0ef2d07a0238b1b583bf26 100644
--- a/pages/login/wechatlogin.vue
+++ b/pages/login/wechatlogin.vue
@@ -3,20 +3,21 @@
 		<view class="center">
 			<image class="w-240 h-240" src="@/static/logo.png"></image>
 		</view>
-		
+
 		<view class="login-btn">
 			<button v-if="agreement" class="lh-90 br-8" style="height: 100%;background-color: #31AD6F;color: #FFF;"
 				open-type="getPhoneNumber" @getphonenumber="onGetphonenumber">
 				<text>立即登录</text>
 			</button>
-			<view v-else @click="$u.toast('请同意用户协议与隐私政策')" class="lh-90" style="height: 100%;background-color: #ccc;border-radius: 8rpx;">
+			<view v-else @click="$u.toast('请同意用户协议与隐私政策')" class="lh-90"
+				style="height: 100%;background-color: #ccc;border-radius: 8rpx;">
 				<text class="fs-30">立即登录</text>
 			</view>
 			<view @click="youkeLogin" class="lh-90 br-8 mt-30" style="height: 100%;background-color: #31AD6F;">
 				<text>游客登录</text>
 			</view>
 		</view>
-		
+
 		<view class="agreement">
 			<image v-if="!agreement" @click="agreement = !agreement" src="@/static/select.png"></image>
 			<image v-else @click="agreement = !agreement" src="@/static/is-select.png"></image>
@@ -37,50 +38,57 @@
 		},
 		onLoad(options) {
 			this.userId = options.userId || ''
-			uni.login({
-				provider: 'weixin',
-				success: (loginRes) => {
-					this.code = loginRes.code
-				}
-			});
+			// uni.login({
+			// 	provider: 'weixin',
+			// 	success: (loginRes) => {
+			// 		this.code = loginRes.code
+			// 	}
+			// });
 		},
 		methods: {
 			onGetphonenumber(e) {
-				uni.switchTab({
-					url: '/pages/home'
-				})
-				if (e.detail.iv && e.detail.encryptedData) {
-					const params = {
-						url: '/api/user/getnewuserinfo',
-						loadingTip: '登录中...',
-						data: {
-							code: this.code,
-							iv: e.detail.iv,
-							encryptedData: e.detail.encryptedData,
-							fid: this.userId // 推荐绑定上下级
-						}
+				uni.login({
+					provider: 'weixin',
+					success: (loginRes) => {
+						this.code = loginRes.code
+						console.log("微信授权信息", loginRes)
+						console.log("手机号授权信息", e)
 					}
-					this.$request(params).then(async (res) => {
-						// console.log(res)
-						if (res.code === 1) {
-							uni.setStorageSync('token', res.data.userinfo.token)
-							this.$store.dispatch('user/getUserInfo');
+				});
+
 
-							uni.redirectTo({
-								url: '/pages/index'
-							})
-						} else {
-							this.$u.toast(res.msg || '登录失败')
-						}
-					}).catch(err => {
-						this.$u.toast(err.msg || '登录失败')
-					})
+				if (e.detail.iv && e.detail.encryptedData) {
+					// const params = {
+					// 	url: '/api/user/getnewuserinfo',
+					// 	loadingTip: '登录中...',
+					// 	data: {
+					// 		code: this.code,
+					// 		iv: e.detail.iv,
+					// 		encryptedData: e.detail.encryptedData,
+					// 		fid: this.userId // 推荐绑定上下级
+					// 	}
+					// }
+					// this.$request(params).then(async (res) => {
+					// 	// console.log(res)
+					// 	if (res.code === 1) {
+					// 		uni.setStorageSync('token', res.data.userinfo.token)
+					// 		this.$store.dispatch('user/getUserInfo');
+
+					// 		uni.redirectTo({
+					// 			url: '/pages/index'
+					// 		})
+					// 	} else {
+					// 		this.$u.toast(res.msg || '登录失败')
+					// 	}
+					// }).catch(err => {
+					// 	this.$u.toast(err.msg || '登录失败')
+					// })
 				} else {
 					this.$u.toast('手机号授权失败')
 				}
 			},
-			youkeLogin(){
-				if(!this.agreement) {
+			youkeLogin() {
+				if (!this.agreement) {
 					return this.$u.toast('请同意用户协议与隐私政策')
 				}
 				uni.switchTab({
@@ -101,7 +109,7 @@
 					// #ifdef APP-PLUS
 					this.$wskj.to('/pages/xieyi?title=' + title + '&content=' + res.data)
 					// #endif
-					
+
 					// #ifdef MP-WEIXIN || MP-ALIPAY
 					this.$wskj.to('/pages/xieyi?title=' + title + '&content=' + encodeURIComponent(res.data))
 					// #endif
diff --git a/pages/wy-bmfw.vue b/pages/wy-bmfw.vue
index 03d1c8ab3d1d85a4f61b43369cb761e63481a4a5..15e9e23e6ac20c20093edeb3468f11402dc53e44 100644
--- a/pages/wy-bmfw.vue
+++ b/pages/wy-bmfw.vue
@@ -15,7 +15,7 @@
 					<text class="fs-52" style="text-align: left;">便民服务</text>
 					<text class="fs-30">洗衣清洁 | 超市送水~</text>
 				</view>
-				<image class="h-280 w-216" src="/static/icon_bmfw.png"></image>
+				<image class="w-280 h-216" src="/static/icon_bmfw.png"></image>
 			</view>
 		</view>
 		<view class="overflow-y mlr-25" style="background: white;border-radius: 20rpx;margin-top: -20rpx;">
diff --git a/pages/wy-home.vue b/pages/wy-home.vue
index 2caf94d58b5521513152d2289ca3c16a852573fd..5d49b00217bf8252857ce035d43c97b9cc96d50e 100644
--- a/pages/wy-home.vue
+++ b/pages/wy-home.vue
@@ -103,7 +103,8 @@
 			},
 			onClick(index) {
 				if (index == 0) {
-					this.$wskj.to("/pagesMain/pages/fkdj")
+					this.$wskj.to("/pages/login/wechatlogin")
+					//this.$wskj.to("/pagesMain/pages/fkdj")
 					return
 				}
 				if (index == 1) {
diff --git a/pages/wy-mine.vue b/pages/wy-mine.vue
index b59b50de9e250a5c5231bc754c1e1b399a2c665b..4dcd8a5600fe218819c17d686dd35bd4ddb820bf 100644
--- a/pages/wy-mine.vue
+++ b/pages/wy-mine.vue
@@ -1,40 +1,56 @@
 <template>
 	<view class="center">
-		<view>
-			<u-navbar @leftClick="" bgColor="transparent" placeholder="true" :titleStyle="{color: '#E5BA00'}">
-				<view style="display: flex;align-items: center;font-size: 36rpx;color: #333333;" slot="left">
-					<image src="https://zhongqian.xnszz.com/1-images/home/20250213002.png"
-						style="width: 40rpx;height: 40rpx;margin-right: 10rpx;" mode=""></image>
-					<text>利达物业中心</text>
-					<image src="https://zhongqian.xnszz.com/1-images/home/20250213003.png"
-						style="width: 30rpx;height: 8.5rpx;margin-left: 8rpx;" mode="widthFix"></image>
+		<view style="background: linear-gradient( 180deg, #1FCA7C 0%, #F2F2F2 100%);">
+			<view class="h-300 flex flex-row-between mt-200">
+				<view class="flex ml-25 mt-70 v-center h-95">
+					<image class="w-95 h-95 br-50" src="/static/icon_logo.png"></image>
+					<view class="flex-column ml-10" style="color: #FFFFFF;text-align: left;" @click="onClick(3)">
+						<text class="fs-32 fw-700">旅行的小七仔</text>
+						<text class="fs-24 mt-10">177****1234</text>
+					</view>
 				</view>
-			</u-navbar>
-		</view>
-		<view>
-			<u-swiper height="200" :list="list1" @change="change" @click="click"></u-swiper>
+				<image class="w-344 h-266" src="/static/icon_my_bg.png"></image>
+			</view>
 		</view>
-		<view class="mar-20 br-16" style="background-color: white;">
-			<view class="grid-container">
-				<view @click="onClick(index)" class="grid-item" v-for="(item, index) in listService" :key="index">
-					<image style="width: 100rpx;height: 100rpx;" :src="item.img"></image>
-					<text>{{item.title}}</text>
-					<text>{{item.describe}}</text>
+		<view class="mlr-25 br-12" style="background: white;margin-top: -60rpx;">
+			<view class="flex-column mar-25" @click="onClick(4)">
+				<text class="fs-32 fw-700 mb-30" style="text-align: left;">房屋信息</text>
+				<view class="flex-column br-12 pad-25" style="background: #F3FEF9;">
+					<view class="flex">
+						<image class="h-42 w-42" src="/static/icon_my_fw.png"></image>
+						<text class="fs-28">利达国宾中心</text>
+					</view>
+					<text class="fs-24 h-54 lh-54 mt-30"
+						style="background: linear-gradient( 90deg, #CAF6E2 0%, #FFFFFF 100%);">
+						1栋2单元205室
+					</text>
 				</view>
 			</view>
 		</view>
-		<u-popup :show="show" mode="center" @close="close" @open="open" round="20">
-			<view class="flex-column mlr-50" style="width:600rpx;">
-				<text>选择小区</text>
-				<view v-for="(item, index) in listService" :key="index">
-					<text>西城小区</text>
+		<view class="mlr-25 br-12 mt-30" style="background: white;">
+			<view class="flex-column mar-25">
+				<text class="fs-32 fw-700 mb-30" style="text-align: left;">常用功能</text>
+				<view class="flex mtb-50">
+					<view @click="onClick(0)" class="flex-column vh-center  fs-24" style="flex: 1;">
+						<image class="h-68 w-64 mtb-10" src="/static/icon_my_wdfw.png"></image>
+						<text>我的房屋</text>
+					</view>
+					<view @click="onClick(1)" class="flex-column vh-center fs-24" style="flex: 1;">
+						<image class="h-68 w-64 mtb-10" src="/static/icon_my_wdgd.png"></image>
+						<text>我的工单</text>
+					</view>
+					<view @click="onClick(2)" class="flex-column vh-center  fs-24" style="flex: 1;">
+						<image class="h-68 w-64  mtb-10" src="/static/icon_my_ygrk.png"></image>
+						<text>员工入口</text>
+					</view>
 				</view>
-				<view>
-					<text class="plr-50 ptb-10 br-16" style="background: blue;">下一步</text>
-				</view>
-
 			</view>
-		</u-popup>
+		</view>
+		<view class="mlr-25 mt-30">
+			<image style="height: 160rpx;width: 100%;" src="/static/icon_my_img.png"></image>
+		</view>
+
+
 	</view>
 </template>
 
@@ -42,59 +58,35 @@
 	export default {
 		data() {
 			return {
-				show: false,
-				list1: [
-					"https://zhongqian.xnszz.com/1-images/home/20250213002.png",
-					"https://zhongqian.xnszz.com/1-images/home/20250213002.png",
-					"https://zhongqian.xnszz.com/1-images/home/20250213002.png",
-				],
-				listService: [{
-						img: "https://zhongqian.xnszz.com/1-images/home/20250213002.png",
-						title: "访客",
-						describe: "请点击输入访客信息"
-					},
-					{
-						img: "https://zhongqian.xnszz.com/1-images/home/20250213002.png",
-						title: "报修报事",
-						describe: "保修报事一键即发"
-					},
-					{
-						img: "https://zhongqian.xnszz.com/1-images/home/20250213002.png",
-						title: "生活缴费",
-						describe: "水费电费在线缴纳"
-					},
-					{
-						img: "https://zhongqian.xnszz.com/1-images/home/20250213002.png",
-						title: "常用电话",
-						describe: "随时查找常用电话"
-					},
-					{
-						img: "https://zhongqian.xnszz.com/1-images/home/20250213002.png",
-						title: "停车缴费",
-						describe: "输入车牌在线缴费"
-					},
-					{
-						img: "https://zhongqian.xnszz.com/1-images/home/20250213002.png",
-						title: "投诉表扬",
-						describe: "投诉表扬线上发布"
-					}
 
-				],
+
 			};
 		},
 		onLoad(options) {
 
 		},
 		methods: {
-			open() {
-				// console.log('open');
-			},
-			close() {
-				this.show = false
-				// console.log('close');
-			},
 			onClick(index) {
-				console.log(index);
+				if (index == 3) {
+					this.$wskj.to("/pagesMine/pages/zlbj")
+					return
+				}
+				if (index == 4) {
+					this.$wskj.to("/pagesMine/pages/fwxx")
+					return
+				}
+				if (index == 0) {
+					this.$wskj.to("/pagesMine/pages/wdfw")
+					return
+				}
+				if (index == 1) {
+					this.$wskj.to("/pagesMain/pages/bxbs")
+					return
+				}
+				if (index == 2) {
+					this.$wskj.to("/pagesMine/pages/yg_login")
+					return
+				}
 			}
 		}
 	};
@@ -105,22 +97,12 @@
 		height: 100vh;
 		display: flex;
 		flex-direction: column;
-		background: #f5f5f5;
+		background: #F2F2F2;
 	}
 
-	.grid-container {
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-around; // 可以根据需求调整元素的水平排列方式，这里是均匀分布
-		align-items: center; // 垂直方向居中对齐
-	}
-
-	.grid-item {
-		width: 46%; // 可以根据设计需求调整宫格宽度
-		height: 300rpx; // 宫格高度
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
+	.item {
+		width: 100%;
+		height: 200rpx;
+		margin-top: 20rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/pagesMain/pages/jnzd_ccc.vue b/pagesMain/pages/jnzd_czf.vue
similarity index 61%
rename from pagesMain/pages/jnzd_ccc.vue
rename to pagesMain/pages/jnzd_czf.vue
index 5dbf65bf90ed98c9ff9b1b4a5f233235ad341f25..d8c377e4408d84856865801c7bbcb1ede08b7c54 100644
--- a/pagesMain/pages/jnzd_ccc.vue
+++ b/pagesMain/pages/jnzd_czf.vue
@@ -1,21 +1,15 @@
 <template>
 	<view class="center plr-25">
-
 		<view class="flex-column br-12 fs-28 mt-30" style="background: white;">
 			<text class="fs-32 fw-700 mt-30" style="text-align: left;padding-left: 30rpx;">车位出租费</text>
-			<text class="fs-28 mt-30" style="text-align: left;padding-left: 30rpx;">停车场</text>
-			<view class="flex-row-between mar-30 br-4 pad-25" style="background: #F2F2F2;">
-				<text>请选择</text>
-				<image class="h-30 w-30" src="/static/icon_xjt.png"></image>
-			</view>
 			<text class="fs-28 mt-30" style="text-align: left;padding-left: 30rpx;">车位号</text>
-			<view class="flex-row-between mar-30 br-4 pad-25" style="background: #F2F2F2;">
-				<text>请选择</text>
+			<view class="flex-row-between mar-30 br-4 pad-25" style="background: #F2F2F2;" @click="openCar">
+				<text>{{carNumber==''?"请选择":carNumber}}</text>
 				<image class="h-30 w-30" src="/static/icon_xjt.png"></image>
 			</view>
 			<text class="fs-28 mt-30" style="text-align: left;padding-left: 30rpx;">租赁时间</text>
-			<view class="flex-row-between mar-30 br-4 pad-25" style="background: #F2F2F2;">
-				<text>请选择</text>
+			<view class="flex-row-between mar-30 br-4 pad-25" style="background: #F2F2F2;" @click="open">
+				<text>{{monthsNumber==''?"请选择":monthsNumber}}</text>
 				<image class="h-30 w-30" src="/static/icon_xjt.png"></image>
 			</view>
 			<text class="fs-28 mt-30" style="text-align: left;padding-left: 30rpx;">缴费金额</text>
@@ -23,11 +17,13 @@
 				<text>￥0</text>
 			</view>
 		</view>
-
 		<view class="fullscreen-btn" style="margin: 0;margin-top: 60rpx;">
 			立即缴费
 		</view>
-
+		<u-picker :show="show" :columns="columns" closeOnClickOverlay="true" @cancel="close" @close="close"
+			@confirm="confirm"></u-picker>
+		<u-picker :show="carShow" :columns="list" closeOnClickOverlay="true" @cancel="closeCar" @close="closeCar"
+			@confirm="confirmCar"></u-picker>
 	</view>
 </template>
 
@@ -35,8 +31,16 @@
 	export default {
 		data() {
 			return {
-				indexTab: 0,
-				type: 0,
+				show: false,
+				carShow: false,
+				list: [
+					['1', '2', '3', '4', '5']
+				],
+				columns: [
+					['1个月', '3个月', '6个月', '9个月', '12个月']
+				],
+				monthsNumber: '',
+				carNumber: '',
 
 			};
 		},
@@ -45,27 +49,29 @@
 
 		},
 		methods: {
-			onClickPrice(index) {
-				this.indexTab = index
+			open() {
+				this.show = true
+			},
+			close() {
+				this.show = false
+
 			},
+			openCar() {
+				this.carShow = true
+			},
+			closeCar() {
+				this.carShow = false
 
-			onClick(index) {
-				if (index == 0) {
-					this.$wskj.to("/pagesMain/pages/tsby_submit?type=0")
-					return
-				}
-				if (index == 1) {
-					this.$wskj.to("/pagesMain/pages/tsby_submit?type=1")
-					return
-				}
-				if (index == 2) {
-					this.$wskj.to("/pagesMain/pages/tsby_lsgd")
-					return
-				}
-				if (index == 3) {
-					this.$wskj.to("/pagesMain/pages/fwgz")
-					return
-				}
+			},
+			confirm(e) {
+				this.show = false
+				this.monthsNumber = e.value[0]
+				console.log("LMG", e.value[0])
+			},
+			confirmCar(e) {
+				this.carShow = false
+				this.carNumber = e.value[0]
+				console.log("LMG", e.value[0])
 			}
 		}
 	};
diff --git a/pagesMain/pages/jnzd_tcfmx.vue b/pagesMain/pages/jnzd_tcfmx.vue
index 9fc41960f5579cb57d990a2ae65783d01a0836e3..17a70efe55e01ef194b9d480bebe9614375feceb 100644
--- a/pagesMain/pages/jnzd_tcfmx.vue
+++ b/pagesMain/pages/jnzd_tcfmx.vue
@@ -100,7 +100,7 @@
 		methods: {
 			onTabClick(index) {
 				if (index == 0) {
-					this.$wskj.to("/pagesMain/pages/jnzd_wyf")
+					this.$wskj.to("/pagesMain/pages/jnzd_czf")
 					return
 				}
 				this.indexTab = index
diff --git a/pagesMain/pages/shjf.vue b/pagesMain/pages/shjf.vue
index 4e9e45490944f8fdb9d6a09ee14b3cc1006520ae..a1bed7c95ce58a50c0a5ce920a260ac91581181f 100644
--- a/pagesMain/pages/shjf.vue
+++ b/pagesMain/pages/shjf.vue
@@ -101,11 +101,11 @@
 					return
 				}
 				if (index == 4) {
-					this.$wskj.to("/pagesMain/pages/jnzd_ccc?type=0")
+					this.$wskj.to("/pagesMain/pages/jnzd_czf?type=0")
 					return
 				}
 				if (index == 5) {
-					this.$wskj.to("/pagesMain/pages/jnzd_ccc?type=1")
+					this.$wskj.to("/pagesMain/pages/jnzd_czf?type=1")
 					return
 				}
 				if (index == 6) {
diff --git a/pagesMine/pages/dk_submit.vue b/pagesMine/pages/dk_submit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..f54371d4e2e944ce77d7cd5f6ef632ab82c4216f
--- /dev/null
+++ b/pagesMine/pages/dk_submit.vue
@@ -0,0 +1,144 @@
+<template>
+	<view class='container'>
+		<view class="mar-20">
+			<view class="flex-column br-12 fs-28 mt-30" style="background: white;">
+				<text class="fs-32 fw-700 pad-30" style="text-align: left;">基本信息</text>
+				<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+					<text style="color: #999999;">职业</text>
+					<text>安保</text>
+				</view>
+				<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+					<text style="color: #999999;">姓名</text>
+					<text>张三</text>
+				</view>
+				<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+					<text style="color: #999999;">性别</text>
+					<text>男</text>
+				</view>
+				<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+					<text style="color: #999999;">手机号</text>
+					<text>199****8989</text>
+				</view>
+			</view>
+
+			<view class="flex-column br-12 fs-24 mt-30 pad-30" style="background: white;color: #999999;">
+				<text class="fs-32 fw-700" style="color: #000;">我的位置</text>
+				<text class="mt-20">请定位当前位置</text>
+				<view @click="onDw" class="mt-20"
+					style="display: flex;flex-direction: row-reverse;align-items: center;">
+					<text>重新定位</text>
+					<image class="w-25 h-25" src="/pagesMine/static/icon_dk_dw.png"></image>
+				</view>
+				<view class="mt-50" style="height: 1rpx;background: #E9E9E9;"> </view>
+				<text class="mt-50" style="color: #000;">拍照</text>
+				<view class="mt-20">
+					<upload-image v-model="images" maxCount="3" width="70" height="70" type="fullurl"></upload-image>
+				</view>
+			</view>
+
+		</view>
+		<view @click="onSubmit" class="fullscreen-btn mt-100">
+			<text>提交打卡</text>
+		</view>
+
+		<!-- 提交 -->
+		<wskj-modal :show="submitShow" :showCancelButton="true" confirmText="确定" confirmColor="#EB7318"
+			@close="submitShow = false" @confirm="onConfirmSubmit" @cancel="submitShow = false">
+			<view class="pt-40 pb-40">
+				<view>
+					<text class="fs-28">确认提交？</text>
+				</view>
+			</view>
+		</wskj-modal>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title: '安保打卡',
+				type: 0,
+				reason: '',
+				submitShow: false,
+				images: '',
+			};
+		},
+		onLoad(e) {
+			this.type = e.type
+			if (e.type == 0) {
+				this.title = "安保打卡"
+			} else {
+				this.title = "保洁打卡"
+			}
+
+		},
+		methods: {
+			onDw() {
+				uni.getLocation({
+					type: 'gcj02',
+					success: function(res) {
+						const latitude = res.latitude;
+						const longitude = res.longitude;
+						uni.openLocation({
+							latitude: latitude,
+							longitude: longitude,
+							success: function(res) {
+								console.log(res);
+							}
+						});
+					}
+				});
+
+			},
+			onSubmit() {
+				this.$wskj.to("/pagesMain/pages/tjsq?type=" + this.type)
+				// if (!this.reason) {
+				// 	return this.$u.toast('请输入内容')
+				// }
+				// if (!this.images) {
+				// 	return this.$u.toast('请至少上传一张照片')
+				// }
+				// if (this.reason.length < 10) {
+				// 	return this.$u.toast('文字描述最低10个字')
+				// }
+				// this.submitShow = true
+			},
+			// 提交
+			onConfirmSubmit() {
+				// const params = {
+				// 	url: '/api/user/yijian',
+				// 	loadingTip: '',
+				// 	data: {
+				// 		content: this.reason,
+				// 		images: this.images
+				// 	}
+				// }
+				// // console.log(params);
+				// this.$request(params).then(res => {
+				// 	// console.log(res)
+				// 	this.submitShow = false
+				// 	if (res.code === 1) {
+				// 		this.$u.toast(res.msg || '提交成功')
+
+				// 		this.reason = ''
+				// 		this.images = ''
+				// 	} else {
+				// 		this.$u.toast(res.msg || '提交失败')
+				// 	}
+				// }).catch(err => {
+				// 	this.submitShow = false
+				// 	this.$u.toast(err.msg || '提交失败')
+				// })
+			}
+		},
+	};
+</script>
+
+<style scoped>
+	.container {
+		display: flex;
+		flex-direction: column;
+		background: #F2F2F2;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesMine/pages/dkjl.vue b/pagesMine/pages/dkjl.vue
new file mode 100644
index 0000000000000000000000000000000000000000..d5fa54612dfb8cd9c9b9a274fea75ca5f045ba01
--- /dev/null
+++ b/pagesMine/pages/dkjl.vue
@@ -0,0 +1,78 @@
+<template>
+	<view class="center">
+		<view class="topbar">
+			<u-navbar :autoBack="true" title="打卡记录" placeholder="true" bgColor="transparent" leftIconColor="#FFF"
+				:title-style="{color: '#FFF'}">
+			</u-navbar>
+			<view class="h-200"></view>
+		</view>
+		<view class="mlr-25" style="margin-top: -100rpx;">
+			<attend-calendar :lateddates="[`2025-5-26`,`2025-5-27`,`2025-6-27`]"
+				:truancyeddates="[`2025-5-23`]"></attend-calendar>
+		</view>
+		<view class="flex v-center pad-30 mlr-25 mt-30" style="background: #EBF5F0;">
+			<text class="fs-28 fw-700">打卡时间：</text>
+			<text class="fs-24">2025-04-03 10:32:31</text>
+		</view>
+
+		<view class="flex-column mlr-25 mt-30" style="background: #EBF5F0;">
+			<view class="flex v-center pad-30">
+				<text class="fs-28 fw-700">打卡天数：</text>
+				<text class="fs-24">25天</text>
+			</view>
+			<view class="flex v-center pad-30">
+				<text class="fs-28 fw-700">缺卡天数：</text>
+				<text class="fs-24">1天</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				sex: '',
+				columns: [
+					['男', '女']
+				],
+
+			};
+		},
+		onLoad(options) {
+
+		},
+		methods: {
+			open() {
+				this.show = true
+			},
+			close() {
+				this.show = false
+			},
+			confirm(e) {
+				this.show = false
+				this.sex = e.value[0]
+				console.log("LMG", e.value[0])
+			}
+
+		}
+	};
+</script>
+
+<style>
+	.center {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #FFFFFF;
+	}
+
+	.topbar {
+		/* 推荐方式：使用静态资源路径 */
+		background-image: url('/pagesMine/static/icon_dkbg.png');
+		background-size: cover;
+		background-position: center;
+		background-repeat: no-repeat;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesMine/pages/fwxx.vue b/pagesMine/pages/fwxx.vue
new file mode 100644
index 0000000000000000000000000000000000000000..07c933ad819c1e3d9c25e487fb54fbf046cbc098
--- /dev/null
+++ b/pagesMine/pages/fwxx.vue
@@ -0,0 +1,120 @@
+<template>
+	<view class="center plr-25">
+
+		<view class="flex-column br-12 fs-28 mt-30" style="background: #FFFFFF;">
+			<text class="fs-32 fw-700 pad-30" style="text-align: left;">基本信息</text>
+			<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+				<text>姓名</text>
+				<text>张三</text>
+			</view>
+			<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+				<text>手机号</text>
+				<text>张三</text>
+			</view>
+			<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+				<text>身份证号</text>
+				<text>张三</text>
+			</view>
+		</view>
+		<view class="overflow-y">
+			<scroll-view scroll-y style="height: 100%;">
+				<view @click="onClickSelecte(index)" v-for="(item, index) in 5" :key="index">
+					<view class="flex-column br-12 fs-28 mt-30" style="background: #FFFFFF;">
+						<view class="fs-32 fw-700 pad-30 flex-row-between">
+							<text>房屋信息</text>
+							<image v-if="selecteIndex==index" class="w-45 h-45" src="/pagesMine/static/icon_fwxx_1.png">
+							</image>
+							<image v-else class="w-45 h-45" src="/pagesMine/static/icon_fwxx_2.png"></image>
+						</view>
+						<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+							<text>小区</text>
+							<text>利达国宾中心</text>
+						</view>
+						<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+							<text>具体位置</text>
+							<text>1栋2单元205室</text>
+						</view>
+						<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+							<text>业主姓名</text>
+							<text>张三</text>
+						</view>
+						<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+							<text>业主手机号</text>
+							<text>177****1234</text>
+						</view>
+					</view>
+				</view>
+
+			</scroll-view>
+		</view>
+		<view class="h-140 pt-20">
+			<view class="fullscreen-btn">
+				确定
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				selecteIndex: 0
+
+			};
+		},
+		onLoad(options) {
+
+		},
+		methods: {
+			open() {
+
+			},
+			close() {
+
+			},
+			onClick(index) {
+				if (index == 0) {
+					this.$wskj.to("/pagesMain/pages/tsby_submit?type=0")
+					return
+				}
+				if (index == 1) {
+					this.$wskj.to("/pagesMain/pages/tsby_submit?type=1")
+					return
+				}
+				if (index == 2) {
+					this.$wskj.to("/pagesMain/pages/tsby_lsgd")
+					return
+				}
+				if (index == 3) {
+					this.$wskj.to("/pagesMain/pages/fwgz")
+					return
+				}
+			},
+			onClickSelecte(index) {
+				this.selecteIndex = index
+			}
+		}
+	};
+</script>
+
+<style>
+	.center {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #F2F2F2;
+	}
+
+	.item {
+		width: 100%;
+		height: 200rpx;
+		margin-top: 20rpx;
+	}
+
+	.item2 {
+		width: 100%;
+		height: 150rpx;
+		margin-top: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesMine/pages/jtcy.vue b/pagesMine/pages/jtcy.vue
new file mode 100644
index 0000000000000000000000000000000000000000..d95dca59358e089e592d972a5c1b88e458fa5e27
--- /dev/null
+++ b/pagesMine/pages/jtcy.vue
@@ -0,0 +1,97 @@
+<template>
+	<view class="center plr-25">
+		<view class="overflow-y">
+			<scroll-view scroll-y style="height: 100%;">
+				<view class="flex-column br-12 fs-28 mt-30" style="background: #FFFFFF;">
+					<text class="fs-32 fw-700 pad-30" style="text-align: left;">家庭成员</text>
+					<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+						<text>姓名</text>
+						<input style="text-align: right;" placeholder="请输入姓名" />
+					</view>
+					<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;" @click="open">
+						<text>性别</text>
+						<view class="flex v-center">
+							<text>{{sex==''?"请选择":sex}}</text>
+							<image class="w-25 h-30 ml-10" src="/static/icon_r.png"></image>
+						</view>
+					</view>
+					<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+						<text>关系</text>
+						<input style="text-align: right;" placeholder="请输入和业主的关系" />
+					</view>
+					<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+						<text>手机号</text>
+						<input style="text-align: right;" :disabled="disabled" type="tel" maxlength="11"
+							placeholder="请输入手机号" />
+					</view>
+
+				</view>
+				<u-picker :show="show" :columns="columns" closeOnClickOverlay="true" @cancel="close" @close="close"
+					@confirm="confirm"></u-picker>
+			</scroll-view>
+		</view>
+		<view class="h-140 pt-20">
+			<!-- <view class="fullscreen-btn">
+				确认添加
+			</view> -->
+			<view class="fullscreen-btn" style="background: #FF6363;">
+				删除
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				disabled: false, //禁止输入 true
+				show: false,
+				sex: '',
+				columns: [
+					['男', '女']
+				],
+
+			};
+		},
+		onLoad(options) {
+
+		},
+		methods: {
+			open() {
+				this.show = true
+			},
+			close() {
+				this.show = false
+			},
+			confirm(e) {
+				this.show = false
+				this.sex = e.value[0]
+				console.log("LMG", e.value[0])
+			}
+
+		}
+	};
+</script>
+
+<style>
+	.center {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #F2F2F2;
+	}
+
+	.item {
+		width: 100%;
+		height: 200rpx;
+		margin-top: 20rpx;
+	}
+
+	.item2 {
+		width: 100%;
+		height: 150rpx;
+		margin-top: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesMine/pages/wdfw.vue b/pagesMine/pages/wdfw.vue
new file mode 100644
index 0000000000000000000000000000000000000000..660bb6eabb32b6849db6d1ecfc236644c75db2e3
--- /dev/null
+++ b/pagesMine/pages/wdfw.vue
@@ -0,0 +1,103 @@
+<template>
+	<view class="center plr-25">
+		<view class="br-12" style="background: linear-gradient( 180deg, #1FCA7C 0%, #DDF1E8 100%);;margin-top: 30rpx;">
+			<view class="flex-column mar-25">
+				<text class="fs-32 fw-700 mb-30" style="text-align: left;">当前住址</text>
+				<view class="flex-column br-12 pad-25" style="background: #F3FEF9;">
+					<view class="flex v-center">
+						<image class="h-42 w-42" src="/static/icon_my_fw.png"></image>
+						<text class="fs-28">利达国宾中心</text>
+						<image class="h-25 w-25 mt-5" src="/static/icon_r.png"></image>
+					</view>
+					<text class="fs-24 h-54 lh-54 mt-30"
+						style="background: linear-gradient( 90deg, #CAF6E2 0%, #FFFFFF 100%);">
+						1栋2单元205室
+					</text>
+				</view>
+			</view>
+		</view>
+		<view class="flex-column fs-32 w-150 vh-center mtb-30">
+			<text style="text-align: center;">家庭成员</text>
+			<view style="width: 60rpx;height: 5rpx;background-color: #1FCA7C;"></view>
+		</view>
+
+		<view class="overflow-y">
+			<scroll-view scroll-y style="height: 100%;">
+				<view @click="onClickSelecte(index)" v-for="(item, index) in 10" :key="index">
+					<view class="flex-column br-12 fs-28 pad-30 mb-20" style="background: #FFFFFF;">
+						<view class="flex vh-center">
+							<image class="w-95 h-95 br-50" src="/static/icon_logo.png"></image>
+							<view class="flex-column ml-20" style="text-align: left;flex: 1;">
+								<text class="fs-30">家庭成员1</text>
+								<view class="flex">
+									<text class="fs-22 mt-10 plr-20 ptb-5 br-4"
+										style="border: 1px solid #1FCA7C;color: #1FCA7C;">长辈1</text>
+								</view>
+
+							</view>
+							<text class="fs-28">17787878787</text>
+						</view>
+					</view>
+				</view>
+
+			</scroll-view>
+		</view>
+		<view class="h-140 pt-20">
+			<view class="fullscreen-btn" @click="onClick(0)">
+				新增人员
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				selecteIndex: 0
+			};
+		},
+		onLoad(options) {
+
+		},
+		methods: {
+			open() {
+
+			},
+			close() {
+
+			},
+			onClick(index) {
+				if (index == 0) {
+					this.$wskj.to("/pagesMine/pages/jtcy")
+					return
+				}
+			},
+			onClickSelecte(index) {
+				this.selecteIndex = index
+				this.$wskj.to("/pagesMine/pages/jtcy")
+			}
+		}
+	};
+</script>
+
+<style>
+	.center {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #F2F2F2;
+	}
+
+	.item {
+		width: 100%;
+		height: 200rpx;
+		margin-top: 20rpx;
+	}
+
+	.item2 {
+		width: 100%;
+		height: 150rpx;
+		margin-top: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesMine/pages/yg_login.vue b/pagesMine/pages/yg_login.vue
new file mode 100644
index 0000000000000000000000000000000000000000..dff83115d16747896c492717f9fbb3673c99d7aa
--- /dev/null
+++ b/pagesMine/pages/yg_login.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="center">
+		<view>
+			<u-navbar left-text="返回" :autoBack="true" placeholder="true" bgColor="transparent">
+			</u-navbar>
+		</view>
+		<view class="flex-column mlr-70 mt-100" style="text-align: left;">
+			<text class="fs-48 fw-700">Hello!\n请登录员工账号</text>
+			<input class="h-86 lh-86 fs-28 plr-33 mt-80" style="background: #FFFFFF;" placeholder="手机号" />
+			<input class="h-86 lh-86 fs-28 plr-33 mt-50" style="background: #FFFFFF;" placeholder="密码" />
+			<view class="fullscreen-btn mt-100" @click="login">
+				立即登录
+			</view>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		onLoad(options) {
+
+		},
+		methods: {
+			login() {
+				this.$wskj.to("/pagesMine/pages/ygzy")
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: linear-gradient(180deg, #DFF4EB 0%, #FFFFFF 100%);
+	}
+</style>
\ No newline at end of file
diff --git a/pagesMine/pages/ygzy.vue b/pagesMine/pages/ygzy.vue
new file mode 100644
index 0000000000000000000000000000000000000000..10ff6d92271a1bdc7e19a2be98a50af9070030bc
--- /dev/null
+++ b/pagesMine/pages/ygzy.vue
@@ -0,0 +1,73 @@
+<template>
+	<view class="center">
+		<view class="flex-column mlr-30">
+			<image @click="onClick(0)" class="item" src="/pagesMine/static/icon_ygzy_1.png"></image>
+			<image @click="onClick(1)" class="item" src="/pagesMine/static/icon_ygzy_2.png"></image>
+			<image @click="onClick(2)" class="item" src="/pagesMine/static/icon_ygzy_3.png"></image>
+			<image @click="onClick(3)" class="item2" src="/pagesMine/static/icon_ygzy_4.png"></image>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+
+			};
+		},
+		onLoad(options) {
+
+		},
+		methods: {
+			open() {
+
+			},
+			close() {
+
+			},
+			onClick(index) {
+				if (index == 0) {
+					this.$wskj.to("/pagesMine/pages/dk_submit")
+					return
+				}
+				if (index == 1) {
+					this.$wskj.to("/pagesMine/pages/dk_submit")
+					return
+				}
+				if (index == 2) {
+					this.$wskj.to("/pagesMain/pages/bxbs_lsgd")
+					return
+				}
+				if (index == 3) {
+					this.$wskj.to("/pagesMine/pages/dkjl")
+					return
+				}
+			}
+		}
+	};
+</script>
+
+<style>
+	.center {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #F2F2F2;
+	}
+
+	.item {
+		width: 100%;
+		height: 200rpx;
+		margin-top: 20rpx;
+	}
+
+	.item2 {
+		width: 100%;
+		height: 150rpx;
+		margin-top: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesMine/pages/zlbj.vue b/pagesMine/pages/zlbj.vue
new file mode 100644
index 0000000000000000000000000000000000000000..7ea48e4e341d615c881d80f9e2359910c98b682c
--- /dev/null
+++ b/pagesMine/pages/zlbj.vue
@@ -0,0 +1,88 @@
+<template>
+	<view class="center plr-25">
+		<view class="overflow-y">
+			<scroll-view scroll-y style="height: 100%;">
+				<view class="flex-column br-12 fs-28 mt-30" style="background: #FFFFFF;">
+					<text class="fs-32 fw-700 pad-30" style="text-align: left;">基本信息</text>
+					<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+						<text>姓名</text>
+						<text>张三</text>
+					</view>
+					<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;" @click="open">
+						<text>性别</text>
+						<view class="flex v-center">
+							<text>{{sex==''?"请选择":sex}}</text>
+							<image class="w-25 h-30 ml-10" src="/static/icon_r.png"></image>
+						</view>
+					</view>
+					<view class="flex-row-between pad-30" style="border-bottom: 1rpx solid #E9E9E9;">
+						<text>手机号</text>
+						<text>张三</text>
+					</view>
+
+				</view>
+				<u-picker :show="show" :columns="columns" closeOnClickOverlay="true" @cancel="close" @close="close"
+					@confirm="confirm"></u-picker>
+			</scroll-view>
+		</view>
+		<view class="h-140 pt-20">
+			<view class="fullscreen-btn">
+				确定
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				sex: '',
+				columns: [
+					['男', '女']
+				],
+
+			};
+		},
+		onLoad(options) {
+
+		},
+		methods: {
+			open() {
+				this.show = true
+			},
+			close() {
+				this.show = false
+			},
+			confirm(e) {
+				this.show = false
+				this.sex = e.value[0]
+				console.log("LMG", e.value[0])
+			}
+
+		}
+	};
+</script>
+
+<style>
+	.center {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #F2F2F2;
+	}
+
+	.item {
+		width: 100%;
+		height: 200rpx;
+		margin-top: 20rpx;
+	}
+
+	.item2 {
+		width: 100%;
+		height: 150rpx;
+		margin-top: 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesMine/static/icon_dk_dw.png b/pagesMine/static/icon_dk_dw.png
new file mode 100644
index 0000000000000000000000000000000000000000..a619fbdad9502c26131b59f36d0696d0e21c1d77
Binary files /dev/null and b/pagesMine/static/icon_dk_dw.png differ
diff --git a/pagesMine/static/icon_dkbg.png b/pagesMine/static/icon_dkbg.png
new file mode 100644
index 0000000000000000000000000000000000000000..8043d35ac1b0ec4b26affabaee82bef2b946666d
Binary files /dev/null and b/pagesMine/static/icon_dkbg.png differ
diff --git a/pagesMine/static/icon_fwxx_1.png b/pagesMine/static/icon_fwxx_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..62c755da87df46e21889d1ddc3f62a6c7bc6fb98
Binary files /dev/null and b/pagesMine/static/icon_fwxx_1.png differ
diff --git a/pagesMine/static/icon_fwxx_2.png b/pagesMine/static/icon_fwxx_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7e5af5d2737e101964c9efe0cf3caf98b1ac763
Binary files /dev/null and b/pagesMine/static/icon_fwxx_2.png differ
diff --git a/pagesMine/static/icon_ygzy_1.png b/pagesMine/static/icon_ygzy_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..87b5b8abac7d99ed7dcf96351267e60f55a0f677
Binary files /dev/null and b/pagesMine/static/icon_ygzy_1.png differ
diff --git a/pagesMine/static/icon_ygzy_2.png b/pagesMine/static/icon_ygzy_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..11e1211d5682756e52b43deaf2bdf53ab27c0ab7
Binary files /dev/null and b/pagesMine/static/icon_ygzy_2.png differ
diff --git a/pagesMine/static/icon_ygzy_3.png b/pagesMine/static/icon_ygzy_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a4a80eea791f804df201ac7b8fd83ffe3796b40
Binary files /dev/null and b/pagesMine/static/icon_ygzy_3.png differ
diff --git a/pagesMine/static/icon_ygzy_4.png b/pagesMine/static/icon_ygzy_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..34d77339ae7522ee6fe5a2efdb2515bac3d6258b
Binary files /dev/null and b/pagesMine/static/icon_ygzy_4.png differ
diff --git a/static/attend-calendar/attendance-arrow-up.png b/static/attend-calendar/attendance-arrow-up.png
new file mode 100644
index 0000000000000000000000000000000000000000..b815fd53c3dd1f496f2515a267f2f66e872877f0
Binary files /dev/null and b/static/attend-calendar/attendance-arrow-up.png differ
diff --git a/static/attend-calendar/attendance_bg.png b/static/attend-calendar/attendance_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..b211ea5e07d3eeb7855696d627f06b50f3cd38ae
Binary files /dev/null and b/static/attend-calendar/attendance_bg.png differ
diff --git a/static/attend-calendar/attendance_data.png b/static/attend-calendar/attendance_data.png
new file mode 100644
index 0000000000000000000000000000000000000000..da01310164f72dcd9f1484d513ba0ddb8d6bbfbe
Binary files /dev/null and b/static/attend-calendar/attendance_data.png differ
diff --git a/static/attend-calendar/attendance_frequently.png b/static/attend-calendar/attendance_frequently.png
new file mode 100644
index 0000000000000000000000000000000000000000..970995027a27a0b7e6c19a225e80a931185a1487
Binary files /dev/null and b/static/attend-calendar/attendance_frequently.png differ
diff --git a/static/attend-calendar/attendance_left.png b/static/attend-calendar/attendance_left.png
new file mode 100644
index 0000000000000000000000000000000000000000..76dacad29a38725c53b8b2c39e7f56f71cb0e63a
Binary files /dev/null and b/static/attend-calendar/attendance_left.png differ
diff --git a/static/attend-calendar/attendance_right.png b/static/attend-calendar/attendance_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b8a4f78a26a70c0e5a7beccca27b4a6acf158d8
Binary files /dev/null and b/static/attend-calendar/attendance_right.png differ
diff --git a/static/icon_my_bg.png b/static/icon_my_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6fff451fdcc4cdca4789605f2babc75dc321e5d
Binary files /dev/null and b/static/icon_my_bg.png differ
diff --git a/static/icon_my_fw.png b/static/icon_my_fw.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cb081e56bfcb501c399937333fc32049400cf58
Binary files /dev/null and b/static/icon_my_fw.png differ
diff --git a/static/icon_my_img.png b/static/icon_my_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..8772bc5da4e4008e3b892e850318bfba0d05a5ce
Binary files /dev/null and b/static/icon_my_img.png differ
diff --git a/static/icon_my_wdfw.png b/static/icon_my_wdfw.png
new file mode 100644
index 0000000000000000000000000000000000000000..410133e7973ad611f257c2b73a7c47935872dddb
Binary files /dev/null and b/static/icon_my_wdfw.png differ
diff --git a/static/icon_my_wdgd.png b/static/icon_my_wdgd.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d1ea46db4eef667fea0874fc62ab4a6e57296fd
Binary files /dev/null and b/static/icon_my_wdgd.png differ
diff --git a/static/icon_my_ygrk.png b/static/icon_my_ygrk.png
new file mode 100644
index 0000000000000000000000000000000000000000..281192d3438c81c2c6a39afcdaf3431e0d11ba28
Binary files /dev/null and b/static/icon_my_ygrk.png differ
diff --git a/static/icon_upload.png b/static/icon_upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..61dd6515d8b63733bca1f0e5eab9dd3cf4cd28d0
Binary files /dev/null and b/static/icon_upload.png differ
diff --git a/static/tabbar/bmfw.png b/static/tabbar/bmfw.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca54b09854df704df37bb742ffee0c3ff2882cdd
Binary files /dev/null and b/static/tabbar/bmfw.png differ
diff --git a/static/tabbar/bmfwHL.png b/static/tabbar/bmfwHL.png
new file mode 100644
index 0000000000000000000000000000000000000000..b42b5c496d6747b69ca2c1569c24d4dd63c008a6
Binary files /dev/null and b/static/tabbar/bmfwHL.png differ
diff --git a/static/tabbar/cart.png b/static/tabbar/cart.png
deleted file mode 100644
index cccc04fa38e8440079584ddcc636c84ef871389e..0000000000000000000000000000000000000000
Binary files a/static/tabbar/cart.png and /dev/null differ
diff --git a/static/tabbar/cartHL.png b/static/tabbar/cartHL.png
deleted file mode 100644
index a27ddf3bcd8fb0f25133f44fc5232c4d14b85c83..0000000000000000000000000000000000000000
Binary files a/static/tabbar/cartHL.png and /dev/null differ
diff --git a/static/tabbar/classify.png b/static/tabbar/classify.png
deleted file mode 100644
index da6050d4acc7518ab24a00c7a62a0789351feb3f..0000000000000000000000000000000000000000
Binary files a/static/tabbar/classify.png and /dev/null differ
diff --git a/static/tabbar/classifyHL.png b/static/tabbar/classifyHL.png
deleted file mode 100644
index a489563774798c317941923c607db4b2e5eaaa59..0000000000000000000000000000000000000000
Binary files a/static/tabbar/classifyHL.png and /dev/null differ
diff --git a/static/tabbar/home.png b/static/tabbar/home.png
index 389c2f64136ccb028aaff8d210530e2613b07c1c..628ff481c0ee8f2e9d82e0770aca28eeecff9ad7 100644
Binary files a/static/tabbar/home.png and b/static/tabbar/home.png differ
diff --git a/static/tabbar/homeHL.png b/static/tabbar/homeHL.png
index 98b85d4ef175ccf0a727841f3d3a2417a0385122..3317ca1ebfdcafb540cecdcdca87d41c1098077b 100644
Binary files a/static/tabbar/homeHL.png and b/static/tabbar/homeHL.png differ
diff --git a/static/tabbar/my.png b/static/tabbar/my.png
index 7a17a8890ae15d38709d832a937c326cc2b20996..87331dd1f0659aeeb621f16632e1bf17dd5e2eef 100644
Binary files a/static/tabbar/my.png and b/static/tabbar/my.png differ
diff --git a/static/tabbar/myHL.png b/static/tabbar/myHL.png
index 44700388a15ba9df472a1cdf4cb2eaee9feac73e..0a278b1cdf8853085c96400c4611d0dbd4908a76 100644
Binary files a/static/tabbar/myHL.png and b/static/tabbar/myHL.png differ