xiaoe_mp_npm 0.5.42-test2 → 0.5.42-test21

package/miniprogram_dist/LiveGoodsList/Header/index.scss

@@ -0,0 +1,79 @@
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin popup-header{
+    padding: vmin(24) vmin(32);
+    height: vmin(48);
+    top: auto;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .head-right-txt {
+      display: inline-block;
+      text-align: right;
+      min-width: vmin(104);
+      font-size: vmin(40);
+    }
+    .popup-header-title{
+      color: rgba(51,51,51,1);
+      font-size: vmin(32);
+      font-weight: 500;
+      font-family: "PingFang SC";
+    }
+    .van-action-sheet__left {
+      color: #c8c9cc;
+      font-size: vmin(22);
+      line-height: inherit;
+      display: flex;
+      align-items: center;
+      min-width: vmin(104);
+  
+    .order-icon {
+      display: inline-block;
+      width: vmin(40);
+      height: vmin(40);
+      -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==");
+    }
+    .head-left-txt {
+      opacity: 1;
+      color: #666666;
+      font-size: vmin(28);
+      font-weight: 500;
+      font-family: "PingFang SC";
+      margin-left: vmin(8);
+    }
+  }
+}
+ 
+
+.popup-header {
+    @include popup-header;
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+    $deviceWidth: 1536 !global;
+
+    .popup-header {
+        @include popup-header;
+    }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .popup-header {
+    @include popup-header;
+  }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+    $deviceWidth: 1536 !global;
+
+    .popup-header {
+        @include popup-header;
+    }
+}

package/miniprogram_dist/LiveGoodsList/Header/index.wxss

