From 40e0a2a394d416566dfde6070a00bee9e75dc14d Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期五, 03 十二月 2021 12:19:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
PAMapp/pages/consultantLogin/index.vue | 2 ++
PAMapp/assets/scss/vendors/elementUI/_messageBox.scss | 5 ++++-
PAMapp/assets/ts/api/share.ts | 2 +-
PAMapp/assets/ts/errorService.ts | 7 ++++++-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/PAMapp/assets/scss/vendors/elementUI/_messageBox.scss b/PAMapp/assets/scss/vendors/elementUI/_messageBox.scss
index 56b4b5c..35ddece 100644
--- a/PAMapp/assets/scss/vendors/elementUI/_messageBox.scss
+++ b/PAMapp/assets/scss/vendors/elementUI/_messageBox.scss
@@ -18,7 +18,9 @@
}
.message-content{
max-height: 150px;
- overflow: auto;
+ max-width: 100%;
+ word-wrap: break-word;
+ overflow-y: auto;
margin-top: 10px;
color: $PRIMARY_BLACK;
letter-spacing: 2px;
@@ -27,6 +29,7 @@
text-align: center;
font-size: 20px;
font-weight: bolder;
+ line-height: 1.5;
color: $PRIMARY_BLACK;
}
}
diff --git a/PAMapp/assets/ts/api/share.ts b/PAMapp/assets/ts/api/share.ts
index cd6084e..a119703 100644
--- a/PAMapp/assets/ts/api/share.ts
+++ b/PAMapp/assets/ts/api/share.ts
@@ -48,7 +48,7 @@
switch (error.response.status) {
case 401:
Promise.all([ErrorMessageBox('���暹��'),window.$nuxt.$store.dispatch('localStorage/actionStorageClear')]).then(()=>{
- location.href='/';
+ _.isEqual(window.$nuxt.$route.name, 'index') ? location.reload() : window.$nuxt.$router.push('/');
});
break;
diff --git a/PAMapp/assets/ts/errorService.ts b/PAMapp/assets/ts/errorService.ts
index 240370b..69aed3e 100644
--- a/PAMapp/assets/ts/errorService.ts
+++ b/PAMapp/assets/ts/errorService.ts
@@ -1,5 +1,6 @@
import { MessageBox } from 'element-ui';
import { MessageBoxData } from 'element-ui/types/message-box';
+import * as _ from 'lodash';
export default function ErrorMessageBox(errorMsg?:string, errorObj?: any):Promise<MessageBoxData>{
errorMsg && console.info('Error: ', errorMsg);
@@ -7,7 +8,7 @@
return MessageBox({
message: errorMsg
- ? errorMsg
+ ? `${breakTextByComma(errorMsg)}`
: `<div class="message-header"> 蝟餌絞���隤�: ${errorObj?.response?.status} </div>
<div class="message-content">${errorObj?.response?.data?.detail}</div>`,
dangerouslyUseHTMLString: true,
@@ -18,3 +19,7 @@
closeOnClickModal:false,
});
}
+// ������銵�
+function breakTextByComma(errorMsg:string):string{
+ return _.split(errorMsg,"嚗�").join('<br>');
+}
diff --git a/PAMapp/pages/consultantLogin/index.vue b/PAMapp/pages/consultantLogin/index.vue
index 17d59a5..5154d1e 100644
--- a/PAMapp/pages/consultantLogin/index.vue
+++ b/PAMapp/pages/consultantLogin/index.vue
@@ -117,6 +117,7 @@
this.loginWithConsultant()
}else{
this.clearValue();
+ this.regenerateImgOfVerification();
ErrorMessageBox('撽�Ⅳ頛詨�隤�');
}
});
@@ -135,6 +136,7 @@
}
private checkHttpErrorStatus(error:any):void{
this.clearValue();
+ this.regenerateImgOfVerification();
switch (error.response.status) {
case 401:
const errorMsg = error.response.data.detail;
--
Gitblit v1.8.0