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

Merge remote-tracking branch 'origin/dev-yxl' into dev-sws

v1.0.0
sws 2024-08-23 18:58:43 +08:00
parent 89757bdef8 eaa2f0e9b3
commit 9d3a3a724b
12 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/App.vue
View File

@ -1,6 +1,13 @@
<template>
<router-view />
<el-config-provider :locale="zhCn">
<router-view />
</el-config-provider>
</template>
<script setup lang="ts">
import { ElConfigProvider } from 'element-plus';
// 中文
import zhCn from 'element-plus/es/locale/lang/zh-cn';
// 英文
import en from 'element-plus/es/locale/lang/en';
</script>
<style scoped lang="scss"></style>

2
src/components/base/color-picker/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="flex-row align-c gap-12">
<el-color-picker v-model="color" show-alpha :predefine="predefine_colors" @change="color_picker_change" />
<el-color-picker v-model="color" show-alpha :predefine="predefine_colors" @change="color_picker_change" />
<icon name="reset" color="primary" size="16" :class="['c-pointer', { disable: color == defaultColor }]" @click="reset_event"></icon>
</div>
</template>

16
src/components/model-data-magic/components/product-list-show.vue
View File

@ -3,8 +3,8 @@
<div class="flex-row gap-10 align-c w h">
<template v-if="props.flex === 'row'">
<div v-for="(item, index) in split_list" :key="index" class="flex-row gap-10 half-width h">
<template v-if="!isEmpty(item.new_url)">
<image-empty v-model="item.new_url[0]" :style="contentImgRadius"></image-empty>
<template v-if="!isEmpty(item.new_cover)">
<image-empty v-model="item.new_cover[0]" :style="contentImgRadius"></image-empty>
</template>
<template v-else>
<image-empty v-model="item.images" class="img" :style="contentImgRadius"></image-empty>
@ -23,8 +23,8 @@
<template v-else-if="actived != 7 || props.num !== 1">
<div v-for="(item, index) in split_list" :key="index" :class="['flex-col gap-10 h', { 'half-width': props.num !== 1, 'w': props.num == 1 }]">
<div class="w h re">
<template v-if="!isEmpty(item.new_url)">
<image-empty v-model="item.new_url[0]" :style="contentImgRadius"></image-empty>
<template v-if="!isEmpty(item.new_cover)">
<image-empty v-model="item.new_cover[0]" :style="contentImgRadius"></image-empty>
</template>
<template v-else>
<image-empty v-model="item.images" class="img" :style="contentImgRadius"></image-empty>
@ -41,8 +41,8 @@
</template>
<template v-else>
<div v-for="(item, index) in split_list" :key="index" class="flex-col w h">
<template v-if="!isEmpty(item.new_url)">
<image-empty v-model="item.new_url[0]" :style="contentImgRadius"></image-empty>
<template v-if="!isEmpty(item.new_cover)">
<image-empty v-model="item.new_cover[0]" :style="contentImgRadius"></image-empty>
</template>
<template v-else>
<image-empty v-model="item.images" class="img" :style="contentImgRadius"></image-empty>
@ -64,8 +64,8 @@
<div class="flex-col gap-20 align-c w h">
<template v-if="props.flex === 'row'">
<div v-for="(item, index) in split_list" :key="index" class="flex-row gap-10 align-c w h">
<template v-if="!isEmpty(item.new_url)">
<image-empty v-model="item.new_url[0]" :style="contentImgRadius"></image-empty>
<template v-if="!isEmpty(item.new_cover)">
<image-empty v-model="item.new_cover[0]" :style="contentImgRadius"></image-empty>
</template>
<template v-else>
<image-empty v-model="item.images" class="img" :style="contentImgRadius"></image-empty>

2
src/components/model-data-magic/components/tabs-content.vue
View File

