From 0056d1e4a41ae09dd3a598044550b41884f5448a Mon Sep 17 00:00:00 2001
From: scout <1134087124@qq.com>
Date: Fri, 25 Oct 2024 09:21:28 +0800
Subject: [PATCH] commit
---
.../x-tabbar/components/tabbar-item/index.vue | 19 ++++
components/x-tabbar/index.vue | 79 +++++++++++++++
config/index.js | 4 +-
config/tabbar/index.js | 58 +++++++++++
config/theme/index.js | 12 +++
pages/index/index.vue | 90 +++++++++---------
static/image/apply/sp.png | Bin 0 -> 1486 bytes
static/image/apply/zu3808@3x.png | Bin 0 -> 1680 bytes
static/image/apply/zu3809@3x.png | Bin 0 -> 1379 bytes
static/image/apply/zu3812@3x.png | Bin 0 -> 1659 bytes
static/image/apply/zu3843@3x.png | Bin 0 -> 3412 bytes
static/image/tabbar/attendance2.png | Bin 0 -> 1277 bytes
static/image/tabbar/kaoqin.png | Bin 0 -> 1934 bytes
static/image/tabbar/message1.png | Bin 0 -> 1696 bytes
static/image/tabbar/message2.png | Bin 0 -> 2371 bytes
static/image/tabbar/my1.png | Bin 0 -> 1902 bytes
static/image/tabbar/my2.png | Bin 0 -> 2167 bytes
static/image/tabbar/wz@3x1.png | Bin 0 -> 2204 bytes
static/image/tabbar/zu3499@3x.png | Bin 0 -> 2451 bytes
19 files changed, 215 insertions(+), 47 deletions(-)
create mode 100644 components/x-tabbar/components/tabbar-item/index.vue
create mode 100644 components/x-tabbar/index.vue
create mode 100644 config/tabbar/index.js
create mode 100644 config/theme/index.js
create mode 100644 static/image/apply/sp.png
create mode 100644 static/image/apply/zu3808@3x.png
create mode 100644 static/image/apply/zu3809@3x.png
create mode 100644 static/image/apply/zu3812@3x.png
create mode 100644 static/image/apply/zu3843@3x.png
create mode 100644 static/image/tabbar/attendance2.png
create mode 100644 static/image/tabbar/kaoqin.png
create mode 100644 static/image/tabbar/message1.png
create mode 100644 static/image/tabbar/message2.png
create mode 100644 static/image/tabbar/my1.png
create mode 100644 static/image/tabbar/my2.png
create mode 100644 static/image/tabbar/wz@3x1.png
create mode 100644 static/image/tabbar/zu3499@3x.png
diff --git a/components/x-tabbar/components/tabbar-item/index.vue b/components/x-tabbar/components/tabbar-item/index.vue
new file mode 100644
index 0000000..fda35e4
--- /dev/null
+++ b/components/x-tabbar/components/tabbar-item/index.vue
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
diff --git a/components/x-tabbar/index.vue b/components/x-tabbar/index.vue
new file mode 100644
index 0000000..fa58796
--- /dev/null
+++ b/components/x-tabbar/index.vue
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
![]()
+
+ {{ item.text }}
+
+
+
+
+
+
+
+
+
+
diff --git a/config/index.js b/config/index.js
index 096c62b..5aaa412 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,8 +1,8 @@
-const env = 'prod';
+const env = 'LocalTest';
const configs = {
LocalTest: {
apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend',
- h5Url:'http://192.168.88.29:8080/#/'
+ h5Url:'http://192.168.88.30:2367/#/'
},
dev: {
apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend',
diff --git a/config/tabbar/index.js b/config/tabbar/index.js
new file mode 100644
index 0000000..7708dd5
--- /dev/null
+++ b/config/tabbar/index.js
@@ -0,0 +1,58 @@
+// 图片资源导入
+import clockInIcon from '@/static/image/tabbar/wz@3x1.png' // 打卡图标
+import clockInSelectedIcon from '@/static/image/tabbar/zu3499@3x.png' // 打卡选中图标
+import attendanceIcon from '@/static/image/tabbar/attendance2.png' // 考勤图标
+import attendanceSelectedIcon from '@/static/image/tabbar/kaoqin.png' // 考勤选中图标
+import myIcon from '@/static/image/tabbar/my1.png' // 我的图标
+import mySelectedIcon from '@/static/image/tabbar/my2.png' // 我的选中图标
+import applyIcon from '@/static/image/apply/zu3809@3x.png' // 申请图标
+import applySelectedIcon from '@/static/image/apply/zu3808@3x.png' // 申请选中图标
+import spIcon from '@/static/image/apply/sp.png' // 审批图标
+import spSelectedIcon from '@/static/image/apply/zu3812@3x.png' // 审批选中图标
+
+// Tabbar 配置
+export const tabbar = [
+ {
+ text: "打卡",
+ iconPath: clockInIcon,
+ selectedIconPath: clockInSelectedIcon,
+ value: 0,
+ iconWidth: '33.32rpx',
+ iconHeight: '40rpx',
+ url: '/pages/clockIn/index'
+ },
+ {
+ text: "考勤",
+ iconPath: attendanceIcon,
+ selectedIconPath: attendanceSelectedIcon,
+ value: 1,
+ url: '/pages/attendance/index'
+ },
+ {
+ text: "我的",
+ iconPath: myIcon,
+ selectedIconPath: mySelectedIcon,
+ value: 3,
+ url: '/pages/mine/index'
+ }
+]
+
+// 审批页面 Tabbar 配置
+export const approveTabbar = [
+ {
+ text: "申请",
+ iconPath: applyIcon,
+ selectedIconPath: applySelectedIcon,
+ value: 0,
+ iconWidth: '33.32rpx',
+ iconHeight: '40rpx'
+ },
+ {
+ text: "审批中心",
+ iconPath: spIcon,
+ selectedIconPath: spSelectedIcon,
+ value: 1,
+ iconWidth: '37rpx',
+ iconHeight: '40rpx'
+ }
+]
diff --git a/config/theme/index.js b/config/theme/index.js
new file mode 100644
index 0000000..bb98ae0
--- /dev/null
+++ b/config/theme/index.js
@@ -0,0 +1,12 @@
+
+export const theme = {
+ colors: {
+ primary: '#46299D',
+ secondary: '#35495e',
+ accent: '#ff4081',
+ error: '#f44336',
+ warning: '#ff9800',
+ info: '#2196f3',
+ success: '#4caf50'
+ }
+};
diff --git a/pages/index/index.vue b/pages/index/index.vue
index fc0b2d8..a5d4147 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,6 @@
-
+124124