xiaoe_mp_npm 0.5.42-test2 → 0.5.42-test21

package/miniprogram_dist/coupon/index.scss

@@ -0,0 +1,83 @@
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin confrim-order {
+    padding: 0 vmin(32);
+    background: #FFF;
+    .coupon-panel {
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        width: 100%;
+        height: vmin(88);
+        .coupon-left {
+            display: flex;
+            align-items: center;
+            .coupon-title {
+                margin-right: vmin(18);
+                line-height: vmin(48);
+                font-size: vmin(28);
+                color: #333;
+            }
+            .coupon-tip {
+                box-sizing: border-box;
+                height: vmin(40);
+                line-height: vmin(40);
+                padding: 0 vmin(14);
+                border-radius: vmin(4);
+                font-size: vmin(24);
+                color: #FF821F;
+                background: rgba(255, 132, 31, 0.16);
+            }
+        }
+        .coupon-right {
+            display: flex;
+            flex: 1;
+            align-items: center;
+            justify-content: flex-end;
+            .coupon-value {
+                color: #ff821f;
+                margin-right: vmin(8);
+                width: fit-content;
+                font-size: vmin(28);
+            }
+            .have-no-coupon {
+                margin-right: vmin(8);
+                line-height: vmin(44);
+                font-size: vmin(28);
+                color: #999;
+            }
+        }
+    }
+}
+
+.confrim-order {
+    @include confrim-order;
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+    $deviceWidth: 1536 !global;
+
+    .confrim-order {
+        @include confrim-order;
+    }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+    $deviceWidth: 1260 !global;
+  
+    .confrim-order {
+        @include confrim-order;
+    }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+    $deviceWidth: 1536 !global;
+
+    .confrim-order {
+        @include confrim-order;
+    }
+}

package/miniprogram_dist/coupon/index.wxss

@@ -1,5 +1,5 @@
 .confrim-order {
-  padding: 0 4.27vmin;
+  padding: 0 4.26667vmin;
   background: #FFF;
 }
 .confrim-order .coupon-panel {
@@ -8,25 +8,25 @@
   justify-content: space-between;
   align-items: center;
   width: 100%;
-  height: 11.73vmin;
+  height: 11.73333vmin;
 }
 .confrim-order .coupon-panel .coupon-left {
   display: flex;
   align-items: center;
 }
 .confrim-order .coupon-panel .coupon-left .coupon-title {
-  margin-right: 2.35vmin;
-  line-height: 6.45vmin;
-  font-size: 3.73vmin;
+  margin-right: 2.4vmin;
+  line-height: 6.4vmin;
+  font-size: 3.73333vmin;
   color: #333;
 }
 .confrim-order .coupon-panel .coupon-left .coupon-tip {
   box-sizing: border-box;
-  height: 5.28vmin;
-  line-height: 5.28vmin;
-  padding: 0 1.76vmin;
-  border-radius: 0.59vmin;
-  font-size: 3.23vmin;
+  height: 5.33333vmin;
+  line-height: 5.33333vmin;
+  padding: 0 1.86667vmin;
+  border-radius: 0.53333vmin;
+  font-size: 3.2vmin;
   color: #FF821F;
   background: rgba(255, 132, 31, 0.16);
 }
