diff --git a/.env.development b/.env.development index 893c0ff..ae2b7ab 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ NODE_ENV = 'development' -VUE_APP_URL = 'http://121.41.26.225:8004' -VUE_APP_CDN = 'http://121.41.26.225:8004' \ No newline at end of file +VUE_APP_URL = 'http://121.41.26.225:8004/' +VUE_APP_CDN = 'http://121.41.26.225:8004/' \ No newline at end of file diff --git a/.env.production b/.env.production index e931731..d9c27f6 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ NODE_ENV = 'production' -VUE_APP_URL = 'http://121.41.26.225:8004' -VUE_APP_CDN = 'http://121.41.26.225:8004' \ No newline at end of file +VUE_APP_URL = 'http://121.41.26.225:8004/' +VUE_APP_CDN = 'http://121.41.26.225:8004/' \ No newline at end of file diff --git a/src/api/basic/index.js b/src/api/basic/estate/index.js similarity index 100% rename from src/api/basic/index.js rename to src/api/basic/estate/index.js diff --git a/src/api/basic/organization/index.js b/src/api/basic/organization/index.js new file mode 100644 index 0000000..8acfc97 --- /dev/null +++ b/src/api/basic/organization/index.js @@ -0,0 +1,10 @@ +import httpService from "@/request" + +// 获取预报列表 +export function functionName(params) { + return httpService({ + url: `url`, + method: 'post', + data: params, + }) +} diff --git a/src/api/login/index.js b/src/api/public/login/index.js similarity index 80% rename from src/api/login/index.js rename to src/api/public/login/index.js index e8d7058..96041d7 100644 --- a/src/api/login/index.js +++ b/src/api/public/login/index.js @@ -3,7 +3,7 @@ import httpService from "@/request" // 发送验证码 export function sendTelCode(params) { return httpService({ - url: `/manage/sendTelCode`, + url: `/sendTelCode`, method: 'post', data: params, }) @@ -11,8 +11,9 @@ export function sendTelCode(params) { // 登录 export function loginTel(params) { return httpService({ - url: `/manage/loginTelCode`, + url: `/loginTelCode`, method: 'post', data: params, }) } +// 退出登录 \ No newline at end of file diff --git a/src/mixins/index.js b/src/mixins/index.js index 1dec06b..712f20b 100644 --- a/src/mixins/index.js +++ b/src/mixins/index.js @@ -12,10 +12,10 @@ export default { install(Vue) { Vue.mixin({ computed: { - ...mapGetters(['getSelectedKeys', 'getOpenKeys']) + ...mapGetters(['getToken','getSelectedKeys', 'getOpenKeys','getLoginStep']) }, methods: { - ...mapActions(['setSelectedKeys', 'setOpenKeys']) + ...mapActions(['setToken','setSelectedKeys', 'setOpenKeys','setLoginStep']) } }) } diff --git a/src/permission.js b/src/permission.js index f83558e..266e4a1 100644 --- a/src/permission.js +++ b/src/permission.js @@ -1,18 +1,18 @@ -/* - * @Author: your name - * @Date: 2021-11-18 17:34:50 - * @LastEditTime: 2021-11-18 17:37:15 - * @LastEditors: Please set LastEditors - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: /ansu-business/src/permission.js - */ import NProgress from "nprogress" import "nprogress/nprogress.css" import router from "@/router" +import store from '@/store' +const whitePath = [ '/login'] +// 判断登录 router.beforeEach((to, from, next) => { NProgress.start() - next(); + const token = store.getters.getToken; + if(!token && !whitePath.includes(to.path)) { + next('/login'); + } else { + next(); + } }) router.afterEach(() => { diff --git a/src/request/index.js b/src/request/index.js index e9befb1..24516a8 100644 --- a/src/request/index.js +++ b/src/request/index.js @@ -1,3 +1,11 @@ +/* + * @Author: your name + * @Date: 2021-10-13 09:28:02 + * @LastEditTime: 2022-01-05 13:44:32 + * @LastEditors: Please set LastEditors + * @Description: In User Settings Edit + * @FilePath: /data-show/src/request/index.js + */ import axios from 'axios'; // import qs from 'qs'; import router from "@/permission" @@ -17,10 +25,10 @@ function filterRequestData(obj) { } //创建axios的实例 const httpService = axios.create({ - baseURL: process.env.VUE_APP_URL + '/1',// TODO:具体的配置可以根据项目情况而来 + baseURL: process.env.VUE_APP_URL+'123456/manage',// TODO:具体的配置可以根据项目情况而来 timeout: 5000 }) -// + communityCode + //axios的拦截--request httpService.interceptors.request.use(config => { const rqParams = filterRequestData(config.params); @@ -28,7 +36,7 @@ httpService.interceptors.request.use(config => { // post 'Content-Type' === 'application/x-www-form-urlencoded' config.headers['Content-Type'] = "application/json"; config.headers['manage-login-token'] = store.getters.getToken; - config.headers['device-type'] = "web"; + // config.headers['device-type'] = "web"; if(config.method === 'post') { config.data = rqData; } else { @@ -43,14 +51,18 @@ httpService.interceptors.request.use(config => { //4、axios的拦截--response httpService.interceptors.response.use(response => { // TODO:具体的code对应的处理可继续添加修改 - let data = null; + // let data = null; let msg = ''; let res = response.data; - if(res.code == 0){ - data = res.data; - msg = res.msg || ""; - return {data, msg}; - } else if(res.code == 100000) { + // console.log(response); + if(res.code === 200){ + // code = 200; + // data = res.data; + // msg = res.msg || ""; + // console.log(msg); + // console.log(data); + return res; + } else if(res.code == '超时') { router.replace({ path: '/login' }); diff --git a/src/store/actions.js b/src/store/actions.js index 50313d2..589eea3 100644 --- a/src/store/actions.js +++ b/src/store/actions.js @@ -7,6 +7,9 @@ * @FilePath: /ansu-business/src/store/actions.js */ const actions = { + setToken: ({commit}, log) => { + commit('setToken', log) + }, setSelectedKeys: ({commit}, log) => { commit('setSelectedKeys', log) }, diff --git a/src/store/getters.js b/src/store/getters.js index 1418396..1402f97 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -12,7 +12,10 @@ const getters = { }, getOpenKeys(state) { return state.openKeys - } + }, + getToken(state) { + return state.token + }, } export default getters \ No newline at end of file diff --git a/src/store/mutations.js b/src/store/mutations.js index 39faf80..91c3214 100644 --- a/src/store/mutations.js +++ b/src/store/mutations.js @@ -17,6 +17,10 @@ const mutations = { let str = JSON.stringify(log); sessionStorage.setItem('openKeys', str); }, + setToken: (state, log) => { + state.token = log; + sessionStorage.setItem('token', log); + }, } export default mutations \ No newline at end of file diff --git a/src/store/state.js b/src/store/state.js index c16ee50..f290c2d 100644 --- a/src/store/state.js +++ b/src/store/state.js @@ -8,6 +8,7 @@ */ const state = { selectedKeys: JSON.parse(sessionStorage.getItem('selectedKeys')) || ['/'], - openKeys: JSON.parse(sessionStorage.getItem('openKeys')) || [] + openKeys: JSON.parse(sessionStorage.getItem('openKeys')) || [], + token: sessionStorage.getItem('token') || "" } export default state \ No newline at end of file diff --git a/src/views/Basic/WorkOrder/addWorkOrder.vue b/src/views/Basic/WorkOrder/addWorkOrder.vue new file mode 100644 index 0000000..917b790 --- /dev/null +++ b/src/views/Basic/WorkOrder/addWorkOrder.vue @@ -0,0 +1,71 @@ + + + diff --git a/src/views/Basic/WorkOrder/index.vue b/src/views/Basic/WorkOrder/index.vue index 2d417ea..bba90d4 100644 --- a/src/views/Basic/WorkOrder/index.vue +++ b/src/views/Basic/WorkOrder/index.vue @@ -41,7 +41,7 @@ - 添加工单 + 添加工单 @@ -116,13 +116,23 @@ + diff --git a/src/views/ShopMall/AccumulatePoints/index.vue b/src/views/ShopMall/AccumulatePoints/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/ShopMall/AfterSale/index.vue b/src/views/ShopMall/AfterSale/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/ShopMall/BusinessManage/index.vue b/src/views/ShopMall/BusinessManage/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/ShopMall/GoodsManage/index.vue b/src/views/ShopMall/GoodsManage/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/ShopMall/OrderManage/index.vue b/src/views/ShopMall/OrderManage/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/vue.config.js b/vue.config.js index 5ae8391..dfb4ede 100644 --- a/vue.config.js +++ b/vue.config.js @@ -9,7 +9,9 @@ module.exports = { // ... runtimeCompiler: true, - - + devServer: { + port: "8443", + }, + // ... }; \ No newline at end of file