sileya-ai
/
vr-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-sws' into dev-yxl

v1.0.0
于肖磊 2024-08-28 09:31:47 +08:00
parent e45d26cb83 205429e506
commit 1a1c93c72e
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/common/upload/index.scss
View File

@ -1,6 +1,5 @@
.upload-content {
height: 57.4rem;
gap: 4.5rem;
.left-content {
width: 22.5rem;
.el-tree {

4
src/components/common/upload/index.vue
View File

@ -13,7 +13,7 @@
</div>
</template>
<div class="upload-content pa-20">
<div v-if="upload_type !== 'icon'" class="flex-row">
<div v-if="upload_type !== 'icon'" class="flex-row gap-40">
<div class="left-content">
<div class="flex-row align-c gap-10 mb-10">
<el-input v-model="search_filter" placeholder="请输入分类名称">
@ -297,7 +297,7 @@ watch(
get_tree();
// 获取附件列表
get_attachment_list();
icon_index.value = -1;
}
}

10
src/components/footer-nav/index.vue
View File

@ -4,8 +4,12 @@
<ul class="flex-row jc-sa align-c w">
<li v-for="(item, index) in footerData?.content?.nav_content" :key="index" class="flex-1 flex-col jc-c align-c gap-5" @mouseenter="is_hover = index + 1" @mouseleave="is_hover = 0">
<div v-if="footerData.content.nav_style !== '2'" class="img re">
<img class="img-item abs radius-xs animate-linear w" :class="is_hover != index + 1 ? 'active' : ''" :src="item.src[0]?.url" width="22" height="22" />
<img class="img-item abs radius-xs animate-linear w" :class="is_hover == index + 1 || index == 0 ? 'active' : ''" :src="item.src_checked[0]?.url" width="22" height="22" />
<div class="img-item abs radius-xs animate-linear w" :class="is_hover != index + 1 || (index !== 0 && is_hover != index + 1) ? 'active' : ''">
<image-empty v-model="item.src[0]" error-img-style="width:1.5rem;height:1.5rem;"></image-empty>
</div>
<div class="img-item abs radius-xs animate-linear w" :class="is_hover == index + 1 || index == 0 ? 'active' : ''">
<image-empty v-model="item.src_checked[0]" error-img-style="width:1.5rem;height:1.5rem;"></image-empty>
</div>
</div>
<span v-if="footerData.content.nav_style !== '1'" class="animate-linear size-12" :style="is_hover == index + 1 || index == 0 ? text_color_checked : default_text_color">{{ item.name }}</span>
</li>
@ -69,6 +73,8 @@ const footer_nav_event = () => {
width: 2rem;
height: 2rem;
.img-item {
width: 2.2rem;
height: 2.2rem;
opacity: 0;
&.active {
opacity: 1;

3
src/layout/components/main/default/footer-nav.ts
View File

@ -1,8 +1,7 @@
import defaultCommon from './index';
import { online_url } from '@/utils';
const new_url = online_url();
const new_url = await online_url();
interface DefaultFooterNav {
content: {
nav_style: string;

2
src/utils/index.ts
View File

@ -329,6 +329,6 @@ export const online_url = async () => {
let temp_data = await import(import.meta.env.VITE_APP_BASE_API == '/dev-api' ? '../../temp.d' : '../../temp_pro.d');
return temp_data.default.temp_attachment_host + '/static/app/tabbar/';
} else {
return (await get_cookie('temp_attachment_host')) + '/static/app/tabbar/';
return get_cookie('attachment_host') + '/static/app/tabbar/';
}
};

1
vite.config.ts
View File

@ -79,6 +79,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
// 构建配置
build: {
target: 'esnext',
// 打包不压缩图片为base64
assetsInlineLimit: 0,
// 混淆器设置