+
+
+
+
+
+
+
diff --git a/apps/FrontendDesigner/src/components/admin/PromptCardHorizontal.vue b/apps/FrontendDesigner/src/components/admin/PromptCardHorizontal.vue
new file mode 100644
index 0000000..77dc5f3
--- /dev/null
+++ b/apps/FrontendDesigner/src/components/admin/PromptCardHorizontal.vue
@@ -0,0 +1,282 @@
+
+
+ ![]()
+
+
+
+
+
+
+
+ {{ prompt.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/FrontendDesigner/src/locales/lang/zh-CN.js b/apps/FrontendDesigner/src/locales/lang/zh-CN.js
index 0201cc3..82a8cca 100644
--- a/apps/FrontendDesigner/src/locales/lang/zh-CN.js
+++ b/apps/FrontendDesigner/src/locales/lang/zh-CN.js
@@ -264,6 +264,7 @@ orderManagement: {
userList: '用户列表',
pointsManagement: '充值包管理',
commissionManagement: '佣金管理',
+ promptManagement: '提示词管理',
logout: '退出登录',
profile: '个人资料',
settings: '设置',
@@ -697,6 +698,31 @@ orderManagement: {
approved: '已通过',
rejected: '已拒绝'
}
+ },
+ promptManagement: {
+ title: '提示词管理',
+ addPrompt: '添加提示词',
+ editPrompt: '编辑提示词',
+ promptDetail: '提示词详情',
+ inactivePrompts: '未生效提示词',
+ activePrompts: '生效提示词',
+ type: '类型',
+ selectType: '选择类型',
+ animal: '动物',
+ person: '人物',
+ general: '通用',
+ title: '标题',
+ enterTitle: '请输入提示词标题',
+ content: '内容',
+ enterContent: '请输入提示词内容',
+ referenceImage: '参考图',
+ imageTip: '支持JPG、PNG格式，大小不超过2MB',
+ active: '已生效',
+ deleteConfirm: '确定要删除这个提示词吗？',
+ deleteSuccess: '删除成功',
+ saveSuccess: '保存成功',
+ activeSuccess: '已设置为生效状态',
+ inactiveSuccess: '已从生效状态移除'
}
},
diff --git a/apps/FrontendDesigner/src/router/index.js b/apps/FrontendDesigner/src/router/index.js
index 555d5b6..fea3ced 100644
--- a/apps/FrontendDesigner/src/router/index.js
+++ b/apps/FrontendDesigner/src/router/index.js
@@ -20,6 +20,7 @@ const AdminPermissionDetail = () => import('@/views/admin/AdminPermissionManagem
const AdminUserList = () => import('@/views/admin/AdminUserList.vue')
const AdminPointsManagement = () => import('@/views/admin/AdminPointsManagement.vue')
const AdminCommissionManagement = () => import('@/views/admin/AdminCommissionManagement.vue')
+const AdminPromptManagement = () => import('@/views/admin/AdminPromptManagement.vue')
const routes = [
{
@@ -178,6 +179,14 @@ const routes = [
meta: {
title: '佣金管理'
}
+ },
+ {
+ path: 'prompt-management',
+ name: 'AdminPromptManagement',
+ component: AdminPromptManagement,
+ meta: {
+ title: '提示词管理'
+ }
}
]
},
diff --git a/apps/FrontendDesigner/src/views/admin/AdminCommissionManagement.vue b/apps/FrontendDesigner/src/views/admin/AdminCommissionManagement.vue
index dc4aa55..f6854d4 100644
--- a/apps/FrontendDesigner/src/views/admin/AdminCommissionManagement.vue
+++ b/apps/FrontendDesigner/src/views/admin/AdminCommissionManagement.vue
@@ -55,12 +55,12 @@
+
+ ![]()
+
+
+
+
+
+
+
+
+ {{ getTypeLabel(prompt.type) }}
+
+ {{ prompt.title }}
+
+
+
+ {{ prompt.content }}
+
+
+
+
+
diff --git a/apps/FrontendDesigner/src/views/admin/AdminOrders copy.vue b/apps/FrontendDesigner/src/views/admin/AdminOrders copy.vue
index f5ccbab..9dbe607 100644
--- a/apps/FrontendDesigner/src/views/admin/AdminOrders copy.vue
+++ b/apps/FrontendDesigner/src/views/admin/AdminOrders copy.vue
@@ -117,9 +117,9 @@
+
+
diff --git a/apps/frontend/src/locales/index.js b/apps/frontend/src/locales/index.js
index 270b3e0..74486fa 100644
--- a/apps/frontend/src/locales/index.js
+++ b/apps/frontend/src/locales/index.js
@@ -603,6 +603,27 @@ export default {
invite_code_empty_error: '请输入邀请码',
join_waitlist: '加入候补队列',
join_waitlist_success: '已成功加入候补队列，我们将尽快与您联系',
+ // 手机号登录相关
+ phone_login_title: '手机号登录',
+ phone_login_subtitle: '使用手机号和验证码登录',
+ phone_label: '手机号',
+ phone_placeholder: '请输入您的手机号',
+ phone_empty_error: '请输入手机号',
+ phone_invalid_error: '请输入有效的手机号',
+ code_label: '验证码',
+ code_placeholder: '请输入验证码',
+ code_empty_error: '请输入验证码',
+ code_invalid_error: '请输入有效的验证码',
+ send_code: '发送验证码',
+ resend_code_after: '{}秒后重新发送',
+ phone_login_mode: '手机号登录',
+ phone_register_mode: '手机号注册',
+ phone_login_button: '登录',
+ phone_register_button: '注册',
+ phone_logging: '正在登录...',
+ phone_registering: '正在注册...',
+ phone_login_link: '使用手机号登录',
+ email_login_link: '使用邮箱登录',
},
payment: {
methods: '支付方式',
@@ -1173,6 +1194,8 @@ export default {
ipType: 'IP类型',
character: '人物',
animal: '动物',
+ modelSelection: '模型选择',
+ modelSelectPlaceholder: '请选择模型',
characterImport: '角色导入',
expression: {
title: '表情选择',
@@ -1261,6 +1284,11 @@ export default {
description: '抱歉，您访问的页面不存在或已被移除。',
goHome: '返回首页',
goBack: '返回上一页'
+ },
+ waitlist: {
+ title: '已加入候补队列',
+ description: '您的申请已提交，正在等待审核。我们将尽快处理您的请求。',
+ goHome: '返回首页'
}
},
en: {
@@ -1966,6 +1994,27 @@ export default {
invite_code_empty_error: 'Please enter invite code',
join_waitlist: 'Join Waitlist',
join_waitlist_success: 'Successfully joined the waitlist, we will contact you soon',
+ // Phone login related
+ phone_login_title: 'Phone Login',
+ phone_login_subtitle: 'Login with phone number and verification code',
+ phone_label: 'Phone Number',
+ phone_placeholder: 'Please enter your phone number',
+ phone_empty_error: 'Please enter phone number',
+ phone_invalid_error: 'Please enter a valid phone number',
+ code_label: 'Verification Code',
+ code_placeholder: 'Please enter verification code',
+ code_empty_error: 'Please enter verification code',
+ code_invalid_error: 'Please enter a valid verification code',
+ send_code: 'Send Code',
+ resend_code_after: 'Resend after {seconds}s',
+ phone_login_mode: 'Phone Login',
+ phone_register_mode: 'Phone Register',
+ phone_login_button: 'Login',
+ phone_register_button: 'Register',
+ phone_logging: 'Logging in...',
+ phone_registering: 'Registering...',
+ phone_login_link: 'Login with Phone',
+ email_login_link: 'Login with Email',
},
payment: {
methods: 'Payment Methods',
@@ -2426,6 +2475,8 @@ export default {
ipType: 'IP Type',
character: 'Character',
animal: 'Animal',
+ modelSelection: 'Model Selection',
+ modelSelectPlaceholder: 'Please select a model',
characterImport: 'Character Import',
expression: {
title: 'Expression Selection',
@@ -2514,6 +2565,11 @@ export default {
description: 'Sorry, the page you are looking for does not exist or has been removed.',
goHome: 'Go Home',
goBack: 'Go Back'
+ },
+ waitlist: {
+ title: 'Joined Waitlist',
+ description: 'Your application has been submitted and is waiting for review. We will process your request as soon as possible.',
+ goHome: 'Go Home'
}
}
},
diff --git a/apps/frontend/src/router/index.js b/apps/frontend/src/router/index.js
index f58921a..2fe01e0 100644
--- a/apps/frontend/src/router/index.js
+++ b/apps/frontend/src/router/index.js
@@ -20,6 +20,7 @@ const home = () => import('../views/home/index.vue')
const PointsRecharge = () => import('../views/PointsRecharge.vue')
const UserCenter = () => import('../views/user/index.vue')
const NotFound = () => import('../views/NotFound.vue')
+const Waitlist = () => import('../views/Waitlist.vue')
NProgress.configure({
showSpinner: false,
})// 开启轻量模式（顶部细线）
@@ -30,17 +31,17 @@ const routes = [
name: 'home',
component: home,
meta: { fullScreen: false }
- },
- {
- path: '/:pathMatch(.*)*',
- name: 'NotFound',
- component: home, // 显示404页面组件
- meta: { requiresAuth: false, keepAlive: false, fullScreen: true }
},{
path: '/login',
name: 'login',
component: Login,
- meta: { requiresGuest: true }
+ meta: { requiresGuest: true }
+ },
+ {
+ path: '/login/phone',
+ name: 'phone-login',
+ component: () => import('@/views/Login/PhoneLogin.vue'),
+ meta: { requiresGuest: true, fullScreen: true }
},
{
path: '/czhome',
@@ -51,8 +52,8 @@ const routes = [
{
path: '/register',
name: 'register',
- component: Register,
- meta: { requiresGuest: true, fullScreen: true }
+ component: Register,
+ meta: { requiresGuest: true, fullScreen: true }
},
{
path: '/forgot-password',
@@ -60,15 +61,15 @@ const routes = [
component: ForgotPassword,
meta: { requiresGuest: true, fullScreen: true }
},
+ {
+ path: '/:pathMatch(.*)*',
+ name: 'NotFound',
+ component: NotFound, // 显示404页面组件
+ meta: { requiresAuth: false, keepAlive: false, fullScreen: true }
+ }
]
//免费会员/达人会员动态路由
export const freeRoutes = [
- {
- path: '/czhome',
- name: 'czhome',
- component: ModernHome,
- meta: { requiresAuth: false, keepAlive: false }
- },
{
path: '/ui-test',
name: 'ui-test',
@@ -172,7 +173,8 @@ router.beforeEach(async (to, from, next) => {
// window.localStorage.setItem('token','123')
// return next()
// }
- if (to.meta.requiresAuth) {
+ const newto = freeRoutes.find(route => route.path == to.path)
+ if (newto?.meta?.requiresAuth) {
const token = localStorage.getItem('token')
// 如果没有 token，跳转到登录页
if (!token) {
@@ -182,8 +184,8 @@ router.beforeEach(async (to, from, next) => {
}
// 检查是否需要添加动态路由
const authStore = useAuthStore();
- const user_role = authStore.user?.user_role || '0'
- if(user_role != '0' && router.getRoutes().length <= routes.length) {
+ const user_role = authStore.user?.user_role;
+ if(user_role != '0' && router.getRoutes().length == routes.length) {
// 添加动态路由
addDynamicRoutes();
if(isDynamicRoute(to.path)) {
@@ -193,18 +195,38 @@ router.beforeEach(async (to, from, next) => {
}, 20);
return
}
+ }else if(user_role == '0'){
+ // 恢复默认路由
+ removeDynamicRoutes()
+ router.addRoute(
+ {
+ path: '/:pathMatch(.*)*',
+ name: 'NotFound',
+ component: Waitlist, // 显示404页面组件
+ meta: { requiresAuth: false, keepAlive: false, fullScreen: true }
+ }
+ )
}
next()
})
// 添加动态路由的函数
function addDynamicRoutes() {
- console.log('添加动态路由前路由数量:', router.getRoutes().length);
freeRoutes.forEach(route => {
router.addRoute(route)
})
}
-
+//恢复默认路由
+function removeDynamicRoutes() {
+ if(router.getRoutes().length == routes.length){
+ return
+ }
+ router.getRoutes().forEach(route => {
+ if (route.name && !routes.some(r => r.name === route.name)) {
+ router.removeRoute(route.name)
+ }
+ })
+}
// 检查是否是动态路由
function isDynamicRoute(path) {
return freeRoutes.some(route => {
@@ -216,11 +238,8 @@ function isDynamicRoute(path) {
}
window.Redirectlogin = () => {
localStorage.removeItem('token')
- router.getRoutes().forEach(route => {
- if (route.name && !routes.some(r => r.name === route.name)) {
- router.removeRoute(route.name)
- }
- })
+ // 恢复默认路由
+ removeDynamicRoutes()
router.push('/login')
}
router.afterEach(() => {
diff --git a/apps/frontend/src/stores/auth.js b/apps/frontend/src/stores/auth.js
index d3fe948..7c69f98 100644
--- a/apps/frontend/src/stores/auth.js
+++ b/apps/frontend/src/stores/auth.js
@@ -6,7 +6,7 @@ export const useAuthStore = defineStore('auth', () => {
// 状态定义
const user = ref({})
const token = ref('')
- // 登录方法
+ // 邮箱登录方法
const login = async (data,callback=null) => {
try {
const res = await requestUtils.common(clientApi.default.LOGIN, data)
@@ -22,6 +22,38 @@ export const useAuthStore = defineStore('auth', () => {
} finally {
}
}
+ // 手机号+验证码登录方法
+ const phoneLogin = async (data,callback=null) => {
+ try {
+ const res = await requestUtils.common(clientApi.default.PHONE_LOGIN, data)
+ if(res.code === 0){
+ let data = res.data;
+ // 登录成功，保存token和用户信息
+ loginSuccess(data,callback)
+ return res
+ }
+ } catch (error) {
+ console.error('手机号登录失败:', error)
+ throw error
+ } finally {
+ }
+ }
+ // 手机号+验证码+密码注册方法
+ const phoneRegister = async (data,callback=null) => {
+ try {
+ const res = await requestUtils.common(clientApi.default.PHONE_REGISTER, data)
+ if(res.code === 0){
+ let data = res.data;
+ // 注册成功，保存token和用户信息
+ loginSuccess(data,callback)
+ return res
+ }
+ } catch (error) {
+ console.error('手机号注册失败:', error)
+ throw error
+ } finally {
+ }
+ }
//登录成功方法
const loginSuccess = (data,callback=null) => {
token.value = data.accessToken
@@ -52,6 +84,8 @@ export const useAuthStore = defineStore('auth', () => {
user,
token,
login,
+ phoneLogin,
+ phoneRegister,
logout,
loginSuccess,
}
diff --git a/apps/frontend/src/views/Login/Login.vue b/apps/frontend/src/views/Login/Login.vue
index da442e9..8d9ded1 100644
--- a/apps/frontend/src/views/Login/Login.vue
+++ b/apps/frontend/src/views/Login/Login.vue
@@ -48,6 +48,15 @@
+
+
+
diff --git a/apps/FrontendDesigner/src/views/admin/AdminPermissionManagement/AdminPermissionManagement.vue b/apps/FrontendDesigner/src/views/admin/AdminPermissionManagement/AdminPermissionManagement.vue
index 448770d..11182d4 100644
--- a/apps/FrontendDesigner/src/views/admin/AdminPermissionManagement/AdminPermissionManagement.vue
+++ b/apps/FrontendDesigner/src/views/admin/AdminPermissionManagement/AdminPermissionManagement.vue
@@ -12,7 +12,8 @@
{{ t('admin.orders.items') }}
-
-
+
+
-
+
+
diff --git a/apps/FrontendDesigner/src/views/admin/AdminPromptManagement.vue b/apps/FrontendDesigner/src/views/admin/AdminPromptManagement.vue
new file mode 100644
index 0000000..eec26c2
--- /dev/null
+++ b/apps/FrontendDesigner/src/views/admin/AdminPromptManagement.vue
@@ -0,0 +1,656 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/FrontendDesigner/src/views/admin/AdminRoleManagement/AdminRoleDetail.vue b/apps/FrontendDesigner/src/views/admin/AdminRoleManagement/AdminRoleDetail.vue
index 11afed8..b8399fe 100644
--- a/apps/FrontendDesigner/src/views/admin/AdminRoleManagement/AdminRoleDetail.vue
+++ b/apps/FrontendDesigner/src/views/admin/AdminRoleManagement/AdminRoleDetail.vue
@@ -39,7 +39,8 @@
+
+
+
+
+
+ {{ t('admin.promptManagement.title') }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('admin.promptManagement.inactivePrompts') }}
+ {{ inactivePrompts.length }} +
+
+
+
+
+
+ {{ t('admin.promptManagement.activePrompts') }}
+ {{ activePrompts.length }} +
+
+
+
+
+
+ {{ t('admin.promptManagement.imageTip') }}
+
+
+
+
+
+
+
+
+
+
+ {{ getTypeLabel(selectedPrompt.type) }}
+
+
+
+ {{ selectedPrompt.title }}
+
+
+
+
+ {{ selectedPrompt.content }}
+
+
+ ![参考图]()
+
+
-
+
+
-
+
+
-
+
+
-
+
@@ -145,9 +145,9 @@
+
+
+
+
diff --git a/apps/FrontendDesigner/src/views/admin/AdminUsers/AdminUsers.vue b/apps/FrontendDesigner/src/views/admin/AdminUsers/AdminUsers.vue
index 2b1e8a9..ec9e559 100644
--- a/apps/FrontendDesigner/src/views/admin/AdminUsers/AdminUsers.vue
+++ b/apps/FrontendDesigner/src/views/admin/AdminUsers/AdminUsers.vue
@@ -76,9 +76,9 @@
+
diff --git a/apps/FrontendDesigner/src/views/admin/AdminUsers/index.js b/apps/FrontendDesigner/src/views/admin/AdminUsers/index.js
index 452ab08..7f59a5b 100644
--- a/apps/FrontendDesigner/src/views/admin/AdminUsers/index.js
+++ b/apps/FrontendDesigner/src/views/admin/AdminUsers/index.js
@@ -23,7 +23,8 @@ export class AdminOrders {
}
const requestUrl = {
method: adminApi.default.getUserDetail.method,
- url: adminApi.default.getUserDetail.url.replace('USERID', params.id)
+ url: adminApi.default.getUserDetail.url.replace('USERID', params.id),
+ isLoading: adminApi.default.getUserDetail.isLoading
}
return requestUtils.common(requestUrl, params);
}
@@ -35,7 +36,8 @@ export class AdminOrders {
}
const requestUrl = {
method: adminApi.default.updateUserStatus.method,
- url: (adminApi.default.updateUserStatus.url.replace('USERID', params.id))+'?'+'id='+data.id+'&status='+data.status
+ url: (adminApi.default.updateUserStatus.url.replace('USERID', params.id))+'?'+'id='+data.id+'&status='+data.status,
+ isLoading: adminApi.default.updateUserStatus.isLoading
}
return requestUtils.common(requestUrl, params);
}
@@ -47,7 +49,8 @@ export class AdminOrders {
}
const requestUrl = {
method: adminApi.default.updateUserName.method,
- url: adminApi.default.updateUserName.url.replace('USERID', params.id)
+ url: adminApi.default.updateUserName.url.replace('USERID', params.id),
+ isLoading: adminApi.default.updateUserName.isLoading
}
return requestUtils.common(requestUrl, params);
}
@@ -62,7 +65,8 @@ export class AdminOrders {
}
const requestUrl = {
method: adminApi.default.getUsersinvites.method,
- url: adminApi.default.getUsersinvites.url.replace('USERID', params.id)
+ url: adminApi.default.getUsersinvites.url.replace('USERID', params.id),
+ isLoading: adminApi.default.getUsersinvites.isLoading
}
return requestUtils.common(requestUrl, params);
}
@@ -74,7 +78,8 @@ export class AdminOrders {
}
const requestUrl = {
method: adminApi.default.changeRole.method,
- url: adminApi.default.changeRole.url.replace('USERID', params.id)
+ url: adminApi.default.changeRole.url.replace('USERID', params.id),
+ isLoading: adminApi.default.changeRole.isLoading
}
return requestUtils.common(requestUrl, params);
}
@@ -111,4 +116,136 @@ export class AdminOrders {
}
return requestUtils.common(requestUrl, params);
}
+ //创建管理员用户
+ async createAdminUser(data) {
+ let params = {
+ username: data.username || '',
+ email: data.email || '',
+ password: data.password || '',
+ fullName: data.fullName || '',
+ isActive: data.isActive !== undefined ? data.isActive : true,
+ isSuperuser: data.isSuperuser !== undefined ? data.isSuperuser : false,
+ roleIds: Array.isArray(data.roleIds) ? data.roleIds : []
+ }
+ return requestUtils.common(adminApi.default.createAdminUser, params);
+ }
+ //分页查询管理员用户列表
+ async getAdminUsersList(data) {
+ let params = {
+ username: data.username || '',
+ email: data.email || '',
+ isActive: data.isActive !== undefined ? data.isActive : true,
+ pageSize: data.pageSize || 10,
+ pageNum: data.pageNum || 1,
+ orderByColumn: data.orderByColumn || '',
+ isAsc: data.isAsc || 'asc'
+ }
+ return requestUtils.common(adminApi.default.getAdminUserList, params);
+ /**
+ 返回示例：
+ {
+ "code": 0,
+ "success": true,
+ "data": {
+ "total": 9007199254740991,
+ "rows": [
+ {
+ "id": 9007199254740991,
+ "username": "string",
+ "email": "string",
+ "fullName": "string",
+ "isActive": true,
+ "isSuperuser": true,
+ "lastLogin": "2025-12-19T05:33:51.763Z",
+ "createdAt": "2025-12-19T05:33:51.763Z",
+ "updatedAt": "2025-12-19T05:33:51.763Z",
+ "roles": [
+ {
+ "id": 9007199254740991,
+ "roleCode": "string",
+ "roleName": "string",
+ "description": "string"
+ }
+ ]
+ }
+ ],
+ "code": 1073741824,
+ "msg": "string"
+ },
+ "message": "操作成功"
+}
+ */
+ }
+ //更新管理员用户
+ async updateAdminUser(data) {
+ let params = {
+ id: data.id,
+ username: data.username,
+ email: data.email,
+ fullName: data.fullName,
+ isActive: data.isActive,
+ isSuperuser: data.isSuperuser,
+ roleIds: data.roleIds
+ }
+ return requestUtils.common(adminApi.default.updateAdminUser, params);
+ }
+ //启用/禁用用户
+ async enableDisableUser(data) {
+ let params = {
+ userId: data.id,
+ isActive : data.isActive
+ }
+ return requestUtils.common(adminApi.default.toggleAdminUserStatus, params);
+ }
+ //重置用户密码
+ async resetUserPassword(data) {
+ let params = {
+ userId: data.id,
+ newPassword: data.newPassword
+ }
+ return requestUtils.common(adminApi.default.resetAdminUserPassword, params);
+ }
+ //根据用户ID查询管理员用户详情
+ async getAdminUserDetail(data) {
+ let params = {
+ userId : data.id || ''
+ }
+ const requestUrl = {
+ method: adminApi.default.getAdminUserDetail.method,
+ url: adminApi.default.getAdminUserDetail.url.replace('USERID', params.id),
+ isLoading: adminApi.default.getAdminUserDetail.isLoading
+ }
+ return requestUtils.common(requestUrl, params);
+ /**
+ {
+ "code": 0,
+ "success": true,
+ "data": {
+ "id": 9007199254740991,
+ "username": "string",
+ "email": "string",
+ "fullName": "string",
+ "isActive": true,
+ "isSuperuser": true,
+ "lastLogin": "2025-12-19T05:36:04.270Z",
+ "createdAt": "2025-12-19T05:36:04.270Z",
+ "updatedAt": "2025-12-19T05:36:04.270Z",
+ "roles": [
+ {
+ "id": 9007199254740991,
+ "roleCode": "string",
+ "roleName": "string",
+ "description": "string"
+ }
+ ]
+ },
+ "message": "操作成功"
+}
+ */
+ }
+ //批量删除管理员用户
+ async deleteAdminUsers(data) {
+ let arr = data.ids || []
+ return requestUtils.common(adminApi.default.batchDeleteAdminUser, arr);
+ }
}
\ No newline at end of file
diff --git a/apps/frontend/package-lock.json b/apps/frontend/package-lock.json
index 10d7335..09e5180 100644
--- a/apps/frontend/package-lock.json
+++ b/apps/frontend/package-lock.json
@@ -10,7 +10,6 @@
"dependencies": {
"@element-plus/icons-vue": "^2.3.2",
"@google/genai": "^1.27.0",
- "@stripe/stripe-js": "^4.8.0",
"@types/three": "^0.180.0",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
@@ -1100,15 +1099,6 @@
"win32"
]
},
- "node_modules/@stripe/stripe-js": {
- "version": "4.10.0",
- "resolved": "https://registry.npmmirror.com/@stripe/stripe-js/-/stripe-js-4.10.0.tgz",
- "integrity": "sha512-KrMOL+sH69htCIXCaZ4JluJ35bchuCCznyPyrbN8JXSGQfwBI1SuIEMZNwvy8L8ykj29t6sa5BAAiL7fNoLZ8A==",
- "license": "MIT",
- "engines": {
- "node": ">=12.16"
- }
- },
"node_modules/@tweenjs/tween.js": {
"version": "23.1.3",
"resolved": "https://registry.npmmirror.com/@tweenjs/tween.js/-/tween.js-23.1.3.tgz",
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index 8d8b57a..5d18916 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -13,7 +13,6 @@
"dependencies": {
"@element-plus/icons-vue": "^2.3.2",
"@google/genai": "^1.27.0",
- "@stripe/stripe-js": "^4.8.0",
"@twind/core": "^1.1.3",
"@twind/preset-autoprefix": "^1.0.7",
"@twind/preset-tailwind": "^1.1.4",
@@ -24,6 +23,7 @@
"country-state-city": "^3.2.1",
"dayjs": "^1.11.13",
"element-plus": "^2.11.7",
+ "install": "^0.13.0",
"jose": "^6.1.1",
"motion-v": "^1.7.4",
"normalize.css": "^8.0.1",
diff --git a/apps/frontend/src/components/IPCard/index.vue b/apps/frontend/src/components/IPCard/index.vue
index 035e839..e49d034 100644
--- a/apps/frontend/src/components/IPCard/index.vue
+++ b/apps/frontend/src/components/IPCard/index.vue
@@ -98,7 +98,9 @@ const isTouching = ref(false);
const isControlsVisible = ref(false);
const cjimg = 'https://draft-user.s3.us-east-2.amazonaws.com/images/14f98f33-06a7-4629-a42e-d7cfbced786f';
const anTypeImg = 'https://draft-user.s3.us-east-2.amazonaws.com/images/1e82b2b6-0e5d-4a62-b65f-098952eb2f67';
-const humanTypeImg = 'https://draft-user.s3.us-east-2.amazonaws.com/images/e3e60cc7-9777-41ba-9d1e-f5ffc92e4fac.webp';
+// const humanTypeImg = 'https://draft-user.s3.us-east-2.amazonaws.com/images/e3e60cc7-9777-41ba-9d1e-f5ffc92e4fac.webp';
+// const humanTypeImg = 'https://draft-user.s3.us-east-2.amazonaws.com/images/61770f50-4b87-40a0-9297-cabda0ec6317.webp'
+const humanTypeImg = ''
const giminiServer = new GiminiServer();
// 图片比例
const imageAspectRatio = ref(9/16); // 默认比例
@@ -218,9 +220,9 @@ const handleGenerateImage = async () => {
}
if(props?.cardData?.ipType){
if(props?.cardData?.ipType==1){
- referenceImages.push(humanTypeImg);
+ humanTypeImg&&referenceImages.push(humanTypeImg);
}else{
- referenceImages.push(anTypeImg);
+ anTypeImg&&referenceImages.push(anTypeImg);
}
}
if(iscjt){
@@ -277,6 +279,8 @@ const handleGenerateImage = async () => {
保证角色所有的服饰衣服都为木头材质颜色，并且要带一些木头纹理，颜色为#e2cfb3。
`
;
+ // 角色姿势：${props.cardData.ipType==1?``:``}
+
if(props.cardData.prompt&&props.cardData.prompt.indexOf('nospec')!=-1){
prompt = '按原图生成'
referenceImages = [props.cardData.inspirationImage];
diff --git a/apps/frontend/src/components/IPCard/tsc.js b/apps/frontend/src/components/IPCard/tsc.js
index bf63c5b..9724db6 100644
--- a/apps/frontend/src/components/IPCard/tsc.js
+++ b/apps/frontend/src/components/IPCard/tsc.js
@@ -140,4 +140,18 @@
// 保证角色所有的服饰衣服都为木头材质颜色，并且要带一些木头纹理，颜色为#bfa888。
// `
+const qwentsc = `
+角色肤色和衣服材质都为纯色一种颜色如下：
+ 重点：保证角色所有的服饰衣服都为木头材质颜色，并且要带一些木头纹理，颜色为#e2cfb3
+ 一个通体由单一纯色木材雕刻而成的角色，整体呈现木质雕塑或木偶风格.
+ A full-body character portrait
+ 角色特征：Q 版萌系造型，头身比例夸张（大头小身），神态纯真，服饰设计融合童话风与复古感
+ 姿势：身体笔直，正对镜头，双臂自然下垂但略微外展，肘部微屈约15度，手掌张开、放松，掌心朝向身体内侧。
+ 双腿并拢伸直，双脚平放于地面，脚尖朝前。
+ 眼睛放大设计：眼眶结构宽大清晰，单侧眼球/眼窝直径不小于2cm（即半径≥1cm），预留足够空间用于嵌入镜头设备，眼型饱满、边缘厚实，适合3D打印安装。
+ 嘴巴小巧，表情温柔童真。
+ Style:潮玩盲盒角色设计，采用 3D 立体建模渲染，呈现细腻的质感与精致的细节。
+ Note: The image should not have white borders.
+ 去除原图中复杂的背景，只保留人物角色的主体。
+`
export const cjt = `将玩偶放在桌子玻璃正中间上，原图放在图中桌面上的相框里面[CJT_DEOTA]`
diff --git a/apps/frontend/src/components/StripePaymentForm.vue b/apps/frontend/src/components/StripePaymentForm.vue
index bbd8a87..4162542 100644
--- a/apps/frontend/src/components/StripePaymentForm.vue
+++ b/apps/frontend/src/components/StripePaymentForm.vue
@@ -61,11 +61,8 @@
import { ref, computed, onMounted, onUnmounted, watch } from 'vue'
import { ElMessage, ElLoading } from 'element-plus'
import { CreditCard, Lock } from '@element-plus/icons-vue'
-import { loadStripe } from '@stripe/stripe-js'
import { useI18n } from 'vue-i18n'
import { PayServer } from '@deotaland/utils'
-// 模拟Stripe公钥（生产环境中应该从环境变量获取）
-const STRIPE_PUBLISHABLE_KEY = import.meta.env.VITE_STRIPE_PUBLISHABLE_KEY
const { t } = useI18n()
// Props
const props = defineProps({
@@ -90,8 +87,6 @@ const props = defineProps({
// Emits
const emit = defineEmits(['payment-success', 'payment-error', 'cancel'])
-// 响应式数据
-const stripe = ref(null)
const elements = ref(null)
const cardElement = ref(null)
const processing = ref(false)
@@ -102,6 +97,7 @@ const couponSuccess = ref('')
const discountAmount = ref(0)
const taxAmount = ref(0)
const shippingAmount = ref(0)
+const isInitialized = ref(false) // 防止重复初始化
// 支付方式选项
// 仅支持 Stripe 卡片支付
@@ -115,6 +111,11 @@ const finalAmount = computed(() => {
const payServer = new PayServer()
// 初始化Stripe
const initializeStripe = async () => {
+ // 防止重复初始化
+ if (isInitialized.value) {
+ return;
+ }
+
try {
const data = await payServer.createPaymentIntent(finalAmount.value, props.currency, {
order_id: props.orderId,
@@ -122,6 +123,8 @@ const initializeStripe = async () => {
})
elements.value = data.element
cardElement.value = data.cardElement
+ isInitialized.value = true;
+
// 监听卡片验证错误
cardElement.value.on('change', ({ error }) => {
const displayError = document.getElementById('card-errors')
@@ -249,6 +252,8 @@ onUnmounted(() => {
if (elements.value) {
elements.value = null
}
+ // 重置初始化标志
+ isInitialized.value = false;
})
// 监听金额变化，重新计算费用
diff --git a/apps/frontend/src/components/auth/PhoneLoginForm.vue b/apps/frontend/src/components/auth/PhoneLoginForm.vue
new file mode 100644
index 0000000..81d96ff
--- /dev/null
+++ b/apps/frontend/src/components/auth/PhoneLoginForm.vue
@@ -0,0 +1,711 @@
+
+
+
+
+
+
+
diff --git a/apps/frontend/src/components/iPandCardLeft/index.vue b/apps/frontend/src/components/iPandCardLeft/index.vue
index 09fc183..f26c5ad 100644
--- a/apps/frontend/src/components/iPandCardLeft/index.vue
+++ b/apps/frontend/src/components/iPandCardLeft/index.vue
@@ -24,6 +24,34 @@
+
+
+
+
+
+
+
+ {{ $t('iPandCardLeft.modelSelection') }}
+
+
+
+ {{ model.name }}
+ {{ model.description }}
+
+
@@ -310,6 +338,48 @@ const handleIpTypeSelect = (type) => {
// // 忽略本地存储异常
// }
};
+
+// 模型选择相关
+const selectedModelId = ref(null);
+const availableModels = ref([
+ {
+ id: 'nano_banana',
+ name: 'Nano Banana',
+ description: '快速生成',
+ model: 'gemini-2.5-flash-image'
+ },
+ {
+ id: 'nano_banana_pro',
+ name: 'Nano Banana Pro',
+ description: '高质量生成',
+ model: 'gemini-3-pro-image-preview'
+ },
+ {
+ id: 'doubao',
+ name: 'Doubao',
+ description: '豆包模型',
+ model: 'doubao'
+ },
+ {
+ id: 'qwimg',
+ name: 'QwImg',
+ description: '通义千问',
+ model: 'ali'
+ }
+]);
+
+// 处理模型选择
+const handleModelSelect = (modelId) => {
+ selectedModelId.value = modelId;
+ const selectedModel = availableModels.value.find(m => m.id === modelId);
+ // 保存到本地存储
+ try {
+ localStorage.setItem('selectedModelId', modelId);
+ localStorage.setItem('selectedModel', JSON.stringify(selectedModel));
+ } catch (e) {
+ // 忽略本地存储异常
+ }
+};
// 新增：电子模块和草图选择相关状态
const selectedModule = ref(null); // 选中的电子模块
const selectedSketch = ref(null); // 选中的草图
@@ -323,6 +393,19 @@ const selectedSkinColor = ref(null); // 选中的肤色
const expressions = ref([]);
const init = () => {
+ // 从本地存储加载模型选择
+ try {
+ const savedModelId = localStorage.getItem('selectedModelId');
+ if (savedModelId) {
+ selectedModelId.value = savedModelId;
+ } else {
+ // 默认选择第一个模型
+ selectedModelId.value = availableModels.value[0].id;
+ }
+ } catch (e) {
+ // 如果加载失败，使用默认模型
+ selectedModelId.value = availableModels.value[0].id;
+ }
}
onMounted(() => {
init()
@@ -1008,6 +1091,27 @@ onMounted(() => {
font-weight: 500;
}
+/* 模型选择样式 */
+.model-select {
+ width: 100%;
+}
+
+.model-option {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+}
+
+.model-option .model-name {
+ font-weight: 600;
+ color: var(--el-text-color-primary);
+}
+
+.model-option .model-description {
+ font-size: 12px;
+ color: var(--el-text-color-secondary);
+}
+
/* 适应亮色主题 */
:root {
--border-color: rgba(0, 0, 0, 0.1);
@@ -1042,6 +1146,11 @@ onMounted(() => {
border-color: #A78BFA;
}
+/* 模型选择在亮色主题下的样式 */
+.model-select {
+ width: 100%;
+}
+
.logo-container {
display: flex;
align-items: center;
@@ -1099,7 +1208,7 @@ onMounted(() => {
/* 选择框样式 */
.model-select {
width: 100%;
- padding: 10px 12px;
+ /* padding: 10px 12px; */
background-color: rgba(255, 255, 255, 0.05);
border: 1px solid rgba(255, 255, 255, 0.1);
border-radius: 6px;
diff --git a/apps/frontend/src/components/layout/AppSidebar.vue b/apps/frontend/src/components/layout/AppSidebar.vue
index 93da40d..3e8231e 100644
--- a/apps/frontend/src/components/layout/AppSidebar.vue
+++ b/apps/frontend/src/components/layout/AppSidebar.vue
@@ -44,7 +44,7 @@
{{ remainingPoints }}
-->
-
+
+
+