@@ -38,13 +38,169 @@
 }
 .confrim-order .coupon-panel .coupon-right .coupon-value {
   color: #ff821f;
-  margin-right: 1.07vmin;
+  margin-right: 1.06667vmin;
   width: fit-content;
-  font-size: 3.73vmin;
+  font-size: 3.73333vmin;
 }
 .confrim-order .coupon-panel .coupon-right .have-no-coupon {
-  margin-right: 1.07vmin;
-  line-height: 5.87vmin;
-  font-size: 3.73vmin;
+  margin-right: 1.06667vmin;
+  line-height: 5.86667vmin;
+  font-size: 3.73333vmin;
   color: #999;
 }
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .confrim-order {
+    padding: 0 2.08333vmin;
+    background: #FFF;
+  }
+  .confrim-order .coupon-panel {
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    height: 5.72917vmin;
+  }
+  .confrim-order .coupon-panel .coupon-left {
+    display: flex;
+    align-items: center;
+  }
+  .confrim-order .coupon-panel .coupon-left .coupon-title {
+    margin-right: 1.17188vmin;
+    line-height: 3.125vmin;
+    font-size: 1.82292vmin;
+    color: #333;
+  }
+  .confrim-order .coupon-panel .coupon-left .coupon-tip {
+    box-sizing: border-box;
+    height: 2.60417vmin;
+    line-height: 2.60417vmin;
+    padding: 0 0.91146vmin;
+    border-radius: 0.26042vmin;
+    font-size: 1.5625vmin;
+    color: #FF821F;
+    background: rgba(255, 132, 31, 0.16);
+  }
+  .confrim-order .coupon-panel .coupon-right {
+    display: flex;
+    flex: 1;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  .confrim-order .coupon-panel .coupon-right .coupon-value {
+    color: #ff821f;
+    margin-right: 0.52083vmin;
+    width: fit-content;
+    font-size: 1.82292vmin;
+  }
+  .confrim-order .coupon-panel .coupon-right .have-no-coupon {
+    margin-right: 0.52083vmin;
+    line-height: 2.86458vmin;
+    font-size: 1.82292vmin;
+    color: #999;
+  }
+}
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  .confrim-order {
+    padding: 0 2.53968vmin;
+    background: #FFF;
+  }
+  .confrim-order .coupon-panel {
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    height: 6.98413vmin;
+  }
+  .confrim-order .coupon-panel .coupon-left {
+    display: flex;
+    align-items: center;
+  }
+  .confrim-order .coupon-panel .coupon-left .coupon-title {
+    margin-right: 1.42857vmin;
+    line-height: 3.80952vmin;
+    font-size: 2.22222vmin;
+    color: #333;
+  }
+  .confrim-order .coupon-panel .coupon-left .coupon-tip {
+    box-sizing: border-box;
+    height: 3.1746vmin;
+    line-height: 3.1746vmin;
+    padding: 0 1.11111vmin;
+    border-radius: 0.31746vmin;
+    font-size: 1.90476vmin;
+    color: #FF821F;
+    background: rgba(255, 132, 31, 0.16);
+  }
+  .confrim-order .coupon-panel .coupon-right {
+    display: flex;
+    flex: 1;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  .confrim-order .coupon-panel .coupon-right .coupon-value {
+    color: #ff821f;
+    margin-right: 0.63492vmin;
+    width: fit-content;
+    font-size: 2.22222vmin;
+  }
+  .confrim-order .coupon-panel .coupon-right .have-no-coupon {
+    margin-right: 0.63492vmin;
+    line-height: 3.49206vmin;
+    font-size: 2.22222vmin;
+    color: #999;
+  }
+}
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .confrim-order {
+    padding: 0 2.08333vmin;
+    background: #FFF;
+  }
+  .confrim-order .coupon-panel {
+    box-sizing: border-box;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    height: 5.72917vmin;
+  }
+  .confrim-order .coupon-panel .coupon-left {
+    display: flex;
+    align-items: center;
+  }
+  .confrim-order .coupon-panel .coupon-left .coupon-title {
+    margin-right: 1.17188vmin;
+    line-height: 3.125vmin;
+    font-size: 1.82292vmin;
+    color: #333;
+  }
+  .confrim-order .coupon-panel .coupon-left .coupon-tip {
+    box-sizing: border-box;
+    height: 2.60417vmin;
+    line-height: 2.60417vmin;
+    padding: 0 0.91146vmin;
+    border-radius: 0.26042vmin;
+    font-size: 1.5625vmin;
+    color: #FF821F;
+    background: rgba(255, 132, 31, 0.16);
+  }
+  .confrim-order .coupon-panel .coupon-right {
+    display: flex;
+    flex: 1;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  .confrim-order .coupon-panel .coupon-right .coupon-value {
+    color: #ff821f;
+    margin-right: 0.52083vmin;
+    width: fit-content;
+    font-size: 1.82292vmin;
+  }
+  .confrim-order .coupon-panel .coupon-right .have-no-coupon {
+    margin-right: 0.52083vmin;
+    line-height: 2.86458vmin;
+    font-size: 1.82292vmin;
+    color: #999;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaoe_mp_npm",
-  "version": "0.5.42-test2",
+  "version": "0.5.42-test21",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {
@@ -71,7 +71,7 @@
   },
   "dependencies": {
     "@vant/weapp": "^1.9.2",
-    "live-mp-tools": "1.2.4",
+    "live-mp-tools": "1.3.1-test2",
     "miniprogram-computed": "4.2.1",
     "mp-plugins-info-collection": "1.1.2"
   }

package/src/ConfirmOrder/components/ConfirmOrderContent/index.scss

@@ -0,0 +1,45 @@
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin confirm-order-content {
+    height: 100%;
+  
+    .confirm-main {
+      padding-bottom: vmin(150);
+      background: #f5f5f5;
+  
+      .coupon-integral-wrapper {
+        margin-bottom: vmin(16);
+      }
+    }
+}
+
+.confirm-order-content {
+    @include confirm-order-content;
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+    $deviceWidth: 1536 !global;
+
+    .confirm-order-content {
+        @include confirm-order-content;
+    }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .confirm-order-content {
+    @include confirm-order-content;
+  }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+    $deviceWidth: 1536 !global;
+
+    .confirm-order-content {
+        @include confirm-order-content;
+    }
+}

package/src/ConfirmOrder/components/ConfirmOrderContent/index.wxss

@@ -1,10 +1,51 @@
 .confirm-order-content {
   height: 100%;
 }
+
 .confirm-order-content .confirm-main {
   padding-bottom: 20vmin;
   background: #f5f5f5;
 }
+
 .confirm-order-content .confirm-main .coupon-integral-wrapper {
-  margin-bottom: 2.13vmin;
+  margin-bottom: 2.13333vmin;
+}
+
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .confirm-order-content {
+    height: 100%;
+  }
+  .confirm-order-content .confirm-main {
+    padding-bottom: 9.76562vmin;
+    background: #f5f5f5;
+  }
+  .confirm-order-content .confirm-main .coupon-integral-wrapper {
+    margin-bottom: 1.04167vmin;
+  }
+}
+
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  .confirm-order-content {
+    height: 100%;
+  }
+  .confirm-order-content .confirm-main {
+    padding-bottom: 11.90476vmin;
+    background: #f5f5f5;
+  }
+  .confirm-order-content .confirm-main .coupon-integral-wrapper {
+    margin-bottom: 1.26984vmin;
+  }
+}
+
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .confirm-order-content {
+    height: 100%;
+  }
+  .confirm-order-content .confirm-main {
+    padding-bottom: 9.76562vmin;
+    background: #f5f5f5;
+  }
+  .confirm-order-content .confirm-main .coupon-integral-wrapper {
+    margin-bottom: 1.04167vmin;
+  }
 }

