diff --git a/src/components/form/address.vue b/src/components/form/address.vue index 923ad3e..ab3544b 100644 --- a/src/components/form/address.vue +++ b/src/components/form/address.vue @@ -25,7 +25,7 @@ }, label: { type: String, - default: '省/市/区', + default: 'Province / City / District', }, province: { type: String, diff --git a/src/components/form/upload/imagesUpload.vue b/src/components/form/upload/imagesUpload.vue index 61c71e9..f969291 100644 --- a/src/components/form/upload/imagesUpload.vue +++ b/src/components/form/upload/imagesUpload.vue @@ -25,7 +25,7 @@ -
点击上传或直接拖入文件
+
Click to UploadOr drag and drop files directly
diff --git a/src/components/form/upload/oss.js b/src/components/form/upload/oss.js index 33d901c..9ddbc1a 100644 --- a/src/components/form/upload/oss.js +++ b/src/components/form/upload/oss.js @@ -6,7 +6,7 @@ export function useOss (beforeUp, multiple) { let fileUploadData = reactive({ policy: '', OSSAccessKeyId: '', - success_action_status: '200', // 让服务端返回200,不然，默认会返回204 + success_action_status: '200', // Have the server return 200; otherwise, it will return 204 by default. callback: '', signature: '', 'x:dir': '', @@ -32,7 +32,7 @@ export function useOss (beforeUp, multiple) { fileUploadData['x:dir'] = obj['dir'] fileUploadHost.value = obj['host'] } - //多选文件时需要这个，不然每个文件上传的都是一样的data + // This is required when selecting multiple files; otherwise, the same data will be uploaded for every single file. if (multiple) { await new Promise(resolve => { setTimeout(() => { resolve() }, 50) diff --git a/src/permission.js b/src/permission.js index 6730570..4bec09e 100644 --- a/src/permission.js +++ b/src/permission.js @@ -21,7 +21,7 @@ router.beforeEach(async (to, from, next) => { const token = getToken() if (!token) { - //无token，跳转到登录 + // No token found; redirecting to login. if (whiteList.indexOf(to.path) !== -1) { next() } else { @@ -29,7 +29,7 @@ router.beforeEach(async (to, from, next) => { } } else { - //有token + // With Token const userStore = useUserStore(pinia) diff --git a/src/router/index.js b/src/router/index.js index 7a18b97..afe8680 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -36,13 +36,13 @@ export const asyncRoutes = [ // path: '/', // name: 'Index', // redirect: '/Home', - // meta: { title: '首页', icon: 'house' }, + // meta: { title: 'front page', icon: 'house' }, // component: () => import('@/layout/index.vue'), // children: [ // { // path: '/Home', // name: 'Home', - // meta: { title: '首页', icon: 'house' }, + // meta: { title: 'front page', icon: 'house' }, // component: () => import('@/views/index/index.vue'), // }, // diff --git a/src/utils/auth.js b/src/utils/auth.js index 0a6d674..e3fd603 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -15,29 +15,29 @@ export function removeToken () { return localStorage.removeItem(TokenKey) } -// 设置 code，并存储当前时间戳（单位：毫秒） +// Set the code and store the current timestamp (in milliseconds). export function setCode(code) { - const now = Date.now(); // 当前时间戳（毫秒） - const expiry = now + 60 * 1000; // 60 秒后过期 + const now = Date.now(); //Current Timestamp (Milliseconds) + const expiry = now + 60 * 1000; // Expires in ... seconds 60 - localStorage.setItem(OidcCode, code); // 存储 code - localStorage.setItem(OidcCodeExpiry, expiry); // 存储过期时间戳 + localStorage.setItem(OidcCode, code); // Storage Code + localStorage.setItem(OidcCodeExpiry, expiry); // Store Expiration Timestamp } -// 获取 code，如果已过期则删除并返回 null +// Retrieve the code; if it has expired, delete it and return null. export function getCode() { - const expiry = localStorage.getItem(OidcCodeExpiry); // 获取过期时间戳 - const now = Date.now(); // 当前时间戳 + const expiry = localStorage.getItem(OidcCodeExpiry); // Get Expiration Timestamp + const now = Date.now(); // Current Timestamp if (expiry && now > parseInt(expiry)) { - // 如果已过期，删除 code 和过期时间 + // If expired, delete the code and the expiration time. removeCode(); return null; } - return localStorage.getItem(OidcCode); // 返回 code（如果未过期） + return localStorage.getItem(OidcCode); // Return code (if not expired) } -// 删除 code 和过期时间 +// Delete the code and expiration time. export function removeCode() { localStorage.removeItem(OidcCode); localStorage.removeItem(OidcCodeExpiry); diff --git a/src/utils/clipboard.js b/src/utils/clipboard.js index 75edf16..e86954e 100644 --- a/src/utils/clipboard.js +++ b/src/utils/clipboard.js @@ -19,7 +19,7 @@ export function handleClipboard (text, event) { export function copyImage (targetNode) { if (window.getSelection) { - // chrome等主流浏览器 + // Mainstream browsers such as Chrome var selection = window.getSelection() selection.removeAllRanges() var range = document.createRange() diff --git a/src/views/address_book/index.vue b/src/views/address_book/index.vue index 82a85b2..139c0bd 100644 --- a/src/views/address_book/index.vue +++ b/src/views/address_book/index.vue @@ -34,7 +34,7 @@ - +