xiaoe_mp_npm 0.5.42-test2 → 0.5.42-test21

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

@@ -0,0 +1,91 @@
+$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;
+    }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .integral-select {
+    @include integral-select;
+  }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+    $deviceWidth: 1536 !global;
+
+    .integral-select {
+        @include integral-select;
+    }
+}

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

@@ -1,18 +1,18 @@
 .integral-select {
-  padding: 0 4.27vmin;
+  padding: 0 4.26667vmin;
   background-color: #fff;
 }
 .integral-select .integral-wrapper {
-  border-top: 0.13vmin solid #eee;
+  border-top: 0.13333vmin solid #eee;
   display: flex;
   align-items: center;
   justify-content: space-between;
   box-sizing: border-box;
   background: #fff;
-  height: 11.73vmin;
+  height: 11.73333vmin;
 }
 .integral-select .integral-wrapper .width16 {
-  width: 4.27vmin;
+  width: 4.26667vmin;
 }
 .integral-select .integral-wrapper .left-text {
   display: flex;
@@ -20,31 +20,187 @@
   align-items: center;
 }
 .integral-select .integral-wrapper .left-text .title {
-  font-size: 3.73vmin;
+  font-size: 3.73333vmin;
   color: #333;
 }
 .integral-select .integral-wrapper .left-text .tips-icon {
-  width: 3.73vmin;
-  height: 3.73vmin;
-  margin-left: 1.07vmin;
+  width: 3.73333vmin;
+  height: 3.73333vmin;
+  margin-left: 1.06667vmin;
   color: #999;
-  padding-top: 0.27vmin;
+  padding-top: 0.26667vmin;
 }
 .integral-select .integral-wrapper .right-text {
   display: flex;
   align-items: center;
 }
 .integral-select .integral-wrapper .right-text .current {
-  font-size: 3.73vmin;
+  font-size: 3.73333vmin;
   color: #999;
-  margin-right: 2.13vmin;
+  margin-right: 2.13333vmin;
 }
 .integral-select .integral-wrapper .right-text .discount {
-  font-size: 3.73vmin;
+  font-size: 3.73333vmin;
   color: #ff8205;
-  margin-right: 2.13vmin;
+  margin-right: 2.13333vmin;
 }
 .integral-select .integral-wrapper .cannot-use {
-  font-size: 3.73vmin;
+  font-size: 3.73333vmin;
   color: #c8c8c8;
 }
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .integral-select {
+    padding: 0 2.08333vmin;
+    background-color: #fff;
+  }
+  .integral-select .integral-wrapper {
+    border-top: 0.0651vmin solid #eee;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    background: #fff;
+    height: 5.72917vmin;
+  }
+  .integral-select .integral-wrapper .width16 {
+    width: 2.08333vmin;
+  }
+  .integral-select .integral-wrapper .left-text {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+  .integral-select .integral-wrapper .left-text .title {
+    font-size: 1.82292vmin;
+    color: #333;
+  }
+  .integral-select .integral-wrapper .left-text .tips-icon {
+    width: 1.82292vmin;
+    height: 1.82292vmin;
+    margin-left: 0.52083vmin;
+    color: #999;
+    padding-top: 0.13021vmin;
+  }
+  .integral-select .integral-wrapper .right-text {
+    display: flex;
+    align-items: center;
+  }
+  .integral-select .integral-wrapper .right-text .current {
+    font-size: 1.82292vmin;
+    color: #999;
+    margin-right: 1.04167vmin;
+  }
+  .integral-select .integral-wrapper .right-text .discount {
+    font-size: 1.82292vmin;
+    color: #ff8205;
+    margin-right: 1.04167vmin;
+  }
+  .integral-select .integral-wrapper .cannot-use {
+    font-size: 1.82292vmin;
+    color: #c8c8c8;
+  }
+}
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  .integral-select {
+    padding: 0 2.53968vmin;
+    background-color: #fff;
+  }
+  .integral-select .integral-wrapper {
+    border-top: 0.07937vmin solid #eee;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    background: #fff;
+    height: 6.98413vmin;
+  }
+  .integral-select .integral-wrapper .width16 {
+    width: 2.53968vmin;
+  }
+  .integral-select .integral-wrapper .left-text {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+  .integral-select .integral-wrapper .left-text .title {
+    font-size: 2.22222vmin;
+    color: #333;
+  }
+  .integral-select .integral-wrapper .left-text .tips-icon {
+    width: 2.22222vmin;
+    height: 2.22222vmin;
+    margin-left: 0.63492vmin;
+    color: #999;
+    padding-top: 0.15873vmin;
+  }
+  .integral-select .integral-wrapper .right-text {
+    display: flex;
+    align-items: center;
+  }
+  .integral-select .integral-wrapper .right-text .current {
+    font-size: 2.22222vmin;
+    color: #999;
+    margin-right: 1.26984vmin;
+  }
+  .integral-select .integral-wrapper .right-text .discount {
+    font-size: 2.22222vmin;
+    color: #ff8205;
+    margin-right: 1.26984vmin;
+  }
+  .integral-select .integral-wrapper .cannot-use {
+    font-size: 2.22222vmin;
+    color: #c8c8c8;
+  }
+}
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .integral-select {
+    padding: 0 2.08333vmin;
+    background-color: #fff;
+  }
+  .integral-select .integral-wrapper {
+    border-top: 0.0651vmin solid #eee;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+    background: #fff;
+    height: 5.72917vmin;
+  }
+  .integral-select .integral-wrapper .width16 {
+    width: 2.08333vmin;
+  }
+  .integral-select .integral-wrapper .left-text {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+  .integral-select .integral-wrapper .left-text .title {
+    font-size: 1.82292vmin;
+    color: #333;
+  }
+  .integral-select .integral-wrapper .left-text .tips-icon {
+    width: 1.82292vmin;
+    height: 1.82292vmin;
+    margin-left: 0.52083vmin;
+    color: #999;
+    padding-top: 0.13021vmin;
+  }
+  .integral-select .integral-wrapper .right-text {
+    display: flex;
+    align-items: center;
+  }
+  .integral-select .integral-wrapper .right-text .current {
+    font-size: 1.82292vmin;
+    color: #999;
+    margin-right: 1.04167vmin;
+  }
+  .integral-select .integral-wrapper .right-text .discount {
+    font-size: 1.82292vmin;
+    color: #ff8205;
+    margin-right: 1.04167vmin;
+  }
+  .integral-select .integral-wrapper .cannot-use {
+    font-size: 1.82292vmin;
+    color: #c8c8c8;
+  }
+}

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

