xiaoe_mp_npm 0.5.42-test2 → 0.5.42-test21

package/src/LiveGoodsList/index.wxml

@@ -7,9 +7,10 @@
  * @LastEditors: conlinchen
  * @LastEditTime: 2021-11-18 19:51:34
   */ 
- -->
-<view>
+-->
+<view class="goods-list-box">
   <custom-popup
+    class="goods-list-box-popup"
     showPopup="{{ show }}"
     popPosition="{{ popPosition }}"
     round="{{ round }}"
@@ -18,21 +19,43 @@
     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 }}" msgCouponData="{{msgCouponData}}" bind:showPopup="showInfoCollection" bind:receivedSuccess="receivedSuccess" sensorReportParams="{{sensorReportParams}}"></coupon-list>
-      <!-- 优惠券列表 end -->
-      <!-- 讲解中的商品 start -->
-        <block wx:if="{{showExplainingGoods}}">
-          <goods-item
+      <scroll-view
+        class="goods-list {{isFullScreen?'full-list':''}}"
+        scroll-y="true"
+        bindscrolltolower="onScrolltolower"
+        refresher-triggered="{{refreshing}}"
+        bindrefresherrefresh="onLoad"
+        refresher-enabled="{{true}}"
+      >
+        <!-- 优惠券列表 start -->
+        <coupon-list
+          showList="{{ showList }}"
+          aliveInfo="{{ aliveInfo }}"
+          msgCouponData="{{msgCouponData}}"
+          bind:showPopup="showInfoCollection"
+          bind:receivedSuccess="receivedSuccess"
+          sensorReportParams="{{sensorReportParams}}"
+          bind:showReceivePopup="showReceivePopup" 
+        ></coupon-list>
+        <!-- 优惠券列表 end -->
+        <!-- 讲解中的商品 start -->
+        <view class="full-item">
+          <block wx:if="{{showExplainingGoods}}">
+            <goods-item
+              style="display:{{!formExplainingGoods.is_display_package ? 'none' : ''}}"
               aliveInfo="{{aliveInfo}}"
               allContactPay="{{allContactPay}}"
               goodsInfo="{{formExplainingGoods}}"
@@ -47,29 +70,28 @@
               sensorReportParams="{{sensorReportParams}}"
               isFullScreen="{{ popPosition === 'right'}}"
               isGrayMarketing="{{ isGrayMarketing}}"
-          ></goods-item>
-        </block>
-      <!-- 讲解中的商品 end -->
-        <goods-item
+            ></goods-item>
+          </block>
+          <goods-item
             wx:for="{{goodsInfo}}"
             wx:for-item="goodsItem"
             wx:key="index"
+            style="display:{{!goodsItem.is_display_package ? 'none' : ''}}"
             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>
+          ></goods-item>
+        </view>
         <view class="finished-text" wx:if="{{!refreshing && finishedTxt !== 'no-data'}}">{{finishedTxt}}</view>
         <view class="no-data" wx:if="{{!refreshing && finishedTxt === 'no-data'}}">
           <image class="no-data-png" src="../common/assets/images/liveGoodsList/no-data.png" />
@@ -80,4 +102,4 @@
     </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,230 @@
-.box {
-  margin: 0 1.6vmin;
-}
-.title {
-  margin: 0;
-  padding: 4.27vmin 2.13vmin 2.13vmin;
-  color: rgba(69, 90, 100, 0.6);
-  font-weight: normal;
-  font-size: 2.4vmin;
-  line-height: 2.67vmin;
-  text-align: center;
-}
-.btn {
-  display: block;
-  width: 100%;
-  margin: 1.33vmin 0;
-  background-color: #fff;
-}
-.page-main {
-  height: 100%;
-}
-.goods-list {
-  box-sizing: border-box;
-  min-height: 40vmin;
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-}
-.goods-list .finished-text {
-  display: flex;
-  justify-content: center;
-  color: #999;
-  font-size: 3.73vmin;
-  padding-bottom: 2.67vmin;
-}
-.goods-list .no-data {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding-top: 10.67vmin;
-}
-.goods-list .no-data .no-data-png {
-  width: 23.47vmin;
-  height: 23.47vmin;
-}
-.goods-list .no-data .no-data-text {
-  color: #999999;
-  font-size: 3.73vmin;
-  margin-top: 4.27vmin;
-}
+.goods-list-box .goods-list-box-popup {
+  width: 100vmin;
+}
+
+.goods-list-box .box {
+  margin: 0 1.6vmin;
+}
+
+.goods-list-box .title {
+  margin: 0;
+  padding: 4.26667vmin 2.13333vmin 2.13333vmin;
+  color: rgba(69, 90, 100, 0.6);
+  font-weight: normal;
+  font-size: 2.4vmin;
+  line-height: 2.66667vmin;
+  text-align: center;
+}
+
+.goods-list-box .btn {
+  display: block;
+  width: 100%;
+  margin: 1.33333vmin 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: 3.73333vmin;
+  padding-bottom: 2.66667vmin;
+}
+
+.goods-list-box .goods-list .no-data {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-top: 10.66667vmin;
+}
+
+.goods-list-box .goods-list .no-data .no-data-png {
+  width: 23.46667vmin;
+  height: 23.46667vmin;
+}
+
+.goods-list-box .goods-list .no-data .no-data-text {
+  color: #999999;
+  font-size: 3.73333vmin;
+  margin-top: 4.26667vmin;
+}
+
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .goods-list-box .goods-list-box-popup {
+    width: 48.82812vmin;
+  }
+  .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: 630px) and (orientation: landscape) {
+  .goods-list-box .goods-list-box-popup {
+    width: 59.52381vmin;
+  }
+  .goods-list-box .box {
+    margin: 0 0.95238vmin;
+  }
+  .goods-list-box .title {
+    margin: 0;
+    padding: 2.53968vmin 1.26984vmin 1.26984vmin;
+    color: rgba(69, 90, 100, 0.6);
+    font-weight: normal;
+    font-size: 1.42857vmin;
+    line-height: 1.5873vmin;
+    text-align: center;
+  }
+  .goods-list-box .btn {
+    display: block;
+    width: 100%;
+    margin: 0.79365vmin 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: 2.22222vmin;
+    padding-bottom: 1.5873vmin;
+  }
+  .goods-list-box .goods-list .no-data {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding-top: 6.34921vmin;
+  }
+  .goods-list-box .goods-list .no-data .no-data-png {
+    width: 13.96825vmin;
+    height: 13.96825vmin;
+  }
+  .goods-list-box .goods-list .no-data .no-data-text {
+    color: #999999;
+    font-size: 2.22222vmin;
+    margin-top: 2.53968vmin;
+  }
+}
+
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .goods-list-box .goods-list-box-popup {
+    width: 48.82812vmin;
+  }
+  .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,45 @@
+$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;
+    }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+    $deviceWidth: 1260 !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,58 @@
 .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: 630px) and (orientation: landscape) {
+  .pay-btn .btn-default {
+    width: 19.04762vmin;
+    height: 6.34921vmin;
+    line-height: 6.34921vmin;
+    font-size: 2.53968vmin;
+    border-radius: 3.1746vmin;
+    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;
+  }
+}