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

Merge branch 'dev-yxl' of gitee.com:zongzhige/shopxo-uniapp into dev-sws

master
sws 2024-09-25 15:30:52 +08:00
parent 1409a3c2fc 0cab5023c3
commit 647e10f25b
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/diy/diy.vue
View File

@ -11,7 +11,7 @@
</view>
<view v-if="is_tabs_type" class="diy-content">
<template v-if="diy_data.length > 0">
<view v-for="(item, index) in diy_data" :key="index">
<view v-for="(item, index) in diy_data" :key="index" :style="{'margin-top': -(item.com_data.style.common_style.floating_up * 2 || 0) + 'rpx' }">
<!-- 基础组件 -->
<componentDiySearch v-if="item.key == 'search'" :value="item.com_data"></componentDiySearch>
<componentDiyCarousel v-else-if="item.key == 'carousel'" :value="item.com_data"></componentDiyCarousel>
@ -55,9 +55,7 @@
</scroll-view>
</view>
</view>
<block v-if="is_show_footer !== '0'">
<componentDiyFooter :key="key" :value="footer_data.com_data" @footer-height="footer_height_computer" @footer-click="footer_click_event"></componentDiyFooter>
</block>
<componentDiyFooter :key="key" :value="footer_data.com_data" @footer-height="footer_height_computer" @footer-click="footer_click_event"></componentDiyFooter>
</view>
</template>
@ -166,7 +164,6 @@
// 选项卡数据
tabs_data: {},
diy_data: [],
is_show_footer: '0',
tabs_home_id: this.propHomeId,
// 商品列表
goods_list: [],
@ -200,7 +197,6 @@
// tabs选项卡数据过滤
// const filter_tabs_list = this.value.tabs_data || [];
this.setData({
is_show_footer: this.value.header.com_data.content.bottom_navigation_show,
key: get_math(),
header_data: this.value.header,
footer_data: this.value.footer,

2
components/diy/goods-list.vue
View File

@ -1,5 +1,5 @@
<template>
<view class="oh" :style="style_container">
<view v-if="!isEmpty(list)" class="oh" :style="style_container">
<view :class="outer_class" :style="onter_style">
<block v-if="!['5'].includes(theme)">
<view v-for="(item, index) in list" :key="index" class="pr" :class="layout_type" :style="layout_style" :data-value="item.goods_url" @tap="url_event">

18
components/diy/seckill.vue
View File

@ -1,5 +1,5 @@
<template>
<view :style="style_container">
<view v-if="!isEmpty(list)" :style="style_container">
<view class="flex-col gap-10">
<view v-if="form.head_state == '1'" class="seckill-head flex-row align-c jc-sb oh" :style="seckill_head_style">
<view :class="['flex-row align-c', { 'gap-10': form.theme != '1', 'jc-sb wh-auto': form.theme == '2' }]">
@ -183,18 +183,6 @@
return {
form: {},
new_style: {},
default_list: {
title: '测试商品标题',
min_original_price: '41.2',
show_original_price_symbol: '￥',
show_original_price_unit: '/ 台',
min_price: '51',
show_price_symbol: '￥',
show_price_unit: '/ 台',
sales_count: '1000',
images: '',
new_cover: [],
},
time_bg: '',
slide_active_color: '',
seckill_head_style: '',
@ -263,8 +251,6 @@
if (data && !isEmpty(data.current)) {
if (!isEmpty(data.current.goods)) {
new_list = data.current.goods;
} else {
new_list = Array(4).fill(this.default_list);
}
const { status, time_first_text } = data.current.time;
this.setData({
@ -282,8 +268,6 @@
this.setData({
intervalId: setInterval(this.updateCountdown, 1000),
});
} else {
new_list = Array(4).fill(this.default_list);
}
this.setData({
time_bg: this.get_time_bg(),