bingyi/shopxo-uniapp
1
0
Fork 0
mirror of https://gitee.com/zongzhige/shopxo-uniapp.git synced 2026-07-08 22:40:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-sws' into dev-yxl

Browse Source
This commit is contained in:
于肖磊
2024-09-10 17:55:15 +08:00
parent 3046166540 3ff7d082c9
commit ed670fca51
3 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common/css/page.css
View File

@ -904,6 +904,30 @@ button[disabled].bg-grey {
font-size: 28rpx;
white-space: initial;
}
.text-line-1 {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
/* 添加标准属性以增加兼容性 */
line-clamp: 1;
-webkit-box-orient: vertical;
word-break: break-word;
overflow-wrap: break-word;
word-wrap: break-word;
}
.text-line-2 {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
/* 添加标准属性以增加兼容性 */
line-clamp: 2;
-webkit-box-orient: vertical;
word-break: break-word;
overflow-wrap: break-word;
word-wrap: break-word;
}
/**
* 文字超出部分换行
*/

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

@ -1,25 +1,25 @@
<template>
<!-- 文章列表 -->
<view class="oh" :style="style_container">
<view class="re oh" :style="style">
<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-f oh" :class="article_theme == '0' ? 'flex-row' : 'flex-col'" :key="index" :style="article_style">
<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">
<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="scaleToFill" />
<image :src="item.new_cover[0].url" class="img" :style="img_radius" mode="widthFix" />
</template>
<template v-else>
<image :src="item.data.cover" class="img" :style="img_radius" mode="scaleToFill" />
<image :src="item.data.cover" class="img" :style="img_radius" mode="widthFix" />
</template>
</template>
<view class="jc-sb flex-1" :class="article_theme == '3' ? 'flex-row align-c' : 'flex-col'" :style="article_theme !== '0' ? content_padding : ''">
<view class="title" :class="article_theme == '3' ? 'text-line-1 flex-1 flex-width' : 'text-line-2'" :style="article_name">{{ item.new_title ? item.new_title : item.data.title }}</view>
<view class="flex-row jc-sb gap-8" :class="article_theme == '3' ? 'ml-10' : 'align-e mt-10'">
<view class="flex-row jc-sb gap-8" :class="article_theme == '3' ? 'margin-left' : 'align-e margin-top'">
<view :style="article_date">{{ field_show.includes('0') ? item.data.add_time : '' }}</view>
<view v-show="field_show.includes('1')" class="flex-row align-c gap-3" :style="article_page_view">
<icon name="eye"></icon>
<iconfont name="icon-eye"></iconfont>
<view>
{{ item.data.access_count ? item.data.access_count : '16' }}
{{ item.data.access_count ? item.data.access_count : '' }}
</view>
</view>
</view>
@ -29,21 +29,21 @@
<view v-else class="oh" :class="article_theme_class">
<el-carousel :key="carousel_key" indicator-position="none" :interval="interval_time" arrow="never" :autoplay="is_roll ? true : false">
<el-carousel-item v-for="(item1, index1) in article_carousel_list" :key="index1" class="flex" :style="article_spacing">
<view v-for="(item, index) in item1.carousel_list" :key="index" class="item bg-f 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">
<template v-if="item.new_cover.length > 0">
<image :src="item.new_cover[0].url" class="img" :style="img_radius" mode="scaleToFill" />
<image :src="item.new_cover[0].url" class="img" :style="img_radius" mode="widthFix" />
</template>
<template v-else>
<image :src="item.data.cover" class="img" :style="img_radius" mode="scaleToFill" />
<image :src="item.data.cover" class="img" :style="img_radius" mode="widthFix" />
</template>
<view class="jc-sb flex-1 flex-col" :style="article_theme !== '0' ? content_padding : ''">
<view class="title text-line-2" :style="article_name">{{ item.new_title ? item.new_title : item.data.title }}</view>
<view class="flex-row jc-sb gap-8 align-e mt-10">
<view class="flex-row jc-sb gap-8 align-e margin-top">
<view :style="article_date">{{ field_show.includes('0') ? item.data.add_time : '' }}</view>
<view v-show="field_show.includes('1')" class="flex-row align-c gap-3" :style="article_page_view">
<icon name="eye"></icon>
<iconfont name="icon-eye"></iconfont>
<view>
{{ item.data.access_count ? item.data.access_count : '16' }}
{{ item.data.access_count ? item.data.access_count : '' }}
</view>
</view>
</view>
@ -62,7 +62,7 @@
props: {
value: {
type: Object,
default: () => ({}),
default: () => {},
},
isCommonStyle: {
type: Boolean,
@ -229,18 +229,19 @@
<style lang="scss" scoped>
.style1 {
.item {
width: 100%;
max-width: 100%;
.img {
height: 8.3rem;
width: 11rem;
height: 166rpx !important;
width: 220rpx;
}
}
}
.style2 {
.item {
width: calc(50% - 0.5rem);
width: calc(50% - 10rpx);
.img {
height: 18rem;
width: 100%;
height: 360rpx !important;
}
}
}
@ -249,7 +250,7 @@
width: 100%;
.img {
width: 100%;
height: 18rem;
height: 360rpx;
}
}
}

4
components/diy/diy.vue
View File

@ -1,5 +1,5 @@
<template>
<view class="ht">
<view class="ht-auto min-ht">
<componentDiyHeader></componentDiyHeader>
<view v-if="value.diy_data.length > 0" :style="diy_content_style">
<view v-for="(item, index) in value.diy_data" :key="index">
@ -54,7 +54,7 @@
componentFloatWindow,
componentTextTitle,
componentAuxiliaryBlank,
componentCarousel
componentCarousel,
},
data() {
return {