@ -94,7 +94,7 @@ const url_value_dialog_call_back = (item: any[]) => {
item.forEach((item: any) => {
form.value.goods_list.push({
id: get_math(),
new_url: [],
new_cover: [],
new_title: '',
data: item,
});

2
src/components/model-data-magic/index.vue
View File

@ -247,7 +247,7 @@ const commodity_list = (list: any[], num: number) => {
const goods_list = cloneDeep(list).map((item: any) => ({
...item.data,
title: !isEmpty(item.new_title) ? item.new_title : item.data.title,
new_url: item.new_url,
new_cover: item.new_cover,
}));
// 存储数据显示
let nav_list = [];

10
src/components/model-shop-list/index.vue
View File

@ -12,8 +12,8 @@
</template>
<template v-else>
<template v-if="!isEmpty(item)">
<template v-if="!isEmpty(item.new_url)">
<image-empty v-model="item.new_url[0]" :class="`flex-img${theme}`" :style="content_img_radius"></image-empty>
<template v-if="!isEmpty(item.new_cover)">
<image-empty v-model="item.new_cover[0]" :class="`flex-img${theme}`" :style="content_img_radius"></image-empty>
</template>
<template v-else>
<image-empty v-model="item.images" :class="`flex-img${theme}`" :style="content_img_radius"></image-empty>
@ -137,7 +137,7 @@ interface plugins_icon_data {
interface data_list {
title: string;
images: string;
new_url: string[];
new_cover: string[];
min_original_price: string;
show_original_price_symbol: string;
show_original_price_unit: string;
@ -156,7 +156,7 @@ const default_list = {
show_price_unit: '',
sales_count: '1000',
images: '',
new_url: [],
new_cover: [],
plugins_view_icon_data: []
};
const list = ref<data_list[]>([]);
@ -187,7 +187,7 @@ watchEffect(() => {
list.value = cloneDeep(form.value.data_list).map((item: any) => ({
...item.data,
title: !isEmpty(item.new_title) ? item.new_title : item.data.title,
new_url: item.new_url,
new_cover: item.new_cover,
}));
} else {
list.value = Array(4).fill(default_list);

2
src/components/model-shop-list/model-shop-list-content.vue
View File

@ -138,7 +138,7 @@ const url_value_dialog_call_back = (item: any[]) => {
item.forEach((item: any) => {
form.value.data_list.push({
id: get_math(),
new_url: [],
new_cover: [],
new_title: '',
data: item,
});

15
src/components/model-shop-tabs/model-shop-tabs-content.vue
View File

@ -178,9 +178,16 @@ const tabs_list_sort = (item: any) => {
const tabs_add = () => {
form.value.tabs_list.push({
id: get_math(),
src: 'carousel',
new_src: [],
href: {},
title: '',
img: [],
desc: '',
data_type: '0',
category: [],
data_ids: [],
number: 4,
sort: '0',
sort_rules: '0',
data_list: [],
});
};
@ -204,7 +211,7 @@ const url_value_dialog_call_back = (item: any[]) => {
item.forEach((item: any) => {
form.value.tabs_list[click_index].data_list.push({
id: get_math(),
new_url: [],
new_cover: [],
new_title: '',
data: item,
});

1
src/layout/components/main/default/custom.ts
View File

@ -1,4 +1,3 @@
import { de } from "element-plus/es/locale";
import defaultCommon from "./index";
interface defaultSearch {

1
src/layout/components/main/default/data-magic.ts
View File

@ -1,6 +1,5 @@
import { get_math } from "@/utils";
import defaultCommon from "./index";
import { tr } from "element-plus/es/locale";
interface data_magic {
start: object;
end: object;

1
src/layout/components/main/default/user-info.ts
View File

@ -1,4 +1,3 @@
import { id } from 'element-plus/es/locale';
import defaultCommon from './index';
interface DefaultUserInfo {
content: {

2
src/main.ts
View File

@ -6,8 +6,8 @@ import router from './router';
import Particles from 'vue3-particles';
import common from '@/utils/common';
import Vue3DraggableResizable from 'vue3-draggable-resizable'
//default styles
import Vue3DraggableResizable from 'vue3-draggable-resizable'
import 'vue3-draggable-resizable/dist/Vue3DraggableResizable.css'
import '@/styles/index.scss';