package/src/ConfirmOrder/components/GoodsInfo/index.scss

@@ -0,0 +1,223 @@
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin goods-info-wrapper {
+    margin-bottom: vmin(18);
+    background: #fff;
+    .font-12{
+      font-size: vmin(24);
+    }
+  
+    .goods-info {
+      padding: vmin(32);
+  
+      .shop-title {
+        display: flex;
+        align-items: center;
+  
+        .shop-img {
+          width: vmin(32);
+          height: vmin(32);
+          margin-right: vmin(16);
+        }
+  
+        .shop-name {
+          font-size: vmin(28);
+        }
+      }
+  
+      .goods-wrapper {
+        display: flex;
+        margin-top: vmin(32);
+  
+        .goods-thumbnail {
+          position: relative;
+          flex: 0 0 vmin(180);
+          height: vmin(180);
+          width: vmin(180);
+          border-radius: vmin(8);
+          border: vmin(2) solid #e5e5e5;
+          overflow: hidden;
+  
+          .goods-type {
+            position: absolute;
+            right: vmin(8);
+            bottom: vmin(8);
+            text-size-adjust: none;
+            color: #ffffff !important;
+            padding: vmin(6);
+            border-radius: vmin(4);
+            background: rgba(0, 0, 0, 0.25);
+            font-size: vmin(20);
+            backdrop-filter: blur(vmin(24));
+            font-weight: 500;
+          }
+  
+          .svip-tag {
+            position: absolute;
+            top: 0;
+            left: 0;
+            padding: vmin(2) vmin(8);
+            background: linear-gradient(315deg, #333333 0%, #525252 68%, #333333 100%);
+            border-radius: vmin(8) 0vmin vmin(8) 0vmin;
+          }
+  
+          .svip-tag-text {
+            font-size: vmin(20);
+            text-size-adjust: none;
+            color: #ffc266;
+            // background: linear-gradient(90deg, #ffe4ad 0%, #ffc266 100%);
+            // background-clip: text;
+            // -webkit-text-fill-color: transparent;
+          }
+        }
+  
+        .goods-detail {
+          flex: 1;
+          margin-left: vmin(24);
+          display: flex;
+          flex-direction: column;
+          justify-content: space-around;
+          padding: 0;
+  
+          .goods-title {
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+            overflow: hidden;
+            word-break: break-all;
+  
+            .goods-tag {
+              margin-right: vmin(4);
+              white-space: nowrap;
+              color: #1472FF;
+              border: vmin(2) solid #1472FF;
+              padding: 0 vmin(8);
+              border-radius: vmin(4);
+              background-color: #fff;
+              top: -vmin(4);
+              position: relative;
+            }
+  
+            .goods-name {
+              font-size: vmin(28);
+            }
+          }
+  
+          .goods-specification {
+            margin-top: vmin(12);
+            height: vmin(36);
+            color: #999;
+            word-break: break-all;
+          }
+  
+          .goods-quantity {
+            display: flex;
+            justify-content: space-between;
+            align-items: flex-end;
+            margin-top: vmin(12);
+            width: 100%;
+            color: #999;
+  
+            .goods-pay-info {
+              flex-grow: 1;
+              display: flex;
+              flex-direction: column;
+            }
+  
+            .goods-limit {
+              margin-bottom: vmin(16);
+              display: flex;
+              font-size: vmin(24);
+  
+              .border-blue {
+                border: #1472FF .02rem solid;
+                color: rgba(20, 114, 255, 1);
+                padding: 0 vmin(8);
+                margin-right: vmin(8);
+                border-radius: vmin(4);
+              }
+  
+              .border-orange {
+                border: rgba(255, 120, 31, 1) vmin(2) solid;
+                color: rgba(255, 120, 31, 1);
+                padding: 0 vmin(8);
+                border-radius: vmin(4);
+              }
+            }
+  
+            .goods-price {
+              display: inline-block;
+              margin-right: vmin(8);
+              margin-bottom: 0;
+              font-size: vmin(32);
+            }
+  
+            .goods-tags {
+              display: inline-block;
+            }
+  
+            .goods-tag {
+              display: inline-block;
+              padding: vmin(2) vmin(12);
+              font-size: vmin(20);
+              border-radius: vmin(20);
+  
+              &+.goods-tag {
+                margin-left: vmin(8);
+              }
+  
+              &.marketing-tag {
+                color: #ff781f;
+                background: #fff3eb;
+              }
+  
+              &.send-friend {
+                color: #07c160;
+                border: vmin(2) solid rgba(7, 193, 96, 0.5);
+              }
+            }
+  
+            .goods-counter {
+              flex-shrink: 0;
+  
+              .goods-plus, .goods-minus {
+                background: none;
+              }
+            }
+          }
+        }
+      }
+    }
+}
+
+
+.goods-info-wrapper {
+    @include goods-info-wrapper;
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+    $deviceWidth: 1536 !global;
+
+    .goods-info-wrapper {
+        @include goods-info-wrapper;
+    }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .goods-info-wrapper {
+    @include goods-info-wrapper;
+  }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+    $deviceWidth: 1536 !global;
+
+    .goods-info-wrapper {
+        @include goods-info-wrapper;
+    }
+}