auto commit

README.md

@@ -1,7 +1,9 @@
 ## 城市智慧停车PDA
-### H5调试,因为没有app方法,需要如下操作调试
+#### H5调试,因为没有app方法,需要如下操作调试
 - `login.vue中` 找到到 `handleLogin()` 设置设配编号为固定值
 
+#### 安卓打包
+
 
 
 

pages.json

@@ -53,6 +53,13 @@
 				// "navigationStyle":"custom",// 隐藏系统导航栏
 				"navigationBarTitleText": "拍照取证"
 			}
+		},
+		{
+			"path": "pages/attence/attence",
+			"style": {
+				"navigationStyle":"custom",// 隐藏系统导航栏
+				"navigationBarTitleText": "考勤"
+			}
 		}
 	],
 	"globalStyle": {

pages/attence/attence.scss

@@ -0,0 +1,123 @@
+page{
+	background-color: #F4F4F4;
+}
+.wrap{margin-top: 30rpx;}
+.payeeinfo{
+	height: 143rpx;
+	background: #FFFFFF;
+	border-radius: 20rpx;
+	padding-left: 30rpx;
+	margin-bottom: 20rpx;
+	.payeeinfo-text{
+		margin-left: 19rpx;
+		.name{
+			font-size: 30rpx;
+			font-weight: 500;
+			color: #5B5B5B;
+			line-height: 42rpx;
+			letter-spacing: 1px;
+		}
+		.id{
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #5B5B5B;
+			line-height: 33rpx;
+			letter-spacing: 1px;
+		}
+	}
+}
+
+.attence-block{
+	background: #FFFFFF;
+	border-radius: 20rpx;
+	padding: 38rpx 30rpx 69rpx;
+	margin-bottom: 20rpx;
+}
+
+.today-attence{
+	margin-bottom: 71rpx;
+	.today-attence-item{
+		flex: 1;
+		height: 105rpx;
+		padding: 20rpx 23rpx 0;
+		background: #F4F4F4;
+		border-radius: 10rpx;
+		font-weight: 400;
+		letter-spacing: 1px;
+		.u-icon{margin-right: 7rpx;}
+		.work-time{
+			font-size: 28rpx;
+			color: #515151;
+			line-height: 40rpx;
+		}
+		.my-time{
+			font-size: 24rpx;
+			color: #515151;
+			line-height: 33rpx;
+		}
+	}
+	.today-attence-item + .today-attence-item{
+		margin-left: 19rpx;
+	}
+}
+
+.attence-button{
+	width: 249rpx;
+	height: 249rpx;
+	margin: 0 auto 30rpx;
+	border-radius: 50%;
+	border: 20rpx solid #EAF3FE;
+	align-content: center;
+	justify-content: center;
+	background: linear-gradient(180deg, #56ABFF 0%, #0062D5 100%);
+	.attence-button-type{
+		font-size: 36rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		line-height: 50rpx;
+	}
+	.attence-button-time{
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #A7CCF5;
+		line-height: 40rpx;
+	}
+}
+
+.position-tip{
+	text-align: center;
+	font-size: 24rpx;
+	font-weight: 400;
+	color: #7D7D7D;
+	line-height: 33rpx;
+	padding-bottom: 45rpx;
+	border-bottom: 1px solid #EAEAEA;
+	margin-bottom: 37rpx;
+	.u-icon{
+		margin-right: 11rpx;
+	}
+}
+
+.statistics{
+	.statistics-item{
+		flex: 1;
+		text-align: center;
+		.statistics-item-til{
+			font-size: 30rpx;
+			font-weight: 400;
+			color: #5C5C5C;
+			line-height: 42rpx;
+		}
+		.statistics-item-con{
+			font-size: 30rpx;
+			font-weight: 400;
+			color: #0667D8;
+			line-height: 42rpx;
+			.number{
+				font-size: 50rpx;
+				line-height: 70rpx;
+				letter-spacing: 2px;
+			}
+		}
+	}
+}

pages/attence/attence.vue

@@ -0,0 +1,97 @@
+<template>
+	<view>
+		<u-navbar 
+		title="城市智慧停车有限公司" 
+		title-color="#fff" 
+		:custom-back="customBack" 
+		:border-bottom="false"
+		back-icon-color="#CCE8FF" 
+		:background="{background: '#008CFF' }">
+		</u-navbar>
+		
+		<view class="wrap">
+			<view class="payeeinfo u-flex">
+				<u-image src="../../static/img/default-portrait.png" width="87" height="87"></u-image>
+				<view class="payeeinfo-text">
+					<view class="name">智慧停车</view>
+					<view class="id">工号：20132311</view>
+				</view>
+			</view>
+			<view class="attence-block">
+				<view class="today-attence u-flex">
+					<view class="today-attence-item">
+						<view class="work-time">上班：09:00</view>
+						<view class="my-time">
+							<u-icon name="checkmark-circle-fill" color="#2979ff" size="28"></u-icon>
+							08:55已打卡
+						</view>
+					</view>
+					<view class="today-attence-item">
+						<view class="work-time">下班：20:00</view>
+						<view class="my-time">
+							<u-icon name="checkmark-circle-fill" color="#2979ff" size="28"></u-icon>
+							08:55已打卡
+						</view>
+					</view>
+				</view>
+				<view class="attence-button u-flex u-flex-wrap">
+					<view class="attence-button-type">下班打卡</view>
+					<view class="attence-button-time">17:20:32</view>
+				</view>
+				<view class="position-tip">
+					<u-icon name="checkmark-circle-fill" color="#21CF3D" size="28"></u-icon>
+					您已进入考勤范围：甜蜜小镇D18组团
+				</view>
+				<view class="statistics u-flex">
+					<view class="statistics-item">
+						<view class="statistics-item-til">本月已打卡</view>
+						<view class="statistics-item-con">
+							<span class="number">5</span>
+							天
+						</view>
+					</view>
+					<view class="statistics-item">
+						<view class="statistics-item-til">月目标打卡</view>
+						<view class="statistics-item-con">
+							<span class="number">23</span>
+							天
+						</view>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		<u-bottom color="#949494">
+			<view class="bottom" slot="content">
+				城市智慧停车 版权所有
+			</view>
+		</u-bottom>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				
+			}
+		},
+		onLoad(){
+			
+		},
+		methods:{
+			customBack(){
+				this.$u.route({
+					// type:'switchTab',
+					url: 'pages/index/index'
+				});
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import  './attence.scss'
+</style>

pages/index/index.vue

@@ -33,7 +33,7 @@
 				</view>
 			</view>
 			<view class="feature-list u-flex u-flex-wrap u-row-between">
-				<view class="feature-item" @click="$refs.uToast.show({title: '建设中'})">
+				<view class="feature-item" @click="openPage('pages/attence/attence')">
 					<u-image width="120rpx" height="120rpx" src="/static/img/index-feature-01.png"></u-image>
 					<view class="feature-item-text">签到</view>
 				</view>

pages/login/login.vue

@@ -69,8 +69,8 @@
 			// 	}
 			// },
 			handleLogin(){
-				// this.form.deviceNo = '1122334455';
-				this.form.deviceNo = device?.getDeviceInfo()?.deviceId;
+				this.form.deviceNo = '1122334455';
+				// this.form.deviceNo = device?.getDeviceInfo()?.deviceId;
 				this.$u.api.login(this.form)
 				.then(res=>{
 					this.$refs.uToast.show({

uview-ui/components/u-bottom/u-bottom.vue

@@ -1,9 +1,10 @@
 <template>
 	<view class="bottom-wrap" :style="[{customStyle,'color': color || 'rgba(255, 255, 255, 0.5)'}]">
-		<view class="bottom" :style="[customStyle]">
+		<view v-if="!$slots.content" class="bottom" :style="[customStyle]">
 			<view class="bottom-p">如您有任何问题，欢迎拨打服务热线</view>
 			<view class="bottom-p">400-5555-8888</view>
 		</view>
+		<slot name="content" v-else />
 	</view>
 </template>