diff --git a/api/oaUser.js b/api/oaUser.js index 0b16a1c..976a82f 100644 --- a/api/oaUser.js +++ b/api/oaUser.js @@ -6,7 +6,17 @@ import oahttp from "@/utils/oahttp.js"; export const loginAccount = (data) => oahttp.post('/login/account', data, { noAuth: true }) /** - * 获取代办事项 已处理事项 + * cesi */ export const test = (data) => oahttp.post('/index/config', data, { noAuth: true }) +/** + * 个人中心 + */ +export const userCenter = (data) => oahttp.get('/user/center', data) + +/** + * 个人信息 + */ +export const userInfo = (data) => oahttp.get('/user/info', data) + diff --git a/pages/oaExamine/oaExamine.vue b/pages/oaExamine/oaExamine.vue index b12dccc..687e18c 100644 --- a/pages/oaExamine/oaExamine.vue +++ b/pages/oaExamine/oaExamine.vue @@ -2,8 +2,10 @@ - + + + @@ -48,7 +50,7 @@ name: '审核完成' }, { name: '未通过' - },], + }, ], myEventList: [], params: { limit: '8', //默认每次请求数据 @@ -71,7 +73,7 @@ }, onLoad() { this.myEventList = [] - this.getApproveMyList(this.params) + // this.getApproveMyList(this.params) }, onShow() { @@ -175,11 +177,11 @@ } .examine_box { - position: fixed; - top: 0; - width: 750rpx; - height: 77rpx; - background: #FFFFFF; + // position: fixed; + // top: 0; + // width: 750rpx; + // height: 77rpx; + // background: #FFFFFF; } @@ -259,4 +261,4 @@ } } - + \ No newline at end of file diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index eec18df..412a01d 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -4,10 +4,10 @@ - + - {{ myOaInfo.name }} {{ myOaInfo.mobile }} + {{ myOaInfo.nickname }} {{ myOaInfo.mobile }} ({{ myOaInfo.did_name }}){{myOaInfo.label_name}} @@ -31,7 +31,7 @@ 公告列表 - 更多 + 更多 @@ -57,12 +57,12 @@ 我的任务 - 更多 + 更多 - + + + + + + + + + + 筛选 + - + @@ -32,6 +54,7 @@ + @@ -39,7 +62,11 @@ export default { data() { return { - + show: false, + lastpage: '', + loadingText: '努力加载中', + loadmoreText: '轻轻上拉', + nomoreText: '我也是有底线的~~', } }, onReady() { @@ -58,6 +85,70 @@ export default { + } + \ No newline at end of file