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

Merge branch 'dev-sws' into dev-yxl

master
于肖磊 2024-09-12 14:13:56 +08:00
parent 3d7058406b 25a84d3c4e
commit 297ab5dd32
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/diy/article-list.vue
View File

@ -3,7 +3,7 @@
<view class="oh" :style="style_container">
<view class="pr oh" :style="style">
<view v-if="!['4'].includes(article_theme)" class="flex-warp" :class="article_theme_class" :style="article_theme !== '3' ? article_spacing : ''">
<view v-for="(item, index) in data_list" class="item bg-white oh" :class="article_theme == '0' ? 'flex-row' : 'flex-col'" :key="index" :style="article_style" :data-value="item.data.url" @click="url_event">
<view v-for="(item, index) in data_list" class="item bg-white oh" :class="article_theme == '0' ? 'flex-row' : 'flex-col'" :key="index" :style="article_style" :data-value="item.data.url" @tap="url_event">
<template v-if="article_theme !== '3'">
<template v-if="item.new_cover.length > 0">
<image :src="item.new_cover[0].url" class="img" :style="img_radius" mode="aspectFill" />
@ -29,7 +29,7 @@
<view v-else class="oh" :class="article_theme_class">
<swiper class="swiper" circular :autoplay="is_roll ? true : false" :interval="interval_time" :style="'height:' + carousel_height_computer">
<swiper-item v-for="(item1, index1) in article_carousel_list" :key="index1" class="flex-row" :style="article_spacing">
<view v-for="(item, index) in item1.carousel_list" :key="index" class="item bg-white oh flex-col" :style="article_style">
<view v-for="(item, index) in item1.carousel_list" :key="index" class="item bg-white oh flex-col" :style="article_style" :data-value="item.data.url" @tap="url_event">
<template v-if="item.new_cover.length > 0">
<image :src="item.new_cover[0].url" class="img" :style="img_radius + article_item_height" mode="aspectFill" />
</template>

2
components/diy/footer.vue
View File

@ -3,7 +3,7 @@
<view class="footer-nav flex-row jc-c align-c bottom-line-exclude">
<view class="footer-nav-content flex-row jc-c align-c wh" :style="style_container">
<ul class="flex-row jc-sa align-c wh padding-0">
<li v-for="(item, index) in nav_content" :key="index" class="flex-1 flex-col jc-c align-c gap-5" :data-index="index" :data-value="item.link.page" @click="url_event">
<li v-for="(item, index) in nav_content" :key="index" class="flex-1 flex-col jc-c align-c gap-5" :data-index="index" :data-value="item.link.page" @tap="url_event">
<view v-if="nav_style !== 2" class="img pr">
<view class="img-item pa border-radius-xs animate-linear" :class="is_active != index ? 'active' : ''">
<img :src="item.img[0].url" class="wh-auto ht-auto" />

2
components/diy/hot-zone.vue
View File

@ -3,7 +3,7 @@
<view ref="containerRef" class="oh container" :style="style_container">
<view ref="hotRef" class="hot pr" :style="style">
<image :src="img" class="wh-auto dis-block" mode="widthFix" @load="on_load_img" />
<view v-for="(item, index) in hot_data" :key="index" class="hot_box" :style="'left: ' + item.drag_start.x * w_scale1 * w_scale2 * 2 + 'rpx;top:' + item.drag_start.y * h_scale1 * h_scale2 * 2 + 'rpx;width: ' + Math.max(item.drag_end.width * w_scale1 * w_scale2, 1) * 2 + 'rpx;height: ' + Math.max(item.drag_end.height * h_scale1 * h_scale2, 1) * 2 + 'rpx;display: flex;'" :data-value="item.link.page" @click="url_event"></view>
<view v-for="(item, index) in hot_data" :key="index" class="hot_box" :style="'left: ' + item.drag_start.x * w_scale1 * w_scale2 * 2 + 'rpx;top:' + item.drag_start.y * h_scale1 * h_scale2 * 2 + 'rpx;width: ' + Math.max(item.drag_end.width * w_scale1 * w_scale2, 1) * 2 + 'rpx;height: ' + Math.max(item.drag_end.height * h_scale1 * h_scale2, 1) * 2 + 'rpx;display: flex;'" :data-value="item.link.page" @tap="url_event"></view>
</view>
</view>
</template>

2
components/diy/modules/tabs-view.vue
View File

@ -1,7 +1,7 @@
<template>
<!-- 文章列表 -->
<view class="tabs flex-row oh" :style="'column-gap: ' + tabs_spacing + 'px;'">
<view v-for="(item, index) in tabs_list" :key="index" class="item nowrap flex-col jc-c gap-4" :class="tabs_theme + (index == active_index ? ' active' : '')" :data-index="index" @click="handle_event">
<view v-for="(item, index) in tabs_list" :key="index" class="item nowrap flex-col jc-c gap-4" :class="tabs_theme + (index == active_index ? ' active' : '')" :data-index="index" @tap="handle_event">
<image v-if="item.img" :src="item.img[0].url" class="img" mode="widthFix" />
<view class="title" :style="index == active_index ? tabs_theme_style.tabs_title_checked : tabs_theme_style.tabs_title">{{ item.title }}</view>
<view class="desc" :style="tabs_theme_index == '1' && index == active_index ? tabs_check : ''">{{ item.desc }}</view>

2
components/diy/user-info.vue
View File

@ -11,7 +11,7 @@
</view>
</view>
<view class="flex-row align-c" :style="'gap:' + base_data.img_space * 2 + 'rpx;'">
<view v-for="(item, index) in icon_setting" :key="index" :style="{ width: base_data.img_size + 'px', height: base_data.img_size + 'px' }" :data-value="item.link.page" @click="url_event">
<view v-for="(item, index) in icon_setting" :key="index" :style="{ width: base_data.img_size + 'px', height: base_data.img_size + 'px' }" :data-value="item.link.page" @tap="url_event">
<image v-if="item.img.length > 0" :src="item.img[0].url" class="border-radius-sm" mode="scaleToFill" :style="{ width: base_data.img_size + 'px', height: base_data.img_size + 'px' }" />
<iconfont v-else :name="'icon-' + item.icon" :size="base_data.img_size + 'rpx'" color="#666"></iconfont>
</view>