k.zhang преди 4 години
родител
ревизия
b904543d69
променени са 7 файла, в които са добавени 36 реда и са изтрити 7 реда
  1. 1 0
      dist/notice-bar/index.js
  2. 1 0
      dist/notice-bar/index.json
  3. 17 0
      dist/notice-bar/index.wxml
  4. 1 0
      dist/notice-bar/index.wxss
  5. 2 1
      pages/shouye/shouye.json
  6. 6 6
      pages/shouye/shouye.wxml
  7. 8 0
      pages/shouye/shouye.wxss

Файловите разлики са ограничени, защото са твърде много
+ 1 - 0
dist/notice-bar/index.js


+ 1 - 0
dist/notice-bar/index.json

@@ -0,0 +1 @@
+{"component":true,"usingComponents":{"l-icon":"../icon/index"}}

+ 17 - 0
dist/notice-bar/index.wxml

@@ -0,0 +1,17 @@
+<view wx:if="{{ show }}" class="l-class l-noticebar" style="color: {{ color }}; background-color: {{ backgroundcolor }}">
+  <l-icon wx:if="{{ frontIconName }}" size="{{frontIconSize}}" color="{{frontIconColor}}" name="{{ frontIconName }}" class="l-noticebar-icon" l-class="l-icon-class"/>
+  <swiper autoplay vertical interval="{{4*speed}}" class="l-noticebar-content-wrap" wx:if="{{type=='swip'}}">
+    <block wx:for="{{swipArr}}" wx:key="swip">
+      <swiper-item data-index="{{index}}" mut-bind:tap="onSwip">
+        {{item}}
+      </swiper-item>
+    </block>
+  </swiper>
+  <view class="l-noticebar-content-wrap l-noticebar-content-wrap-view" wx:else>
+    <view class="l-noticebar-content" mut-bind:tap="handleTap" animation="{{ animationData }}">
+      <slot></slot>
+    </view>
+  </view>
+  <l-icon wx:if="{{ endIconName && !close }}" size="{{endIconSize}}" color="{{endIconColor}}" class="l-noticebar-operation" name="{{ endIconName }}" mut-bind:tap="onIconTap"/>
+  <l-icon wx:if="{{close}}" class="l-noticebar-operation" name="close" size="{{endIconSize}}" color="{{endIconColor}}" mut-bind:tap="onClose"/>
+</view>

Файловите разлики са ограничени, защото са твърде много
+ 1 - 0
dist/notice-bar/index.wxss


+ 2 - 1
pages/shouye/shouye.json

@@ -12,7 +12,8 @@
     "l-segment-item":"/dist/segment-item/index",
     "l-card":"/dist/card/index",
     "l-tag":"/dist/tag/index",
-    "l-price":"/dist/price/index"
+    "l-price":"/dist/price/index",
+    "l-notice":"/dist/notice-bar/index"
   },
   "navigationBarTitleText": "首页"
 }

+ 6 - 6
pages/shouye/shouye.wxml

@@ -12,12 +12,12 @@
   <image class="empty-icon" src="/pages/image/dd.png" ></image>
     【五件套】不锈钢盆圆形加厚加深盆子家用厨房装汤和面洗菜沥水盆
   </view>
-  <view class="contentcard">
-    一元优惠
-  </view>
-  <view class="contentcard">
-    返利
-  </view>
+<view class="containertag">
+  <l-tag plain="{{true}}" font-color="#d81e06" shape="circle">一元券</l-tag>
+  <l-tag plain="{{true}}" font-color="#d81e06" shape="circle">返利0.01元</l-tag>
+</view>
+  
+ 
   <l-price unit="券后价格¥" value="666.00" del-color="#3963bc"></l-price>
   <l-price unit="原价¥" value="666.00" deleted="{{true}}" del-color="#3963bc"></l-price>
   <view class="contentcard">

+ 8 - 0
pages/shouye/shouye.wxss

@@ -167,4 +167,12 @@
   width: 30rpx;
   height: 30rpx;
   background-color:rgb(252, 248, 248);
+}
+
+
+.containertag{
+  display: flex;
+  flex-direction: row;
+  align-items: flex-end;
+  flex-wrap: wrap;
 }