From 577087f7668d3a31c26351e53818081ee10a0270 Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Tue, 8 Aug 2023 17:13:14 +0800
Subject: [PATCH] 团购优化

---
 components/diy_public/diy_public.wxml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/diy_public/diy_public.wxml b/components/diy_public/diy_public.wxml
index 5afa016..aa9b237 100644
--- a/components/diy_public/diy_public.wxml
+++ b/components/diy_public/diy_public.wxml
@@ -98,12 +98,12 @@
                 </block>
               </view>
               <view class="ellipsis-2 new_item1_goods_name" style="{{'height:88rpx;font-size:24rpx; '+ (prom_type==2 ? 'margin-bottom:10rpx;':'')  + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view>
-              <view class="buy_box fs24" style="{{'margin-bottom:10rpx;' +(object.text_align==2 ? ' justify-content: center;' :'' )}}" wx:if="{{prom_type==6 && (object.group_size || object.group_type)}}">
+              <view class="buy_box fs24" style="{{'margin-bottom:10rpx;'+(object.text_align==2 ? ' justify-content: center;' :'' )}}" wx:if="{{prom_type==6 && (object.group_size || object.group_type)}}">
                 <view class="mgr10 lineh24" wx:if="{{object.group_size}}">{{aitem.ct_num}}人团</view>
                 <view class="lineh24" wx:if="{{object.group_type}}">{{kttypeArr[aitem.kttype]}}团</view>
               </view>
         
-              <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price pdlf10 clor7b" style="{{'font-size:20rpx;' + 'display:block;'+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}">
+              <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price pdlf10 clor7b" style="{{'font-size:20rpx;' + 'display:block;'+ ((!object.trade_name && prom_type==2)? 'margin-top:20rpx;':'' ) +(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}">
                 <text class="{{prom_type==2 ? 'group':'' }}" wx:if="{{object.seconds_num}}">{{prom_text}}<text class="{{prom_type==2 ? '':'clor'}}">{{aitem.buy_num}}</text>件</text>
                 <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text>
               </view>
--
libgit2 0.21.4