From f4e29153947f33d3da700bc6b0b04631061fcbb9 Mon Sep 17 00:00:00 2001 From: Lee <342694918@qq.com> Date: Thu, 22 Dec 2022 16:47:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=AF=BC=E8=88=AA=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E5=AE=8C?= =?UTF-8?q?=E6=88=90-1222?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commons/style.css | 71 ++++++++- components/status-nav/status-nav.vue | 18 +++ components/tabbar/tabbar.vue | 82 +++++++---- pages/director/enter/enter.vue | 10 +- pages/director/expenditure/expenditure.vue | 10 +- pages/director/overtime/overtime.vue | 10 +- pages/director/sign/sign.vue | 10 +- pages/worker/my/my.vue | 8 +- pagesA/signRecord/signRecord.vue | 9 +- pagesB/notick/notick.vue | 138 +++--------------- pagesB/worker/worker.vue | 46 +++--- static/icon/icon-stars-active.png | Bin 0 -> 1778 bytes static/icon/icon-stars.png | Bin 0 -> 2332 bytes static/icon/icon-tabbar-06.png | Bin 0 -> 1184 bytes .../.sourcemap/mp-weixin/common/main.js.map | 2 +- .../components/status-nav/status-nav.js.map | 2 +- .../mp-weixin/components/tabbar/tabbar.js.map | 2 +- .../pages/director/enter/enter.js.map | 2 +- .../director/expenditure/expenditure.js.map | 2 +- .../pages/director/overtime/overtime.js.map | 2 +- .../mp-weixin/pages/director/sign/sign.js.map | 2 +- .../mp-weixin/pages/worker/my/my.js.map | 2 +- .../pagesA/signRecord/signRecord.js.map | 2 +- .../mp-weixin/pagesB/notick/notick.js.map | 2 +- .../mp-weixin/pagesB/worker/worker.js.map | 2 +- unpackage/dist/dev/mp-weixin/common/main.wxss | 53 +++++++ .../components/status-nav/status-nav.js | 17 +++ .../components/status-nav/status-nav.wxml | 2 +- .../dev/mp-weixin/components/tabbar/tabbar.js | 58 ++++++-- .../mp-weixin/components/tabbar/tabbar.wxml | 2 +- .../mp-weixin/pages/director/enter/enter.js | 8 +- .../mp-weixin/pages/director/enter/enter.wxml | 2 +- .../pages/director/expenditure/expenditure.js | 8 +- .../director/expenditure/expenditure.wxml | 2 +- .../pages/director/overtime/overtime.js | 10 +- .../pages/director/overtime/overtime.wxml | 2 +- .../dev/mp-weixin/pages/director/sign/sign.js | 10 +- .../mp-weixin/pages/director/sign/sign.wxml | 2 +- .../dist/dev/mp-weixin/pages/worker/my/my.js | 7 +- .../dev/mp-weixin/pages/worker/my/my.wxml | 2 +- .../mp-weixin/pagesA/signRecord/signRecord.js | 7 +- .../pagesA/signRecord/signRecord.wxml | 2 +- .../dev/mp-weixin/pagesB/notick/notick.js | 9 ++ .../dev/mp-weixin/pagesB/notick/notick.wxml | 2 +- .../dev/mp-weixin/pagesB/worker/worker.js | 29 ++-- .../dev/mp-weixin/pagesB/worker/worker.json | 1 - .../dev/mp-weixin/pagesB/worker/worker.wxml | 2 +- .../dev/mp-weixin/project.private.config.json | 16 +- .../static/icon/icon-stars-active.png | Bin 0 -> 1778 bytes .../dev/mp-weixin/static/icon/icon-stars.png | Bin 0 -> 2332 bytes .../static/icon/icon-start-active.png | Bin 0 -> 1778 bytes .../dev/mp-weixin/static/icon/icon-start.png | Bin 0 -> 2332 bytes .../mp-weixin/static/icon/icon-tabbar-06.png | Bin 0 -> 1184 bytes .../dev/mp-weixin/static/icon/形状8.png | Bin 0 -> 2332 bytes 54 files changed, 434 insertions(+), 253 deletions(-) create mode 100644 static/icon/icon-stars-active.png create mode 100644 static/icon/icon-stars.png create mode 100644 static/icon/icon-tabbar-06.png create mode 100644 unpackage/dist/dev/mp-weixin/static/icon/icon-stars-active.png create mode 100644 unpackage/dist/dev/mp-weixin/static/icon/icon-stars.png create mode 100644 unpackage/dist/dev/mp-weixin/static/icon/icon-start-active.png create mode 100644 unpackage/dist/dev/mp-weixin/static/icon/icon-start.png create mode 100644 unpackage/dist/dev/mp-weixin/static/icon/icon-tabbar-06.png create mode 100644 unpackage/dist/dev/mp-weixin/static/icon/形状8.png diff --git a/commons/style.css b/commons/style.css index a24e8fd..007932a 100644 --- a/commons/style.css +++ b/commons/style.css @@ -211,15 +211,29 @@ page{ padding: 20rpx 30rpx 30rpx; } +.notick-status{ + display: flex; + align-items: center; + height: 120rpx; + padding: 0 30rpx; + border-top: 25rpx solid #ecf5fb; +} + .sign-cate .notice-msg{ margin: 40rpx 0 60rpx; +} + +.notick-status .radio-item:first-child{ + margin-right: 50rpx; } - + +.notick-status .radio-item, .sign-cate .radio-item{ display: flex; align-items: center; height: 70rpx; -} +} +.notick-status .radio-item>view:first-child, .sign-cate .radio-item>view:first-child{ box-sizing: border-box; width: 30rpx; @@ -228,10 +242,12 @@ page{ border-radius: 100%; margin-right: 6rpx; position: relative; -} +} +.notick-status .radio-item>view.checked, .sign-cate .radio-item>view.checked{ border: 2rpx solid #0788ff; -} +} +.notick-status .radio-item>view.checked::after, .sign-cate .radio-item>view.checked::after{ content: ""; display: block; @@ -262,7 +278,52 @@ page{ } .sign-cate-btns .btn:last-child{ background-image: linear-gradient(to right,#028bfd,#02b4fe); -} +} + +.notick-txt{ + width: calc(100% - 60rpx); + margin: 0 auto; + border-top: 2rpx solid #e9ebf3; +} + +.notick-tips{ + display: flex; + align-items: center; + height: 60rpx; + margin-top: 20rpx; +} +.notick-tips::before{ + content: ""; + display: inline-block; + width: 10rpx; + height: 10rpx; + background-color: #333333; + margin: 5rpx 15rpx 0 0; + border-radius: 10rpx; +} + +.notick-txt .input{ + box-sizing: border-box; + width: 100%; + height: 650rpx; + padding: 10rpx; + border: 2rpx solid #e2e5ed; + line-height: 1.6; + border-radius: 5rpx; +} + +.sign-cate .evaluate-txt{ + justify-content: center; +} + +.sign-cate .evaluate-txt .evaluate-stars{ + margin: 30rpx 7rpx 10rpx; +} + +.sign-cate .evaluate-txt .evaluate-stars image{ + width: 62rpx; + height: 59rpx; +} /* 安全公告 */ .safety-bulletin{ diff --git a/components/status-nav/status-nav.vue b/components/status-nav/status-nav.vue index ac97cb7..71bc523 100644 --- a/components/status-nav/status-nav.vue +++ b/components/status-nav/status-nav.vue @@ -4,6 +4,12 @@ + + + + + + @@ -41,6 +47,11 @@ type: String, default: '50px' }, + // 是否显示返回主页 + ifHome: { + type: Boolean, + default: false + }, //是否显示返回键 ifReturn: { type: Boolean, @@ -129,6 +140,13 @@ } }) }, + + //返回主页 + toHome() { + uni.reLaunch({ + url: '/pages/pagehome/pagehome' + }) + } } } diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue index 80eefc6..60e000c 100644 --- a/components/tabbar/tabbar.vue +++ b/components/tabbar/tabbar.vue @@ -6,8 +6,12 @@ {{item.title}} - + {{item.title}} + + + + {{item.title}} @@ -35,12 +39,16 @@ {iconPath:'/static/icon/icon-tabbar-03.png',title:'我的'} ], //工人底部列表 directorBarList:[ - {iconPath:'/static/icon/icon-tabbar-01.png',title:'打卡'}, - {iconPath:'/static/icon/icon-tabbar-04.png',title:'支出'}, - {iconPath:'/static/icon/icon-tabbar-05.png',title:'录入'}, + {iconPath:'/static/icon/icon-tabbar-01.png',title:'打卡'}, + {iconPath:'/static/icon/icon-tabbar-06.png',title:'工作台'}, + {iconPath:'/static/icon/icon-tabbar-03.png',title:'我的'} + ], //负责人底部列表 + workbenchBarList:[ + {iconPath:'/static/icon/icon-tabbar-01.png',title:'打卡'}, + {iconPath:'/static/icon/icon-tabbar-04.png',title:'支出'}, + {iconPath:'/static/icon/icon-tabbar-05.png',title:'录入'}, {iconPath:'/static/icon/icon-tabbar-02.png',title:'加班'}, - {iconPath:'/static/icon/icon-tabbar-03.png',title:'我的'} - ], //负责人底部列表 + ], //工作台底部列表 }; }, methods:{ @@ -83,29 +91,15 @@ uni.reLaunch({ url:'/pages/worker/sign/sign?userType=director', }) - break; - case 1: - if(this.$toolAll.tools.judgeAuth()) { - uni.reLaunch({ - url:'/pages/director/expenditure/expenditure', - }) - } - break; - case 2: - if(this.$toolAll.tools.judgeAuth()) { - uni.reLaunch({ - url:'/pages/director/enter/enter', - }) - } - break; - case 3: - if(this.$toolAll.tools.judgeAuth()) { - uni.reLaunch({ - url:'/pages/director/overtime/overtime', - }) - } break; - case 4: + case 1: + if(this.$toolAll.tools.judgeAuth()) { + uni.reLaunch({ + url:'/pages/director/sign/sign?userType=workbench', + }) + } + break; + case 2: if(this.$toolAll.tools.judgeAuth()) { uni.reLaunch({ url:'/pages/worker/my/my?userType=director', @@ -113,6 +107,38 @@ } break; } + } + if(this.userType=='workbench'){ + switch (index){ + case 0: + if(this.$toolAll.tools.judgeAuth()) { + uni.reLaunch({ + url:'/pages/director/sign/sign?userType=workbench', + }) + } + break; + case 1: + if(this.$toolAll.tools.judgeAuth()) { + uni.reLaunch({ + url:'/pages/director/expenditure/expenditure?userType=workbench', + }) + } + break; + case 2: + if(this.$toolAll.tools.judgeAuth()) { + uni.reLaunch({ + url:'/pages/director/enter/enter?userType=workbench', + }) + } + break; + case 3: + if(this.$toolAll.tools.judgeAuth()) { + uni.reLaunch({ + url:'/pages/director/overtime/overtime?userType=workbench', + }) + } + break; + } } }, } diff --git a/pages/director/enter/enter.vue b/pages/director/enter/enter.vue index 477fa9e..09fc349 100644 --- a/pages/director/enter/enter.vue +++ b/pages/director/enter/enter.vue @@ -1,7 +1,7 @@