diff --git a/commons/style.css b/commons/style.css index 87a60e4..143809e 100644 --- a/commons/style.css +++ b/commons/style.css @@ -1,6 +1,6 @@ /* 内容区 */ -.content *{ - box-sizing: border-box; +page{ + color: #333333; } /* 首页 */ .sign-top{ @@ -96,6 +96,7 @@ overflow: hidden; margin-top: -60rpx; padding: 10rpx 48rpx; + overflow: hidden; } .sign-record .title{ @@ -231,18 +232,211 @@ text-align: center; margin: 26rpx 0 0 170rpx; } -.register-information .item .position-name{ +.register-information .item .name{ display: flex; justify-content: space-between; align-items: center; height: 64rpx; } -.register-information .item .position-name image{ +.register-information .item .name image{ width: 19rpx; height: 14rpx; margin-right: 5rpx; } +/* 加班 */ +.overtime-from{ + width: 100%; + padding-top: 10rpx; + border-top: 26rpx solid #ecf5fb; +} + +.overtime-from .item{ + width: calc(100% - 60rpx); + padding: 20rpx 0 33rpx; + margin: 0 auto; + border-top: 2rpx solid #f1f5f9; + line-height: 2; +} + +.overtime-from .item:first-child{ + border-top: 0; +} + +.overtime-from .item .title{ + display: flex; + align-items: center; + font-weight: bold; +} +.overtime-from .item .title:before{ + content: ""; + display: inline-block; + width: 9rpx; + height: 9rpx; + border-radius: 100%; + background-color: #333333; + margin-right: 15rpx; +} + +.overtime-from .item .input{ + box-sizing: border-box; + width: calc(100% - 25rpx); + height: 70rpx; + margin: 7rpx 0 0 25rpx; + padding: 0 10rpx; + border: 2rpx solid #dcdcdc; + border-radius: 5rpx; +} + +.overtime-from .item .textarea{ + height: 295rpx; + padding: 10rpx; + line-height: 1.6; +} + +.overtime-from .item .name{ + display: flex; + justify-content: space-between; + align-items: center; + height: 66rpx; +} + +.overtime-from .item .name image{ + width: 18rpx; + height: 10rpx; + margin-right: 5rpx; +} + +.overtime-from .item .time-input{ + display: flex; + justify-content: space-between; + align-items: center; +} + +.overtime-from .item .time-input .input{ + width: calc(100% - 90rpx); +} + +.overtime-from .submit-btn{ + width: calc(100% - 85rpx); + background-image: linear-gradient(to right,#028bfd,#02b4fe); + border-radius: 5rpx; + line-height: 80rpx; + margin-left: 55rpx; + text-align: center; +} + +/* 个人中心 */ +.my-top{ + padding-bottom: 45rpx; +} +.my-info{ + display: flex; + align-items: center; + padding: 25rpx 30rpx; +} +.my-info .my-cover{ + width: 130rpx; + height: 130rpx; + margin-right: 20rpx; + border-radius: 100%; + border: 2rpx solid #dcdcdc; + overflow: hidden; +} +.my-info .my-cover image{ + width: 130rpx; + height: 130rpx; +} + +.my-info .my-txt{ + line-height: 1.5; + text-align: left; +} +.my-info .my-txt view:nth-of-type(2){ + display: inline-block; + padding: 0 30rpx; + margin-top: 8rpx; + line-height: 46rpx; + background-color: #036db3; + border: 2rpx solid #b8c7e7; + border-radius: 25rpx; + letter-spacing: 2rpx; + text-indent: 2rpx; + text-align: center; +} + +.my-more{ + margin-top: -45rpx; + border-radius: 20rpx 20rpx 0 0; + padding: 0; +} + +.my-more .item{ + display: flex; + justify-content: space-between; + align-items: center; + height: 95rpx; + padding: 0 30rpx; + border-bottom: 15rpx solid #f1f5f9; +} +.my-more .item:last-child{ + border-bottom: 15rpx solid #f1f5f9; +} + +.my-more .item .img{ + display: flex; + align-items: center; + width: 45rpx; + height: 95rpx; +} +.my-more .item .txt{ + width: calc(100% - 57rpx); +} +.my-more .item>image{ + width: 12rpx; + height: 19rpx; +} + +/* 个人资料 */ +.information-from{ + border-top: 26rpx solid #ecf5fb; +} +.information-from .item{ + display: flex; + justify-content: space-between; + align-items: center; + width: calc(100% - 60rpx); + height: 80rpx; + margin: 0 auto; + border-bottom: 2rpx solid #f1f5f9; +} +.information-from .item:first-child{ + height: 144rpx; +} +.information-from .cover{ + width: 100rpx; + height: 100rpx; + border-radius: 100%; + overflow: hidden; +} +.information-from .cover image{ + width: 100rpx; + height: 100rpx; +} +.information-from .item>image{ + width: 12rpx; + height: 19rpx; + margin-left: 14rpx; +} + +.information-from .item .title{ + width: 150rpx; +} + +.information-from .item .msg{ + width: calc(100% - 176rpx); + text-align: right; +} /* 登录 */ diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue index b95f388..cc7b07d 100644 --- a/components/tabbar/tabbar.vue +++ b/components/tabbar/tabbar.vue @@ -143,7 +143,7 @@ width: 100%; margin-top: 6rpx; line-height: 1.2; - color: #888888; + color: #737373; } .tabbar-item.active .title{ color: #0788ff; diff --git a/pages.json b/pages.json index 8658a60..f660bfb 100644 --- a/pages.json +++ b/pages.json @@ -64,6 +64,72 @@ } } ], + "subPackages": [{ //A包 + "root": "pagesA", + "pages": [ + { //基本信息 + "path" : "information/information", + "style" : { + "navigationBarTitleText": "基本信息", + "enablePullDownRefresh": false + } + }, + { //打卡记录 + "path" : "signRecord/signRecord", + "style" : { + "navigationBarTitleText": "打卡记录", + "enablePullDownRefresh": false + } + }, + { //工资记录 + "path" : "wagesRecord/wagesRecord", + "style" : { + "navigationBarTitleText": "工资记录", + "enablePullDownRefresh": false + } + }, + { //加班记录 + "path" : "overtimeRecord/overtimeRecord", + "style" : { + "navigationBarTitleText": "加班记录", + "enablePullDownRefresh": false + } + }, + { //编辑加班 + "path" : "overtimeEdit/overtimeEdit", + "style" : { + "navigationBarTitleText": "编辑加班", + "enablePullDownRefresh": false + } + }, + { //单页 + "path" : "singlePage/singlePage", + "style" : { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + }, + { //B包 + "root": "pagesB", + "pages": [ + // { //个人资料 + // "path" : "ucenter/ucenter", + // "style" : { + // "navigationBarTitleText": "", + // "enablePullDownRefresh": false + // } + // }, + ] + } + ], + "preloadRule": { + "pages/worker/my/my": { + "network": "all", + "packages": ["pagesA"] + } + }, "globalStyle": { "navigationBarTextStyle": "black", "navigationBarBackgroundColor": "#ffffff", //导航栏背景色 diff --git a/pages/worker/my/my.vue b/pages/worker/my/my.vue index 8a087ed..5dbfd65 100644 --- a/pages/worker/my/my.vue +++ b/pages/worker/my/my.vue @@ -1,7 +1,32 @@