s-material-react 1.3.36 → 1.3.38

package/css/common/icon.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: 'iconfont'; /* Project id 3540782 */
-  src: url('//at.alicdn.com/t/c/font_3540782_tk2k34lqfkn.woff2?t=1679627495575') format('woff2'),
-    url('//at.alicdn.com/t/c/font_3540782_tk2k34lqfkn.woff?t=1679627495575') format('woff'),
-    url('//at.alicdn.com/t/c/font_3540782_tk2k34lqfkn.ttf?t=1679627495575') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_3540782_9656zj9vb8j.woff2?t=1684824218273') format('woff2'),
+    url('//at.alicdn.com/t/c/font_3540782_9656zj9vb8j.woff?t=1684824218273') format('woff'),
+    url('//at.alicdn.com/t/c/font_3540782_9656zj9vb8j.ttf?t=1684824218273') format('truetype');
 }
 
 .iconfont {
@@ -21,6 +21,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-backtop:before {
+  content: '\e637';
+}
+
 .icon-gonggao:before {
   content: '\e607';
 }

package/css/common/index.scss

@@ -6,3 +6,4 @@
 @import './stepNum.scss';
 @import './rateItem.scss';
 @import './noData.scss';
+@import './promotionItem';

package/css/common/promotionItem.scss

@@ -0,0 +1,87 @@
+.promotionItem {
+  display: flex;
+  min-height: 120px;
+  box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.1);
+  margin: 0 10px;
+  border-radius: 6px;
+  overflow: hidden;
+
+  .lPart {
+    flex: 1;
+    background: linear-gradient(270deg, #1a1922 0%, #383647 100%);
+    border-radius: 6px;
+    position: relative;
+    padding-top: 20px;
+
+    .round {
+      width: 24px;
+      height: 24px;
+      border-radius: 100%;
+      background-color: #ffffff;
+      position: absolute;
+      top: 50%;
+      right: -12px;
+      margin-top: -12px;
+    }
+
+    .tagBg {
+      height: 26px;
+      line-height: 26px;
+      width: 200px;
+      background: #ffffff;
+      transform: rotate(-45deg);
+      text-align: center;
+      position: absolute;
+      top: 14px;
+      left: -72px;
+
+      .txt {
+        font-size: 14px;
+        color: #394259;
+        font-weight: 500;
+        text-align: center;
+      }
+    }
+
+    .rule {
+      font-size: 24px;
+      font-weight: 500;
+      color: #ffffff;
+      text-align: center;
+      margin-bottom: 10px;
+    }
+
+    .title {
+      font-size: 14px;
+      font-weight: 400;
+      color: #ffffff;
+      text-align: center;
+      display: block;
+      margin-bottom: 2px;
+    }
+
+    .time {
+      color: rgba(255, 255, 255, 0.45);
+      font-size: 12px;
+      text-align: center;
+      display: block;
+
+      .num {
+        display: inline-block;
+      }
+    }
+  }
+
+  .rPart {
+    width: 48px;
+    padding: 4px 4px 4px 0;
+
+    .sideBorder {
+      border: 1px solid #c3c6cd;
+      border-left: none;
+      height: 100%;
+      border-top-right-radius: 6px;
+      border-bottom-right-radius: 6px;
+    }
+  }
+}

package/css/pages/basic/backTopGroup/backTop.scss

@@ -0,0 +1,4 @@
+.backTop {
+  display: flex;
+  align-items: center;
+}

package/css/pages/basic/backTopGroup/index.scss

@@ -0,0 +1 @@
+@import './backTop';

package/css/pages/cart.scss

@@ -1,11 +1,47 @@
+.cart-wrap {
+  padding: 0 10px;
+  h4 {
+    font-size: 14px;
+    text-align: left;
+    padding-top: 15px;
+    margin-bottom: 10px;
+  }
+  .cart-bg {
+    border: solid 1px #efefef;
+    background: #fff;
+    .cart-dis-title {
+      margin: 10px;
+      padding-bottom: 10px;
+      display: flex;
+      align-items: center;
+      border-bottom: 1px #efefef solid;
+      .tips {
+        background: #b79f77;
+        color: #fff;
+        font-size: 12px;
+        border-radius: 20px;
+        padding: 2px 6px;
+      }
+    }
+  }
+}
+
+.promotion-item {
+  display: grid;
+  grid-template-columns: auto 50px;
+  margin-bottom: 10px;
+  .content {
+    text-align: left;
+  }
+}
+
 .cart {
   background-color: #f6f6f6;
-
   .edit {
     text-align: right;
     border-bottom: 1px solid #e2e2e2;
     padding: 6px 0;
-    background-color: #ffffff;
+    //background-color: #fff;
 
     .btn {
       display: inline-block;
@@ -27,7 +63,7 @@
     grid-template-columns: 20px 82px 1fr;
     gap: 10px;
     border-bottom: 1px solid #e2e2e2;
-    background-color: #ffffff;
+    //background-color: #ffffff;
 
     .checkBoxWrap {
       position: relative;
@@ -98,105 +134,108 @@
   }
 
   //}
-
-  .dashboard {
-    height: 50px;
-    line-height: 50px;
-    width: 100%;
-    padding: 0 10px;
-    box-sizing: border-box;
+}
+.cart-dashboard {
+  height: 50px;
+  line-height: 50px;
+  width: 100%;
+  padding: 0 10px;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  background: rgba(255, 255, 255, 1);
+  border-top: 1px solid #eeeeee;
+  overflow: hidden;
+  position: sticky;
+  bottom: 0;
+
+  .choose {
     display: flex;
-    justify-content: space-between;
-    background: rgba(255, 255, 255, 1);
-    border-top: 1px solid #eeeeee;
-    overflow: hidden;
-    position: sticky;
-    bottom: 0;
-
-    .choose {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      .wx-checkbox-input {
-        width: 18px;
-        height: 18px;
-        border-radius: 50%;
-      }
+    justify-content: center;
+    align-items: center;
 
-      .wx-checkbox-input.wx-checkbox-input-checked {
-        background-color: #000000;
-      }
-
-      .wx-checkbox-input.wx-checkbox-input-checked::before {
-        color: #ffffff;
-        font-size: 14px;
-      }
+    .wx-checkbox-input {
+      width: 18px;
+      height: 18px;
+      border-radius: 50%;
     }
 
-    .check {
-      display: flex;
-      align-items: center;
+    .wx-checkbox-input.wx-checkbox-input-checked {
+      background-color: #000000;
+    }
 
-      .priceGroup {
-        vertical-align: top;
-        margin-right: 8px;
-        color: #a7a7a7;
-        display: grid;
-        grid-template-rows: 50% 50%;
-        height: 100%;
+    .wx-checkbox-input.wx-checkbox-input-checked::before {
+      color: #ffffff;
+      font-size: 14px;
+    }
+  }
 
-        .discount {
-          font-size: 12px;
-          display: flex;
-          align-items: center;
-        }
+  .check {
+    display: flex;
+    align-items: center;
 
-        .all {
-          font-size: 14px;
-          display: flex;
-          align-items: center;
-        }
+    .priceGroup {
+      vertical-align: top;
+      margin-right: 8px;
+      color: #a7a7a7;
+      display: grid;
+      grid-template-rows: 50% 50%;
+      height: 100%;
 
-        .data {
-          color: #000000;
-        }
+      .discount {
+        font-size: 12px;
+        display: flex;
+        align-items: center;
       }
 
-      .btn {
-        height: 40px;
-        line-height: 40px;
-        padding: 0 26px;
-        border-radius: 20px;
-        background: #000000;
+      .all {
         font-size: 14px;
-        color: #fff;
-        display: inline-block;
-        vertical-align: top;
+        display: flex;
+        align-items: center;
       }
-    }
 
-    .del {
-      .btn {
-        height: 40px;
-        line-height: 40px;
-        padding: 0 26px;
-        border-radius: 20px;
-        background: #ff1643;
-        font-size: 14px;
-        color: #fff;
-        display: inline-block;
-        vertical-align: top;
+      .data {
+        color: #000000;
       }
     }
+
+    .btn {
+      height: 40px;
+      line-height: 40px;
+      padding: 0 26px;
+      border-radius: 20px;
+      background: #000000;
+      font-size: 14px;
+      color: #fff;
+      display: inline-block;
+      vertical-align: top;
+    }
   }
-}
 
+  .del {
+    .btn {
+      margin-top: 6px;
+      height: 40px;
+      line-height: 40px;
+      padding: 0 26px;
+      border-radius: 20px;
+      background: #ff1643;
+      font-size: 14px;
+      color: #fff;
+      display: inline-block;
+      vertical-align: top;
+    }
+  }
+}
 .cart-edit {
+  position: sticky;
+  top: 0;
+  background: #fff;
   text-align: right;
+  z-index: 1000;
   border-bottom: 1px solid #e2e2e2;
   padding: 6px 0;
-  background-color: #ffffff;
+  //background-color: #ffffff;
 
   .btn {
     display: inline-block;
@@ -206,11 +245,14 @@
     padding: 10px 12px;
   }
 }
-.cart-promote-active{
+.cart-promote-active {
   margin: 0 12px;
   text-align: left;
-  padding-bottom: 10px;
-  border-bottom: 1px solid #e2e2e2;
+  padding: 10px 0;
+  border-top: 1px solid #efefef;
+  display: grid;
+  cursor: pointer;
+  grid-template-columns: auto 30px;
 }
 .cart-list-item {
   width: 100%;
@@ -220,7 +262,7 @@
   grid-template-columns: 20px 82px 1fr;
   gap: 10px;
   //
-  background-color: #ffffff;
+  //background-color: #ffffff;
   .checkBoxWrap {
     position: relative;
 

package/css/pages/classifyNavGroup/classifyNav.scss

@@ -1,20 +1,19 @@
 .classifyNav {
-    width: 100%;
-    display: grid;
-    grid-template-columns: repeat(4, 1fr);
-  
-    .classifyNavItem {
-      .img {
-        width: 60px;
-        height: 60px;
-        display: block;
-        margin: 10px auto 0;
-      }
-      .label {
-        display: block;
-        text-align: center;
-        margin-top: 6px;
-      }
+  width: 100%;
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+
+  .classifyNavItem {
+    .img {
+      width: 60px;
+      height: 60px;
+      display: block;
+      margin: 10px auto 0;
+    }
+    .label {
+      display: block;
+      text-align: center;
+      margin-top: 6px;
     }
   }
-  
+}

package/css/pages/classifyNavGroup/classifyNavOne.scss

@@ -6,15 +6,12 @@
   padding: 10px 0;
   box-sizing: border-box;
 
-
   .classifyNav-item {
-
     .classifyNav-item-img {
       margin: 0 auto 5px;
       width: 60px;
       height: 60px;
       display: block;
     }
-
   }
 }

package/css/pages/goods.scss

@@ -15,7 +15,6 @@
     margin-top: 10px;
     padding: 8px;
     position: relative;
-
   }
 
   .titleType {

package/css/pages/goodsClassifyGroup/goodsClassifyOne.scss

@@ -50,7 +50,7 @@
       z-index: 99;
       border-radius: 10px;
       overflow: hidden;
-      background-color: #FFFFFF;
+      background-color: #ffffff;
       border: 1px solid #dddddd;
 
       .goodsClassifyOne-tipWrap-handleBar {

package/css/pages/goodsClassifyGroup/goodsClassifyTwo.scss

@@ -1,5 +1,4 @@
 .goodsClassifyTwo {
-
   .goodsClassifyTwoWrap {
     display: flex;
 

package/css/pages/goodsDetailGroup/GoodsDetailInfoOne.scss

@@ -2,7 +2,7 @@
   background-color: #fff;
   margin: 0 10px;
   padding: 13px;
-  border-bottom: 1px solid #EDEDED;
+  border-bottom: 1px solid #ededed;
 
   .title {
     font-size: 18px;

package/css/pages/goodsGroup/goodsSlider.scss

@@ -28,7 +28,6 @@
       box-sizing: border-box;
 
       .title {
-
       }
 
       .info {

package/css/pages/goodsGroup/goodsSlideshow.scss

@@ -36,7 +36,7 @@
     margin: 0 auto;
     border: 1px solid #000;
     overflow: hidden;
-    background: #FFFFFF;
+    background: #ffffff;
 
     &.active {
       transform: scale(1);
@@ -77,13 +77,12 @@
       line-height: 40px;
       background: #000;
       border-radius: 100px;
-      color: #FFFFFF;
+      color: #ffffff;
       text-align: center;
       font-size: 18px;
     }
 
     .adm-swiper-slide {
-
     }
   }
 }

package/css/pages/goodsList.scss

@@ -34,13 +34,38 @@
       }
     }
   }
-  .goodDetail{
+  .goodDetail {
     display: flex;
     justify-content: space-between;
     align-items: center;
+    height: 25px;
+    line-height: 25px;
+    margin: 0 10px;
   }
-  .anticon{
-    flex-direction: row-reverse;
+  .decoration {
+    text-decoration: line-through;
+  }
+  .textBox {
+    display: flex;
+    // padding: 0 10px;
+  }
+  .boxNone {
+    display: none;
+  }
+  .mgtop {
+    margin-top: 10px;
+  }
+  .mgbtm {
+    margin-bottom: 10px;
+  }
+  .mgrf {
+    margin-left: 10px;
+    margin-right: 10px;
+    line-height: 25px;
+    height: 25px;
+  }
+  .btm {
+    height: 0;
   }
   .listWrap {
     background-color: #f6f6f6;
@@ -53,20 +78,23 @@
       .listItem {
         overflow: hidden;
         background-color: #fff;
-        padding-bottom: 12px;
-
+        // padding-bottom: 12px;
+        height: fit-content;
         .img {
           display: block;
           width: 100%;
           height: 170px;
-          margin-bottom: 5px;
+          // margin-bottom: 5px;
         }
 
         .name {
           font-size: 12px;
           display: block;
-          padding: 0 10px;
-          margin-bottom: 5px;
+          // padding: 10px;
+          height: 25px;
+          line-height: 25px;
+          margin: 0 10px;
+          // margin-bottom: 5px;
           @include titleLine(1);
         }
 
@@ -74,9 +102,7 @@
           display: block;
           color: #ff0934;
           font-size: 12px;
-          padding: 0 10px;
         }
-    
       }
     }
   }

package/css/pages/index.scss

@@ -35,13 +35,14 @@
 @import './search.scss';
 @import './searchStyleTwo.scss';
 
-
 // basic
 @import './lineGroup';
 @import './goodsGroup';
 // business
 @import './goodsClassifyGroup';
 @import './goodsDetailGroup';
+@import './marketingGroup';
+@import './basic/backTopGroup';
 
 //
 //* {
@@ -49,5 +50,5 @@
 //}
 //
 .design-container .monitor .monitor-node .actived:after {
-    //display: none;
+  display: none;
 }