xiaoe_mp_npm 0.5.39 → 0.5.40-alpha2

package/miniprogram_dist/ConfirmOrder/components/GoodsInfo/index.wxss

@@ -6,43 +6,43 @@
   font-size: 3.2vmin;
 }
 .goods-info-wrapper .goods-info {
-  padding: 4.27vmin;
+  padding: 4.26667vmin;
 }
 .goods-info-wrapper .goods-info .shop-title {
   display: flex;
   align-items: center;
 }
 .goods-info-wrapper .goods-info .shop-title .shop-img {
-  width: 4.27vmin;
-  height: 4.27vmin;
-  margin-right: 2.13vmin;
+  width: 4.26667vmin;
+  height: 4.26667vmin;
+  margin-right: 2.13333vmin;
 }
 .goods-info-wrapper .goods-info .shop-title .shop-name {
-  font-size: 3.73vmin;
+  font-size: 3.73333vmin;
 }
 .goods-info-wrapper .goods-info .goods-wrapper {
   display: flex;
-  margin-top: 4.27vmin;
+  margin-top: 4.26667vmin;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-thumbnail {
   position: relative;
   flex: 0 0 24vmin;
   height: 24vmin;
-  width: 24vw;
-  border-radius: 1.07vmin;
-  border: 0.27vmin solid #e5e5e5;
+  width: 24vmin;
+  border-radius: 1.06667vmin;
+  border: 0.26667vmin solid #e5e5e5;
   overflow: hidden;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-thumbnail .goods-type {
   position: absolute;
-  right: 1.07vmin;
-  bottom: 1.07vmin;
+  right: 1.06667vmin;
+  bottom: 1.06667vmin;
   text-size-adjust: none;
   color: #ffffff !important;
   padding: 0.8vmin;
-  border-radius: 0.53vmin;
+  border-radius: 0.53333vmin;
   background: rgba(0, 0, 0, 0.25);
-  font-size: 2.67vmin;
+  font-size: 2.66667vmin;
   backdrop-filter: blur(3.2vmin);
   font-weight: 500;
 }
@@ -50,12 +50,12 @@
   position: absolute;
   top: 0;
   left: 0;
-  padding: 0.27vmin 1.07vmin;
+  padding: 0.26667vmin 1.06667vmin;
   background: linear-gradient(315deg, #333333 0%, #525252 68%, #333333 100%);
-  border-radius: 1.07vmin 0vmin 1.07vmin 0vmin;
+  border-radius: 1.06667vmin 0vmin 1.06667vmin 0vmin;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-thumbnail .svip-tag-text {
-  font-size: 2.67vmin;
+  font-size: 2.66667vmin;
   text-size-adjust: none;
   color: #ffc266;
 }
@@ -75,18 +75,18 @@
   word-break: break-all;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title .goods-tag {
-  margin-right: 0.53vmin;
+  margin-right: 0.53333vmin;
   white-space: nowrap;
   color: #1472FF;
-  border: 0.27vmin solid #1472FF;
-  padding: 0 1.07vmin;
-  border-radius: 0.53vmin;
+  border: 0.26667vmin solid #1472FF;
+  padding: 0 1.06667vmin;
+  border-radius: 0.53333vmin;
   background-color: #fff;
-  top: -0.53vmin;
+  top: -vmin(4);
   position: relative;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title .goods-name {
-  font-size: 3.73vmin;
+  font-size: 3.73333vmin;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-specification {
   margin-top: 1.6vmin;
@@ -108,40 +108,40 @@
   flex-direction: column;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-limit {
-  margin-bottom: 2.13vmin;
+  margin-bottom: 2.13333vmin;
   display: flex;
   font-size: 3.2vmin;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-limit .border-blue {
   border: #1472FF 0.02rem solid;
   color: #1472ff;
-  padding: 0 1.07vmin;
-  margin-right: 1.07vmin;
-  border-radius: 0.53vmin;
+  padding: 0 1.06667vmin;
+  margin-right: 1.06667vmin;
+  border-radius: 0.53333vmin;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-limit .border-orange {
-  border: #ff781f 0.27vmin solid;
+  border: #ff781f 0.26667vmin solid;
   color: #ff781f;
-  padding: 0 1.07vmin;
-  border-radius: 0.53vmin;
+  padding: 0 1.06667vmin;
+  border-radius: 0.53333vmin;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-price {
   display: inline-block;
-  margin-right: 1.07vmin;
+  margin-right: 1.06667vmin;
   margin-bottom: 0;
-  font-size: 4.27vmin;
+  font-size: 4.26667vmin;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tags {
   display: inline-block;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tag {
   display: inline-block;
-  padding: 0.27vmin 1.6vmin;
-  font-size: 2.67vmin;
-  border-radius: 2.67vmin;
+  padding: 0.26667vmin 1.6vmin;
+  font-size: 2.66667vmin;
+  border-radius: 2.66667vmin;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tag + .goods-tag {
-  margin-left: 1.07vmin;
+  margin-left: 1.06667vmin;
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tag.marketing-tag {
   color: #ff781f;
@@ -149,7 +149,7 @@
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tag.send-friend {
   color: #07c160;
-  border: 0.27vmin solid rgba(7, 193, 96, 0.5);
+  border: 0.26667vmin solid rgba(7, 193, 96, 0.5);
 }
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter {
   flex-shrink: 0;
@@ -158,3 +158,327 @@
 .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-minus {
   background: none;
 }
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .goods-info-wrapper {
+    margin-bottom: 1.17188vmin;
+    background: #fff;
+  }
+  .goods-info-wrapper .font-12 {
+    font-size: 1.5625vmin;
+  }
+  .goods-info-wrapper .goods-info {
+    padding: 2.08333vmin;
+  }
+  .goods-info-wrapper .goods-info .shop-title {
+    display: flex;
+    align-items: center;
+  }
+  .goods-info-wrapper .goods-info .shop-title .shop-img {
+    width: 2.08333vmin;
+    height: 2.08333vmin;
+    margin-right: 1.04167vmin;
+  }
+  .goods-info-wrapper .goods-info .shop-title .shop-name {
+    font-size: 1.82292vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper {
+    display: flex;
+    margin-top: 2.08333vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-thumbnail {
+    position: relative;
+    flex: 0 0 11.71875vmin;
+    height: 11.71875vmin;
+    width: 11.71875vmin;
+    border-radius: 0.52083vmin;
+    border: 0.13021vmin solid #e5e5e5;
+    overflow: hidden;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-thumbnail .goods-type {
+    position: absolute;
+    right: 0.52083vmin;
+    bottom: 0.52083vmin;
+    text-size-adjust: none;
+    color: #ffffff !important;
+    padding: 0.39062vmin;
+    border-radius: 0.26042vmin;
+    background: rgba(0, 0, 0, 0.25);
+    font-size: 1.30208vmin;
+    backdrop-filter: blur(1.5625vmin);
+    font-weight: 500;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-thumbnail .svip-tag {
+    position: absolute;
+    top: 0;
+    left: 0;
+    padding: 0.13021vmin 0.52083vmin;
+    background: linear-gradient(315deg, #333333 0%, #525252 68%, #333333 100%);
+    border-radius: 0.52083vmin 0vmin 0.52083vmin 0vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-thumbnail .svip-tag-text {
+    font-size: 1.30208vmin;
+    text-size-adjust: none;
+    color: #ffc266;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail {
+    flex: 1;
+    margin-left: 1.5625vmin;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    padding: 0;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+    word-break: break-all;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title .goods-tag {
+    margin-right: 0.26042vmin;
+    white-space: nowrap;
+    color: #1472FF;
+    border: 0.13021vmin solid #1472FF;
+    padding: 0 0.52083vmin;
+    border-radius: 0.26042vmin;
+    background-color: #fff;
+    top: -vmin(4);
+    position: relative;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title .goods-name {
+    font-size: 1.82292vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-specification {
+    margin-top: 0.78125vmin;
+    height: 2.34375vmin;
+    color: #999;
+    word-break: break-all;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-end;
+    margin-top: 0.78125vmin;
+    width: 100%;
+    color: #999;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-pay-info {
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-limit {
+    margin-bottom: 1.04167vmin;
+    display: flex;
+    font-size: 1.5625vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-limit .border-blue {
+    border: #1472FF 0.02rem solid;
+    color: #1472ff;
+    padding: 0 0.52083vmin;
+    margin-right: 0.52083vmin;
+    border-radius: 0.26042vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-limit .border-orange {
+    border: #ff781f 0.13021vmin solid;
+    color: #ff781f;
+    padding: 0 0.52083vmin;
+    border-radius: 0.26042vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-price {
+    display: inline-block;
+    margin-right: 0.52083vmin;
+    margin-bottom: 0;
+    font-size: 2.08333vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tags {
+    display: inline-block;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tag {
+    display: inline-block;
+    padding: 0.13021vmin 0.78125vmin;
+    font-size: 1.30208vmin;
+    border-radius: 1.30208vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tag + .goods-tag {
+    margin-left: 0.52083vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tag.marketing-tag {
+    color: #ff781f;
+    background: #fff3eb;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tag.send-friend {
+    color: #07c160;
+    border: 0.13021vmin solid rgba(7, 193, 96, 0.5);
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter {
+    flex-shrink: 0;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-plus,
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-minus {
+    background: none;
+  }
+}
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .goods-info-wrapper {
+    margin-bottom: 1.17188vmin;
+    background: #fff;
+  }
+  .goods-info-wrapper .font-12 {
+    font-size: 1.5625vmin;
+  }
+  .goods-info-wrapper .goods-info {
+    padding: 2.08333vmin;
+  }
+  .goods-info-wrapper .goods-info .shop-title {
+    display: flex;
+    align-items: center;
+  }
+  .goods-info-wrapper .goods-info .shop-title .shop-img {
+    width: 2.08333vmin;
+    height: 2.08333vmin;
+    margin-right: 1.04167vmin;
+  }
+  .goods-info-wrapper .goods-info .shop-title .shop-name {
+    font-size: 1.82292vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper {
+    display: flex;
+    margin-top: 2.08333vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-thumbnail {
+    position: relative;
+    flex: 0 0 11.71875vmin;
+    height: 11.71875vmin;
+    width: 11.71875vmin;
+    border-radius: 0.52083vmin;
+    border: 0.13021vmin solid #e5e5e5;
+    overflow: hidden;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-thumbnail .goods-type {
+    position: absolute;
+    right: 0.52083vmin;
+    bottom: 0.52083vmin;
+    text-size-adjust: none;
+    color: #ffffff !important;
+    padding: 0.39062vmin;
+    border-radius: 0.26042vmin;
+    background: rgba(0, 0, 0, 0.25);
+    font-size: 1.30208vmin;
+    backdrop-filter: blur(1.5625vmin);
+    font-weight: 500;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-thumbnail .svip-tag {
+    position: absolute;
+    top: 0;
+    left: 0;
+    padding: 0.13021vmin 0.52083vmin;
+    background: linear-gradient(315deg, #333333 0%, #525252 68%, #333333 100%);
+    border-radius: 0.52083vmin 0vmin 0.52083vmin 0vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-thumbnail .svip-tag-text {
+    font-size: 1.30208vmin;
+    text-size-adjust: none;
+    color: #ffc266;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail {
+    flex: 1;
+    margin-left: 1.5625vmin;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    padding: 0;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+    word-break: break-all;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title .goods-tag {
+    margin-right: 0.26042vmin;
+    white-space: nowrap;
+    color: #1472FF;
+    border: 0.13021vmin solid #1472FF;
+    padding: 0 0.52083vmin;
+    border-radius: 0.26042vmin;
+    background-color: #fff;
+    top: -vmin(4);
+    position: relative;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-title .goods-name {
+    font-size: 1.82292vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-specification {
+    margin-top: 0.78125vmin;
+    height: 2.34375vmin;
+    color: #999;
+    word-break: break-all;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-end;
+    margin-top: 0.78125vmin;
+    width: 100%;
+    color: #999;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-pay-info {
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-limit {
+    margin-bottom: 1.04167vmin;
+    display: flex;
+    font-size: 1.5625vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-limit .border-blue {
+    border: #1472FF 0.02rem solid;
+    color: #1472ff;
+    padding: 0 0.52083vmin;
+    margin-right: 0.52083vmin;
+    border-radius: 0.26042vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-limit .border-orange {
+    border: #ff781f 0.13021vmin solid;
+    color: #ff781f;
+    padding: 0 0.52083vmin;
+    border-radius: 0.26042vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-price {
+    display: inline-block;
+    margin-right: 0.52083vmin;
+    margin-bottom: 0;
+    font-size: 2.08333vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tags {
+    display: inline-block;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tag {
+    display: inline-block;
+    padding: 0.13021vmin 0.78125vmin;
+    font-size: 1.30208vmin;
+    border-radius: 1.30208vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tag + .goods-tag {
+    margin-left: 0.52083vmin;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tag.marketing-tag {
+    color: #ff781f;
+    background: #fff3eb;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-tag.send-friend {
+    color: #07c160;
+    border: 0.13021vmin solid rgba(7, 193, 96, 0.5);
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter {
+    flex-shrink: 0;
+  }
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-plus,
+  .goods-info-wrapper .goods-info .goods-wrapper .goods-detail .goods-quantity .goods-counter .goods-minus {
+    background: none;
+  }
+}

package/miniprogram_dist/ConfirmOrder/components/IntegralSelect/index.scss

@@ -0,0 +1,83 @@
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin integral-select {
+    padding: 0 vmin(32);
+    background-color: #fff;
+  
+    .integral-wrapper {
+      border-top: vmin(1) solid #eee;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      box-sizing: border-box;
+      background: #fff;
+      height: vmin(88);
+      .width16{
+        width:vmin(32);
+      }
+  
+      .left-text {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+  
+        .title {
+          font-size: vmin(28);
+          color: #333;
+        }
+  
+        .tips-icon {
+          width: vmin(28);
+          height: vmin(28);
+          margin-left: vmin(8);
+          color: #999;
+          padding-top: vmin(2);
+        }
+      }
+  
+      .right-text {
+        display: flex;
+        align-items: center;
+  
+        .current {
+          font-size: vmin(28);
+          color: #999;
+          margin-right: vmin(16);
+        }
+  
+        .discount {
+          font-size: vmin(28);
+          color: #ff8205;
+          margin-right: vmin(16);
+        }
+      }
+  
+      .cannot-use {
+        font-size: vmin(28);
+        color: #c8c8c8;
+      }
+    }
+}
+
+.integral-select {
+    @include integral-select;
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+    $deviceWidth: 1536 !global;
+
+    .integral-select {
+        @include integral-select;
+    }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+    $deviceWidth: 1536 !global;
+
+    .integral-select {
+        @include integral-select;
+    }
+}