diff --git a/package.json b/package.json index 3531c6a..18a6992 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,8 @@ "vue-demi": "^0.14.0", "vue-router": "^3.5.4", "vuex": "^3.6.2", - "jsencrypt": "^3.0.3" + "jsencrypt": "^3.0.3", + "lodash": "^4.17.15" }, "devDependencies": { "@babel/core": "^7.18.10", diff --git a/src/api/home.js b/src/api/home.js deleted file mode 100644 index 4239f3b..0000000 --- a/src/api/home.js +++ /dev/null @@ -1,6 +0,0 @@ -// import qs from 'qs' -// axios -// import request from '@/utils/request' -//home api - - \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js index 5e5dbcc..c8c57b2 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,7 +1,8 @@ const api = { Login: '/auth/login/govH5/loginByPassword', UserInfo: '/epmetuser/customerstaff/govH5/detail', - Customerlist: '/epmetuser/customerstaff/customerlist' + Customerlist: '/epmetuser/customerstaff/customerlist', + ServiceList: '/governance/service/rcvAndProcess/waitingRcvServiceList' } export default api diff --git a/src/assets/css/common.less b/src/assets/css/common.less index 470b3b1..8d427da 100644 --- a/src/assets/css/common.less +++ b/src/assets/css/common.less @@ -82,8 +82,9 @@ } .pages { width: 100%; - height: 100vh; background-color: #f7f7f7; + height: 100vh; + overflow-y: scroll; } .rounded-corner { border-radius: 20px; @@ -93,5 +94,4 @@ } .small_img{ width: 18px; - } \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index d48dd3c..5dd41b1 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -23,6 +23,7 @@ service.interceptors.request.use( config.headers['Authorization'] = localStorage.getItem('token') } config.baseURL = config.baseURL + '/' + Tips.loading() return config }, error => { @@ -46,8 +47,11 @@ service.interceptors.response.use( if (loginCode.includes(res.code)) { localStorage.removeItem('token') router.replace('/') + }else if(code > 8000){ + Tips.error(res.msg) + }else{ + Tips.error('网络错误,请稍后再试') } - Tips.error(res.msg) return Promise.reject(res || 'error') } } diff --git a/src/views/assistance/index.vue b/src/views/assistance/index.vue index 84dc561..c87463a 100644 --- a/src/views/assistance/index.vue +++ b/src/views/assistance/index.vue @@ -1,69 +1,76 @@ - +