) => {
if(row.createtime === null) return '暂无';
@@ -147,4 +210,14 @@ onMounted(() => {
}
}
}
+.dialog-content{
+ padding: 0;
+ display: flex;
+ flex-direction: column;
+}
+.dialog-footer{
+ margin-top: 20px;
+ display: flex;
+ justify-content: flex-end;
+}
\ No newline at end of file
diff --git a/src/views/photos/index.vue b/src/views/photos/index.vue
index 3bb25e7..2edd9cb 100644
--- a/src/views/photos/index.vue
+++ b/src/views/photos/index.vue
@@ -46,9 +46,7 @@
-
-
-
+
@@ -305,19 +303,14 @@ const viteUrl = import.meta.env.VITE_API_URL;
// 图片链接格式化
const jpgFormatter = (row: any) => {
- // console.log("44444444444",row);
let newPath;
if (row?.data) {
newPath = row.data.path.replaceAll('\\', '/')
- // console.log("11111111111",newPath);
-
} else {
newPath = row.path.replaceAll('\\\\', '/')
- // console.log("333333333333",newPath);
-
}
- newPath = newPath.includes('http://8.138.171.103/') ? newPath : 'http://8.138.171.103/' + newPath
- // console.log("22222222222222222",newPath);
+ newPath = newPath.includes('http://8.138.171.103/') ? newPath : encodeURI(viteUrl + newPath)
+
return `${newPath}`;
}
@@ -461,26 +454,15 @@ const handleRemove = (file: UploadFile, uploadFiles) => {
//下载图片
const download = async(row:any) =>{
state.formData.loading = true;
- // console.log("44444444444",row);
let newPath;
if (row?.data) {
newPath = row.data.path.replaceAll('\\', '/')
- // console.log("11111111111",newPath);
-
} else {
newPath = row.path.replaceAll('\\\\', '/')
- // console.log("333333333333",newPath);
-
}
newPath = newPath.includes('http://localhost:8888/') ? newPath : viteUrl + newPath
- // console.log("22222222222222222",newPath);
try{
await downloadPhoto(newPath);
-
- ElMessage({
- message: '图片下载成功!',
- type: 'success',
- });
}catch(error){
console.error(error);
ElMessage.error('图片下载失败!')
diff --git a/src/views/service/apply/detail.vue b/src/views/service/apply/detail.vue
new file mode 100644
index 0000000..9d89b62
--- /dev/null
+++ b/src/views/service/apply/detail.vue
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
![]()
+
+
+
{{state.data.name}}
+
{{state.data.tips}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/service/apply/dialog.vue b/src/views/service/apply/dialog.vue
new file mode 100644
index 0000000..b3e2aa1
--- /dev/null
+++ b/src/views/service/apply/dialog.vue
@@ -0,0 +1,319 @@
+
+
+
+
+
+
+
diff --git a/src/views/service/apply/index.vue b/src/views/service/apply/index.vue
new file mode 100644
index 0000000..8a5a203
--- /dev/null
+++ b/src/views/service/apply/index.vue
@@ -0,0 +1,399 @@
+
+
+
+
+ 应用名称:
+
+
+
+
+ 查询
+
+
+
+
+
+ 重置
+
+
+
+
+
+ 新增应用
+
+
+
+
{{ val.title }}
+
+
+ {{ v.label }}
+
+
+ {{ val.isMore ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
{{ v.name }}
+
{{ v.tips || 'pixel.ai制图功能,开始魔法~~' }}
+
+
{{ state.filtering[0].children[Number(v.type)+1].label }}
+
{{ getDate(v.createtime) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/website/index.vue b/src/views/website/index.vue
index 2bab309..e32d4e8 100644
--- a/src/views/website/index.vue
+++ b/src/views/website/index.vue
@@ -301,7 +301,8 @@
{{ $t('message.layout.logoSetting') }}
+ :file-list="getThemeConfig.logoMini?[{name:getThemeConfig.globalTitle,url:getThemeConfig.logoMini}]:
+ []" accept='image/*' :on-remove="handleRemove">
上传文件
@@ -475,7 +476,7 @@ import commonFunction from '/@/utils/commonFunction';
import other from '/@/utils/other';
import mittBus from '/@/utils/mitt';
import { articleApi } from '/@/api/article';
-import logoMini from '/@/assets/logo-mini.svg';
+import logoMini from '/@/assets/logo.png';
const state = reactive({
isMobile: false,
@@ -643,8 +644,8 @@ const handlePreview: UploadProps['onPreview'] = (uploadFile) =>{
};
const handleRemove: UploadProps['onRemove'] = (file, uploadFiles) => {
// onWartermarkLogoMiniInput('/src/assets/logo-mini.svg');
- onWartermarkLogoMiniInput('');
uploadRef.value.clearFiles();
+ onWartermarkLogoMiniInput('');
}
// 封面基本路径
const viteUrl = import.meta.env.VITE_API_URL;
@@ -722,6 +723,8 @@ const onCopyConfigClick = () => {
// 一键恢复默认
const onResetConfigClick = () => {
Local.clear();
+ onWartermarkLogoMiniInput('');
+ uploadRef.value.clearFiles();
window.location.reload();
// @ts-ignore
Local.set('version', __NEXT_VERSION__);
diff --git a/vite.config.ts b/vite.config.ts
index d013e1c..cb2ab69 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -15,6 +15,9 @@ const alias: Record = {
'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js',
};
+// 请求映射后端路径
+const url:string = 'http://8.138.171.103';
+
const viteConfig = defineConfig((mode: ConfigEnv) => {
const env = loadEnv(mode.mode, process.cwd());
@@ -31,7 +34,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
hmr: true,
proxy: {
'/vueAdminApi': {
- target: 'http://8.138.171.103:8081',
+ target: url+':8081',
// target: 'http://8.138.175.106:8090',
// target: 'https://www.ymsc.org.cn/vueAdminApi',
ws: true,
@@ -40,7 +43,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
rewrite: (path) => path.replace(/^\/vueAdminApi/, ''),
},
'/pixelApi': {
- target: 'http://8.138.171.103:8082',
+ target: url+'/pixelApi',
ws: true,
secure: false,
changeOrigin: true,
@@ -56,13 +59,27 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
rewrite: (path) => path.replace(/^\/vueAdmin/, ''),
},
'/upload': {
- target: 'http://8.138.171.103',
+ target: url,
// target: 'http://8.138.175.106',
// target: 'https://www.ymsc.org.cn/upload',
secure: false,
ws: true,
changeOrigin: true,
},
+ '/aiupload': {
+ target: url,
+ // target: 'http://8.138.175.106',
+ // target: 'https://www.ymsc.org.cn/upload',
+ secure: false,
+ ws: true,
+ changeOrigin: true,
+ },
+ '/static': {
+ target: url,
+ secure: false,
+ ws: true,
+ changeOrigin: true,
+ },
'/gitee': {
target: 'https://gitee.com',
ws: true,