diff --git a/src/pages.json b/src/pages.json index c7fe08e..d2a803c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,136 +1,149 @@ { - "pages": [ - //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - // { - // "path": "pages/index/index", - // "style": { - // "navigationBarTitleText": "uni-app" - // } - // }, - // 首页 - { - "path": "pages/login/index", - "style": { - "navigationBarTitleText": "登录" - } - }, - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "首页" - } - }, - { - "path": "pages/face/index", - "style": { - "navigationBarTitleText": "人脸录入", - "navigationBarBackgroundColor": "#ffffff" - } - }, - { - "path": "pages/clock/index", - "style": { - "navigationBarTitleText": "考勤打卡", - "navigationBarBackgroundColor": "#ffffff" - } - }, - // 我的 - { - "path": "pages/my/index", - "style": { - "navigationBarTitleText": "我的" - } - }, - // 出差报备 - { - "path": "pages/evection/index", - "style": { - "navigationBarTitleText": "出差报备" - } - }, - // 报备记录列表 - { - "path": "pages/evection/recordList", - "style": { - "navigationBarTitleText": "报备记录" - } - }, - // 报备记录列表 - { - "path": "pages/evection/details", - "style": { - "navigationBarTitleText": "出差报备详情" - } - }, - // 休假报备 - { - "path": "pages/holiday/index", - "style": { - "navigationBarTitleText": "休假报备" - } - }, - // 报备记录列表 - { - "path": "pages/holiday/recordList", - "style": { - "navigationBarTitleText": "报备记录" - } - }, - // 报备记录列表 - { - "path": "pages/holiday/details", - "style": { - "navigationBarTitleText": "休假报备详情" - } - }, - //修改密码 - { - "path": "pages/password/index", - "style": { - "navigationBarTitleText": "修改密码" - } - }, - { - "path" : "pages/panel/index", - "style" : - { - "navigationBarTitleText" : "面板", - "navigationBarBackgroundColor": "#ffffff" - } - }, - { - "path" : "pages/clock/detail", - "style" : - { - "navigationBarTitleText" : "人脸考勤", - "navigationBarBackgroundColor": "#ffffff" - } - } - ], - "tabBar": { - "color": "#2c2c2c", - "selectedColor": "#1296db", - "borderStyle": "black", - "backgroundColor": "#FFFFFF", - "iconWidth": "24px", - "list": [{ - "pagePath": "pages/index/index", - "text": "首页", - "iconPath": "static/home.png", - "selectedIconPath": "static/homeSelected.png" - }, - { - "pagePath": "pages/my/index", - "text": "我的", - "iconPath": "static/workSpace.png", - "selectedIconPath": "static/workSpaceSelected.png" - } - ] - }, - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" - } -} \ No newline at end of file + "pages": [ + //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages + // { + // "path": "pages/index/index", + // "style": { + // "navigationBarTitleText": "uni-app" + // } + // }, + // 首页 + { + "path": "pages/login/index", + "style": { + "navigationBarTitleText": "登录" + } + }, + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "首页" + } + }, + { + "path": "pages/face/index", + "style": { + "navigationBarTitleText": "人脸录入", + "navigationBarBackgroundColor": "#ffffff" + } + }, + { + "path": "pages/clock/index", + "style": { + "navigationBarTitleText": "考勤打卡", + "navigationBarBackgroundColor": "#ffffff" + } + }, + // 我的 + { + "path": "pages/my/index", + "style": { + "navigationBarTitleText": "我的" + } + }, + // 出差报备 + { + "path": "pages/evection/index", + "style": { + "navigationBarTitleText": "出差报备" + } + }, + // 报备记录列表 + { + "path": "pages/evection/recordList", + "style": { + "navigationBarTitleText": "报备记录" + } + }, + // 报备记录列表 + { + "path": "pages/evection/details", + "style": { + "navigationBarTitleText": "出差报备详情" + } + }, + // 休假报备 + { + "path": "pages/holiday/index", + "style": { + "navigationBarTitleText": "休假报备" + } + }, + // 报备记录列表 + { + "path": "pages/holiday/recordList", + "style": { + "navigationBarTitleText": "报备记录" + } + }, + // 报备记录列表 + { + "path": "pages/holiday/details", + "style": { + "navigationBarTitleText": "休假报备详情" + } + }, + //修改密码 + { + "path": "pages/password/index", + "style": { + "navigationBarTitleText": "修改密码" + } + }, + { + "path": "pages/panel/index", + "style": { + "navigationBarTitleText": "面板", + "navigationBarBackgroundColor": "#ffffff" + } + }, + { + "path": "pages/clock/detail", + "style": { + "navigationBarTitleText": "人脸考勤", + "navigationBarBackgroundColor": "#ffffff" + } + }, + // 轮休申请 + { + "path": "pages/stagger-holidays/index", + "style": { + "navigationBarTitleText": "轮休申请" + } + }, + // 临时外出申请 + { + "path": "pages/temporary-outing/index", + "style": { + "navigationBarTitleText": "临时外出申请" + } + } + ], + "tabBar": { + "color": "#2c2c2c", + "selectedColor": "#1296db", + "borderStyle": "black", + "backgroundColor": "#FFFFFF", + "iconWidth": "24px", + "list": [ + { + "pagePath": "pages/index/index", + "text": "首页", + "iconPath": "static/home.png", + "selectedIconPath": "static/homeSelected.png" + }, + { + "pagePath": "pages/my/index", + "text": "我的", + "iconPath": "static/workSpace.png", + "selectedIconPath": "static/workSpaceSelected.png" + } + ] + }, + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8" + } +} diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 9910f70..6a7bd4a 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,217 +1,233 @@ - \ No newline at end of file + .grid-item:nth-child(2n) { + margin-right: 0; + } + } + } + + .centered-text { + text-align: center; + display: block; + } + diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index e9141f1..8c24d8a 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -1,440 +1,454 @@ diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue index 052713d..ae26160 100644 --- a/src/pages/my/index.vue +++ b/src/pages/my/index.vue @@ -1,260 +1,271 @@ diff --git a/src/pages/stagger-holidays/details.vue b/src/pages/stagger-holidays/details.vue new file mode 100644 index 0000000..cfea40b --- /dev/null +++ b/src/pages/stagger-holidays/details.vue @@ -0,0 +1,241 @@ +