diff --git a/main.js b/main.js
index 8458b43..904b195 100644
--- a/main.js
+++ b/main.js
@@ -21,11 +21,14 @@ Vue.prototype.goHome = () => {
  * @param {string} path 页面完成路径
  * @param {string} query 参数字符串a=x&b=y
  */
+
+// 白名单页面
+const whiteListPath = ['/pages/basic-info/basic-info','/pages/statistics/statistics','/pages/user-code/user-code']
+
 Vue.prototype.openPage = function(path, query = '') {
 	let url = query ? `${path}?${query}` : path;
 	store.commit('user/setPagePath',url)
-	// 白名单页面
-	const whiteListPath = ['/pages/basic-info/basic-info','/pages/statistics/statistics','/pages/user-code/user-code']
+	
 	const choosePath = whiteListPath.indexOf(path)
 	if(!store.state.user.userInfo.id && choosePath === -1) {
 		url = '/pages/basic-info/basic-info';
diff --git a/pages.json b/pages.json
index 3cbbcfa..163196b 100644
--- a/pages.json
+++ b/pages.json
@@ -32,6 +32,12 @@
         "navigationBarTitleText": "领取健康码"
       }
     },
+	{
+	  "path": "pages/punch-the-clock/punch-the-clock",
+	  "style": {
+	    "navigationBarTitleText": "每日健康打卡"
+	  }
+	},
     {
       "path": "pages/basic-info/basic-info",
       "style": {
diff --git a/pages/basic-info/basic-info.vue b/pages/basic-info/basic-info.vue
index 3357b77..d7ecf4e 100644
--- a/pages/basic-info/basic-info.vue
+++ b/pages/basic-info/basic-info.vue
@@ -171,7 +171,6 @@ export default {
 		  });
           this.success = true;
           this.setUserInfo(data);
-		  console.log(pagePath)
 		  if(pagePath === '/pages/basic-info/basic-info'){
 			  uni.reLaunch({
 			  	url: `/pages/index/index`,
diff --git a/pages/index/components/home.vue b/pages/index/components/home.vue
index 446c81b..fac8112 100644
--- a/pages/index/components/home.vue
+++ b/pages/index/components/home.vue
@@ -22,7 +22,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="cu-card flex margin bg-white shadow card-radius" hover-class="cc-active" @tap="openPage('/pages/apply-code/apply-code')">
+			<view class="cu-card flex margin bg-white shadow card-radius" hover-class="cc-active" @tap="openPage('/pages/punch-the-clock/punch-the-clock')">
 				<view class="flex align-center padding">
 					<view class="round lg cu-avatar icon2">
 						<view class="iconfont icon-carryout"></view>
diff --git a/pages/my-code/my-code.vue b/pages/my-code/my-code.vue
index e600ccd..02329e0 100644
--- a/pages/my-code/my-code.vue
+++ b/pages/my-code/my-code.vue
@@ -31,6 +31,9 @@
 				</view>
 			</view>
 		</view>
+		<view v-if="tableList && tableList.length === 0" class="padding-lg">
+			您还没有申请健康码，请点击右下角加号申请健康码。
+		</view>
 	</view>
 
 </template>
diff --git a/pages/my-trips/my-trips.vue b/pages/my-trips/my-trips.vue
index a36bb81..2b8db40 100644
--- a/pages/my-trips/my-trips.vue
+++ b/pages/my-trips/my-trips.vue
@@ -29,6 +29,10 @@
 				</view>
 			</view>
 		</view>
+		
+		<view v-if="tableList && tableList.length === 0" class="padding-lg">
+			您还没有添加行程，请点击右下角加号添加行程。
+		</view>
 
 	</view>
 
diff --git a/pages/punch-the-clock/punch-the-clock.vue b/pages/punch-the-clock/punch-the-clock.vue
new file mode 100644
index 0000000..ff837d8
--- /dev/null
+++ b/pages/punch-the-clock/punch-the-clock.vue
@@ -0,0 +1,293 @@
+<template>
+	<view>
+		<form class="padding-lr cu-form-group flex-direction">
+			<view class="cu-form-group flex flex-direction padding-tb">
+				<view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>当前所在地区</view>
+				<view class="flex align-center">
+					<input class="flex-sub padding-left-xs" @tap="handleSelectLocation" placeholder="请选择当前所在地区" name="input" type="btn"
+					 v-model="district" />
+					<text class="cuIcon-location timer"></text>
+				</view>
+			</view>
+			<view class="cu-form-group flex flex-direction padding-tb">
+				<view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>当前所在详细地址</view>
+				<input placeholder="请输入详细地址(含门牌号)" name="input" type="text" v-model="address" />
+			</view>
+			<view class="cu-form-group flex flex-direction padding-top">
+				<view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>当前状态</view>
+				<radio-group class="block" @change="StateChange">
+					<view class="cu-list menu text-left">
+						<view class="cu-item" v-for="(state,index) in status" :key="index">
+							<label class="flex justify-between align-center">
+								<radio class="round margin-right-xs" :checked="index === healthTypeId" :value="state.id"></radio>
+								<view class="flex-sub" style="font-size: 34rpx;">{{ state.name }}</view>
+							</label>
+						</view>
+					</view>
+				</radio-group>
+			</view>
+			<view class="cu-form-group flex flex-direction padding-tb">
+				<view class="title padding-bottom-sm">就诊医院（若无填无）</view>
+				<input placeholder="请输入就诊医院" name="input" type="text" v-model="hospital" />
+			</view>
+			<view class="cu-form-group flex flex-direction padding-top">
+				<view class="title padding-bottom-sm">最近14天是否有武汉居住史、旅游史或武汉亲戚来访</view>
+				<radio-group class="block" @change="TourChange">
+					<view class="flex">
+						<view class="flex-sub margin-tb-sm" v-for="(tour,index) in tours" :key="index">
+							<label class="flex justify-between align-center">
+								<radio class="round margin-right-xs" :checked="index === touchHubei" :value="tour.value"></radio>
+								<text class="flex-sub" style="font-size: 34rpx;">{{ tour.name }}</text>
+							</label>
+						</view>
+					</view>
+				</radio-group>
+			</view>
+
+			<view class="cu-form-group flex flex-direction padding-top">
+				<view class="title padding-bottom-sm">最近14天是否有新冠肺炎患者或疑似患者接触史</view>
+				<radio-group class="block" @change="TouchChange">
+					<view class="flex">
+						<view class="flex-sub margin-tb-sm" v-for="(touch,index) in touches" :key="index">
+							<label class="flex justify-between align-center">
+								<radio class="round margin-right-xs" :checked="index === touchSick" :value="touch.value"></radio>
+								<text class="flex-sub" style="font-size: 34rpx;">{{ touch.name }}</text>
+							</label>
+						</view>
+					</view>
+				</radio-group>
+			</view>
+			<view class="cu-form-group flex flex-direction padding-tb">
+				<view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>当前体温（℃）</view>
+				<input placeholder="请输入当前真实体温" name="input" type="number" v-model="animalHeat" />
+			</view>
+		</form>
+		<user-agreement @changeIntentions="changeIntentions"></user-agreement>
+		<button class="bg-cyan margin primary-btn" hover-class="cc-active" @tap="handleHealthSign">确认提交</button>
+		<!-- 历史 -->
+		<button class="shadow round bg-cyan history-btn iconfont icon-history" hover-class="cc-active" @tap="openPage('/pages/my-code/my-code')"></button>
+	</view>
+</template>
+
+<script>
+	import {
+		showToast
+	} from 'common/script/util';
+	import {
+		HEALTH_SIGN
+	} from 'api/api';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+
+	export default {
+		data() {
+			return {
+				district: '请选择当前所在地区',
+				address: '',
+				// status: [],
+				hospital: '',
+				tours: [{
+					value: '0',
+					name: '否'
+				}, {
+					value: '1',
+					name: '是'
+				}],
+				touches: [{
+					value: '0',
+					name: '否'
+				}, {
+					value: '1',
+					name: '是'
+				}],
+				animalHeat: 0,
+				healthTypeId: 0,
+				touchHubei: 0,
+				touchSick: 0,
+				agree: false,
+			};
+		},
+		computed: mapState('user', ['token', 'status']),
+		
+		methods: {
+			...mapMutations('user', ['setHealthCode']),
+			handleSelectLocation() {
+				const that = this;
+				uni.chooseLocation({
+					success: function(res) {
+						console.log('位置名称：' + res.name);
+						console.log('详细地址：' + res.address);
+						that.district = res.address;
+					},
+				});
+			},
+			
+			changeIntentions(data) {
+			  this.agree = data;
+			},
+
+			// 状态
+			StateChange: function(evt) {
+				for (let i = 0; i < this.status.length; i++) {
+					if (this.status[i].id === evt.target.value) {
+						this.healthTypeId = i;
+						break;
+					}
+				}
+			},
+
+			// 旅游
+			TourChange: function(evt) {
+				for (let i = 0; i < this.tours.length; i++) {
+					if (this.tours[i].value === evt.target.value) {
+						this.touchHubei = i;
+						break;
+					}
+				}
+			},
+
+			// 接触
+			TouchChange(evt) {
+				console.log(this.touches,'aa')
+				for (let b = 0; b < this.touches.length; b++) {
+					if (this.touches[b].value === evt.target.value) {
+						this.touchSick = b;
+						break;
+					}
+				}
+			},
+
+			/**
+			 * 申请健康码
+			 */
+			async handleHealthSign() {
+				try {
+					if (!this.checkRules()) return;
+
+					const {
+						address,
+						animalHeat,
+						district,
+						healthTypeId,
+						hospital,
+						token,
+						touchHubei,
+						touchSick
+					} = this;
+					const params = {
+						param: {
+							address,
+							animalHeat,
+							district,
+							healthTypeId: healthTypeId + 1,
+							hospital,
+							token,
+							touchHubei,
+							touchSick
+						}
+					};
+					
+					const res = await this.$http.post(HEALTH_SIGN, params);
+					const {
+						success,
+						code,
+						msg,
+						data
+					} = res.data;
+					if (success && code === 200) {
+						uni.showToast({
+						    title: '申请健康码成功',
+						    duration: 2000
+						});
+						this.success = true;
+						this.setHealthCode(data.healthCode)
+						uni.reLaunch({
+							url: `/pages/index/index`,
+						});
+					} else {
+						uni.showToast({
+							title: msg || '申请健康码失败',
+							icon: 'none'
+						});
+					}
+				} catch (error) {
+					console.log('error: ', error);
+					if (error.msg) {
+						uni.showToast({
+							title: error.msg || '申请健康码失败',
+							icon: 'none'
+						});
+					}
+				}
+			},
+
+			// 验证信息
+			checkRules() {
+				const {
+					district,
+					address,
+					healthTypeId,
+					animalHeat,
+					agree
+				} = this;
+				if (!district || district === '请选择当前所在地区') {
+					showToast('请选择当前所在地区');
+					return;
+				}
+				if (!address) {
+					showToast('请输入当前所在地址');
+					return;
+				}
+				if (healthTypeId < 0) {
+					showToast('请选择状态');
+					return;
+				}
+				if (!animalHeat) {
+					showToast('请输入当前体温');
+					return;
+				}
+				if (!agree) {
+					showToast('请确定是否为本人填写');
+					return;
+				}
+				return true;
+			},
+
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.agree-box {
+		width: 70rpx;
+	}
+
+	.agree-text {
+		line-height: 60rpx;
+	}
+
+	.timer {
+		font-size: 34rpx !important;
+		color: $gray;
+	}
+
+	.primary-btn {
+		border-radius: 15rpx;
+	}
+
+	.history-btn {
+		position: fixed;
+		bottom: 40rpx;
+		right: 40rpx;
+		width: 96rpx;
+		height: 96rpx;
+		line-height: 96rpx;
+		padding: 0;
+	}
+
+	.history-btn::after {
+		border: none;
+	}
+</style>