diff --git a/src/api/index.js b/src/api/index.js index c8c57b2..844fc31 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -2,7 +2,9 @@ const api = { Login: '/auth/login/govH5/loginByPassword', UserInfo: '/epmetuser/customerstaff/govH5/detail', Customerlist: '/epmetuser/customerstaff/customerlist', - ServiceList: '/governance/service/rcvAndProcess/waitingRcvServiceList' + ServiceList: '/governance/service/rcvAndProcess/waitingRcvServiceList', + Password: '/epmetuser/customerstaff/changePassword', + } export default api diff --git a/src/api/user.js b/src/api/user.js index f5b3d13..de3c58b 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -28,3 +28,12 @@ export function getCustomerlist(data) { data, }) } +// 用户修改密码 post 方法 +export function changePassword(data) { + return request({ + url: api.Password, + method: 'post', + data, + }) +} + diff --git a/src/assets/css/common.less b/src/assets/css/common.less index 8d427da..bbd14a5 100644 --- a/src/assets/css/common.less +++ b/src/assets/css/common.less @@ -66,11 +66,23 @@ margin-right: 12px; } } +.p-top12{ + padding-top: 12px; + &-left{ + padding-left: 12px; + } +} .m-top5{ margin-top: 5px; &-bottom{ margin-bottom: 5px; } + &-left{ + margin-left: 5px; + } + &-right{ + margin-right: 5px; + } } diff --git a/src/config/env.development.js b/src/config/env.development.js index 046d75b..5fdf3f0 100644 --- a/src/config/env.development.js +++ b/src/config/env.development.js @@ -3,7 +3,8 @@ module.exports = { env: 'development', title: 'e联社区', baseUrl: 'http://192.168.1.144/', // 项目地址 - baseApi: 'http://192.168.1.144/api', // 本地api请求地址,注意：如果你使用了代理，请设置成'/' + // baseApi: 'http://192.168.1.144/api', // 本地api请求地址,注意：如果你使用了代理，请设置成'/' + baseApi: 'http://219.146.91.110:30801/api', // 本地api请求地址,注意：如果你使用了代理，请设置成'/' APPID: 'xxx', APPSECRET: 'xxx', } diff --git a/src/router/router.config.js b/src/router/router.config.js index 7589a39..40a3b39 100644 --- a/src/router/router.config.js +++ b/src/router/router.config.js @@ -19,5 +19,10 @@ export const constantRouterMap = [ path: '/assistance', component: () => import('@/views/assistance'), meta: { title: '诉求代办', keepAlive: false } + }, + { + path: '/changePassword', + component: () => import('@/views/mine/changePassword'), + meta: { title: '修改密码', keepAlive: false } } ] diff --git a/src/store/index.js b/src/store/index.js index 1ee10b9..056992a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1,3 +1,21 @@ +// import Vue from 'vue' +// import Vuex from 'vuex' +// import getters from './getters' +// import app from './modules/app' + +// Vue.use(Vuex) + +// const store = new Vuex.Store({ + +// modules: { +// app +// }, +// getters +// }) + +// export default store + + import Vue from 'vue' import Vuex from 'vuex' import getters from './getters' @@ -5,11 +23,31 @@ import app from './modules/app' Vue.use(Vuex) +const userInfo = { + state: { + userInfo: { + userName: '', + agencyName: '', + serviceOrgIdentities: [] + } + }, + mutations: { + setUserInfo(state, userInfo) { + state.userInfo = userInfo; + } + } +}; + +const userInfoGetters = { + userInfo: state => state.userInfo.userInfo +}; + const store = new Vuex.Store({ modules: { - app + app, + userInfo }, - getters -}) + getters: userInfoGetters +}); -export default store +export default store; \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 5dd41b1..2bdeeae 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -37,6 +37,7 @@ service.interceptors.response.use( response => { Toast.clear() const res = response.data + const code = res.code; if (res.status && res.status !== 200) { return Promise.reject(res || 'error') } else { diff --git a/src/views/assistance/card.vue b/src/views/assistance/card.vue index ff9adcf..dd7518a 100644 --- a/src/views/assistance/card.vue +++ b/src/views/assistance/card.vue @@ -1,121 +1,121 @@