diff --git a/components/task/index.vue b/components/task/index.vue new file mode 100644 index 0000000..f0f85ed --- /dev/null +++ b/components/task/index.vue @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue new file mode 100644 index 0000000..ea8c9bb --- /dev/null +++ b/components/task/taskItem.vue @@ -0,0 +1,108 @@ + + + + + \ No newline at end of file diff --git a/static/icons/err_c.png b/static/icons/err_c.png new file mode 100644 index 0000000..0371b58 Binary files /dev/null and b/static/icons/err_c.png differ diff --git a/static/icons/ok_c.png b/static/icons/ok_c.png new file mode 100644 index 0000000..69d4efb Binary files /dev/null and b/static/icons/ok_c.png differ diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue index d81ce8a..65ac28a 100644 --- a/subpkg/companyInfo/companyInfo.vue +++ b/subpkg/companyInfo/companyInfo.vue @@ -1,19 +1,23 @@ \ No newline at end of file diff --git a/utils/oahttp.js b/utils/oahttp.js index 4d860e4..e104d64 100644 --- a/utils/oahttp.js +++ b/utils/oahttp.js @@ -3,6 +3,7 @@ import { HEADER, TOKENNAME, } from '@/config/app'; +import { Toast } from '../libs/uniApi'; // import { checkLogin } from '../libs/login'; import store from '../store'; @@ -55,6 +56,14 @@ function baseRequestTwo(url, method, data, { store.commit("LOGOUT"); reject(res.data); } + else if (res.data.code == 0){ + uni.hideLoading(); + uni.showToast({ + title: res.data.msg || '请检查网络', + icon: 'none' + }) + reject(res.data); + } else if (res.data.code == 1) reslove(res.data); else if (res.data.code == 200) @@ -63,12 +72,12 @@ function baseRequestTwo(url, method, data, { toLogin(); reject(res.data); } else if (res.data.code == 501) { - uni.reLaunch({ - url: '/pages/error/index' - }) + // uni.reLaunch({ + // url: '/pages/error/index' + // }) reject(res.data); } else { - uni.hideLoading(); + // uni.hideLoading(); uni.showToast({ title: res.data.msg || '请检查网络', icon: 'none' @@ -77,7 +86,7 @@ function baseRequestTwo(url, method, data, { } }, fail: (message) => { - uni.hideLoading() + // uni.hideLoading() reject('请求失败'); } })