xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/miniprogram_dist/LiveGoodsList/Header/index.wxss

@@ -1,6 +1,5 @@
 .popup-header {
-  padding: 0 4.26667vmin;
-  height: 14.93333vmin;
+  padding: 2.66667vmin 4.26667vmin;
   top: auto;
   display: flex;
   justify-content: space-between;
@@ -9,7 +8,23 @@
   box-sizing: border-box;
 }
 .popup-header.popup-header-full {
-  padding-right: 30.66667vmin;
+  flex-direction: column;
+  align-items: flex-start;
+}
+.popup-header.popup-header-full .header-ttitle {
+  color: #333333;
+  text-align: center;
+  font-family: "PingFang SC";
+  font-size: 4.26667vmin;
+  font-style: normal;
+  font-weight: 500;
+  line-height: 6.4vmin;
+  margin-bottom: 3.2vmin;
+}
+.popup-header.popup-header-full .header-other-full {
+  margin-top: 2.13333vmin;
+  display: flex;
+  align-items: center;
 }
 .popup-header .head-right-txt {
   display: inline-block;
@@ -31,6 +46,9 @@
   font-weight: 500;
   font-family: "PingFang SC";
 }
+.popup-header .header-other {
+  width: 100%;
+}
 .popup-header .van-action-sheet__left {
   color: #c8c9cc;
   font-size: 2.93333vmin;
@@ -38,6 +56,7 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
+  box-sizing: border-box;
   width: 100%;
 }
 .popup-header .van-action-sheet__left .search-container {
@@ -96,8 +115,7 @@
 }
 @media screen and (min-width: 768px) and (orientation: portrait) {
   .popup-header {
-    padding: 0 2.08333vmin;
-    height: 7.29167vmin;
+    padding: 1.30208vmin 2.08333vmin;
     top: auto;
     display: flex;
     justify-content: space-between;
@@ -106,7 +124,23 @@
     box-sizing: border-box;
   }
   .popup-header.popup-header-full {
-    padding-right: 14.97396vmin;
+    flex-direction: column;
+    align-items: flex-start;
+  }
+  .popup-header.popup-header-full .header-ttitle {
+    color: #333333;
+    text-align: center;
+    font-family: "PingFang SC";
+    font-size: 2.08333vmin;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 3.125vmin;
+    margin-bottom: 1.5625vmin;
+  }
+  .popup-header.popup-header-full .header-other-full {
+    margin-top: 1.04167vmin;
+    display: flex;
+    align-items: center;
   }
   .popup-header .head-right-txt {
     display: inline-block;
@@ -128,6 +162,9 @@
     font-weight: 500;
     font-family: "PingFang SC";
   }
+  .popup-header .header-other {
+    width: 100%;
+  }
   .popup-header .van-action-sheet__left {
     color: #c8c9cc;
     font-size: 1.43229vmin;
@@ -135,6 +172,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
+    box-sizing: border-box;
     width: 100%;
   }
   .popup-header .van-action-sheet__left .search-container {
@@ -194,8 +232,7 @@
 }
 @media screen and (min-height: 630px) and (orientation: landscape) {
   .popup-header {
-    padding: 0 2.53968vmin;
-    height: 8.88889vmin;
+    padding: 1.5873vmin 2.53968vmin;
     top: auto;
     display: flex;
     justify-content: space-between;
@@ -204,7 +241,23 @@
     box-sizing: border-box;
   }
   .popup-header.popup-header-full {
-    padding-right: 18.25397vmin;
+    flex-direction: column;
+    align-items: flex-start;
+  }
+  .popup-header.popup-header-full .header-ttitle {
+    color: #333333;
+    text-align: center;
+    font-family: "PingFang SC";
+    font-size: 2.53968vmin;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 3.80952vmin;
+    margin-bottom: 1.90476vmin;
+  }
+  .popup-header.popup-header-full .header-other-full {
+    margin-top: 1.26984vmin;
+    display: flex;
+    align-items: center;
   }
   .popup-header .head-right-txt {
     display: inline-block;
@@ -226,6 +279,9 @@
     font-weight: 500;
     font-family: "PingFang SC";
   }
+  .popup-header .header-other {
+    width: 100%;
+  }
   .popup-header .van-action-sheet__left {
     color: #c8c9cc;
     font-size: 1.74603vmin;
@@ -233,6 +289,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
+    box-sizing: border-box;
     width: 100%;
   }
   .popup-header .van-action-sheet__left .search-container {
@@ -292,8 +349,7 @@
 }
 @media screen and (min-height: 768px) and (orientation: landscape) {
   .popup-header {
-    padding: 0 2.08333vmin;
-    height: 7.29167vmin;
+    padding: 1.30208vmin 2.08333vmin;
     top: auto;
     display: flex;
     justify-content: space-between;
@@ -302,7 +358,23 @@
     box-sizing: border-box;
   }
   .popup-header.popup-header-full {
-    padding-right: 14.97396vmin;
+    flex-direction: column;
+    align-items: flex-start;
+  }
+  .popup-header.popup-header-full .header-ttitle {
+    color: #333333;
+    text-align: center;
+    font-family: "PingFang SC";
+    font-size: 2.08333vmin;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 3.125vmin;
+    margin-bottom: 1.5625vmin;
+  }
+  .popup-header.popup-header-full .header-other-full {
+    margin-top: 1.04167vmin;
+    display: flex;
+    align-items: center;
   }
   .popup-header .head-right-txt {
     display: inline-block;
@@ -324,6 +396,9 @@
     font-weight: 500;
     font-family: "PingFang SC";
   }
+  .popup-header .header-other {
+    width: 100%;
+  }
   .popup-header .van-action-sheet__left {
     color: #c8c9cc;
     font-size: 1.43229vmin;
@@ -331,6 +406,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
+    box-sizing: border-box;
     width: 100%;
   }
   .popup-header .van-action-sheet__left .search-container {

package/miniprogram_dist/LiveGoodsList/README.md

@@ -1,10 +1,10 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: conlinchen
- * @Date: 2021-11-13 15:55:49
- * @LastEditors: conlinchen
- * @LastEditTime: 2021-11-13 15:55:49
--->
-## 开发者：Conlin
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: conlinchen
+ * @Date: 2021-11-13 15:55:49
+ * @LastEditors: conlinchen
+ * @LastEditTime: 2021-11-13 15:55:49
+-->
+## 开发者：Conlin
 ## 该组件的业务功能： 直播营销模块中的优惠券列表

package/miniprogram_dist/LiveGoodsList/index.js

@@ -45,6 +45,10 @@ Component({
         alive_state: 2,
       },
     },
+    userInfo: {
+      type: Object,
+      value: {}
+    },
     // 是否去客服内支付
     allContactPay: {
       type: Boolean,
@@ -226,6 +230,8 @@ Component({
     isGoodsTagGroupOn: false, // 商品标签开关
     tagGroupList: [], // 商品标签列表
     tag_group_id: '0', // 当前选中的商品标签ID
+    popupHeaderStyle: 'border-radius: 24rpx 24rpx 0 0;',
+    contentStyle: "",
   },
   lifetimes: {
     // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
@@ -268,8 +274,14 @@ Component({
     },
     popupHeaderStyle(data) {
       let headerStyle = ''
+      const vmin = ($rpx) => {
+        return `${$rpx * 100 / 750}vmin`;
+      }
+      if (data.isFullScreen) {
+        headerStyle += `height: ${vmin(200)};`
+      }
       if (data.tagGroupList.length > 0) {
-        headerStyle += `height: ${data.isFullScreen ? rpxToVmin(400) : rpxToVmin(200)};`
+        headerStyle += `height: ${data.isFullScreen ? vmin(288) : vmin(220)};`
       }
       if (data.popPosition === 'bottom') {
         headerStyle += 'border-radius: 24rpx 24rpx 0 0;'
@@ -278,8 +290,11 @@ Component({
     },
     contentStyle(data) {
       let contentStyle = ''
+      const vmin = ($rpx) => {
+        return `${$rpx * 100 / 750}vmin`;
+      }
       if (data.tagGroupList.length > 0) {
-        contentStyle += `height: calc(100% - ${data.isFullScreen ? rpxToVmin(400) : rpxToVmin(200)});`
+        contentStyle += `height: calc(100% - ${data.isFullScreen ? vmin(288) : vmin(220)});`
       }
       if (data.popPosition === 'bottom') {
         contentStyle += 'border-radius: 24rpx 24rpx 0 0;'
@@ -758,12 +773,12 @@ Component({
           })
       }, this.getRandomInt(0, 1000))
     },
-    getGoodsList(onScrolltolower = false) {
-      let state = this.data.componentsState
+    getGoodsList(onScrolltolower = false, { page_size = 0, page_index = 0 } = {}) {
+      let state = this.data.componentsState;
       let params = {
         alive_id: this.data.aliveInfo.alive_id,
-        page_size: this.data.page_size,
-        page: this.data.page_index,
+        page_size: page_size || this.data.page_size,
+        page: page_index || this.data.page_index,
         port: 1,
         app_id: this.properties.aliveInfo.app_id,
         user_id: this.properties.aliveInfo.user_id,
@@ -833,10 +848,14 @@ Component({
             page_index: this.data.page_index + 1,
             finishedTxt,
             finished,
-            total,
-          })
-          this._freshing = false
-          this.scrolling = false
+            total
+          }, () => {
+            this.triggerEvent('getGoodsListLength', {
+              listLength: this.data.goodsInfo.length
+            })
+          });
+          this._freshing = false;
+          this.scrolling = false;
         }
       })
     },

package/miniprogram_dist/LiveGoodsList/index.less

@@ -1,53 +1,53 @@
-
-.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%;
-    .finished-text{
-      display: flex;
-      justify-content: center;
-      color: #999;
-      font-size: 3.73vmin;
-      padding-bottom: 2.67vmin;
-    }
-    .no-data{
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      padding-top: 10.67vmin;
-      .no-data-png{
-        width: 23.47vmin;
-        height: 23.47vmin;
-      }
-      .no-data-text{
-        color: #999999;
-        font-size: 3.73vmin;
-        margin-top: 4.27vmin;
-      }
-    }
-}
+
+.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%;
+    .finished-text{
+      display: flex;
+      justify-content: center;
+      color: #999;
+      font-size: 3.73vmin;
+      padding-bottom: 2.67vmin;
+    }
+    .no-data{
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      padding-top: 10.67vmin;
+      .no-data-png{
+        width: 23.47vmin;
+        height: 23.47vmin;
+      }
+      .no-data-text{
+        color: #999999;
+        font-size: 3.73vmin;
+        margin-top: 4.27vmin;
+      }
+    }
+}