qianggou
/
uniapp
forked from zhongyuanhaiju/uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
wuhui_zzw 2023-03-20 19:20:10 +08:00
parent 16f74331d4 526122e421
commit 7970a355ef
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,10 @@
:class="[{ 'using-hidden': goodsValue.nameLineMode == 'single' }, { 'multi-hidden': goodsValue.nameLineMode == 'multiple' }]"> :class="[{ 'using-hidden': goodsValue.nameLineMode == 'single' }, { 'multi-hidden': goodsValue.nameLineMode == 'multiple' }]">
{{ item.goods_name }} {{ item.goods_name }}
</view> </view>
<view class="give-diamond" v-if="parseFloat(item.give_diamond) > 0">
<image class="give-diamond-image" :src="$util.img('public/static/img/futures/give_diamond.png')" mode="widthFix"></image>
{{ parseFloat(item.give_diamond) }}颗钻石
</view>
<template v-if="goodsValue.tag"> <template v-if="goodsValue.tag">
<view class="tag-wrap" v-if="goodsValue.tag.value == 'label' && item.label_name"> <view class="tag-wrap" v-if="goodsValue.tag.value == 'label' && item.label_name">
<text class="hollow-tag">{{ item.label_name }}</text> <text class="hollow-tag">{{ item.label_name }}</text>
@ -106,6 +110,10 @@
:class="[{ 'using-hidden': goodsValue.nameLineMode == 'single' }, { 'multi-hidden': goodsValue.nameLineMode == 'multiple' }]"> :class="[{ 'using-hidden': goodsValue.nameLineMode == 'single' }, { 'multi-hidden': goodsValue.nameLineMode == 'multiple' }]">
{{ item.goods_name }} {{ item.goods_name }}
</view> </view>
<view class="give-diamond" v-if="parseFloat(item.give_diamond) > 0">
<image class="give-diamond-image" :src="$util.img('public/static/img/futures/give_diamond.png')" mode="widthFix"></image>
{{ parseFloat(item.give_diamond) }}颗钻石
</view>
<template v-if="goodsValue.tag"> <template v-if="goodsValue.tag">
<view class="tag-wrap" v-if="goodsValue.tag.value == 'label' && item.label_name"> <view class="tag-wrap" v-if="goodsValue.tag.value == 'label' && item.label_name">
<text class="hollow-tag">{{ item.label_name }}</text> <text class="hollow-tag">{{ item.label_name }}</text>
@ -344,6 +352,29 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.give-diamond{
width: 145rpx;
display: inline-flex;
flex-direction: row;
flex-wrap: nowrap;
align-content: center;
justify-content: center;
align-items: center;
border: 2rpx solid #f13453;
color: #f13453;
font-size: 24rpx;
height: 38rpx;
line-height: 38rpx;
padding: 0 15rpx;
border-radius: 60rpx;
//margin-left: 30rpx;
.give-diamond-image{
width: 22rpx!important;
height: 22rpx!important;
margin-right: 5rpx;
}
}
.goods-list { .goods-list {
overflow: hidden; overflow: hidden;
.goods-item { .goods-item {
@ -420,7 +451,7 @@
.buy-btn { .buy-btn {
color: #fff; color: #fff;
background-color: $base-color; background-color: #F13453;
color: var(--btn-text-color); color: var(--btn-text-color);
border-radius: 50rpx; border-radius: 50rpx;
font-size: $font-size-tag; font-size: $font-size-tag;

5
components/diy-components/diy-many-goods-list.vue
View File

@ -14,7 +14,7 @@
<view class="split-line" v-if="index > 0"></view> <view class="split-line" v-if="index > 0"></view>
<view class="cate"> <view class="cate">
<view class="name">{{ item.title }}</view> <view class="name">{{ item.title }}</view>
<view class="desc" :class="{ 'color-base-bg': index == cateIndex && item.desc }">{{ item.desc }}</view> <view class="desc" :class="{ 'color-base-bg-red': index == cateIndex && item.desc }">{{ item.desc }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -263,6 +263,9 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.color-base-bg-red {
background-color: #F13453 !important;
}
scroll-view { scroll-view {
width: 100%; width: 100%;
white-space: nowrap; white-space: nowrap;