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-09-24 13:36:06 +08:00
parent 5697f042a4 65303f836d
commit 0517381728
12 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/images/components/model-goods-list/price.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 380 B

BIN
src/assets/images/custom/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
src/assets/images/layout/siderbar/tabs-carousel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

15
src/components/common/custom-module/model-icon/index.vue
View File

@ -1,8 +1,6 @@
<template>
<div class="img-outer re oh" :style="com_style">
<div :style="icon_style" class="flex-row">
<icon :name="form.icon_class" :color="form.icon_color" :size="form.icon_size"></icon>
</div>
<div class="img-outer re oh flex-row" :style="com_style">
<icon :name="form.icon_class" :color="form.icon_color" :size="form.icon_size"></icon>
</div>
</template>
<script setup lang="ts">
@ -30,15 +28,10 @@ const props = defineProps({
const form = reactive(props.value);
const com_style = computed(() => {
let style = `${ set_count() } background-color: ${ form.com_bg }; ${ radius_computer(form.bg_radius) }`;
let style = `${ set_count() } background-color: ${ form.com_bg }; ${ radius_computer(form.bg_radius) };transform: rotate(${form.icon_rotate}deg);${ padding_computer(form.icon_padding) };`;
if (form.border_show == '1') {
style += `border: ${form.border_size}px ${form.border_style} ${form.border_color};`;
style += `border: ${form.border_size}px ${form.border_style} ${form.border_color};box-sizing: border-box;`;
}
return style;
});
const icon_style = computed(() => {
let style = `transform: rotate(${form.icon_rotate}deg);${ padding_computer(form.icon_padding) };`;
if (form.icon_location == 'center') {
style += `justify-content: center;`;
} else if (form.icon_location == 'left') {

2
src/components/common/custom-module/model-icon/model-icon-style.vue
View File

@ -77,7 +77,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="边框粗细">
<slider v-model="form.border_size" :max="1000"></slider>
<slider v-model="form.border_size" :max="100"></slider>
</el-form-item>
</template>
</card-container>

2
src/components/common/custom-module/model-image/model-image-style.vue
View File

@ -51,7 +51,7 @@
<radius :value="form.border_radius" @update:value="border_radius_change"></radius>
</el-form-item>
<el-form-item label="边框粗细">
<slider v-model="form.border_size" :max="1000"></slider>
<slider v-model="form.border_size" :max="100"></slider>
</el-form-item>
</template>
</card-container>

2
src/components/common/custom-module/model-text/model-text-style.vue
View File

@ -97,7 +97,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="边框粗细">
<slider v-model="form.border_size" :max="1000"></slider>
<slider v-model="form.border_size" :max="100"></slider>
</el-form-item>
</template>
</card-container>

9
src/components/model-carousel/index.vue
View File

@ -156,8 +156,13 @@ const interval_list = ref({
const interval_types = computed(() => interval_type.value == 'card');
const swiper_Width = ref(390);
const swiper_right_2 = computed(() => ((swiper_Width.value - new_style.value.image_spacing) / 2) + 'px');
const swiper_right_3 = computed(() => ((swiper_Width.value - (new_style.value.image_spacing * 2)) / 3) + 'px');
// const swiper_right_2 = computed(() => (swiper_Width.value - new_style.value.image_spacing) / 2 + 'px');
// const swiper_right_3 = computed(() => (swiper_Width.value / 2) - 55 - (new_style.value.image_spacing * 2) + 'px');
const swiper_right_2 = computed(() => (swiper_Width.value - new_style.value.image_spacing) / 2 + (55 * 1.5 + new_style.value.image_spacing) + 'px');
const swiper_right_3 = computed(() => (swiper_Width.value - new_style.value.image_spacing) / 3 + 'px');
const negative_swiper_right_2 = computed(() => '-' + swiper_right_2.value);
const negative_swiper_right_3 = computed(() => '-' + swiper_right_3.value);
const swiperSize = ref<any>(null);

2
src/components/model-custom/components/index-default.ts
View File

@ -97,7 +97,7 @@ export const icon_com_data = {
icon_weight: 'normal',
icon_size: 12,
icon_option: 'none',
icon_location: 'left',
icon_location: 'center',
icon_padding: {
padding: 0,
padding_top: 0,

15
src/components/model-goods-list/index.vue
View File

@ -37,8 +37,8 @@
<span v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</span>
</div>
<div v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="size-10 flex">
<span class="original-price-left"></span
><span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
<img class="original-price-left" :src="form.static_img[0].url" />
<span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
>{{ item.show_original_price_symbol }}{{ item.min_original_price }}
<template v-if="is_show('original_price_unit')">
{{ item.show_original_price_unit }}
@ -72,8 +72,8 @@
<span v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</span>
</div>
<div v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="size-10 flex">
<span class="original-price-left"></span
><span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
<img class="original-price-left" :src="form.static_img[0].url" />
<span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
>{{ item.show_original_price_symbol }}{{ item.min_original_price }}
<template v-if="is_show('original_price_unit')">
{{ item.show_original_price_unit }}
@ -121,8 +121,8 @@
<span v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</span>
</div>
<div v-if="show_content && is_show('original_price') && !isEmpty(item.min_original_price)" class="size-10 flex">
<span class="original-price-left"></span
><span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
<img class="original-price-left" :src="form.static_img[0].url" />
<span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
>{{ item.show_original_price_symbol }}{{ item.min_original_price }}
<template v-if="is_show('original_price_unit')">
{{ item.show_original_price_unit }}
@ -491,9 +491,6 @@ watchEffect(() => {
}
.original-price-left {
width: 1rem;
background-image: url('/src/assets/images/components/model-goods-list/price.png');
background-size: 100% 100%;
background-repeat: no-repeat;
}
.original-price {
background-color: #ede2c5;

4
src/views/layout/components/main/default/goods-list.ts
View File

@ -1,4 +1,6 @@
import defaultCommon from './index';
import { online_url } from '@/utils';
const new_url = await online_url('/static/app/common/').then((res) => res);
interface DefaultProductList {
content: {
theme: string;
@ -15,6 +17,7 @@ interface DefaultProductList {
order_by_type: string;
order_by_rule: string;
is_show: string[];
static_img: uploadList[];
is_shop_show: string;
shop_type: string;
shop_button_text: string;
@ -68,6 +71,7 @@ const defaultProductList: DefaultProductList = {
order_by_type: '0',
order_by_rule: '0',
is_show: ['title', 'plugins_view_icon', 'price', 'sales_count', 'original_price'],
static_img: [{ id: 2, url: new_url + 'price.png', original: '角标', title: '角标', ext: '.png', type: 'img' }],
is_shop_show: '1',
shop_type: 'text',
shop_button_text: '购买',

4
src/views/layout/components/main/default/goods-tabs.ts
View File

@ -1,4 +1,6 @@
import defaultCommon from './index';
import { online_url } from '@/utils';
const new_url = await online_url('/static/app/common/').then((res) => res);
interface articleTabsList {
id: string;
title: string;
@ -22,6 +24,7 @@ interface DefaultProductList {
carousel_col: number;
tabs_list: articleTabsList[];
tabs_active_index: number;
static_img: uploadList[];
is_show: string[];
is_shop_show: string;
is_price_solo: string;
@ -83,6 +86,7 @@ const defaultProductList: DefaultProductList = {
{ id: '4', title: '测试三', img: [], desc: '简介', data_type: '0', category_ids: [], brand_ids: [], data_ids: [], number: 4, order_by_type: '0', order_by_rule: '0', data_list: [], data_auto_list: [] },
],
tabs_active_index: 0,
static_img: [{ id: 2, url: new_url + 'price.png', original: '角标', title: '角标', ext: '.png', type: 'img' }],
is_show: ['title', 'plugins_view_icon', 'price', 'sales_count', 'original_price'],
is_shop_show: '1',
is_price_solo: '1',