xiaoe_mp_npm 0.5.39 → 0.5.40-alpha2

package/src/LiveGoodsList/Header/index.wxss

@@ -1,44 +1,143 @@
 .popup-header {
-  padding: 3.2vmin 4.27vmin;
+  padding: 3.2vmin 4.26667vmin;
   height: 6.4vmin;
   top: auto;
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
+
 .popup-header .head-right-txt {
   display: inline-block;
   text-align: right;
-  min-width: 13.87vmin;
-  font-size: 5.33vmin;
+  min-width: 13.86667vmin;
+  font-size: 5.33333vmin;
 }
+
 .popup-header .popup-header-title {
   color: #333333;
-  font-size: 4.27vmin;
+  font-size: 4.26667vmin;
   font-weight: 500;
   font-family: "PingFang SC";
 }
+
 .popup-header .van-action-sheet__left {
   color: #c8c9cc;
-  font-size: 2.93vmin;
+  font-size: 2.93333vmin;
   line-height: inherit;
   display: flex;
   align-items: center;
-  min-width: 13.87vmin;
+  min-width: 13.86667vmin;
 }
+
 .popup-header .van-action-sheet__left .order-icon {
   display: inline-block;
-  width: 5.33vmin;
-  height: 5.33vmin;
+  width: 5.33333vmin;
+  height: 5.33333vmin;
   -moz-background-size: 100% 100%;
   background-size: 100% 100%;
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAACXBIWXMAACxLAAAsSwGlPZapAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAANHSURBVHgB7ZzPcdpQEId/yAwXH0IJdBCoINCBXYHlYRAcSQekAnPk34yVCuxUYDowJagEc4ADM0D2xTplkvDEaldE3m+GEYeHkD6e3q7eWwQYhvEfU4ESg8GgcTweh/T2E2RZVyqV8WQySaCAisBer9ekzQudWB06vNGP1ZnP5ysIE0ABEveoKM9RD4LgAQqoCCSaUIZ6YBsKaAksLWePgRQU2vQr38AjKFC7EAVAw0bs0WxNx7eczWbPOIPMAl1AoAN7orcNlIuERN5mDTyZBLpedzgcXpATrodMp9N7MIiiKKbNHXKCgk+HUqCld3vfhi6PI3mPKDl0jk9hGHpnDN4C9/u9S4IbKD/1Wq029G1c9W1Il9sX5IxLNfr9PqtX0z5yPy68Dwkjn4beAiGTyzWKitAnaPg2zCLwj/gEAhrojygASk3+GSTzCECWSDNREUiX6Rv0SaCA1mTCN+jzHQqoCKSxaEwbJzGBPAm9vtJ3jqAAO4j4kp7QCCXDgggTE8jEBDIxgUxMIBMTyMQEMjGBTEwgE/E7kbQq4YHuh9vQZUXrG7fSJR6iPdCto+C9pKMNfZq0vvGaHoMYogLdOopyScfv1NO1HDFEBRYs7xd0GYtWg0kHEfHqqFO4qgMIIipwt9vFKFbiiqbRRCdWRaNwHMduKr9FkTikS0li+fGvUABZXV9fi89Kq0yozufzmDYxSogl0kxMIBMTyMQEMjGBTMSj8HA4rG82mztKY3IpTkrLcVUWzX0QF7jdbl/pls5VYSEnwiiKhpSkd9I8s1BEL2GXQEOmKLNZq9VCXADSkwltCEH7/owLQFSgZFUW3aqtcQGICry6uhpLSHT7dPvGBSAq0E2n04m26HJbIifS6amO1r8xTyEehdMT7aCkWCLNxAQyMYFMTCATE8jEBDIxgUxMIBMTyMQEMjGBTEwgExPIxAQyMYFMTCATE8jEBDIxgUzYayLuuS9RFIX4oGTpgQk+Dt513VkEXkxBjwI/fBt6C9ztduOCnv+iTRIEQezb2Fugq4RyDyhEiXEd5HA43GdZtM8UhReLxZK+pIVyjocJvTruHDN85vxnqHa73ZtqtdqG/IO1pVnv9/vnrOIMwygFPwHK0g4OEWNPBgAAAABJRU5ErkJggg==");
 }
+
 .popup-header .van-action-sheet__left .head-left-txt {
   opacity: 1;
   color: #666666;
-  font-size: 3.73vmin;
+  font-size: 3.73333vmin;
   font-weight: 500;
   font-family: "PingFang SC";
-  margin-left: 1.07vmin;
+  margin-left: 1.06667vmin;
+}
+
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .popup-header {
+    padding: 1.5625vmin 2.08333vmin;
+    height: 3.125vmin;
+    top: auto;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .popup-header .head-right-txt {
+    display: inline-block;
+    text-align: right;
+    min-width: 6.77083vmin;
+    font-size: 2.60417vmin;
+  }
+  .popup-header .popup-header-title {
+    color: #333333;
+    font-size: 2.08333vmin;
+    font-weight: 500;
+    font-family: "PingFang SC";
+  }
+  .popup-header .van-action-sheet__left {
+    color: #c8c9cc;
+    font-size: 1.43229vmin;
+    line-height: inherit;
+    display: flex;
+    align-items: center;
+    min-width: 6.77083vmin;
+  }
+  .popup-header .van-action-sheet__left .order-icon {
+    display: inline-block;
+    width: 2.60417vmin;
+    height: 2.60417vmin;
+    -moz-background-size: 100% 100%;
+    background-size: 100% 100%;
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAACXBIWXMAACxLAAAsSwGlPZapAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAANHSURBVHgB7ZzPcdpQEId/yAwXH0IJdBCoINCBXYHlYRAcSQekAnPk34yVCuxUYDowJagEc4ADM0D2xTplkvDEaldE3m+GEYeHkD6e3q7eWwQYhvEfU4ESg8GgcTweh/T2E2RZVyqV8WQySaCAisBer9ekzQudWB06vNGP1ZnP5ysIE0ABEveoKM9RD4LgAQqoCCSaUIZ6YBsKaAksLWePgRQU2vQr38AjKFC7EAVAw0bs0WxNx7eczWbPOIPMAl1AoAN7orcNlIuERN5mDTyZBLpedzgcXpATrodMp9N7MIiiKKbNHXKCgk+HUqCld3vfhi6PI3mPKDl0jk9hGHpnDN4C9/u9S4IbKD/1Wq029G1c9W1Il9sX5IxLNfr9PqtX0z5yPy68Dwkjn4beAiGTyzWKitAnaPg2zCLwj/gEAhrojygASk3+GSTzCECWSDNREUiX6Rv0SaCA1mTCN+jzHQqoCKSxaEwbJzGBPAm9vtJ3jqAAO4j4kp7QCCXDgggTE8jEBDIxgUxMIBMTyMQEMjGBTEwgE/E7kbQq4YHuh9vQZUXrG7fSJR6iPdCto+C9pKMNfZq0vvGaHoMYogLdOopyScfv1NO1HDFEBRYs7xd0GYtWg0kHEfHqqFO4qgMIIipwt9vFKFbiiqbRRCdWRaNwHMduKr9FkTikS0li+fGvUABZXV9fi89Kq0yozufzmDYxSogl0kxMIBMTyMQEMjGBTMSj8HA4rG82mztKY3IpTkrLcVUWzX0QF7jdbl/pls5VYSEnwiiKhpSkd9I8s1BEL2GXQEOmKLNZq9VCXADSkwltCEH7/owLQFSgZFUW3aqtcQGICry6uhpLSHT7dPvGBSAq0E2n04m26HJbIifS6amO1r8xTyEehdMT7aCkWCLNxAQyMYFMTCATE8jEBDIxgUxMIBMTyMQEMjGBTEwgExPIxAQyMYFMTCATE8jEBDIxgUzYayLuuS9RFIX4oGTpgQk+Dt513VkEXkxBjwI/fBt6C9ztduOCnv+iTRIEQezb2Fugq4RyDyhEiXEd5HA43GdZtM8UhReLxZK+pIVyjocJvTruHDN85vxnqHa73ZtqtdqG/IO1pVnv9/vnrOIMwygFPwHK0g4OEWNPBgAAAABJRU5ErkJggg==");
+  }
+  .popup-header .van-action-sheet__left .head-left-txt {
+    opacity: 1;
+    color: #666666;
+    font-size: 1.82292vmin;
+    font-weight: 500;
+    font-family: "PingFang SC";
+    margin-left: 0.52083vmin;
+  }
+}
+
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .popup-header {
+    padding: 1.5625vmin 2.08333vmin;
+    height: 3.125vmin;
+    top: auto;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .popup-header .head-right-txt {
+    display: inline-block;
+    text-align: right;
+    min-width: 6.77083vmin;
+    font-size: 2.60417vmin;
+  }
+  .popup-header .popup-header-title {
+    color: #333333;
+    font-size: 2.08333vmin;
+    font-weight: 500;
+    font-family: "PingFang SC";
+  }
+  .popup-header .van-action-sheet__left {
+    color: #c8c9cc;
+    font-size: 1.43229vmin;
+    line-height: inherit;
+    display: flex;
+    align-items: center;
+    min-width: 6.77083vmin;
+  }
+  .popup-header .van-action-sheet__left .order-icon {
+    display: inline-block;
+    width: 2.60417vmin;
+    height: 2.60417vmin;
+    -moz-background-size: 100% 100%;
+    background-size: 100% 100%;
+    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAACXBIWXMAACxLAAAsSwGlPZapAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAANHSURBVHgB7ZzPcdpQEId/yAwXH0IJdBCoINCBXYHlYRAcSQekAnPk34yVCuxUYDowJagEc4ADM0D2xTplkvDEaldE3m+GEYeHkD6e3q7eWwQYhvEfU4ESg8GgcTweh/T2E2RZVyqV8WQySaCAisBer9ekzQudWB06vNGP1ZnP5ysIE0ABEveoKM9RD4LgAQqoCCSaUIZ6YBsKaAksLWePgRQU2vQr38AjKFC7EAVAw0bs0WxNx7eczWbPOIPMAl1AoAN7orcNlIuERN5mDTyZBLpedzgcXpATrodMp9N7MIiiKKbNHXKCgk+HUqCld3vfhi6PI3mPKDl0jk9hGHpnDN4C9/u9S4IbKD/1Wq029G1c9W1Il9sX5IxLNfr9PqtX0z5yPy68Dwkjn4beAiGTyzWKitAnaPg2zCLwj/gEAhrojygASk3+GSTzCECWSDNREUiX6Rv0SaCA1mTCN+jzHQqoCKSxaEwbJzGBPAm9vtJ3jqAAO4j4kp7QCCXDgggTE8jEBDIxgUxMIBMTyMQEMjGBTEwgE/E7kbQq4YHuh9vQZUXrG7fSJR6iPdCto+C9pKMNfZq0vvGaHoMYogLdOopyScfv1NO1HDFEBRYs7xd0GYtWg0kHEfHqqFO4qgMIIipwt9vFKFbiiqbRRCdWRaNwHMduKr9FkTikS0li+fGvUABZXV9fi89Kq0yozufzmDYxSogl0kxMIBMTyMQEMjGBTMSj8HA4rG82mztKY3IpTkrLcVUWzX0QF7jdbl/pls5VYSEnwiiKhpSkd9I8s1BEL2GXQEOmKLNZq9VCXADSkwltCEH7/owLQFSgZFUW3aqtcQGICry6uhpLSHT7dPvGBSAq0E2n04m26HJbIifS6amO1r8xTyEehdMT7aCkWCLNxAQyMYFMTCATE8jEBDIxgUxMIBMTyMQEMjGBTEwgExPIxAQyMYFMTCATE8jEBDIxgUzYayLuuS9RFIX4oGTpgQk+Dt513VkEXkxBjwI/fBt6C9ztduOCnv+iTRIEQezb2Fugq4RyDyhEiXEd5HA43GdZtM8UhReLxZK+pIVyjocJvTruHDN85vxnqHa73ZtqtdqG/IO1pVnv9/vnrOIMwygFPwHK0g4OEWNPBgAAAABJRU5ErkJggg==");
+  }
+  .popup-header .van-action-sheet__left .head-left-txt {
+    opacity: 1;
+    color: #666666;
+    font-size: 1.82292vmin;
+    font-weight: 500;
+    font-family: "PingFang SC";
+    margin-left: 0.52083vmin;
+  }
 }

package/src/LiveGoodsList/index.js

@@ -13,6 +13,7 @@ import {
   ASSOCIATION,
   PUNCH_CARD
 } from "../common/utils/constants.js";
+import { rpxToVmin } from '../common/utils/index.js'
 const computedBehavior = require('miniprogram-computed').behavior
 
 const MARKET_ACTIVITY_MAP = {
@@ -109,6 +110,10 @@ Component({
     isGrayMarketing: {
       type: Boolean,
       value: false
+    },
+    orientation: {
+      type: String,
+      value: 'hor'
     }
   },
   data: {
@@ -139,7 +144,9 @@ Component({
       return data.formExplainingGoods.resource_id && data.explainingGoodsIndex > 2
     },
     customStyle(properties) {
-      return properties.popPosition === "bottom" ? "height: calc(100% - 422rpx);" : "height: 100%;width: 100vmin;"
+      const { popPosition, orientation } = properties
+      const position = `position: ${orientation === 'ver' ? 'fixed' : 'absolute'}; left: 0; bottom: 0`
+      return popPosition === "bottom" ? `${position}; width: ${orientation === 'ver' ? '100%' : rpxToVmin(750)}; height: calc(100% - ${rpxToVmin(422)});` : "height: 100%;width: 100vmin;"
     },
   },
   methods: {

package/src/LiveGoodsList/index.scss

@@ -0,0 +1,80 @@
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin goods-list-box {
+  .box {
+    margin: 0 vmin(12);
+  }
+
+  .title {
+    margin: 0;
+    padding: vmin(32) vmin(16) vmin(16);
+    color: rgba(69, 90, 100, 0.6);
+    font-weight: normal;
+    font-size: vmin(18);
+    line-height: vmin(20);
+    text-align: center;
+  }
+
+  .btn {
+    display: block;
+    width: 100%;
+    margin: vmin(10) 0;
+    background-color: #fff;
+  }
+  .page-main {
+    height: 100%;
+  }
+  .goods-list {
+    box-sizing: border-box;
+    min-height: 40vmin;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    .finished-text {
+      display: flex;
+      justify-content: center;
+      color: #999;
+      font-size: vmin(28);
+      padding-bottom: vmin(20);
+    }
+    .no-data {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      padding-top: vmin(80);
+      .no-data-png {
+        width: vmin(176);
+        height: vmin(176);
+      }
+      .no-data-text {
+        color: #999999;
+        font-size: vmin(28);
+        margin-top: vmin(32);
+      }
+    }
+  }
+}
+
+
+.goods-list-box {
+  @include goods-list-box;
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .goods-list-box {
+      @include goods-list-box;
+  }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .goods-list-box {
+      @include goods-list-box;
+  }
+}

package/src/LiveGoodsList/index.wxml

@@ -8,7 +8,7 @@
  * @LastEditTime: 2021-11-18 19:51:34
   */ 
  -->
-<view>
+<view class="goods-list-box">
   <custom-popup
     showPopup="{{ show }}"
     popPosition="{{ popPosition }}"
@@ -18,57 +18,75 @@
     overlay="{{popPosition === 'bottom' && !overlayStyle ? false : true}}"
     overlay-style="{{ overlayStyle }}"
     zIndex="{{zIndex}}"
-    bind:onOverlayClick="onOverlayClick">
+    bind:onOverlayClick="onOverlayClick"
+  >
     <view slot="header">
       <!-- 弹窗头部 start-->
-      <header bind:closePop="closePop" bind:gotoPayRecords="gotoPayRecords" showClose="{{showClose}}"></header>
+      <header
+        bind:closePop="closePop"
+        bind:gotoPayRecords="gotoPayRecords"
+        showClose="{{showClose}}"
+      ></header>
       <!-- 弹窗头部 end-->
     </view>
     <view slot="content" class="page-main">
       <!-- 商品列表 start-->
-      <scroll-view class="goods-list"  scroll-y="true" bindscrolltolower="onScrolltolower" refresher-triggered="{{refreshing}}" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}">
-      <!-- 优惠券列表 start -->
-      <coupon-list showList="{{ showList }}" aliveInfo="{{ aliveInfo }}" bind:showPopup="showInfoCollection" bind:receivedSuccess="receivedSuccess" sensorReportParams="{{sensorReportParams}}"></coupon-list>
-      <!-- 优惠券列表 end -->
-      <!-- 讲解中的商品 start -->
+      <scroll-view
+        class="goods-list"
+        scroll-y="true"
+        bindscrolltolower="onScrolltolower"
+        refresher-triggered="{{refreshing}}"
+        bindrefresherrefresh="onLoad"
+        refresher-enabled="{{true}}"
+      >
+        <!-- 优惠券列表 start -->
+        <coupon-list
+          showList="{{ showList }}"
+          aliveInfo="{{ aliveInfo }}"
+          bind:showPopup="showInfoCollection"
+          bind:receivedSuccess="receivedSuccess"
+          sensorReportParams="{{sensorReportParams}}"
+        ></coupon-list>
+        <!-- 优惠券列表 end -->
+        <!-- 讲解中的商品 start -->
         <block wx:if="{{showExplainingGoods}}">
           <goods-item
-              aliveInfo="{{aliveInfo}}"
-              allContactPay="{{allContactPay}}"
-              goodsInfo="{{formExplainingGoods}}"
-              coupon_switch="{{coupon_switch}}"
-              bind:sendNewMsg="sendNewMsg"
-              bind:showConfirmOrder="showConfirmOrder"
-              bind:showSku="showSku"
-              explainingGoods="{{explainingGoods}}"
-              bind:showDialog="showDialog"
-              class="goods-item"
-              envName="{{ENV_NAME}}"
-              sensorReportParams="{{sensorReportParams}}"
-              isFullScreen="{{ popPosition === 'right'}}"
-              isGrayMarketing="{{ isGrayMarketing}}"
-          ></goods-item>
-        </block>
-      <!-- 讲解中的商品 end -->
-        <goods-item
-            wx:for="{{goodsInfo}}"
-            wx:for-item="goodsItem"
-            wx:key="index"
-            goodsInfo="{{goodsItem}}"
+            aliveInfo="{{aliveInfo}}"
             allContactPay="{{allContactPay}}"
+            goodsInfo="{{formExplainingGoods}}"
             coupon_switch="{{coupon_switch}}"
             bind:sendNewMsg="sendNewMsg"
             bind:showConfirmOrder="showConfirmOrder"
             bind:showSku="showSku"
-            aliveInfo="{{aliveInfo}}"
             explainingGoods="{{explainingGoods}}"
             bind:showDialog="showDialog"
-            bind:toDetails="toDetails"
             class="goods-item"
             envName="{{ENV_NAME}}"
             sensorReportParams="{{sensorReportParams}}"
             isFullScreen="{{ popPosition === 'right'}}"
             isGrayMarketing="{{ isGrayMarketing}}"
+          ></goods-item>
+        </block>
+        <!-- 讲解中的商品 end -->
+        <goods-item
+          wx:for="{{goodsInfo}}"
+          wx:for-item="goodsItem"
+          wx:key="index"
+          goodsInfo="{{goodsItem}}"
+          allContactPay="{{allContactPay}}"
+          coupon_switch="{{coupon_switch}}"
+          bind:sendNewMsg="sendNewMsg"
+          bind:showConfirmOrder="showConfirmOrder"
+          bind:showSku="showSku"
+          aliveInfo="{{aliveInfo}}"
+          explainingGoods="{{explainingGoods}}"
+          bind:showDialog="showDialog"
+          bind:toDetails="toDetails"
+          class="goods-item"
+          envName="{{ENV_NAME}}"
+          sensorReportParams="{{sensorReportParams}}"
+          isFullScreen="{{ popPosition === 'right'}}"
+          isGrayMarketing="{{ isGrayMarketing}}"
         ></goods-item>
         <view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>
         <view class="no-data" wx:if="{{!refreshing && finishedTxt === 'no-data'}}">
@@ -80,4 +98,9 @@
     </view>
   </custom-popup>
 </view>
-<van-dialog id="van-dialog" confirm-button-color="#105cfb" catchtap="stopEvent"/>
+<van-dialog
+  id="van-dialog"
+  confirm-button-color="#105cfb"
+  catchtap="stopEvent"
+/>
+

package/src/LiveGoodsList/index.wxss

@@ -1,50 +1,164 @@
-.box {
+.goods-list-box .box {
   margin: 0 1.6vmin;
 }
-.title {
+
+.goods-list-box .title {
   margin: 0;
-  padding: 4.27vmin 2.13vmin 2.13vmin;
+  padding: 4.26667vmin 2.13333vmin 2.13333vmin;
   color: rgba(69, 90, 100, 0.6);
   font-weight: normal;
   font-size: 2.4vmin;
-  line-height: 2.67vmin;
+  line-height: 2.66667vmin;
   text-align: center;
 }
-.btn {
+
+.goods-list-box .btn {
   display: block;
   width: 100%;
-  margin: 1.33vmin 0;
+  margin: 1.33333vmin 0;
   background-color: #fff;
 }
-.page-main {
+
+.goods-list-box .page-main {
   height: 100%;
 }
-.goods-list {
+
+.goods-list-box .goods-list {
   box-sizing: border-box;
   min-height: 40vmin;
   display: flex;
   flex-direction: column;
   height: 100%;
 }
-.goods-list .finished-text {
+
+.goods-list-box .goods-list .finished-text {
   display: flex;
   justify-content: center;
   color: #999;
-  font-size: 3.73vmin;
-  padding-bottom: 2.67vmin;
+  font-size: 3.73333vmin;
+  padding-bottom: 2.66667vmin;
 }
-.goods-list .no-data {
+
+.goods-list-box .goods-list .no-data {
   display: flex;
   flex-direction: column;
   align-items: center;
-  padding-top: 10.67vmin;
+  padding-top: 10.66667vmin;
 }
-.goods-list .no-data .no-data-png {
-  width: 23.47vmin;
-  height: 23.47vmin;
+
+.goods-list-box .goods-list .no-data .no-data-png {
+  width: 23.46667vmin;
+  height: 23.46667vmin;
 }
-.goods-list .no-data .no-data-text {
+
+.goods-list-box .goods-list .no-data .no-data-text {
   color: #999999;
-  font-size: 3.73vmin;
-  margin-top: 4.27vmin;
+  font-size: 3.73333vmin;
+  margin-top: 4.26667vmin;
+}
+
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .goods-list-box .box {
+    margin: 0 0.78125vmin;
+  }
+  .goods-list-box .title {
+    margin: 0;
+    padding: 2.08333vmin 1.04167vmin 1.04167vmin;
+    color: rgba(69, 90, 100, 0.6);
+    font-weight: normal;
+    font-size: 1.17188vmin;
+    line-height: 1.30208vmin;
+    text-align: center;
+  }
+  .goods-list-box .btn {
+    display: block;
+    width: 100%;
+    margin: 0.65104vmin 0;
+    background-color: #fff;
+  }
+  .goods-list-box .page-main {
+    height: 100%;
+  }
+  .goods-list-box .goods-list {
+    box-sizing: border-box;
+    min-height: 40vmin;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+  .goods-list-box .goods-list .finished-text {
+    display: flex;
+    justify-content: center;
+    color: #999;
+    font-size: 1.82292vmin;
+    padding-bottom: 1.30208vmin;
+  }
+  .goods-list-box .goods-list .no-data {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding-top: 5.20833vmin;
+  }
+  .goods-list-box .goods-list .no-data .no-data-png {
+    width: 11.45833vmin;
+    height: 11.45833vmin;
+  }
+  .goods-list-box .goods-list .no-data .no-data-text {
+    color: #999999;
+    font-size: 1.82292vmin;
+    margin-top: 2.08333vmin;
+  }
+}
+
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .goods-list-box .box {
+    margin: 0 0.78125vmin;
+  }
+  .goods-list-box .title {
+    margin: 0;
+    padding: 2.08333vmin 1.04167vmin 1.04167vmin;
+    color: rgba(69, 90, 100, 0.6);
+    font-weight: normal;
+    font-size: 1.17188vmin;
+    line-height: 1.30208vmin;
+    text-align: center;
+  }
+  .goods-list-box .btn {
+    display: block;
+    width: 100%;
+    margin: 0.65104vmin 0;
+    background-color: #fff;
+  }
+  .goods-list-box .page-main {
+    height: 100%;
+  }
+  .goods-list-box .goods-list {
+    box-sizing: border-box;
+    min-height: 40vmin;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+  .goods-list-box .goods-list .finished-text {
+    display: flex;
+    justify-content: center;
+    color: #999;
+    font-size: 1.82292vmin;
+    padding-bottom: 1.30208vmin;
+  }
+  .goods-list-box .goods-list .no-data {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding-top: 5.20833vmin;
+  }
+  .goods-list-box .goods-list .no-data .no-data-png {
+    width: 11.45833vmin;
+    height: 11.45833vmin;
+  }
+  .goods-list-box .goods-list .no-data .no-data-text {
+    color: #999999;
+    font-size: 1.82292vmin;
+    margin-top: 2.08333vmin;
+  }
 }

package/src/PayModule/button/index.scss

@@ -0,0 +1,37 @@
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin pay-btn{
+    .btn-default{
+        width: vmin(240);
+        height: vmin(80);
+        line-height: vmin(80);
+        font-size: vmin(32);
+        border-radius: vmin(40);
+        background: rgba(255,84,41,1);
+        color: #ffffff;
+    }
+    .invalidBtn{
+        opacity: 0.2;
+    }
+}
+
+.pay-btn {
+    @include pay-btn;
+  }
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+$deviceWidth: 1536 !global;
+    .pay-btn {
+        @include pay-btn;
+    }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+$deviceWidth: 1536 !global;
+    .pay-btn {
+        @include pay-btn;
+    }
+}

package/src/PayModule/button/index.wxss

@@ -1,12 +1,43 @@
 .pay-btn .btn-default {
   width: 32vmin;
-  height: 10.67vmin;
-  line-height: 10.67vmin;
-  font-size: 4.27vmin;
-  border-radius: 5.33vmin;
+  height: 10.66667vmin;
+  line-height: 10.66667vmin;
+  font-size: 4.26667vmin;
+  border-radius: 5.33333vmin;
   background: #ff5429;
   color: #ffffff;
 }
+
 .pay-btn .invalidBtn {
   opacity: 0.2;
 }
+
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .pay-btn .btn-default {
+    width: 15.625vmin;
+    height: 5.20833vmin;
+    line-height: 5.20833vmin;
+    font-size: 2.08333vmin;
+    border-radius: 2.60417vmin;
+    background: #ff5429;
+    color: #ffffff;
+  }
+  .pay-btn .invalidBtn {
+    opacity: 0.2;
+  }
+}
+
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .pay-btn .btn-default {
+    width: 15.625vmin;
+    height: 5.20833vmin;
+    line-height: 5.20833vmin;
+    font-size: 2.08333vmin;
+    border-radius: 2.60417vmin;
+    background: #ff5429;
+    color: #ffffff;
+  }
+  .pay-btn .invalidBtn {
+    opacity: 0.2;
+  }
+}

package/src/common/utils/index.js

@@ -54,3 +54,12 @@ export const isEmptyObject = (object) => {
 export const isPhone = (val) => {
     return /^1(3|4|5|6|7|8)\d{9}$/.test(val);
 }
+
+// 大屏适配 rpx 转 vmin
+export const rpxToVmin = (rpx) => {
+  const { screenWidth, screenHeight, deviceOrientation, platform } = wx.getSystemInfoSync()
+  const isPad = (screenWidth > 768 && deviceOrientation === 'portrait') || (screenHeight > 768 && deviceOrientation === 'landscape')
+  const isPc = platform === 'windows' || platform === 'mac' || platform === 'devtools'
+  const deviceWidth = isPad || isPc ? 1536 : 750
+  return `${rpx * 100 / deviceWidth}vmin`
+}

package/src/coupon/components/CouponItem/index.less

@@ -26,6 +26,7 @@
         }
     }
 }
+
 .couponNewV2 {
     position: relative;
     display: flex;