diff --git a/api/api.js b/api/api.js
index 2f41c6b..da4c185 100644
--- a/api/api.js
+++ b/api/api.js
@@ -115,6 +115,22 @@ const config = {
showLoading : true,
debounce : 400,
},
+
+
+
+ // 项目列表分页
+ clockProjectList: {
+ url: '/clock/project/list',
+ method: 'GET',
+ auth : true,
+ },
+ // 设置项目经纬度
+ clockProjectLocation: {
+ url: '/clock/project/location',
+ method: 'POST',
+ auth : true,
+ showLoading : true,
+ },
}
diff --git a/pages.json b/pages.json
index 05d3380..75942a6 100644
--- a/pages.json
+++ b/pages.json
@@ -62,6 +62,13 @@
"style": {
"navigationBarTitleText": "选择工程"
}
+ },
+ {
+ "path" : "projectManage/projectManage",
+ "style" :
+ {
+ "navigationBarTitleText" : "项目管理"
+ }
}
]
}],
diff --git a/pages/index/center.vue b/pages/index/center.vue
index da808f0..e3dda60 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -7,14 +7,14 @@
-
{{ userInfo.auth.name }}
+
{{ userInfo.auth.name }}
-
{{ userInfo.team.name }}
+
{{ userInfo.team.name }}
-
+
+
@@ -22,22 +22,40 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
@@ -49,7 +67,9 @@
@@ -120,11 +156,11 @@
justify-content: space-around;
box-sizing: border-box;
padding: 10rpx 0rpx 10rpx 10rpx;
-
+
.user-name {
font-size: 36rpx;
}
-
+
.user-project {
font-size: 30rpx;
}
diff --git a/pages/subPack/projectManage/projectManage.vue b/pages/subPack/projectManage/projectManage.vue
new file mode 100644
index 0000000..c9dd9bf
--- /dev/null
+++ b/pages/subPack/projectManage/projectManage.vue
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
+
+ 项目名:
+
+
+ {{ item.name }}
+
+
+
+
+ 当前团队:
+
+
+ {{ item.teamId_dictText }}
+
+
+
+
+ 打卡地址:
+
+
+ {{ item.address }}
+
+
+
+
+ 维度:
+
+
+ {{ item.lat }}
+
+
+
+
+ 经度:
+
+
+ {{ item.lon }}
+
+
+
+
+ 设置打卡地点
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/uni.scss b/uni.scss
index 230457e..d7dd6b4 100644
--- a/uni.scss
+++ b/uni.scss
@@ -12,7 +12,7 @@
* 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
*/
/* 颜色变量 */
-$uni-color: #FD5100;
+$uni-color: #4C9EEA;
/* 行为相关颜色 */
$uni-color-primary: #007aff;
@@ -84,4 +84,27 @@ $bg-color: white;
// 这个用于控制小程序的自定义导航栏等颜色
page{
--main-color: #4C9EEA;
+}
+
+
+
+
+
+.uni-color-btn{
+ border-radius: 40rpx;
+ padding: 20rpx;
+ margin: 40rpx;
+ background: $uni-color;
+ color: #fff;
+ text-align: center;
+ font-size: 28rpx;
+}
+.uni-uncolor-btn{
+ border-radius: 40rpx;
+ padding: 20rpx;
+ margin: 40rpx;
+ border: 1px solid $uni-color;
+ color: $uni-color;
+ text-align: center;
+ font-size: 28rpx;
}
\ No newline at end of file