@@ -1,5 +1,5 @@
 .popup-header {
-  padding: 3.2vmin 4.27vmin;
+  padding: 3.2vmin 4.26667vmin;
   height: 6.4vmin;
   top: auto;
   display: flex;
@@ -9,27 +9,27 @@
 .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==");
@@ -37,8 +37,146 @@
 .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: 630px) and (orientation: landscape) {
+  .popup-header {
+    padding: 1.90476vmin 2.53968vmin;
+    height: 3.80952vmin;
+    top: auto;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .popup-header .head-right-txt {
+    display: inline-block;
+    text-align: right;
+    min-width: 8.25397vmin;
+    font-size: 3.1746vmin;
+  }
+  .popup-header .popup-header-title {
+    color: #333333;
+    font-size: 2.53968vmin;
+    font-weight: 500;
+    font-family: "PingFang SC";
+  }
+  .popup-header .van-action-sheet__left {
+    color: #c8c9cc;
+    font-size: 1.74603vmin;
+    line-height: inherit;
+    display: flex;
+    align-items: center;
+    min-width: 8.25397vmin;
+  }
+  .popup-header .van-action-sheet__left .order-icon {
+    display: inline-block;
+    width: 3.1746vmin;
+    height: 3.1746vmin;
+    -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: 2.22222vmin;
+    font-weight: 500;
+    font-family: "PingFang SC";
+    margin-left: 0.63492vmin;
+  }
+}
+@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/miniprogram_dist/LiveGoodsList/index.js

@@ -13,8 +13,21 @@ import {
   ASSOCIATION,
   PUNCH_CARD
 } from "../common/utils/constants.js";
+import { rpxToVmin } from '../common/utils/index.js'
 const computedBehavior = require('miniprogram-computed').behavior
 
+let activityCountdownTimer = null // 活动倒计时计时器
+let hadActivity = false
+let activityList = [] // 参与活动的商品
+
+// 预热模块
+let preheatTimer = null // 预热倒计时计时器
+let hadPreheat = false
+let preheatList = [] // 参与活动的商品
+
+let hasActivity = false // 是否有参与活动的商品
+let hasPreheat = false // 是否有参与预热的商品
+
 const MARKET_ACTIVITY_MAP = {
   3: "限时折扣",
   4: "好友助力",
@@ -59,6 +72,12 @@ Component({
         newVal && this.data.explainingGoods.length && this.getExplainingGoodsInfo()
         newVal && this.getPreferentialPriceSetting()
         newVal && this.onLoad()
+        if(!newVal){
+          clearInterval(activityCountdownTimer)
+          activityCountdownTimer = null
+          clearInterval(preheatTimer)
+          preheatTimer = null
+        }
       }
     },
     // 讲解中商品
@@ -120,8 +139,12 @@ Component({
       type: Object,
       value: {},
       observer(newVal) {
-        newVal.switch && this.handlerListInfo(newVal)
+        this.handlerListInfo(newVal)
       }
+    },
+    orientation: {
+      type: String,
+      value: 'hor'
     }
   },
   data: {
@@ -152,10 +175,62 @@ 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%' : ''}; height: calc(100% - ${rpxToVmin(422)});` : "height: 100%;width: 100vmin;"
     },
   },
   methods: {
+    // 商品总活动倒计时
+    startActivityCountdown(list) {
+      clearInterval(activityCountdownTimer)
+      activityCountdownTimer = setInterval(() => {
+        hadActivity = false
+        list.forEach((i) => {
+          let targetDate = new Date(i.time.replace(/-/g, '/')).getTime() - new Date().getTime()
+          if (targetDate <= 0) return
+          hadActivity = true
+          let temp = `goodsInfo[${i.index}].activityCountdown`
+          this.setData({
+            [temp]: targetDate,
+          })
+        })
+        if (!hadActivity) {
+          clearInterval(activityCountdownTimer)
+          activityCountdownTimer = null
+        }
+      }, 1000)
+    },
+    // 预热倒计时
+    startPreheatCountdown(list) {
+      clearInterval(preheatTimer)
+      preheatTimer = setInterval(() => {
+        hadPreheat = false
+        list.forEach((i) => {
+          let targetDate = new Date(i.time.replace(/-/g, '/')).getTime() - new Date().getTime()
+          if (targetDate <= 0) {
+            activityList.push({
+              time: this.data.goodsInfo[i.index].end_at,
+              index: i.index,
+            })
+            this.setData({
+              [`goodsInfo[${i.index}].preheatTime`]: 0,
+            })
+            return
+          }
+          hadPreheat = true
+          let temp = `goodsInfo[${i.index}].preheatTime`
+          this.setData({
+            [temp]: targetDate,
+          })
+        })
+        if (!hadPreheat) {
+          clearInterval(preheatTimer)
+          preheatTimer = null
+        }
+      }, 1000)
+    },
+
     /**
     * 带货/优惠券实时同步
     * @param {object} msgData im消息体
@@ -164,10 +239,14 @@ Component({
     handlerListInfo(msgData) {
       let type = '', marketInfo = []
 
-      // jer todo 还有im接受的相关逻辑需要补充
       // 遍历获取操作类型
       for (let key in msgData) {
         switch (key) {
+          // 带货开关操作
+          case "switch":
+            type = "goodsSwitch";
+            marketInfo = Number(msgData[key]);
+            break;
           // 新增操作
           case "conf_list":
             type = "goodsConfList";
@@ -191,8 +270,7 @@ Component({
           default:
             break
         }
-        console.log('jer=========', type, marketInfo)
-        if (marketInfo?.length > 0) {
+        if (marketInfo?.length > 0 || ['goodsSwitch', 'couponSwitch'].includes(type)) {
           this.changGoodsList({type, marketInfo})
           type = ''
           marketInfo = []
@@ -207,6 +285,27 @@ Component({
       let goodsInfo = this.data.goodsInfo,
       formExplainingGoods = this.data.formExplainingGoods
       switch (type) {
+        // 带货和优惠券开关操作
+        case "goodsSwitch":
+          if (!marketInfo) {
+            // 清空数据
+            this.setData({
+              goodsInfo: [],
+              page_index: 1,
+              total: 0,
+              refreshing: false,
+              finishedTxt: '加载中',
+              finished: false,
+              formExplainingGoods: {},
+              explainingGoodsIndex: 1,
+              currentGoodsItem: {},
+              componentsState: 1
+            })
+          } else if (this.data.goodsInfo.length === 0 && marketInfo === 1) {
+            // 重新打开按钮后,请求一次列表
+            this.properties.isGrayMarketing ? getGoodsListNew : getGoodsList
+          }
+          break;
         case "goodsConfList":
           // 如果已经加载完了，可以拼接数据
           if (this.data.finished) this.formatData(marketInfo, true);
@@ -215,7 +314,6 @@ Component({
         case "goodsBatchSwitchList":
           marketInfo.map((item) => {
             for (let index = 0; index < goodsInfo.length; index++) {
-              // jer todo 可能需要更改一下这个超级会员的字段
               if (item.id === goodsInfo[index].id) {
                 // 遍历插入相应的修改值
                 for (let key in item) {
@@ -229,16 +327,19 @@ Component({
                   }
                 }
                 break;
-              } else if (type === "goodsBatchSwitchList" && item.is_display_package === 1 && item.order_weight < goodsInfo[index].order_weight) {
+              } else if (type === "goodsBatchSwitchList" && item.is_display_package === 1 && ((item.order_weight < goodsInfo[index].order_weight) || (this.data.finished && index === (goodsInfo.length - 1) && item.order_weight > goodsInfo[index].order_weight))) {
                 // 由于兼容显示商品时，接口并没有此商品的话，需要做一个插入商品到对应位置的操作，获取需要插入状态值(只有学员才需要操作)
-                goodsInfo.splice(index, 0, item);
+                this.formatItem(item)
+                if (item.order_weight < goodsInfo[index].order_weight) {
+                  goodsInfo.splice(index, 0, item);
+                } else if (this.data.finished && index === (goodsInfo.length - 1) && item.order_weight > goodsInfo[index].order_weight) {
+                  goodsInfo.splice(index+1, 0, item);
+                }
                 break;
               }
             };
           });
-          this.setData({
-            goodsInfo,
-          })
+          this.formatData(goodsInfo, false, true)
           break;
         case "goodsDelList":
           let delIndex = -1; // 删除数据的当前下标
@@ -258,9 +359,7 @@ Component({
             // 重置删除下标
             delIndex = -1;
           });
-          this.setData({
-            goodsInfo,
-          })
+          this.formatData(goodsInfo, false, true)
           break;
         default:
           break;
@@ -400,20 +499,58 @@ Component({
             }
           })
       },
-      formatData(data,onScrolltolower){
+      formatData(data,onScrolltolower,isReplace = false){
         //onScrolltolower代表是上拉加载的标识，网卡的时候有上拉加载与下拉刷新同时请求，上拉加载的数据也push进去的情况。
-          let goodsInfo = this.data.goodsInfo
-          data.forEach((item,index) => {
-              this.formatItem(item)
-              if (!this._freshing && onScrolltolower) {
-                goodsInfo.push(item)
-              }
+        let goodsInfo = this.data.goodsInfo
+        data.forEach((item,index) => {
+          this.formatItem(item)
+          if (!this._freshing && onScrolltolower) {
+            goodsInfo.push(item)
+          }
+        })
+        if (this._freshing && !onScrolltolower || isReplace) {
+          //下拉刷新的时候直接赋值
+          goodsInfo = JSON.parse(JSON.stringify(data))
+        }
+        this.setData({goodsInfo},()=>{
+          this.getActivityStatus(this.data.goodsInfo)
+        })
+      },
+      getActivityStatus(data){
+        activityList = []
+        preheatList = []
+        data.forEach((item, index) => {
+          if (item.is_activity && item.end_at) {
+            hasActivity = true
+            item.activityCountdown = 0
+            activityList.push({
+              time: item.end_at,
+              index,
             })
-            if (this._freshing && !onScrolltolower) {
-              //下拉刷新的时候直接赋值
-              goodsInfo = JSON.parse(JSON.stringify(data))
+          }
+          // this.data.isSeckill && this.data.preheating
+          if (item.activity_type === 8 && item.sec_kill_is_preheat === 1) {
+            //预热开始时间
+            let startTime = (item.start_at && new Date(item.start_at.replace(/-/g, '/'))) || new Date()
+            let times = startTime.getTime() - item.sec_kill_preheat_time * 1000
+            let preHeatTime = new Date(times) || new Date()
+  
+            let startTime2 = (item.start_at && new Date(item.start_at.replace(/-/g, '/'))) || new Date()
+            let nowTime = new Date().getTime()
+            let preheating = nowTime > preHeatTime.getTime() && startTime2.getTime() > nowTime
+  
+            if (preheating) {
+              hasPreheat = true
+              item.preheatTime = 0
+              preheatList.push({
+                time: item.start_at,
+                index,
+              })
             }
-            this.setData({goodsInfo})
+          }
+        })
+        if (hasActivity) this.startActivityCountdown(activityList) //活动倒计时
+        if (hasPreheat) this.startPreheatCountdown(preheatList) // 预热倒计时
       },
       formatItem(e) {
           e.resourceTypeName = e.resource_type_name // 商品类型
@@ -594,6 +731,11 @@ Component({
         goodsInfo: [],
         finishedTxt: "no-data"
       })
+    },
+    showReceivePopup(e) {
+      console.log("sage---走进来了吗");
+      console.log("sage----列表 dataset",e.currentTarget.dataset.item,e.detail);
+      this.triggerEvent('showReceivePopup', e.detail)
     }
   }
 })

package/miniprogram_dist/LiveGoodsList/index.scss

@@ -0,0 +1,93 @@
+$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;
+  }
+
+  .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;
+  }
+}
+// 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;
+  }
+}