diff --git a/config/app.js b/config/app.js index fcf6e72..39d6763 100644 --- a/config/app.js +++ b/config/app.js @@ -49,7 +49,8 @@ module.exports = { //#endif }, // 回话密钥名称 请勿修改此配置 - TOKENNAME: 'X-Token', + // TOKENNAME: 'X-Token', + TOKENNAME: 'token', // 缓存时间 0 永久 EXPIRE: 0, }; diff --git a/manifest.json b/manifest.json index 09a7a91..2f54160 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "nk-oa", - "appid" : "__UNI__7F12D2D", + "appid" : "__UNI__3A527D1", "description" : "", "versionName" : "1.0.0", "versionCode" : "100", @@ -17,26 +17,29 @@ "delay" : 0 }, /* 模块配置 */ - "modules" : {}, + "modules" : { + "Payment" : {} + }, /* 应用发布信息 */ "distribute" : { /* android打包配置 */ "android" : { "permissions" : [ - "", - "", - "", - "", - "", + "", "", "", + "", "", - "", - "", + "", "", - "", "", - "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -46,8 +49,8 @@ "sdkConfigs" : { "payment" : { "weixin" : { - "__platform__" : [ "ios", "android" ], - "appid" : "", + "__platform__" : [ "android" ], + "appid" : "__UNI__3A527D1", "UniversalLinks" : "" } } diff --git a/pages.json b/pages.json index 8a54ece..202a74d 100644 --- a/pages.json +++ b/pages.json @@ -23,7 +23,7 @@ { "path": "pages/oaTask/oaTask", "style": { - "navigationBarTitleText": "新建任务" + "navigationBarTitleText": "今日任务" } }, { @@ -31,24 +31,20 @@ "style": { "navigationBarTitleText": "我的" } + }, { + "path": "pages/oaLogin/oaLogin", + "style": { + "navigationBarTitleText": "登录" + } + + }, { + "path": "pages/oaManager/oaManager", + "style": { + "navigationBarTitleText": "片区经理" + } + } - ,{ - "path" : "pages/oaLogin/oaLogin", - "style" : - { - "navigationBarTitleText": "登录" - } - - } - ,{ - "path" : "pages/oaManager/oaManager", - "style" : - { - "navigationBarTitleText": "片区经理" - } - - } - ], + ], "subPackages": [{ "root": "pages/views", "name": "views", @@ -100,9 +96,7 @@ "enablePullDownRefresh": false } - } - - , { + }, { "path": "leave_request", "style": { "navigationBarTitleText": "请假申请", @@ -111,6 +105,37 @@ } ] + }, { + "root": "subpkg", + "name": "subpkg", + "pages": [ + { + "path": "personnel/personnel", + "style": { + "navigationBarTitleText": "人员管理", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "finance/finance", + "style" : + { + "navigationBarTitleText": "财务管理", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "topUp/topUp", + "style" : + { + "navigationBarTitleText": "账户充值", + "enablePullDownRefresh": false + } + + } + ] }], "globalStyle": { "navigationBarTextStyle": "black", @@ -156,4 +181,4 @@ ] }, "uniIdRouter": {} -} +} \ No newline at end of file diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index 1739150..eec18df 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -213,7 +213,7 @@ navTo(url) { url ? uni.navigateTo({ - url: url + url: url, }) : Toast('暂未开放') }, backlogDetails() { diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue index ed30794..08facae 100644 --- a/pages/oaMy/oaMy.vue +++ b/pages/oaMy/oaMy.vue @@ -30,20 +30,20 @@ - + 1000 - 绩效考核 + 可提现金额 0 - 部门奖金 + 冻结金额 0 - 公司奖金 + 充值金额 diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue index b9a2bb3..01573ce 100644 --- a/pages/oaTask/oaTask.vue +++ b/pages/oaTask/oaTask.vue @@ -25,7 +25,10 @@ +新建任务 - + + + + @@ -273,6 +276,17 @@ border-radius: 30rpx; background-color: $theme-oa-color; } + + .task_list{ + display: flex; + justify-content: space-between; + align-items: center; + flex-direction: column; + padding-top: 21rpx; + .task_card{ + margin-bottom: 21rpx; + } + } .eventList_box { margin: 0 auto; diff --git a/static/server/server.js b/static/server/server.js index e70f8c6..37af3bf 100644 --- a/static/server/server.js +++ b/static/server/server.js @@ -195,7 +195,8 @@ export const oaHomeData = [ }, { text: '人员管理', - icon: prefix + 'oa/ccsq@2x.png' + icon: prefix + 'oa/ccsq@2x.png', + url: '/subpkg/personnel/personnel' }, { text: '固定资产', diff --git a/utils/oahttp.js b/utils/oahttp.js index 5705f48..f3b6e69 100644 --- a/utils/oahttp.js +++ b/utils/oahttp.js @@ -22,17 +22,18 @@ function baseRequestTwo(url, method, data, { let Url = HTTP_REQUEST_URL_THREE, header = HEADER; - // if (!noAuth) { - // //登录过期自动登录 - // if (!store.state.app.token) { - // toLogin(); - // return Promise.reject({ - // msg: '未登录' - // }); - // } - // } + if (!noAuth) { + //登录过期自动登录 + if (!store.state.app.token) { + toLogin(); + return Promise.reject({ + msg: '未登录' + }); + } + } - if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token; + // if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token; + if (store.state.app.token) header[TOKENNAME] = store.state.app.token; // header[TOKENNAME] = 'Bearer sdjflidshjgfkbdasgjmasbgvhauuiavhkesvndkaesbvkjsdbv'; return new Promise((reslove, reject) => { // uni.showLoading({ @@ -44,6 +45,7 @@ function baseRequestTwo(url, method, data, { method: method || 'GET', header: header, data: data || {}, + params: method == 'GET' ? data : {}, success: (res) => { // uni.hideLoading() if (noVerify)