xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/miniprogram_dist/LiveGoodsList/index.scss

@@ -1,173 +1,173 @@
-$deviceWidth: 750;
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin goods-list-box {
-  .goods-list-box-popup {
-    width: vmin(750);
-  }
-  
-  .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;
-  }
-
-  .goods-list-box-popup-header{
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    padding-top: vmin(120);
-    .goods-list-box-popup-header-bg {
-      box-sizing: border-box;
-      width: vmin(530);
-      height: vmin(128);
-    }
-    .lottery-title {
-      margin-bottom: vmin(20);
-      font-size: vmin(28);
-      color: #fff;
-    }
-    .close-icon {
-      position: absolute;
-      top: vmin(152);
-      right: vmin(-10);
-      z-index: 1;
-      box-sizing: border-box;
-      padding: vmin(10);
-      width: vmin(52);
-      height: vmin(52);
-    }
-  }
-
-  .tag-group-list {
-    .tag-group-item-box {
-      display: flex;
-      flex-wrap: nowrap;
-      align-items: center;
-      padding-left: vmin(32);
-      height: vmin(88);
-      box-sizing: border-box;
-    }
-    .tag-group-item {
-      flex-shrink: 0;
-      position: relative;
-      height: vmin(88);
-      line-height: vmin(88);
-      display:inline-block;
-      margin-right: vmin(48);
-      color: #666;
-      box-sizing: border-box;
-      font-size: vmin(28);
-    }
-    .tag-group-item-active {
-      font-weight: 500;
-      color: #333;
-      font-size: vmin(32);
-      max-width: vmin(192);
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      &::after {
-        content: '';
-        display: block;
-        height: vmin(4);
-        width: vmin(48);
-        background-color: #FF5429;
-        position: absolute;
-        bottom: vmin(8);
-        left: 50%;
-        transform: translateX(-50%);
-        border-radius: vmin(1);
-        transition: .25s;
-        transition-timing-function: ease-in-out;
-      }
-    }
-  }
-
-  .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);
-      }
-    }
-  }
-  .lottery-list {
-    padding: 0 vmin(16);
-    .goods-list {
-      background: #fff;
-      height: calc(100% - #{vmin(200)});
-      border-radius: vmin(16);
-    }
-  }
-}
-
-
-.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;
-  }
-}
-// PC 放大适配
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  $deviceWidth: 1260 !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;
-  }
-}
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin goods-list-box {
+  .goods-list-box-popup {
+    width: vmin(750);
+  }
+  
+  .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;
+  }
+
+  .goods-list-box-popup-header{
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding-top: vmin(120);
+    .goods-list-box-popup-header-bg {
+      box-sizing: border-box;
+      width: vmin(530);
+      height: vmin(128);
+    }
+    .lottery-title {
+      margin-bottom: vmin(20);
+      font-size: vmin(28);
+      color: #fff;
+    }
+    .close-icon {
+      position: absolute;
+      top: vmin(152);
+      right: vmin(-10);
+      z-index: 1;
+      box-sizing: border-box;
+      padding: vmin(10);
+      width: vmin(52);
+      height: vmin(52);
+    }
+  }
+
+  .tag-group-list {
+    .tag-group-item-box {
+      display: flex;
+      flex-wrap: nowrap;
+      align-items: center;
+      padding-left: vmin(32);
+      height: vmin(88);
+      box-sizing: border-box;
+    }
+    .tag-group-item {
+      flex-shrink: 0;
+      position: relative;
+      height: vmin(88);
+      line-height: vmin(88);
+      display:inline-block;
+      margin-right: vmin(48);
+      color: #666;
+      box-sizing: border-box;
+      font-size: vmin(28);
+    }
+    .tag-group-item-active {
+      font-weight: 500;
+      color: #333;
+      font-size: vmin(32);
+      max-width: vmin(192);
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      &::after {
+        content: '';
+        display: block;
+        height: vmin(4);
+        width: vmin(48);
+        background-color: #FF5429;
+        position: absolute;
+        bottom: vmin(8);
+        left: 50%;
+        transform: translateX(-50%);
+        border-radius: vmin(1);
+        transition: .25s;
+        transition-timing-function: ease-in-out;
+      }
+    }
+  }
+
+  .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);
+      }
+    }
+  }
+  .lottery-list {
+    padding: 0 vmin(16);
+    .goods-list {
+      background: #fff;
+      height: calc(100% - #{vmin(200)});
+      border-radius: vmin(16);
+    }
+  }
+}
+
+
+.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;
+  }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !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/miniprogram_dist/LiveGoodsList/index.wxml

@@ -27,7 +27,12 @@
   >
     <!-- 购物车气泡 -->
     <view slot="custom" wx:if="{{ showShoppingCart }}">
-      <shopping-cart-bubble id="goodsBubble" aliveInfo="{{aliveInfo}}" />
+      <shopping-cart-bubble
+        id="goodsBubble"
+        showShoppingCart="{{showShoppingCart}}"
+        aliveInfo="{{aliveInfo}}"
+        hotSalesConf="{{hotSalesConf}}"
+      />
     </view>
 
     <view slot="header" wx:if="{{!isSpecifyGoods && !searchStatus}}">
@@ -95,6 +100,7 @@
               style="display:{{!formExplainingGoods.is_display_package && !isSpecifyGoods ? 'none' : ''}};position:relative"
               aliveInfo="{{aliveInfo}}"
               aliveSubId="{{aliveSubId}}"
+              userInfo="{{userInfo}}"
               allContactPay="{{allContactPay}}"
               goodsInfo="{{formExplainingGoods}}"
               coupon_switch="{{coupon_switch}}"
@@ -128,6 +134,7 @@
               style="display:{{ goodsItem.resource_id == formExplainingGoods.resource_id ? 'none' : (!goodsItem.is_display_package && !isSpecifyGoods ? 'none' : '') }};position:relative"
               goodsInfo="{{goodsItem}}"
               aliveInfo="{{aliveInfo}}"
+              userInfo="{{userInfo}}"
               aliveSubId="{{aliveSubId}}"
               allContactPay="{{allContactPay}}"
               coupon_switch="{{coupon_switch}}"
@@ -169,6 +176,7 @@
         coupon_switch="{{coupon_switch}}"
         envName="{{ENV_NAME}}"
         sensorReportParams="{{sensorReportParams}}"
+        userInfo="{{userInfo}}"
         isGrayMarketing="{{ isGrayMarketing}}"
         stockSwitch="{{ stockSwitch }}"
         sendingGoodId="{{sendingGoodId}}"