Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4
# Conflicts: # src/main/resources/static/assets/platform/js/util/commonUtil.js # src/main/resources/views/layouts/platform.html
This commit is contained in:
@@ -17,7 +17,7 @@ const commonUtil = {
|
||||
if (response.config.responseType === "blob") {
|
||||
return response
|
||||
}
|
||||
if (response.data && response.data.code !== 0 && response.data.code !== 200) {
|
||||
if (response.data && response.data.code !== 0 && response.data.code !== 99) {
|
||||
if (isMobile) {
|
||||
vant.Toast(response.data.msg)
|
||||
} else {
|
||||
@@ -25,7 +25,7 @@ const commonUtil = {
|
||||
}
|
||||
return Promise.reject(response.data)
|
||||
}
|
||||
return response.data || response.result
|
||||
return response.data
|
||||
},
|
||||
(error) => {
|
||||
const userAgent = navigator.userAgent || navigator.vendor || window.opera
|
||||
@@ -217,7 +217,6 @@ const commonUtil = {
|
||||
function doSm2Encrypt(msgString) {
|
||||
return sm2.doEncrypt(msgString, publicKey, cipherMode)
|
||||
}
|
||||
|
||||
// SM2数组加密
|
||||
function doSm2ArrayEncrypt(msgString) {
|
||||
return sm2.doEncrypt(msgString, publicKey, cipherMode)
|
||||
|
||||
Reference in New Issue
Block a user