diff --git a/Yi.Ai.Vue3/.env.development b/Yi.Ai.Vue3/.env.development index 6059351c..ce807789 100644 --- a/Yi.Ai.Vue3/.env.development +++ b/Yi.Ai.Vue3/.env.development @@ -11,10 +11,11 @@ VITE_WEB_ENV = 'development' VITE_WEB_BASE_API = '/dev-api' # 本地接口 -VITE_API_URL = http://localhost:19001/api/app -#VITE_API_URL = http://ccnetcore.com:19001/api/app +# VITE_API_URL = http://localhost:19001/api/app +VITE_API_URL=http://ccnetcore.com:19001/api/app # SSO单点登录url -SSO_SEVER_URL='http://localhost:18001' +# SSO_SEVER_URL='http://localhost:18001' +SSO_SEVER_URL='http://ccnetcore.com' # SSO单点登录项目标识 SSO_CLIENT_ID='YiXin-Ai'; diff --git a/Yi.Ai.Vue3/src/config/index.ts b/Yi.Ai.Vue3/src/config/index.ts index ffe2a5fa..16c8aa57 100644 --- a/Yi.Ai.Vue3/src/config/index.ts +++ b/Yi.Ai.Vue3/src/config/index.ts @@ -12,4 +12,4 @@ export const COLLAPSE_THRESHOLD: number = 600; export const SIDE_BAR_WIDTH: number = 280; // 路由白名单地址[本地存在的路由 staticRouter.ts 中] -export const ROUTER_WHITE_LIST: string[] = ['/chat', '/chat/not_login', '/product', '/403', '/404']; +export const ROUTER_WHITE_LIST: string[] = ['/chat', '/chat/not_login', '/products', '/403', '/404']; diff --git a/Yi.Ai.Vue3/src/config/sso.ts b/Yi.Ai.Vue3/src/config/sso.ts index b3148f16..bb983ab7 100644 --- a/Yi.Ai.Vue3/src/config/sso.ts +++ b/Yi.Ai.Vue3/src/config/sso.ts @@ -1,4 +1,4 @@ // 三方登录 // export const SSO_SEVER_URL: string = 'https://ccnetcore.com'; -export const SSO_SEVER_URL: string = import.meta.env.SSO_SEVER_URL || 'http://localhost:18001'; +export const SSO_SEVER_URL: string = import.meta.env.SSO_SEVER_URL || 'http://ccnetcore.com'; export const SSO_CLIENT_ID: string = import.meta.env.SSO_CLIENT_ID || 'YiXin-Ai'; diff --git a/Yi.Ai.Vue3/src/pages/product/index.vue b/Yi.Ai.Vue3/src/pages/products/index.vue similarity index 100% rename from Yi.Ai.Vue3/src/pages/product/index.vue rename to Yi.Ai.Vue3/src/pages/products/index.vue diff --git a/Yi.Ai.Vue3/src/routers/modules/staticRouter.ts b/Yi.Ai.Vue3/src/routers/modules/staticRouter.ts index da6a2807..3d0d89b2 100644 --- a/Yi.Ai.Vue3/src/routers/modules/staticRouter.ts +++ b/Yi.Ai.Vue3/src/routers/modules/staticRouter.ts @@ -34,7 +34,7 @@ export const layoutRouter: RouteRecordRaw[] = [ { path: '/products', name: 'products', - component: () => import('@/pages/product/index.vue'), + component: () => import('@/pages/products/index.vue'), meta: { title: '产品页面', keepAlive: true, // 如果需要缓存 diff --git a/Yi.Ai.Vue3/types/import_meta.d.ts b/Yi.Ai.Vue3/types/import_meta.d.ts index caa83c90..9f0c04a9 100644 --- a/Yi.Ai.Vue3/types/import_meta.d.ts +++ b/Yi.Ai.Vue3/types/import_meta.d.ts @@ -6,7 +6,8 @@ interface ImportMetaEnv { readonly VITE_WEB_ENV: string; readonly VITE_WEB_BASE_API: string; readonly VITE_API_URL: string; - readonly VITE_BUILD_COMPRESS: string; + readonly SSO_SEVER_URL: string; + readonly SSO_CLIENT_ID: string; } declare interface ImportMeta { diff --git a/Yi.Pure.Vue3/src/components/ReIcon/data.ts b/Yi.Pure.Vue3/src/components/ReIcon/data.ts index b5769e8c..a7a4502e 100644 --- a/Yi.Pure.Vue3/src/components/ReIcon/data.ts +++ b/Yi.Pure.Vue3/src/components/ReIcon/data.ts @@ -2063,8 +2063,8 @@ export const IconJson = { "printer-cloud-line", "printer-fill", "printer-line", - "product-hunt-fill", - "product-hunt-line", + "products-hunt-fill", + "products-hunt-line", "profile-fill", "profile-line", "prohibited-fill", diff --git a/Yi.Pure.Vue3/src/views/list/card/components/ListCard.vue b/Yi.Pure.Vue3/src/views/list/card/components/ListCard.vue index 0501a4ae..e196afe0 100644 --- a/Yi.Pure.Vue3/src/views/list/card/components/ListCard.vue +++ b/Yi.Pure.Vue3/src/views/list/card/components/ListCard.vue @@ -24,10 +24,10 @@ const props = defineProps({ } }); -const emit = defineEmits(["manage-product", "delete-item"]); +const emit = defineEmits(["manage-products", "delete-item"]); const handleClickManage = (product: CardProductType) => { - emit("manage-product", product); + emit("manage-products", product); }; const handleClickDelete = (product: CardProductType) => {