Showing
8 changed files
with
22 additions
and
11 deletions
| ... | @@ -8,7 +8,7 @@ VUE_APP_Version = '1.0.0' | ... | @@ -8,7 +8,7 @@ VUE_APP_Version = '1.0.0' |
| 8 | 8 | ||
| 9 | VUE_APP_WEB_ADDRESS = 'uat' | 9 | VUE_APP_WEB_ADDRESS = 'uat' |
| 10 | 10 | ||
| 11 | -VUE_APP_BASE_API = 'https://exportdeclarationuat-tw.apac.fedex.com/' | 11 | +VUE_APP_BASE_API = 'https://iclear-connectuat.apac.fedex.com' |
| 12 | 12 | ||
| 13 | VUE_APP_BASE_ROUTE = '/ipc' | 13 | VUE_APP_BASE_ROUTE = '/ipc' |
| 14 | 14 | ... | ... |
| ... | @@ -1178,6 +1178,16 @@ input:disabled { | ... | @@ -1178,6 +1178,16 @@ input:disabled { |
| 1178 | } | 1178 | } |
| 1179 | } | 1179 | } |
| 1180 | 1180 | ||
| 1181 | +.el-message-box { | ||
| 1182 | + .el-message-box__content { | ||
| 1183 | + word-wrap: break-word !important | ||
| 1184 | + } | ||
| 1185 | +} | ||
| 1186 | + | ||
| 1187 | +.el-popper { | ||
| 1188 | + word-wrap: break-word !important | ||
| 1189 | +} | ||
| 1190 | + | ||
| 1181 | .el-table__body-wrapper { | 1191 | .el-table__body-wrapper { |
| 1182 | &::-webkit-scrollbar { | 1192 | &::-webkit-scrollbar { |
| 1183 | height: 8px; | 1193 | height: 8px; | ... | ... |
| ... | @@ -161,7 +161,7 @@ export default { | ... | @@ -161,7 +161,7 @@ export default { |
| 161 | type: "warning", | 161 | type: "warning", |
| 162 | }).then(() => { | 162 | }).then(() => { |
| 163 | this.$store.dispatch("LogOut").then(() => { | 163 | this.$store.dispatch("LogOut").then(() => { |
| 164 | - location.href = "/ImpPer"; | 164 | + location.href = process.env.VUE_APP_BASE_LOGINOUT; |
| 165 | }); | 165 | }); |
| 166 | }); | 166 | }); |
| 167 | }, | 167 | }, | ... | ... |
| ... | @@ -43,7 +43,8 @@ export const constantRoutes = [ | ... | @@ -43,7 +43,8 @@ export const constantRoutes = [ |
| 43 | path: "/login", | 43 | path: "/login", |
| 44 | component: (resolve) => require(["@/views/login"], resolve), | 44 | component: (resolve) => require(["@/views/login"], resolve), |
| 45 | hidden: true, | 45 | hidden: true, |
| 46 | - }, { | 46 | + }, |
| 47 | + { | ||
| 47 | path: "/redjrectLogin", | 48 | path: "/redjrectLogin", |
| 48 | component: (resolve) => require(["@/views/redjrectLogin"], resolve), | 49 | component: (resolve) => require(["@/views/redjrectLogin"], resolve), |
| 49 | hidden: true, | 50 | hidden: true, | ... | ... |
| ... | @@ -58,9 +58,9 @@ service.interceptors.response.use( | ... | @@ -58,9 +58,9 @@ service.interceptors.response.use( |
| 58 | const code = Number(res.data.code) || 200; | 58 | const code = Number(res.data.code) || 200; |
| 59 | // 获取错误信息 | 59 | // 获取错误信息 |
| 60 | const msg = errorCode[code] || res.data.msg || errorCode["default"]; | 60 | const msg = errorCode[code] || res.data.msg || errorCode["default"]; |
| 61 | - if (code === 10004) { | 61 | + if (code === 10001 || code === 10002 || code === 10003 || code === 10004 || code === 10005) { |
| 62 | MessageBox.alert( | 62 | MessageBox.alert( |
| 63 | - "The login status has expired. You can continue to stay on this page or log in again.", | 63 | + "Please log in again!", |
| 64 | "System prompt", | 64 | "System prompt", |
| 65 | { | 65 | { |
| 66 | confirmButtonText: "Login again", | 66 | confirmButtonText: "Login again", |
| ... | @@ -69,7 +69,7 @@ service.interceptors.response.use( | ... | @@ -69,7 +69,7 @@ service.interceptors.response.use( |
| 69 | } | 69 | } |
| 70 | ).then(() => { | 70 | ).then(() => { |
| 71 | store.dispatch("FedLogOut").then(() => { | 71 | store.dispatch("FedLogOut").then(() => { |
| 72 | - location.href = "/ImpPer"; | 72 | + location.href = process.env.VUE_APP_BASE_LOGINOUT; |
| 73 | }); | 73 | }); |
| 74 | }); | 74 | }); |
| 75 | } else if (code === 500) { | 75 | } else if (code === 500) { | ... | ... |
| ... | @@ -97,10 +97,9 @@ | ... | @@ -97,10 +97,9 @@ |
| 97 | ADD | 97 | ADD |
| 98 | </el-button> | 98 | </el-button> |
| 99 | <el-popover placement="top" width="430" trigger="hover"> | 99 | <el-popover placement="top" width="430" trigger="hover"> |
| 100 | - <div> | 100 | + <div style="word-wrap: break-word !important"> |
| 101 | - If the waybill you want too upload thecustoms clearance files | 101 | + If the waybill you want too upload thecustoms clearance files is |
| 102 | - <br /> | 102 | + not listed,please click here to add the tracking number. |
| 103 | - is not listed,please click here to add the tracking number. | ||
| 104 | </div> | 103 | </div> |
| 105 | <svg-icon | 104 | <svg-icon |
| 106 | slot="reference" | 105 | slot="reference" | ... | ... |
| ... | @@ -266,6 +266,7 @@ export default { | ... | @@ -266,6 +266,7 @@ export default { |
| 266 | height: 100%; | 266 | height: 100%; |
| 267 | width: 100%; | 267 | width: 100%; |
| 268 | font-size: 14px; | 268 | font-size: 14px; |
| 269 | + word-wrap: break-word !important; | ||
| 269 | .main-bg { | 270 | .main-bg { |
| 270 | min-height: 400px; | 271 | min-height: 400px; |
| 271 | position: relative; | 272 | position: relative; | ... | ... |
| ... | @@ -19,7 +19,7 @@ export default { | ... | @@ -19,7 +19,7 @@ export default { |
| 19 | this.loading = false; | 19 | this.loading = false; |
| 20 | // this.$router.push({ path: '/login',query:{changePasswordType:this.$route.query.changePasswordType,loginname:this.$route.query.loginname} }) | 20 | // this.$router.push({ path: '/login',query:{changePasswordType:this.$route.query.changePasswordType,loginname:this.$route.query.loginname} }) |
| 21 | } else { | 21 | } else { |
| 22 | - this.$router.push({ path: "/login" }); | 22 | + this.$router.push({ path: "/404" }); |
| 23 | this.loading = false; | 23 | this.loading = false; |
| 24 | } | 24 | } |
| 25 | }, | 25 | }, | ... | ... |
-
Please register or login to post a comment