diff --git a/api/api.js b/api/api.js index 38b3659..fd71e1d 100644 --- a/api/api.js +++ b/api/api.js @@ -80,7 +80,7 @@ const config = { }, // 打卡详情列表 clockList: { - url: 'clock/in/log', + url: '/clock/in/log', method: 'GET', }, } diff --git a/components/broadside/broadside.vue b/components/broadside/broadside.vue index edab2a6..87a3659 100644 --- a/components/broadside/broadside.vue +++ b/components/broadside/broadside.vue @@ -7,7 +7,8 @@ - {{ userInfo.nickName }} + {{ userInfo.auth.name }} {{ userInfo.team.name }} diff --git a/mixins/list.js b/mixins/list.js index 4f072f9..a27db1c 100644 --- a/mixins/list.js +++ b/mixins/list.js @@ -52,9 +52,9 @@ export default { success(res.result) - this[this.mixinsListKey || 'list'] = res.result.records + this[this.mixinsListKey || 'list'] = res.result.records || res.result - this.total = res.result.total + this.total = res.result.total || res.result.length } }) }) diff --git a/pages/index/center.vue b/pages/index/center.vue index 69ec71d..da808f0 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -7,7 +7,8 @@
-
{{ userInfo.nickName }}
+
{{ userInfo.auth.name }}
{{ userInfo.team.name }} diff --git a/pages/index/index.vue b/pages/index/index.vue index 0ad0703..74b719e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -36,7 +36,8 @@
打卡记录
- 高新区项目一队项目1 + {{ userInfo.team.name }}
@@ -52,7 +53,7 @@ diff --git a/pages/subPack/human/human.vue b/pages/subPack/human/human.vue index 55e47d5..c1d7367 100644 --- a/pages/subPack/human/human.vue +++ b/pages/subPack/human/human.vue @@ -10,26 +10,31 @@ - + + - 人脸认证仅能由李*意本人完成验证时,请将镜头对准您的脸部 + 人脸认证仅能由{{ userInfo.auth.name }}本人完成验证时,请将镜头对准您的脸部 - + 避免遮挡 - + 光线充足 - + 正对充足 @@ -42,13 +47,33 @@ diff --git a/pages/subPack/record/record.vue b/pages/subPack/record/record.vue index 9f88899..ae08818 100644 --- a/pages/subPack/record/record.vue +++ b/pages/subPack/record/record.vue @@ -8,10 +8,12 @@ @@ -44,13 +46,13 @@ 今日打卡详情 - + @@ -61,6 +63,8 @@