Merge branch 'release/v1.1.3发布'

zhaojs

2023-06-30 ba3d748f9eb65a66fca9bd74fc7796b90a0a70ae

 uniapp/components/rowGoods.vue

@@ -17,12 +17,12 @@
   
         <view class="cardbottom-container colCenEnd">
            <view class="discounts-container rowCen borderBox">
               <view class="coupon-box rowCenCen" v-if="items.couponPrice>0 || items.sourceType=='wph'">
               <view class="coupon-box rowCenCen" style="border: 1px solid #f50d49;width:auto;color: #f50d49; background: none;" v-if="items.couponPrice>0 || items.sourceType=='wph'">
                  <view>
                     {{items.sourceType=='wph'?items.discount+'折':items.couponPrice+'元券'}}
                  </view>
               </view>
               <view class="back-box rowCenCen"  v-if="items.fanli">
               <view class="back-box rowCenCen"  style="background: #f50d49;" v-if="items.fanli">
                  <view>
                     返{{items.fanli}}元
                  </view>
@@ -89,21 +89,27 @@
   
         .goodsnameinfo-content {
            width: 100%;
	
            position: relative;
            .typeIcon-content {
               width: 60rpx;
               height: 24rpx;
               margin-right: 5rpx;
               position: absolute;
               top: 7rpx;
            }
   
            .tradename {
               flex: 1;
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
               font-size: 28rpx;
               font-weight: 500;
               text-indent: 2.5em;
               color: #333333;
               text-overflow: -o-ellipsis-lastline;
               overflow: hidden;
               text-overflow: ellipsis;
               display: -webkit-box;
               -webkit-line-clamp: 2;
               line-clamp: 2;
               -webkit-box-orient: vertical;
            }
         }