Merge branch 'feature/v1.1.5开发' into develop

zhaojs

2023-08-11 83e49ed8b1ab05dd332def0fba6c3703d1e91373

 uniapp/components/colGoods.vue

@@ -13,15 +13,16 @@
                  {{items.dtitle}}
               </view>
            </view>
				
         </view>
         <view class="goodsPrice-goodSale colCen borderBox">
            <view class="couponInfo-bar rowCen">
               <view class="couponbox rowCenCen" v-if="items.couponPrice>0 || items.faction=='w'">
               <view class="couponbox rowCenCen" style="border: 1px solid #f50d49; color: #f50d49; background: none;" v-if="items.couponPrice>0 || items.faction=='w'">
                  <view>
                     {{items.faction=='w' ?(items.discount+'折'):items.couponPrice+'元券'}}
                  </view>
               </view>
               <view class="backPrice rowCenCen">
               <view class="backPrice rowCenCen" style="background: #f50d49;">
                  <view>返{{items.fanli}}元</view>
               </view>
            </view>
@@ -42,6 +43,8 @@
                  已售{{items.monthSales}}
               </view>
            </view>
				
             <view class="shopname">{{items.shopName}}</view>
         </view>
      </view>
   </view>
@@ -52,6 +55,8 @@
      props: {
         items: Object
      },
      created(){
      },
      data() {
         return {

@@ -61,6 +66,15 @@
</script>

<style lang="scss">
   .shopname{
          font-size: 11px;
          display: flex;
          align-items: flex-start;
          width: 100%;
          color: #999999;
          margin: 2px 0;
		
   }
   .items-container {
      width: 346rpx;
      height: 100%;