@@ -0,0 +1,61 @@
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin invoice-show {
+    .invoice-title {
+      min-width: vmin(144);
+      flex-grow: 0;
+    }
+  
+    .right-cont {
+      display: flex;
+      text-align: right;
+      align-items: center;
+      justify-content: flex-end;
+  
+      .img-zhixiang {
+        width: vmin(32);
+        height: vmin(32);
+      }
+    }
+  
+    .EC1 {
+      color: #333;
+    }
+  
+    .EC4 {
+      color: #ccc;
+    }
+}
+
+.invoice-show {
+    @include invoice-show;
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+    $deviceWidth: 1536 !global;
+
+    .invoice-show {
+        @include invoice-show;
+    }
+}
+
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .invoice-show {
+    @include invoice-show;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+    $deviceWidth: 1536 !global;
+
+    .invoice-show {
+        @include invoice-show;
+    }
+}

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

@@ -9,8 +9,8 @@
   justify-content: flex-end;
 }
 .invoice-show .right-cont .img-zhixiang {
-  width: 4.27vmin;
-  height: 4.27vmin;
+  width: 4.26667vmin;
+  height: 4.26667vmin;
 }
 .invoice-show .EC1 {
   color: #333;
@@ -18,3 +18,69 @@
 .invoice-show .EC4 {
   color: #ccc;
 }
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .invoice-show .invoice-title {
+    min-width: 9.375vmin;
+    flex-grow: 0;
+  }
+  .invoice-show .right-cont {
+    display: flex;
+    text-align: right;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  .invoice-show .right-cont .img-zhixiang {
+    width: 2.08333vmin;
+    height: 2.08333vmin;
+  }
+  .invoice-show .EC1 {
+    color: #333;
+  }
+  .invoice-show .EC4 {
+    color: #ccc;
+  }
+}
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  .invoice-show .invoice-title {
+    min-width: 11.42857vmin;
+    flex-grow: 0;
+  }
+  .invoice-show .right-cont {
+    display: flex;
+    text-align: right;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  .invoice-show .right-cont .img-zhixiang {
+    width: 2.53968vmin;
+    height: 2.53968vmin;
+  }
+  .invoice-show .EC1 {
+    color: #333;
+  }
+  .invoice-show .EC4 {
+    color: #ccc;
+  }
+}
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .invoice-show .invoice-title {
+    min-width: 9.375vmin;
+    flex-grow: 0;
+  }
+  .invoice-show .right-cont {
+    display: flex;
+    text-align: right;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  .invoice-show .right-cont .img-zhixiang {
+    width: 2.08333vmin;
+    height: 2.08333vmin;
+  }
+  .invoice-show .EC1 {
+    color: #333;
+  }
+  .invoice-show .EC4 {
+    color: #ccc;
+  }
+}

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

@@ -0,0 +1,40 @@
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin leave-word {
+	margin-bottom: vmin(16);
+
+	.van-cell {
+		line-height: vmin(40);
+	}
+}
+
+.leave-word {
+    @include leave-word;
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+    $deviceWidth: 1536 !global;
+
+    .leave-word {
+        @include leave-word;
+    }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+    $deviceWidth: 1260 !global;
+  
+    .leave-word {
+        @include leave-word;
+    }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+    $deviceWidth: 1536 !global;
+
+    .leave-word {
+        @include leave-word;
+    }
+}

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

@@ -1,6 +1,30 @@
 .leave-word {
-  margin-bottom: 2.13vmin;
+  margin-bottom: 2.13333vmin;
 }
 .leave-word .van-cell {
-  line-height: 5.33vmin;
+  line-height: 5.33333vmin;
+}
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .leave-word {
+    margin-bottom: 1.04167vmin;
+  }
+  .leave-word .van-cell {
+    line-height: 2.60417vmin;
+  }
+}
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  .leave-word {
+    margin-bottom: 1.26984vmin;
+  }
+  .leave-word .van-cell {
+    line-height: 3.1746vmin;
+  }
+}
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .leave-word {
+    margin-bottom: 1.04167vmin;
+  }
+  .leave-word .van-cell {
+    line-height: 2.60417vmin;
+  }
 }

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

