diff --git a/commons/style.css b/commons/style.css index dca7f87..2c48dc4 100644 --- a/commons/style.css +++ b/commons/style.css @@ -176,6 +176,74 @@ page{ z-index: 999; } +/* 打卡类型 */ +.sign-cate{ + box-sizing: border-box; + width: calc(100% - 150rpx); + border-radius: 10rpx; + padding: 40rpx 60rpx; +} + +.sign-cate .title{ + font-weight: bold; + text-align: center; +} + +.sign-cate .txt{ + display: flex; + align-items: center; + justify-content: space-around; +} + +.sign-cate .radio-item{ + display: flex; + align-items: center; + height: 60rpx; + margin: 30rpx 0 40rpx; +} +.sign-cate .radio-item>view:first-child{ + box-sizing: border-box; + width: 30rpx; + height: 30rpx; + border: 2rpx solid #bdbdbd; + border-radius: 100%; + margin-right: 6rpx; + position: relative; +} +.sign-cate .radio-item>view.checked{ + border: 2rpx solid #0788ff; +} +.sign-cate .radio-item>view.checked::after{ + content: ""; + display: block; + width: 18rpx; + height: 18rpx; + border-radius: 100%; + background-color: #0788ff; + position: absolute; + left: 5rpx; + top: 5rpx; + z-index: 1; +} + +.sign-cate-btns{ + display: flex; + justify-content: space-around; + align-items: center; +} +.sign-cate-btns .btn{ + width: calc(50% - 30rpx); + line-height: 70rpx; + border-radius: 5rpx; + text-align: center; +} + .sign-cate-btns .btn:first-child{ + background-color: #b5b5b5; +} +.sign-cate-btns .btn:last-child{ + background-image: linear-gradient(to right,#028bfd,#02b4fe); +} + /* 安全公告 */ .safety-bulletin{ box-sizing: border-box; diff --git a/pages/director/overtime/overtime.vue b/pages/director/overtime/overtime.vue index d2aa330..341ba4c 100644 --- a/pages/director/overtime/overtime.vue +++ b/pages/director/overtime/overtime.vue @@ -27,6 +27,7 @@ 姓名:{{item.worker_name}} 加班时长:{{item.time}}小时 提交时间:{{item.create_time}} + 备注:{{item.remarks}} @@ -185,6 +186,7 @@ create_time: item.create_time, status:item.status, status_text:item.status_text, + remarks:item.remarks, ifcheck:false, } overtimeArr.push(obj); diff --git a/pages/login/login.vue b/pages/login/login.vue index 95d0cb3..90e433b 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,12 +1,12 @@