s-material-react 1.3.31 → 1.3.32

package/css/pages/goodsDetail.scss

@@ -1,27 +1,12 @@
-.GoodsDetailWrap {
-  //overflow: scroll;
-  background-color: #f6f6f6;
-  //padding-top: 12px;
-  //padding-bottom: 12px;
+.goodsDetail-topInfo {
+  background-color: #fff;
+  margin: 0 10px;
+  padding: 13px;
+  display: flex;
+  border-bottom: 1px solid #ededed;
 
-  .skeleton {
-    width: 100%;
-    height: 100vh;
-    box-sizing: border-box;
-    padding: 10px;
-  }
-
-  .topSlider {
-    margin-bottom: 10px;
-  }
-
-  .goodsDetail-topInfo {
-    background-color: #fff;
-    margin: 0 10px 12px;
-    padding: 13px;
-    display: grid;
-    grid-template-columns: 1fr 54px;
-    border-radius: 8px;
+  .lPart {
+    flex: 1;
 
     .name {
       font-size: 18px;
@@ -36,209 +21,241 @@
       font-weight: 600;
       line-height: 28px;
     }
+  }
 
-    .rPart {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      flex-direction: column;
-      border-left: 1px solid #ededed;
-      padding-left: 10px;
-
-      .icon {
-        cursor: pointer;
-        width: 21px;
-        height: 21px;
-        display: block;
-        margin: 0 auto 7px;
-      }
+  .rPart {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    border-left: 1px solid #ededed;
+    padding-left: 10px;
+    width: 54px;
+
+    .icon {
+      cursor: pointer;
+      width: 21px;
+      height: 21px;
+      display: block;
+      margin: 0 auto 7px;
+    }
 
-      .txt {
-        font-size: 12px;
-      }
+    .txt {
+      font-size: 12px;
     }
   }
+}
 
-  .goodsDetail-promotion {
-    background-color: #fff;
-    margin: 0 10px 12px;
-    padding: 13px;
-    border-radius: 8px;
-    display: grid;
-    grid-template-columns: 52px 1fr;
+.GoodsDetailWrap {
+  //overflow: scroll;
+  background-color: #f6f6f6;
+  //padding-top: 12px;
+  //padding-bottom: 12px;
+  .topSlider {
+    margin-bottom: 10px;
+  }
+}
 
-    .label {
-      font-size: 14px;
-    }
+.goodsDetail-promotion {
+  background-color: #fff;
+  margin: 0 10px;
+  padding: 13px;
+  display: grid;
+  grid-template-columns: 52px 1fr;
+  border-bottom: 1px solid #ededed;
 
-    .group {
-      display: flex;
-      flex-wrap: wrap;
-      margin: -10px -10px 0 0;
+  .label {
+    font-size: 14px;
+  }
 
-      .noPromotion {
-        line-height: 22px;
-        color: #999;
-      }
+  .group {
+    display: flex;
+    flex-wrap: wrap;
+    margin: -10px -10px 0 0;
 
-      .item {
-        font-size: 12px;
-        padding: 2px 10px;
-        background-color: #f3f3f3;
-        display: inline-block;
-        margin: 10px 10px 0 0;
-        border-radius: 20px;
-      }
+    .noPromotion {
+      line-height: 1;
+      padding-top: 14px;
+      color: #999;
+    }
+
+    .item {
+      font-size: 12px;
+      padding: 2px 10px;
+      background-color: #f3f3f3;
+      display: inline-block;
+      margin: 10px 10px 0 0;
+      border-radius: 20px;
     }
   }
+}
 
-  .goodsDetail-coupon,
-  .goodsDetail-size {
-    background-color: #fff;
-    margin: 0 10px 12px;
-    padding: 13px;
-    border-radius: 8px;
-    display: grid;
-    grid-template-columns: 52px 1fr;
-    font-size: 14px;
+.goodsDetail-coupon,
+.goodsDetail-size {
+  background-color: #fff;
+  margin: 0 10px;
+  padding: 13px;
+  display: grid;
+  grid-template-columns: 52px 1fr;
+  font-size: 14px;
+  border-bottom: 1px solid #ededed;
 
-    .info {
-      display: flex;
-      justify-content: space-between;
+  .info {
+    display: flex;
+    justify-content: space-between;
 
-      .label {
-        color: #999;
-      }
+    .label {
+      color: #999;
+    }
 
-      .icon {
-        cursor: pointer;
-        width: 14px;
-        height: 3px;
-        margin-top: 10px;
-      }
+    .icon {
+      cursor: pointer;
+      width: 14px;
+      height: 3px;
+      margin-top: 10px;
     }
   }
+}
+
+.goodsDetailHandleBar {
+  width: 100%;
+  height: 54px;
+  background-color: #ffffff;
+  position: sticky;
+  bottom: 0;
+  left: 0;
+  //top: 0;
+  box-sizing: border-box;
+  padding: 7px 10px;
+  //display: grid;
+  //grid-template-columns: 30px 40px 1fr;
+  //gap: 20px;
+  display: flex;
+
+  .txt {
+    font-size: 13px;
+    margin-top: 4px;
+  }
 
-  .goodsDetailHandleBar {
-    width: 100%;
-    height: 54px;
+  .server {
+    width: 30px;
+    margin-right: 20px;
+  }
+
+  .cart {
+    width: 40px;
+    margin-right: 20px;
     background-color: #ffffff;
-    position: sticky;
-    bottom: 0;
-    left: 0;
-    //top: 0;
-    box-sizing: border-box;
-    padding: 7px 10px;
-    display: grid;
-    grid-template-columns: 30px 40px 1fr;
-    gap: 20px;
+  }
 
-    .txt {
-      font-size: 13px;
-      margin-top: 4px;
-    }
+  .linkGroup {
+    text-align: center;
+  }
+}
 
-    .linkGroup {
-      text-align: center;
-    }
+.popup-buy-button {
+  padding: 20px 10px 0;
+  height: 40px;
+}
 
-    .btnGroup {
-      display: grid;
-      grid-template-columns: repeat(2, 1fr);
+.goods-detail-btn-group {
+  display: flex;
+  flex: 1;
 
-      .btn {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        font-size: 14px;
+  .btn {
+    flex: 1;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 14px;
 
-        &.addCart {
-          background-color: #959595;
-          color: #ffffff;
-          border-top-left-radius: 20px;
-          border-bottom-left-radius: 20px;
-        }
+    &.addCart {
+      background-color: #959595;
+      color: #ffffff;
+      border-top-left-radius: 20px;
+      border-bottom-left-radius: 20px;
+    }
 
-        &.buy {
-          background-color: #000000;
-          color: #ffffff;
-          border-top-right-radius: 20px;
-          border-bottom-right-radius: 20px;
-        }
-      }
+    &.buy {
+      background-color: #000000;
+      color: #ffffff;
+      border-top-right-radius: 20px;
+      border-bottom-right-radius: 20px;
     }
   }
+}
 
-  .goodsDetailTab {
-    background-color: #ffffff;
-    margin: 0 10px 12px;
-    border-radius: 8px;
-    overflow: hidden;
-
-    .tabs {
-      width: 100%;
-      height: 50px;
-      line-height: 50px;
-      text-align: center;
-      margin-bottom: 10px;
-      display: flex;
+.goodsDetailTab {
+  background-color: #ffffff;
+  margin: 0 10px 12px;
+  border-radius: 8px;
+  overflow: hidden;
 
-      .tabsItem {
-        flex: 1;
-        display: inline-block;
-        font-size: 16px;
-        position: relative;
+  .tabs {
+    width: 100%;
+    height: 50px;
+    line-height: 50px;
+    text-align: center;
+    margin-bottom: 10px;
+    display: flex;
 
-        &.active {
-          .line {
-            display: block;
-          }
-        }
+    .tabsItem {
+      flex: 1;
+      display: inline-block;
+      font-size: 16px;
+      position: relative;
 
+      &.active {
         .line {
-          width: 40px;
-          height: 2px;
-          background-color: #000000;
-          position: absolute;
-          bottom: 0;
-          left: 50%;
-          margin-left: -20px;
-          display: none;
+          display: block;
         }
       }
+
+      .line {
+        width: 40px;
+        height: 2px;
+        background-color: #000000;
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        margin-left: -20px;
+        display: none;
+      }
     }
   }
+}
 
-  .goodsDetail-info {
-    .mystyle {
-      width: 100% !important;
-      height: auto;
-      display: block;
-      background-size: cover !important;
-    }
+.goodsDetail-info {
+  .mystyle {
+    width: 100% !important;
+    height: auto;
+    display: block;
+    background-size: cover !important;
+  }
+
+  width: 100%;
+  background-color: #ffffff;
 
+  .ssd-module-wrap {
     width: 100%;
-    background-color: #ffffff;
 
-    .ssd-module-wrap {
+    .ssd-module {
       width: 100%;
-
-      .ssd-module {
-        width: 100%;
-        background-size: cover;
-      }
+      background-size: cover;
     }
   }
+}
 
-  .goodsDetailEvaluate {
-    padding: 0 13px;
-    .topInfo {
-      font-size: 14px;
-    }
+.goodsDetailEvaluate {
+  padding: 0 13px;
+
+  .topInfo {
+    font-size: 14px;
   }
 }
 
 .goodsDetail-coupon-popup {
+  overflow: auto;
   padding: 14px 14px 0;
 
   .stamp {
@@ -393,6 +410,7 @@
           border-radius: 4px;
           color: #a7a7a7;
           margin-bottom: 10px;
+
           &.active {
             //background: #346fc2;
             background: #000000;

package/css/pages/index.scss

@@ -20,6 +20,7 @@
 @import './addressList';
 @import './addressDetail';
 @import './placeOrder';
+@import './placeOrderGroup';
 @import './placeOrderResult';
 @import './couponList';
 @import './cart';
@@ -28,10 +29,13 @@
 @import './mineOrderEntry';
 @import './mineFunction';
 @import './paymentMode';
-@import './footprint.scss';
+@import './footprint';
 @import './collectionList';
 @import './noticeDetail';
 @import './expressinfo';
+@import './articleDetail';
+@import './search.scss';
+@import './searchStyleTwo.scss';
 //
 //* {
 //    box-sizing: border-box;

package/css/pages/mineFunction.scss

@@ -14,6 +14,8 @@
 
       .icon {
         margin-right: 12px;
+        width: 22px;
+        height: 22px;
       }
 
       .label {

package/css/pages/mineOrderEntry.scss

@@ -23,16 +23,16 @@
   }
 
   .content {
-    display: grid;
-    grid-template-columns: repeat(5, 1fr);
     height: 73px;
     text-align: center;
     padding-top: 14px;
+    display: flex;
 
     .contentItem {
+      flex: 1;
       .icon {
-        font-size: 22px !important;
-        font-weight: 500 !important;
+        width: 22px;
+        height: 22px;
         display: block;
         margin: 0 auto 7px;
       }

package/css/pages/placeOrderGroup.scss

@@ -0,0 +1,161 @@
+.placeOrder-chooseAddress {
+  background: #fff;
+  margin: 0 12px;
+  padding-bottom: 8px;
+  height: 58px;
+  border-bottom: 1px solid #dddddd;
+
+  .group {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 8px;
+    line-height: 58px;
+
+    .local {
+      width: 17px;
+      height: 16px;
+      margin-right: 7px;
+      //background-color: yellowgreen;
+      display: inline-block;
+    }
+
+    .address {
+      font-size: 14px;
+      color: #000;
+    }
+  }
+
+  .address-info {
+    width: 100%;
+    display: grid;
+    grid-template-columns: 25px auto 50px;
+
+    .left-title {
+      display: flex;
+      font-size: 14px;
+      margin: 10px 0 4px 0;
+      flex-basis: auto;
+    }
+
+    .left-padding {
+      padding-left: 5px;
+    }
+
+    .left-title-default {
+      background: #1a1922;
+      font-size: 10px;
+      color: #fff;
+      padding: 2px 4px;
+      margin-left: 5px;
+      border-radius: 5px;
+    }
+  }
+
+  .arrow {
+    width: 6px;
+    height: 10px;
+    //background-color: yellowgreen;
+  }
+}
+
+.place-order-goods {
+  margin: 12px 12px 0;
+  background: #fff;
+  border-bottom: 1px solid #dddddd;
+}
+
+.placeOrder-blcWrap {
+  margin: 0 12px;
+  padding: 12px 0;
+  background-color: #fff;
+  border-bottom: 1px solid #dddddd;
+
+  .title {
+    font-size: 16px;
+    font-weight: 500;
+    color: #333333;
+    margin-bottom: 17px;
+  }
+
+  .placeOrder-blcItem {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 17px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    .label {
+      color: #333;
+    }
+
+    .value {
+      color: #a7a7a7;
+
+      .icon {
+        width: 6px;
+        height: 10px;
+        display: inline-block;
+        //background-color: yellowgreen;
+        margin-left: 5px;
+      }
+    }
+  }
+}
+
+.placeOrderFooter {
+  background-color: #fff;
+  height: 54px;
+  line-height: 54px;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 12px;
+  box-sizing: border-box;
+  align-items: center;
+  position: sticky;
+  bottom: 0;
+
+  .price {
+    font-size: 14px;
+    color: #333333;
+  }
+
+  .btn {
+    width: 105px;
+    height: 40px;
+    line-height: 40px;
+    color: #ffffff;
+    padding: 0 12px;
+    background-color: #000;
+    text-align: center;
+    border-radius: 20px;
+  }
+}
+
+.coupon-select {
+  background-color: #fff;
+  margin: 0 12px;
+  padding: 12px 0;
+  display: grid;
+  grid-template-columns: 52px 1fr;
+  font-size: 14px;
+  border-bottom: 1px solid #dddddd;
+}
+
+.info {
+  display: flex;
+  justify-content: space-between;
+
+  .label {
+    color: #999;
+  }
+
+  .icon {
+    cursor: pointer;
+    width: 14px;
+    height: 3px;
+    margin-top: 8px;
+  }
+}

package/css/pages/search.scss

@@ -0,0 +1,15 @@
+.boxPosition {
+  position: sticky;
+  top: 0;
+  padding-top: 0 !important;
+  z-index: 99;
+}
+.weight {
+  font-weight: 600;
+}
+.italic {
+  font-style: italic;
+}
+.decoration {
+  text-decoration: underline;
+}

package/css/pages/searchStyleTwo.scss

@@ -0,0 +1,23 @@
+.boxPosition {
+  position: sticky;
+  top: 0;
+  padding-top: 0 !important;
+  z-index: 99;
+}
+.weight {
+  font-weight: 600;
+}
+.italic {
+  font-style: italic;
+}
+.decoration {
+  text-decoration: underline;
+}
+.searchBtn {
+  width: 20%;
+  height: 100%;
+}
+.btnBorderRadius {
+  border-bottom-right-radius: 20px;
+  border-top-right-radius: 20px;
+}

package/dist/common/card/index.d.ts

@@ -5,5 +5,6 @@ export interface CardItemType {
     goodsCamount: number;
     pricesetNprice?: number;
     skuName?: string;
+    skuCode?: string;
 }
-export declare const CardJsx: ({ dataPic, goodsName, goodsCamount, pricesetNprice, skuName }: CardItemType) => JSX.Element;
+export declare const CardJsx: ({ dataPic, goodsName, goodsCamount, pricesetNprice, skuName, skuCode }: CardItemType) => JSX.Element;