@@ -0,0 +1,62 @@
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin paybar {
+    bottom: 0;
+    background: #fff;
+    box-shadow: 0 0 vmin(16) 0 rgba(0, 0, 0, 0.08);
+    position: fixed;
+    width: 100%;
+  
+    .pay-wrapper {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      box-sizing: border-box;
+      padding: 0 vmin(40);
+      height: vmin(112);
+  
+      .pay-amount {
+        .pay-text {
+          font-weight: 500;
+        }
+  
+        .pay-price-float,
+        .pay-price-int,
+        .pay-currency {
+          color: #ff5429;
+          font-weight: 500;
+        }
+      }
+    }
+}
+
+.paybar {
+    @include paybar;
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+    $deviceWidth: 1536 !global;
+
+    .paybar {
+        @include paybar;
+    }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  p.paybar {
+    @include paybar;
+  }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+    $deviceWidth: 1536 !global;
+
+    .paybar {
+        @include paybar;
+    }
+}

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

@@ -1,7 +1,7 @@
 .paybar {
   bottom: 0;
   background: #fff;
-  box-shadow: 0 0 2.13vmin 0 rgba(0, 0, 0, 0.08);
+  box-shadow: 0 0 2.13333vmin 0 rgba(0, 0, 0, 0.08);
   position: fixed;
   width: 100%;
 }
@@ -10,8 +10,8 @@
   justify-content: space-between;
   align-items: center;
   box-sizing: border-box;
-  padding: 0 5.33vmin;
-  height: 14.93vmin;
+  padding: 0 5.33333vmin;
+  height: 14.93333vmin;
 }
 .paybar .pay-wrapper .pay-amount .pay-text {
   font-weight: 500;
@@ -22,3 +22,81 @@
   color: #ff5429;
   font-weight: 500;
 }
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .paybar {
+    bottom: 0;
+    background: #fff;
+    box-shadow: 0 0 1.04167vmin 0 rgba(0, 0, 0, 0.08);
+    position: fixed;
+    width: 100%;
+  }
+  .paybar .pay-wrapper {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+    padding: 0 2.60417vmin;
+    height: 7.29167vmin;
+  }
+  .paybar .pay-wrapper .pay-amount .pay-text {
+    font-weight: 500;
+  }
+  .paybar .pay-wrapper .pay-amount .pay-price-float,
+  .paybar .pay-wrapper .pay-amount .pay-price-int,
+  .paybar .pay-wrapper .pay-amount .pay-currency {
+    color: #ff5429;
+    font-weight: 500;
+  }
+}
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  p.paybar {
+    bottom: 0;
+    background: #fff;
+    box-shadow: 0 0 1.26984vmin 0 rgba(0, 0, 0, 0.08);
+    position: fixed;
+    width: 100%;
+  }
+  p.paybar .pay-wrapper {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+    padding: 0 3.1746vmin;
+    height: 8.88889vmin;
+  }
+  p.paybar .pay-wrapper .pay-amount .pay-text {
+    font-weight: 500;
+  }
+  p.paybar .pay-wrapper .pay-amount .pay-price-float,
+  p.paybar .pay-wrapper .pay-amount .pay-price-int,
+  p.paybar .pay-wrapper .pay-amount .pay-currency {
+    color: #ff5429;
+    font-weight: 500;
+  }
+}
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .paybar {
+    bottom: 0;
+    background: #fff;
+    box-shadow: 0 0 1.04167vmin 0 rgba(0, 0, 0, 0.08);
+    position: fixed;
+    width: 100%;
+  }
+  .paybar .pay-wrapper {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+    padding: 0 2.60417vmin;
+    height: 7.29167vmin;
+  }
+  .paybar .pay-wrapper .pay-amount .pay-text {
+    font-weight: 500;
+  }
+  .paybar .pay-wrapper .pay-amount .pay-price-float,
+  .paybar .pay-wrapper .pay-amount .pay-price-int,
+  .paybar .pay-wrapper .pay-amount .pay-currency {
+    color: #ff5429;
+    font-weight: 500;
+  }
+}