diff --git a/sub-government-screen-service/src/utils/permission.js b/sub-government-screen-service/src/utils/permission.js index 7a74abf..c955183 100644 --- a/sub-government-screen-service/src/utils/permission.js +++ b/sub-government-screen-service/src/utils/permission.js @@ -17,8 +17,6 @@ NProgress.configure({ showSpinner: false }); const { VITE_APP_MIAN_URL } = import.meta.env; const whiteList = []; router.beforeEach(async (to, from, next) => { - console.info('beforeEach************to', to); - console.info('beforeEach**********from', from); NProgress.start(); if (typeof to.meta.title === 'string') { document.title = '数据大屏 | ' + to.meta.title; diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js index ac708d4..91a9acd 100644 --- a/sub-operation-service/src/router/index.js +++ b/sub-operation-service/src/router/index.js @@ -101,7 +101,6 @@ export const constantRoutes = [ }, ], }, - ...demo, ]; /** diff --git a/sub-operation-service/src/store/modules/user.js b/sub-operation-service/src/store/modules/user.js index fd325d8..773d16e 100644 --- a/sub-operation-service/src/store/modules/user.js +++ b/sub-operation-service/src/store/modules/user.js @@ -47,6 +47,7 @@ export const useUserStore = defineStore({ return !isEmpty(this.menus) ? JSON.parse(decode(this.menus, true)) : []; }, logout() { + console.info('sub-operation-service*****************退出登录'); this.token = null; this.userInfo = {}; this.currentOrg = null; diff --git a/sub-operation-service/src/styles/global.scss b/sub-operation-service/src/styles/global.scss index 9c091aa..84fa919 100644 --- a/sub-operation-service/src/styles/global.scss +++ b/sub-operation-service/src/styles/global.scss @@ -8,7 +8,7 @@ $color-000:#000; $color-fff:#fff; $color-primary: #20a0ff; $color-success: #13ce66; -$color-warning: #f7ba2a; +$color-warning: #FFBE4D; $color-danger: #ff4949; $color-info: #50bfff; $color-secondary: #2e90fe; diff --git a/sub-operation-service/src/styles/iconfont.css b/sub-operation-service/src/styles/iconfont.css index 9ebf1d4..57bb6c3 100644 --- a/sub-operation-service/src/styles/iconfont.css +++ b/sub-operation-service/src/styles/iconfont.css @@ -1,7 +1,7 @@ @font-face { font-family: "iconfont"; /* Project id 4879313 */ src: - url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAwEAAsAAAAAFRwAAAu3AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACEUgqaYJYOATYCJANECyQABCAFhGcHgSob4hEjEbaCsXIl++sEbsAQrAb6GyLWKCra1s4arx2+okU9xXa4WH6+Mzz9My4jvICK4jflu0Mp4f9tbzt3Zn7ru0tztaou/CpUacYi8eAsxhGPJLx4gv6Xa5n5pISyKsI8qgKyy+X2gHKT24fqqirZ8YSKfR2wUe30tGn/NhtpVjBbyCd42pIGQs2JKVpRzZ92t/XdO0cCyZ2nCSROxKkbcOIegtzd1i+ztgQyDDDKssQDjyiwGiCAwGye+5kV4Hr1vc+3n6szSVtoiF+jl7v/bxs384/5xw9RazQykUgy8cgjRLGUSZRWca6mjvtvUhIr6FpbLlcFVjNMpPb3PA0CuWP9Um18dpU0d4ER6cDgkUJVXt21Bam9uQSGRlJrzLtqVPogglvuNsB79vr6zKXgRAm8p/nHTHL9M822J0fgH0pfI5jdgQh4sO+ZR5Md94oWZD8z5TQ6mCOkZCqH3y4rtj2Op8BOs7amG1VuKreomZNw/RcvEkukMrlCqVJrtIgy2FSC9MvRmksc4RnGkIxADAABNgfgYfPoE48tAEAMWwRIYEsAKWwZIIOtAOSwNYACtg5QwjYAKtgmQA3bAmhg2y5aEHdzryKcIWEQEu1A+lZWAifaGcQh4hNIU6BxobZ4C32kSMZnazFpVnq6HsPw2RgHCzZhIiQ4juFcIRfiztfwMCWCcHi6SJwi/AtxDDXrw4N0v2Ftk6Q2IGxA0SSy8w6KwkGx34+ijFfoBW6UuReBYJTR++tkwQ3MA5DkPoLRDyGYeoRymz+3xOElBXYPLXL6KLHLz6xkUTUsurup/leldQBlM33NLz3i2gbt3ExsXiDiFDrg0PO95AHaFwxCEMo0NAxkhUZCAQAWeQMCg0fgFPtnqw0NoZWM2I7Rg6NtUArVHh1CcUC+oJhGk+x+iBo1mjtMjqBwwuFMtDPpIrEranPYBQKP5/WGonxif52YULRETRhhiYJ3EYSuJQOoOV7oWBS4I8E1U2Ed050TydYw94gldS/u1cRcrXhOamaJ80PQMKZAWHR/C0jVOSDk8Iv8XpqKTBhKZLdBryUS23EmRDbpyQ1TzQ60EiExdtvQ39KHnM2RjGCbDvL5EBEtQDxeMsgK5ZDLALJVa/e8LqCbACBD3iETU4YRiD5Xg6XizL1L8xB/8a5bF+pnNVcF2+nb50GyC4vrSltqE99746xIjboiiO6crnfGwHsJ3XgfLTBoXtf0T7tu7VZarAkkccSQlnElHJDTHzRF5Zy+IFUnXsBJvAFACjx7mMkw0cTEDoPkVUhti0MUv2O1/+QO1c5H0iIPYnpwrcuLNXD68WMyFmMSCSoed2ytlGZGOPtRJETW0PbHMzkgTZ2zHa5oAqKccRzITd8c7XotEr3F3BjpJDuGryMHwPQy01GDCa27/5iOVyuJG4mhA2DFdKooqc3f2BDYyHYEMWOtcrC5UVgWhKhEK5jYtOTjQyx6sE2WUtc+5CInBIFBeRqic32SgVZpcm1L/2rI5afCtMDu9NFNpNDhZZajm4kg9cRQTdwWIjPHYlUObwhlxK5YwhU4qa3jZ66DNWihHaSGhiBbpmQyO/2QesQ8IO+viTfq5e0CYaxqYZjrpI9c4pW0M1591xypeLeWYByxqjumjtL79sc1mHvTFrvb8/roHIt9KyZqEDbiGbWRa8uC8yCdsKtmZKhGkl1lBUJ7QBLvgLfsh2DKt5IZUZBeMcpA1MU4Qj8GgJzalMQliIIqHlA/jNBxaAp/tXOqrh5/jvfI8jHv2HPhUs2d0KSM6VPU3+1TN9iBMP0G5xj7hjSFC2wN6n3/qadMV0wauGMpBUftaq4aREVf+Le7+5bm1pU0rBkuhn0W4fqC6dWIRbB8+FdBUD76FfFaauZXd3uhVMi96sh2bgqXjBzh+jhl8Yb6Z9OYiF4W+PIC+p/HmnYkKR3eTpzsh1JzUjmNHxjEYSg30+l4e//CoYvjD67eKv76yl2ZIL73JWm/KFsQEp8h+cPegwqvjXmmXSDLI44SkyfnJkLL87ZOziOgsacVK4f22R3nL4SbbFfONu6rvHCISHWVbpjBXwammzsPqVcq5k5U6rEfJD9gepRNyBvNm+bKlV9jQAKwCFs2+wO1kpibzdE0WqqkvByeSZWjelpyIqba44Bcc8r9B89+g/ymiP6jeFLxT1QhUXT8rehN3ZRSxZ+c+VdXvsg2xZUN5dhtpo3XMvhBbYCvSgFtkBdJ8AJU8hL+gPR9Ovlb+hA8WTC38itj4wdR0vXLRmj1xbSOdAqm9ih3r+WuWQ+c+dx8fdLUcZA0XR79v7FpvPxl4TuiXOG7QiiaNFf0jhDC5MBkm0f2HtSvytWH1fJXsRkChhfjMYL9mXfu5f4dqknS8bQDVxMq3MHiEXy8zYGr5DW1nKck1I/EJ3hg5qt32Dpcv+vDz0PzDle1HJE/55F6VLIjrbadC8PrOTqWmH2q1FChKysqnDe/VFuk2W+6RDt/fkm+rucqyx8Fvv7GnsYTW/cczFvJW2X9Tv2erfrW7W/V79pXpfNSssDdn8fTQmI94YyOMiBfR1h7FUvNzvGFWfn5WYXjXxk5w3qKZUZVCa2SH47UshZkdjNO3oxmRk5WLhULipZbdy1YsOuMYWxnik3NunH27EHJGav1gARITo8hHpACHEoJy5eVG0uNE0uzK5blt9d//8OPP/w0lsu6LLviv1SpscK45NuM/cEDqCu8f1ammL3+ETLAM9K6Opwj5eEDuAobwJRSDtRsZ6bW0lOqz0i40jM39xrnuYrHFxrG508oCE0oLLjwa2l/XE6hXaDRHSQnic8uXXOWlaSEsdPrF/vHQaSf4PGLp53aupGZFjDMvUw/5Zl+Gph/KF4uu1Gf/jC9/obMhHHQ2WlKyUJSJZ2Oc3ELdRH7Z+DG5XCG9X/h9ubF7ifbnhHeu0vVbNvexTVKDX5eRAtmVy/VOZ88vki9XHPXV7FYXbDAOk/nzHKDVcA9/9V7ossKEwvZ+7zdJetPdWQuVuWzptA6DO4rbwfEYxkyKr3yrWITInY22ziWKQL/igwL9fqFlQUTU8UYXQl12YbvdXmlI3BU9mxQFp7a1TU3Khi4i5cUK+a9MX+mU7VMewcs1zhVZzNvKOYVR++7qxRF8me29fZsI4sJkM6HgHjMnt5tzxTLKxUgO1J05zvrmwXXFn4HX1JoUxHu7UuS+iU9N7qXtv107rel3dd7lwAlPO/whllrZ85cO2vDL4aBC6v7Xx6Tp71mWec023JybGbnTcOMbctxmm+iqffONCdbYBK2JJtha/a0ViJH85cKtuRYUpINR6yqiWX2VU6T076ybKI1s0afnGJJzoVzPtcaTfNmmWeb5oOjYwgAY8fYOJgKqDD9AF4J8AywpG4Axo4yI41/E26B9SiApr/BBwKi1AfPDyDpIKz8UNw1vWtS73SNKjilhHB/kHPgn/UlOtL8f5TUqbmOyT3zD9OUjPAGH+pm4/vQDy2z/lP072/UT3udmd4PfKjC3OyBbWK3a4bxf8ZbTegGhPzFUedSNQu9ODRWY1BnT8w7kJNMGAlO6r3YtQzc+HhnGaoQJ7FC/MeyCsIg3Q2JFE5JTJNeh+T2jK1dGMQoRQZs2oUQae2HOLVP4kF6SwJIn0MiM78kBulfSO4mfHOFzV5GNAgEkxs73JUqsmzFbLzLYBcDofuy10EnLjN5PpNrF0xABFrFEknJLiBa3NIq5OOXvUEQKB5r5YHEjIMYd2ezFm2JjFQhGaEBAZOIJs6wE90lKRGre2y+v2XAVhQQNKdwndOSE4PGz+Vl5DiEE6aIq1lPqiZKbAWIOAuPiEb5IW78BkmCa67CxXTeA+Q7LsOR4GPdsqQ7i9eUsW8JN7yJbdcivtYuJ6+gSLESpcqUq1CpSrUaterUMzZHhVCn4pVA63OpdYZrr0gNEDEwXWRSaGSJa0fMUMqvCqAEQbXlRm7i1MIk+a+BoRtCtZASYqwx7LR0BNIEgIkiOinpEg==') format('woff2'), + url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'), } .iconfont { @@ -12,6 +12,34 @@ -moz-osx-font-smoothing: grayscale; } +.icon-voucher:before { + content: "\e75e"; +} + +.icon-car:before { + content: "\e75f"; +} + +.icon-landoperate:before { + content: "\e760"; +} + +.icon-climate:before { + content: "\e754"; +} + +.icon-soil:before { + content: "\e75b"; +} + +.icon-landform:before { + content: "\e75c"; +} + +.icon-more:before { + content: "\e75d"; +} + .icon-home:before { content: "\e639"; } diff --git a/sub-operation-service/src/utils/axios.js b/sub-operation-service/src/utils/axios.js index b34705a..56ba701 100644 --- a/sub-operation-service/src/utils/axios.js +++ b/sub-operation-service/src/utils/axios.js @@ -71,8 +71,10 @@ publicAxios.interceptors.request.use(async (config) => { * @param res * @returns */ -const formatResult = (res) => { +const formatResult = async (res) => { const code = res.data.code || res.status; + // console.info('formatResult', code) + const UserStore = useUserStore(); switch (code) { case 200: case 0: @@ -83,6 +85,11 @@ const formatResult = (res) => { // code === 1 或 500 代表存在错误 ElNotification.error(res.data.message); break; + case 401: + // code === 401 代表登录过期 + await UserStore.logout(); + router.push('/login'); + break; default: ElNotification.error(res.data.message); break; diff --git a/sub-operation-service/src/utils/permission.js b/sub-operation-service/src/utils/permission.js index 34c7a5b..68d91ec 100644 --- a/sub-operation-service/src/utils/permission.js +++ b/sub-operation-service/src/utils/permission.js @@ -22,8 +22,8 @@ router.beforeEach(async (to, from, next) => { } const userStore = useUserStore(); - const hasToken = true; - + const hasToken = userStore.hasToken(); + console.log('sub-operation-service************hasToken', hasToken); if (hasToken) { if (to.path === '/login') { // 如果已登录,请重定向到主页 diff --git a/sub-operation-service/src/views/ecommerce/components/backDivider.vue b/sub-operation-service/src/views/ecommerce/components/backDivider.vue new file mode 100644 index 0000000..2e53e6a --- /dev/null +++ b/sub-operation-service/src/views/ecommerce/components/backDivider.vue @@ -0,0 +1,57 @@ + + + diff --git a/sub-operation-service/src/views/ecommerce/components/banner.vue b/sub-operation-service/src/views/ecommerce/components/banner.vue index d650149..5578411 100644 --- a/sub-operation-service/src/views/ecommerce/components/banner.vue +++ b/sub-operation-service/src/views/ecommerce/components/banner.vue @@ -1,6 +1,6 @@