代码提交

style/images.scss

@@ -0,0 +1,14 @@
+$base-path: 'https://b2c-pro-static-dev.zkthink.com/';
+
+$addDelIcon: url('#{$base-path}/static/images/delete_icon.png'); // 删除按钮图标
+
+$orderStateClock: url('#{$base-path}/static/images/icon-order-info-5.png'); // 订单状态icon-时钟
+
+$orderStateMoney: url('#{$base-path}/static/images/icon-order-info-1.png'); // 订单状态icon-金额
+
+$orderStateReturn: url('#{$base-path}/static/images/icon-order-info-2.png'); // 订单状态icon-退货
+
+$orderStateFinish: url('#{$base-path}/static/images/icon-order-info-4.png'); // 订单状态icon-已完成
+
+$orderStateCoupon: url('#{$base-path}/static/background/coupon-bg.png'); // 优惠券背景
+

style/style.scss

@@ -868,6 +868,24 @@ image {
   right: 0;
   background: #fff;
   z-index: 89;
+  .off-tip{
+    display: none;
+    background-color: rgba(0,0,0,0.5);
+    color: #fff;
+    font-size: 24rpx;
+    line-height: 60rpx;
+    text-align: center;
+  }
+  .action-cont{
+    width: 100%;
+    display: flex;
+  }
+  &.off{
+    display: block;
+    .off-tip{
+      display: block;
+    }
+  }
   //#ifdef H5
   &.screen {
     bottom: var(--window-bottom);
@@ -879,8 +897,9 @@ image {
     padding-bottom: 0;
     bottom: 0;
   }
-
   // #endif
+
+
   &.column {
     flex-direction: column;
 
@@ -931,6 +950,7 @@ image {
         position: absolute;
         right: -10rpx;
         top: 0;
+        z-index: 999;
       }
 
       .action-icon-img {
@@ -1202,10 +1222,21 @@ image {
   }
 }
 
-.uni-tabbar{
-  height: 118rpx;
-  .uni-tabbar__label{
-    font-size: 20rpx;
-    line-height: 28rpx;
+// 购物车和售后产品选择统计信息
+.select-product-settle-info {
+  @include usePadding(40, 0);
+  font-size: 28rpx;
+  transition: height .3s;
+  height: 0;
+  overflow: hidden;
+
+  .row {
+    margin: 20rpx 0;
+  }
+
+  &.show {
+    @include usePadding(40, 10);
+    border-top: 1rpx solid #E6E6E6;
+    height: 260rpx;
   }
 }