diff --git a/pages.json b/pages.json index 6b1a8db..22b4ea3 100644 --- a/pages.json +++ b/pages.json @@ -197,6 +197,15 @@ "enablePullDownRefresh": false } + } + ,{ + "path" : "personnelDetails/personnelDetails", + "style" : + { + "navigationBarTitleText": "人员详细信息", + "enablePullDownRefresh": false + } + } ] }], diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index 15fd4c1..ef8cce5 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -2,7 +2,7 @@ - + @@ -32,16 +32,7 @@ - - + 公告列表 更多 @@ -49,12 +40,16 @@ - - + + {{ item.title }} + + 暂无更多消息 + + @@ -75,7 +70,14 @@ - + + + + + + 暂无任务 + 登录后查看任务详情 + - + + + + 登录里海OA,开启线上便捷办公 + + + @@ -326,7 +334,6 @@ bottom: -121.75rpx; transform: translate(-50%); width: 694.74rpx; - min-height: 221.05rpx; background: #FFFFFF; border-radius: 12px; padding: 28.07rpx; @@ -363,7 +370,30 @@ } } } + + &_no{ + margin-top: 19.3rpx; + color: #666666; + + .text { + font-size: 28.04rpx; + white-space: nowrap; /* 禁止换行 */ + overflow: hidden; /* 溢出隐藏 */ + text-overflow: ellipsis; /* 使用省略号代表被截断的文本 */ + width: 580rpx; /* 设置元素宽度,根据需要进行调整 */ + + &::before { + content: none; + } + } + } } + .backlog_no_data{ + bottom: -70rpx; + } + } + .home_header_no_data{ + margin-bottom: 93.33rpx; } .fast_track { @@ -399,6 +429,29 @@ border-radius: 12px; // padding: 28.07rpx; + .no_task{ + width: 694rpx; + height: 140rpx; + padding: 28rpx; + background: #FFFFFF; + border-radius: 21rpx 21rpx 21rpx 21rpx; + display: flex; + flex-direction: column; + justify-content: space-evenly; + .title{ + font-size: 28rpx; + font-weight: 500; + color: #000000CC; + line-height: 35rpx; + } + .tips{ + font-size: 25rpx; + font-weight: 400; + color: #333333FF; + line-height: 35rpx; + } + } + .task_title{ font-size: 25rpx; @@ -482,4 +535,40 @@ } } } + + .no_login{ + position: fixed; + left: 0; + bottom: 0; + width: 100vw; + height: 112rpx; + /* #ifdef H5 */ + height: 200rpx; + /* #endif */ + background: rgba(#333333, 0.4); + border-radius: 14rpx 14rpx 0rpx 0rpx; + padding: 28rpx 28rpx; + .view{ + display: flex; + justify-content: space-between; + align-items: center; + .text{ + font-size: 28rpx; + font-weight: 500; + color: #FFFFFF; + } + .btn{ + width: 158rpx; + height: 60rpx; + background: #3274F9; + border-radius: 30rpx 30rpx 30rpx 30rpx; + font-size: 28rpx; + font-weight: 500; + color: #FFFFFF; + display: flex; + justify-content: center; + align-items: center; + } + } + } \ No newline at end of file diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue index 166b280..7af789a 100644 --- a/pages/oaLogin/oaLogin.vue +++ b/pages/oaLogin/oaLogin.vue @@ -18,10 +18,12 @@ - 获取验证码 + + {{tips}} - 新用户注册 + 忘记密码? @@ -33,6 +35,7 @@ + +