Merge branch 'Xfy' of http://8.137.125.67:4000/SwtTt29/Program-mini into Xfy

pages/index/index.wxml

@@ -231,6 +231,7 @@
                     data-index="0"
                   ></image>
                   <view wx:if="{{item.supplyStatus === '预售'}}" class="promo-tag presale">预售</view>
+                  <view wx:if="{{item.supplyStatus === '现货'}}" class="promo-tag in-stock">现货</view>
                 </view>
                 <view class="product-info">
                   <view class="product-title">{{item.name}}</view>

pages/index/index.wxss

@@ -1123,6 +1123,11 @@ wx-button:not([size=mini]) {
   box-shadow: 0 2rpx 8rpx rgba(255, 107, 0, 0.3);
 }
 
+.promo-tag.in-stock {
+  background: linear-gradient(135deg, #52c41a 0%, #73d13d 100%);
+  box-shadow: 0 2rpx 8rpx rgba(82, 196, 26, 0.3);
+}
+
 .promo-tag.source {
   background: linear-gradient(135deg, #e00 0%, #ff4d4f 100%);
   box-shadow: 0 2rpx 8rpx rgba(255, 0, 0, 0.3);