diff --git a/src/App.vue b/src/App.vue
index 780d599..64ebff6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,7 @@
-
+
@@ -46,12 +46,19 @@ const setLockScreen = computed(() => {
// 获取版本号
const getVersion = computed(() => {
let isVersion = false;
- if (route.path !== '/login') {
+ if (route.path !== '/login' && route.path !== '/article/content') {
// @ts-ignore
if ((Local.get('version') && Local.get('version') !== __NEXT_VERSION__) || !Local.get('version')) isVersion = true;
}
return isVersion;
});
+// 隐藏广告
+const hideSponsors = computed(() => {
+ const path = route.path;
+ console.log(path === '/login' || path === '/article/content');
+
+ return path === '/login' || path === '/article/content';
+});
// 获取全局组件大小
const getGlobalComponentSize = computed(() => {
return other.globalComponentSize();
diff --git a/src/api/baseUrlHost.ts b/src/api/baseUrlHost.ts
index b0b5e37..55b68c1 100644
--- a/src/api/baseUrlHost.ts
+++ b/src/api/baseUrlHost.ts
@@ -1 +1,2 @@
-export const baseUrlHost = "/vueAdminApi";
\ No newline at end of file
+export const baseUrlHost = "/vueAdminApi";
+export const pixelUrlHost = "/pixelApi";
\ No newline at end of file
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 8343a03..06511ff 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -11,6 +11,7 @@ export default {
UserManage: 'UserManage',
systemDic: 'systemDic',
article: 'article',
+ apply: 'apply',
message: 'message',
order: 'order',
articleContent: 'articleContent',
diff --git a/src/i18n/lang/zh-cn.ts b/src/i18n/lang/zh-cn.ts
index 3a94bc6..9072357 100644
--- a/src/i18n/lang/zh-cn.ts
+++ b/src/i18n/lang/zh-cn.ts
@@ -11,6 +11,7 @@ export default {
systemDept: '部门管理',
systemDic: '字典管理',
article: '文章管理',
+ apply: '应用管理',
carousel: '轮播图管理',
clients: '客户管理',
photos: '图片管理',
diff --git a/src/i18n/lang/zh-tw.ts b/src/i18n/lang/zh-tw.ts
index 08f60b8..7c8cd7a 100644
--- a/src/i18n/lang/zh-tw.ts
+++ b/src/i18n/lang/zh-tw.ts
@@ -11,6 +11,7 @@ export default {
systemDept: '部門管理',
systemDic: '字典管理',
article: '文章管理',
+ apply: '应用管理',
message: '聯言管理',
articleContent: '文章詳情',
order: '訂單管理',
diff --git a/src/i18n/pages/login/en.ts b/src/i18n/pages/login/en.ts
index 2654a18..b2ae285 100644
--- a/src/i18n/pages/login/en.ts
+++ b/src/i18n/pages/login/en.ts
@@ -10,7 +10,7 @@ export default {
},
account: {
accountPlaceholder1: 'The user name admin or not is common',
- accountPlaceholder2: 'Password: 123456',
+ accountPlaceholder2: 'Please enter the password',
accountPlaceholder3: 'Please enter the verification code',
accountBtnText: 'Sign in',
},
diff --git a/src/i18n/pages/login/zh-cn.ts b/src/i18n/pages/login/zh-cn.ts
index 3367b53..96714be 100644
--- a/src/i18n/pages/login/zh-cn.ts
+++ b/src/i18n/pages/login/zh-cn.ts
@@ -9,8 +9,8 @@ export default {
two4: '友情链接',
},
account: {
- accountPlaceholder1: '用户名 admin 或不输均为 common',
- accountPlaceholder2: '密码：123456',
+ accountPlaceholder1: '请输入用户名',
+ accountPlaceholder2: '请输入密码',
accountPlaceholder3: '请输入验证码',
accountBtnText: '登 录',
},
diff --git a/src/i18n/pages/login/zh-tw.ts b/src/i18n/pages/login/zh-tw.ts
index 138e8c8..664d71e 100644
--- a/src/i18n/pages/login/zh-tw.ts
+++ b/src/i18n/pages/login/zh-tw.ts
@@ -9,8 +9,8 @@ export default {
two4: '友情連結',
},
account: {
- accountPlaceholder1: '用戶名admin或不輸均為common',
- accountPlaceholder2: '密碼：123456',
+ accountPlaceholder1: '請輸入用戶名',
+ accountPlaceholder2: '請輸入密碼',
accountPlaceholder3: '請輸入驗證碼',
accountBtnText: '登入',
},
diff --git a/src/router/route.ts b/src/router/route.ts
index 69dbe1e..6562a63 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -188,6 +188,7 @@ export const dynamicRoutes: Array = [
},
],
},
+ // 文章管理
{
path: '/article',
name: 'article',
@@ -250,6 +251,23 @@ export const dynamicRoutes: Array = [
}
]
},
+ // 应用管理
+ // {
+ // path: '/apply',
+ // name: 'apply',
+ // component: () => import('/@/views/apply/index.vue'),
+ // meta: {
+ // title: 'message.router.apply',
+ // isLink: '',
+ // isHide: false,
+ // isKeepAlive: true,
+ // isAffix: false,
+ // isIframe: false,
+ // roles: ['admin', 'common'],
+ // icon: 'iconfont icon-crew_feature',
+ // },
+ // children: []
+ // },
// 轮播图管理
{
path: '/carousel',
diff --git a/src/views/article/index.vue b/src/views/article/index.vue
index d9f5727..68e7e14 100644
--- a/src/views/article/index.vue
+++ b/src/views/article/index.vue
@@ -184,7 +184,7 @@ const toEditArticle = (row: any) => {
const copyLink = (row: any) => {
if(row.id == null||row.id == ''){ ElMessage.warning('链接为空');return;}
var aux = document.createElement("input");
- aux.setAttribute("value", `${viteUrl}#article/content?id=${row.id}`);
+ aux.setAttribute("value", `${viteUrl}vueAdmin/#article/content?id=${row.id}`);
document.body.appendChild(aux);
aux.select();
document.execCommand("copy");
@@ -200,7 +200,7 @@ const toShowDetail = (row: any) => {
// 预览
const toPreview = (row: any) => {
- window.open(`${viteUrl}#article/content?id=${row.id}`);
+ window.open(`${viteUrl}vueAdmin/#article/content?id=${row.id}`);
}
// 文章删除
diff --git a/src/views/login/component/account.vue b/src/views/login/component/account.vue
index c292c6b..4b2e49f 100644
--- a/src/views/login/component/account.vue
+++ b/src/views/login/component/account.vue
@@ -79,8 +79,10 @@ const router = useRouter();
const state = reactive({
isShowPassword: false,
ruleForm: {
- username: 'admin1',
- password: '123456',
+ // username: 'admin1',
+ // password: '123456',
+ username: '',
+ password: '',
code: '1234',
usertype: 1
},
@@ -116,8 +118,11 @@ const onSignIn = async () => {
// 执行完 initBackEndControlRoutes，再执行 signInSuccess
signInSuccess(isNoPower);
}
+ }else{
+ ElMessage.error(res.message);
}
} catch (error) {
+ ElMessage.error('账号或密码错误！');
} finally {
state.loading.signIn = false;
}
diff --git a/vite.config.ts b/vite.config.ts
index 4f362a7..d013e1c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -32,12 +32,34 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
proxy: {
'/vueAdminApi': {
target: 'http://8.138.171.103:8081',
+ // target: 'http://8.138.175.106:8090',
+ // target: 'https://www.ymsc.org.cn/vueAdminApi',
ws: true,
+ secure: false,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/vueAdminApi/, ''),
},
+ '/pixelApi': {
+ target: 'http://8.138.171.103:8082',
+ ws: true,
+ secure: false,
+ changeOrigin: true,
+ rewrite: (path) => path.replace(/^\/pixelApi/, ''),
+ },
+ '/vueAdmin': {
+ target: 'http://localhost:8888',
+ // target: 'http://8.138.175.106:8090',
+ // target: 'https://www.ymsc.org.cn/vueAdmin',
+ ws: true,
+ secure: false,
+ changeOrigin: true,
+ rewrite: (path) => path.replace(/^\/vueAdmin/, ''),
+ },
'/upload': {
target: 'http://8.138.171.103',
+ // target: 'http://8.138.175.106',
+ // target: 'https://www.ymsc.org.cn/upload',
+ secure: false,
ws: true,
changeOrigin: true,
},