Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/config/axios/service.js

@@ -12,7 +12,7 @@ import { useI18n } from '@/hooks/web/useI18n'
 // import { resetRouter } from '@/router'
 // import { deleteUserCache } from '@/hooks/web/useCache'
 
-const { t } = useI18n()
+
 
 const tenantEnable = import.meta.env.VITE_APP_TENANT_ENABLE
 const { result_code, base_url, request_timeout } = config
@@ -87,10 +87,7 @@ service.interceptors.request.use(
 // response 拦截器
 service.interceptors.response.use(
   async (response) => {
-    // import { i18n } from '@/plugins/vueI18n'
-
-    // console.log(i18n)
-    // const { t } = i18n
+    const { t } = useI18n()
     let { data } = response
     const config = response.config
     if (!data) {
@@ -166,7 +163,7 @@ service.interceptors.response.use(
         // hard coding：忽略这个提示，直接登出
         console.log(msg)
       }
-       else {
+      else {
         Snackbar.error(msg)
       }
       return Promise.reject(msg)
@@ -175,7 +172,8 @@ service.interceptors.response.use(
     }
   },
   (error) => {
-    console.log('err' + error) // for debug
+    const { t } = useI18n()
+    // console.log('err' + error) // for debug
     let { message } = error
     if (message === 'Network Error') {
       message = t('sys.api.errorMessage')
@@ -194,6 +192,7 @@ const refreshToken = async () => {
   return await axios.post(base_url + '/system/auth/refresh-token?refreshToken=' + getRefreshToken())
 }
 const handleAuthorized = () => {
+  const { t } = useI18n()
   if (!isReLogin.show) {
     // 如果已经到重新登录页面则不进行弹窗提示
     if (window.location.href.includes('login?redirect=')) {

src/locales/en.js

@@ -1,5 +1,7 @@
 export default {
-  common: {},
+  common: {
+    confirmTitle: 'System Hint',
+  },
   sys: {
     api: {
       operationFailed: 'Operation failed',
@@ -9,9 +11,7 @@ export default {
       apiTimeoutMessage: 'The interface request timed out, please refresh the page and try again!',
       apiRequestFailed: 'The interface request failed, please try again later!',
       networkException: 'network anomaly',
-      networkExceptionMsg:
-        'Please check if your network connection is normal! The network is abnormal',
-
+      networkExceptionMsg: 'Please check if your network connection is normal! The network is abnormal',
       errMsg401: 'The user does not have permission (token, user name, password error)!',
       errMsg403: 'The user is authorized, but access is forbidden!',
       errMsg404: 'Network request error, the resource was not found!',

src/views/Home/personal/components/hotJobs.vue

@@ -15,6 +15,8 @@ let jobs = ref(null)
 const getTreeData = async () => {
   const res = await getHotPositionList()
   jobs.value = res || []
+  // 暂无数据，先假数据
+  if (!res?.length) jobs.value = ['Java','PHP','C#','.NET','会计','区块链工程师','测试', '新媒体运营','人力资源专员/助理','GIS工程师']
 }
 getTreeData()
 </script>