From fe007797ad5bb6e9b8df29d3bd07650efd2b54bd Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Tue, 18 Jul 2023 15:10:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=B4=A6=E5=8F=B7=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD,=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/app.js | 6 ++- main.js | 2 + manifest.json | 16 +++++- pages.json | 11 +--- pages/oaExamine/oaExamine.vue | 12 +++-- pages/oaHome/oaHome.vue | 94 +++++++++++++++++++++++++---------- pages/oaMy/oaMy.vue | 2 +- store/modules/app.js | 7 +++ utils/oahttp.js | 32 ++++++------ 9 files changed, 123 insertions(+), 59 deletions(-) diff --git a/config/app.js b/config/app.js index 46c2eda..fcf6e72 100644 --- a/config/app.js +++ b/config/app.js @@ -1,7 +1,9 @@ let httpApiThree; let httpApi -httpApi = 'https://shop.lihaink.cn' //生产 -httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 +// httpApi = 'https://shop.lihaink.cn' //生产 +httpApi = 'https://worker-task.lihaink.cn' //生产 +httpApiThree = 'https://worker-task.lihaink.cn' //生产 +// httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 // #ifdef H5 httpApiThree = 'baseUrlTest' //生产 // #endif diff --git a/main.js b/main.js index caf1b0a..52dbb93 100644 --- a/main.js +++ b/main.js @@ -2,7 +2,9 @@ import App from './App' import store from './store' import uView from '@/uni_modules/uview-ui' +import taskCard from "@/components/taskCard/taskCard.vue" Vue.use(uView) +Vue.use(taskCard) // #ifndef VUE3 import Vue from 'vue' Vue.config.productionTip = false diff --git a/manifest.json b/manifest.json index 0e187f4..43ce3ea 100644 --- a/manifest.json +++ b/manifest.json @@ -48,6 +48,20 @@ }, /* 快应用特有相关 */ "quickapp": {}, + + "h5": { + "devServer": { + "proxy": { + "baseUrlTest/api": { + "target": "https://worker-task.lihaink.cn", + "changeOrigin": true, + "pathRewrite": { + "^/baseUrlTest/api": "/api" + } + } + } + } + }, /* 小程序特有相关 */ "mp-weixin": { "appid": "wx6e14cb98394e36bc", @@ -69,4 +83,4 @@ "enable": false }, "vueVersion": "2" -} +} \ No newline at end of file diff --git a/pages.json b/pages.json index 2f4ce80..8a54ece 100644 --- a/pages.json +++ b/pages.json @@ -36,13 +36,7 @@ "path" : "pages/oaLogin/oaLogin", "style" : { - "navigationBarTitleText": "", - "app-plus": { - "titleNView": false - }, - "mp-weixin": { - "titleNView": false - } + "navigationBarTitleText": "登录" } } @@ -50,8 +44,7 @@ "path" : "pages/oaManager/oaManager", "style" : { - "navigationBarTitleText": "片区经理", - "enablePullDownRefresh": false + "navigationBarTitleText": "片区经理" } } diff --git a/pages/oaExamine/oaExamine.vue b/pages/oaExamine/oaExamine.vue index 6da28cb..b12dccc 100644 --- a/pages/oaExamine/oaExamine.vue +++ b/pages/oaExamine/oaExamine.vue @@ -2,7 +2,7 @@ - @@ -41,12 +41,14 @@ data() { return { list1: [{ - name: '我发起的', + name: '全部', }, { - name: '我处理的', + name: '审核中', }, { - name: '抄送给我的' - }, ], + name: '审核完成' + }, { + name: '未通过' + },], myEventList: [], params: { limit: '8', //默认每次请求数据 diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index c179231..1739150 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -1,5 +1,6 @@ diff --git a/store/modules/app.js b/store/modules/app.js index aea766b..1619115 100644 --- a/store/modules/app.js +++ b/store/modules/app.js @@ -22,6 +22,13 @@ const mutations = { state.token = data.result.token Cache.set("USER_INFO", data.result.user, time) Cache.set("TOKEN", data.result.token, time) + }, + SET_USERINFO(state, data){ + let time = Cache.time(); + state.userInfo = data.user + state.token = data.token + Cache.set("USER_INFO", data.user, time) + Cache.set("TOKEN", data.token, time) } }; diff --git a/utils/oahttp.js b/utils/oahttp.js index ab72c2b..5705f48 100644 --- a/utils/oahttp.js +++ b/utils/oahttp.js @@ -22,23 +22,25 @@ 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; + // header[TOKENNAME] = 'Bearer sdjflidshjgfkbdasgjmasbgvhauuiavhkesvndkaesbvkjsdbv'; return new Promise((reslove, reject) => { // uni.showLoading({ // title: '加载中' // }) uni.request({ - url: Url + '/api/v1' + url, + // url: Url + '/api/v1' + url, + url: Url + '/api' + url, method: method || 'GET', header: header, data: data || {}, @@ -47,7 +49,9 @@ function baseRequestTwo(url, method, data, { if (noVerify) // reslove(res.data, res); reslove(res.data); - else if (res.data.code == 0) + // else if (res.data.code == 0) + // reject(res.data); + else if (res.data.code == 1) reslove(res.data); else if (res.data.code == 200) reslove(res.data.data); @@ -61,10 +65,10 @@ function baseRequestTwo(url, method, data, { reject(res.data); } else { uni.showToast({ - title: res.data.message || '请检查网络', + title: res.data.msg || '请检查网络', icon: 'none' }) - // reject(res.data.message || '请检查网络'); + reject(res.data.msg || '请检查网络'); } }, fail: (message) => { @@ -81,4 +85,4 @@ const oahttp = {}; oahttp[method] = (api, data, opt) => baseRequestTwo(api, method, data, opt || {}) }); -export default oahttp; +export default oahttp; \ No newline at end of file