xiaoe_mp_npm 1.1.21 → 1.1.22-test02

package/src/LevelMemberBar/index.wxss

@@ -1 +1 @@
-.level-member-goods{display:inline-block;max-width:30.66667vmin;height:4.26667vmin;padding:0 1.06667vmin;margin:1.06667vmin 0;line-height:4.26667vmin;font-size:2.66667vmin;font-weight:500;background-color:#FFF3EB;color:#FF781F;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}@media screen and (min-width: 768px) and (orientation: portrait){.level-member-goods{display:inline-block;max-width:14.97396vmin;height:2.08333vmin;padding:0 .52083vmin;margin:.52083vmin 0;line-height:2.08333vmin;font-size:1.30208vmin;font-weight:500;background-color:#FFF3EB;color:#FF781F;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}}@media screen and (min-height: 630px) and (orientation: landscape){.level-member-goods{display:inline-block;max-width:18.25397vmin;height:2.53968vmin;padding:0 .63492vmin;margin:.63492vmin 0;line-height:2.53968vmin;font-size:1.5873vmin;font-weight:500;background-color:#FFF3EB;color:#FF781F;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}}@media screen and (min-height: 768px) and (orientation: landscape){.level-member-goods{display:inline-block;max-width:14.97396vmin;height:2.08333vmin;padding:0 .52083vmin;margin:.52083vmin 0;line-height:2.08333vmin;font-size:1.30208vmin;font-weight:500;background-color:#FFF3EB;color:#FF781F;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}}
+.level-member-goods{display:inline-block;max-width:30.66667vmin;height:4.26667vmin;padding:0 1.06667vmin;margin:1.06667vmin 0;line-height:4.26667vmin;font-size:2.66667vmin;font-weight:500;background-color:#FFF3EB;color:#FF781F;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}@media screen and (min-width: 768px) and (orientation: portrait){.level-member-goods{display:inline-block;max-width:14.97396vmin;height:2.08333vmin;padding:0 .52083vmin;margin:.52083vmin 0;line-height:2.08333vmin;font-size:1.30208vmin;font-weight:500;background-color:#FFF3EB;color:#FF781F;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}}@media screen and (min-height: 630px) and (orientation: landscape){.level-member-goods{display:inline-block;max-width:18.25397vmin;height:2.53968vmin;padding:0 .63492vmin;margin:.63492vmin 0;line-height:2.53968vmin;font-size:1.5873vmin;font-weight:500;background-color:#FFF3EB;color:#FF781F;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}}@media screen and (min-height: 768px) and (orientation: landscape){.level-member-goods{display:inline-block;max-width:14.97396vmin;height:2.08333vmin;padding:0 .52083vmin;margin:.52083vmin 0;line-height:2.08333vmin;font-size:1.30208vmin;font-weight:500;background-color:#FFF3EB;color:#FF781F;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}}

package/src/LiveGoodsList/Header/index.js

@@ -1,65 +1,65 @@
-/*
- * @Descripttion:
- * @version:
- * @Author: conlinchen
- * @Date: 2021-10-29 16:35:58
- * @LastEditors: conlinchen
- * @LastEditTime: 2021-11-01 18:34:08
- */
-// src/LiveGoodsList/Components/Header/index.js
-const computedBehavior = require('miniprogram-computed').behavior;
-Component({
-  behaviors: [computedBehavior],
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    showClose: {
-      type: Boolean,
-      value: true
-    },
-    // 弹窗类型 0: 正常带货弹窗, 1: 有返回的适用商品弹窗, 2: 无返回的适用商品弹窗
-    popupType: {
-      type: Number,
-      value: 0
-    },
-    searchStatus: {
-      type: Boolean,
-      value: false
-    },
-    isFullScreen: {
-      type: Boolean,
-      value: false
-    }
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {},
-  computed: {
-    headerTitle(data) {
-      return data.popupType === 0 ? '' : '适用商品';
-    }
-  },
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    closePop() {
-      this.triggerEvent('closePop');
-    },
-    gotoPayRecords() {
-      this.triggerEvent('gotoPayRecords');
-    },
-    gotoCouponList() {
-      this.triggerEvent('gotoCouponList');
-    },
-    goBack() {
-      this.triggerEvent('goBack');
-    },
-    toSearch() {
-      this.triggerEvent('toSearch');
-    }
-  }
-});
+/*
+ * @Descripttion:
+ * @version:
+ * @Author: conlinchen
+ * @Date: 2021-10-29 16:35:58
+ * @LastEditors: conlinchen
+ * @LastEditTime: 2021-11-01 18:34:08
+ */
+// src/LiveGoodsList/Components/Header/index.js
+const computedBehavior = require('miniprogram-computed').behavior;
+Component({
+  behaviors: [computedBehavior],
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    showClose: {
+      type: Boolean,
+      value: true
+    },
+    // 弹窗类型 0: 正常带货弹窗, 1: 有返回的适用商品弹窗, 2: 无返回的适用商品弹窗
+    popupType: {
+      type: Number,
+      value: 0
+    },
+    searchStatus: {
+      type: Boolean,
+      value: false
+    },
+    isFullScreen: {
+      type: Boolean,
+      value: false
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {},
+  computed: {
+    headerTitle(data) {
+      return data.popupType === 0 ? '' : '适用商品';
+    }
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    closePop() {
+      this.triggerEvent('closePop');
+    },
+    gotoPayRecords() {
+      this.triggerEvent('gotoPayRecords');
+    },
+    gotoCouponList() {
+      this.triggerEvent('gotoCouponList');
+    },
+    goBack() {
+      this.triggerEvent('goBack');
+    },
+    toSearch() {
+      this.triggerEvent('toSearch');
+    }
+  }
+});

package/src/LiveGoodsList/Header/index.json

@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-icon": "@vant/weapp/icon/index"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "@vant/weapp/icon/index"
+  }
+}

package/src/LiveGoodsList/Header/index.less

@@ -1,45 +1,45 @@
-.popup-header{
-  padding: 3.2vmin 4.27vmin;
-  height: 6.4vmin;
-  top: auto;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  .head-right-txt {
-    display: inline-block;
-    text-align: right;
-    min-width: 13.87vmin;
-    font-size: 5.33vmin;
-  }
-  .popup-header-title{
-    color: rgba(51,51,51,1);
-    font-size: 4.27vmin;
-    font-weight: 500;
-    font-family: "PingFang SC";
-  }
-  .van-action-sheet__left {
-    color: #c8c9cc;
-    font-size: 2.93vmin;
-    line-height: inherit;
-    display: flex;
-    align-items: center;
-    min-width: 13.87vmin;
-
-  .order-icon {
-    display: inline-block;
-    width: 5.33vmin;
-    height: 5.33vmin;
-    -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: 3.73vmin;
-    font-weight: 500;
-    font-family: "PingFang SC";
-    margin-left: 1.07vmin;
-  }
-}
-}
+.popup-header{
+  padding: 3.2vmin 4.27vmin;
+  height: 6.4vmin;
+  top: auto;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  .head-right-txt {
+    display: inline-block;
+    text-align: right;
+    min-width: 13.87vmin;
+    font-size: 5.33vmin;
+  }
+  .popup-header-title{
+    color: rgba(51,51,51,1);
+    font-size: 4.27vmin;
+    font-weight: 500;
+    font-family: "PingFang SC";
+  }
+  .van-action-sheet__left {
+    color: #c8c9cc;
+    font-size: 2.93vmin;
+    line-height: inherit;
+    display: flex;
+    align-items: center;
+    min-width: 13.87vmin;
+
+  .order-icon {
+    display: inline-block;
+    width: 5.33vmin;
+    height: 5.33vmin;
+    -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: 3.73vmin;
+    font-weight: 500;
+    font-family: "PingFang SC";
+    margin-left: 1.07vmin;
+  }
+}
+}

package/src/LiveGoodsList/Header/index.scss

@@ -1,138 +1,158 @@
-$deviceWidth: 750;
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin popup-header{
-    padding: 0 vmin(32);
-    height: vmin(112);
-    top: auto;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    position: relative;
-    box-sizing: border-box;
-    &.popup-header-full{
-      padding-right: vmin(230);
-    }
-    .head-right-txt {
-      display: inline-block;
-      text-align: right;
-      font-size: vmin(40);
-    }
-    .back-icon-container{
-      width: vmin(32);
-    }
-    .back-icon {
-      width: vmin(32);
-      height: vmin(32);
-      background-size: 100% 100%;
-      background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/lui0decp0tzb.png");
-    }
-    .popup-header-title{
-      // position: absolute;
-      // left: 50%;
-      // top: 0;
-      // height: 100%;
-      // display: flex;
-      // justify-content: center;
-      // align-items: center;
-      // transform: translateX(-50%);
-      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;
-      justify-content: space-between;
-      width: 100%;
-      .search-container {
-        flex: 1;
-        height: vmin(68);
-        background: #f7f8fa;
-        position: relative;
-        border-radius: vmin(32);
-        padding-left: vmin(64);
-        line-height: vmin(68);
-        color: #b2b2b2;
-        font-size: vmin(28);
-        .search-icon {
-          width: vmin(32);
-          height: vmin(32);
-          position: absolute;
-          top: 50%;
-          transform: translateY(-50%);
-          left: vmin(24);
-        }
-      }
-      .goods-operate {
-        display: flex;
-        align-items: center;
-      }
-      .left-icon {
-        display: flex;
-        align-items: center;
-        flex-direction: column;
-        margin-left: vmin(32);
-        .order-icon {
-          display: inline-block;
-          width: vmin(32);
-          height: vmin(32);
-          -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==");
-          margin-bottom: vmin(8);
-        }
-        .coupon-icon {
-          display: inline-block;
-          width: vmin(32);
-          height: vmin(32);
-          -moz-background-size: 100% 100%;
-          background-size: 100% 100%;
-          background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/luhrfo8g0xa8.png");
-          margin-bottom: vmin(8);
-        }
-      }
-      .head-left-txt {
-        opacity: 1;
-        color: #666666;
-        font-size: vmin(24);
-        font-weight: 500;
-        font-family: "PingFang SC";
-      }
-    }
-}
- 
-
-.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;
-    }
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin popup-header{
+    padding: vmin(20) vmin(32);
+    // height: vmin(112);
+    top: auto;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: relative;
+    box-sizing: border-box;
+    &.popup-header-full{
+      flex-direction: column;
+      align-items: flex-start;
+      .header-ttitle {
+        color: #333333;
+        text-align: center;
+        font-family: "PingFang SC";
+        font-size: vmin(32);
+        font-style: normal;
+        font-weight: 500;
+        line-height: vmin(48);
+        margin-bottom: vmin(24);
+      }
+      .header-other-full {
+        margin-top: vmin(16);
+        display: flex;
+        align-items: center;
+      }
+    }
+    .head-right-txt {
+      display: inline-block;
+      text-align: right;
+      font-size: vmin(40);
+    }
+    .back-icon-container{
+      width: vmin(32);
+    }
+    .back-icon {
+      width: vmin(32);
+      height: vmin(32);
+      background-size: 100% 100%;
+      background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/lui0decp0tzb.png");
+    }
+    .popup-header-title{
+      // position: absolute;
+      // left: 50%;
+      // top: 0;
+      // height: 100%;
+      // display: flex;
+      // justify-content: center;
+      // align-items: center;
+      // transform: translateX(-50%);
+      color: rgba(51,51,51,1);
+      font-size: vmin(32);
+      font-weight: 500;
+      font-family: "PingFang SC";
+    }
+    .header-other {
+      width: 100%;
+    }
+    .van-action-sheet__left {
+      color: #c8c9cc;
+      font-size: vmin(22);
+      line-height: inherit;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      box-sizing: border-box;
+      width: 100%;
+      .search-container {
+        flex: 1;
+        height: vmin(68);
+        background: #f7f8fa;
+        position: relative;
+        border-radius: vmin(32);
+        padding-left: vmin(64);
+        line-height: vmin(68);
+        color: #b2b2b2;
+        font-size: vmin(28);
+        .search-icon {
+          width: vmin(32);
+          height: vmin(32);
+          position: absolute;
+          top: 50%;
+          transform: translateY(-50%);
+          left: vmin(24);
+        }
+      }
+      .goods-operate {
+        display: flex;
+        align-items: center;
+      }
+      .left-icon {
+        display: flex;
+        align-items: center;
+        flex-direction: column;
+        margin-left: vmin(32);
+        .order-icon {
+          display: inline-block;
+          width: vmin(32);
+          height: vmin(32);
+          -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==");
+          margin-bottom: vmin(8);
+        }
+        .coupon-icon {
+          display: inline-block;
+          width: vmin(32);
+          height: vmin(32);
+          -moz-background-size: 100% 100%;
+          background-size: 100% 100%;
+          background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/luhrfo8g0xa8.png");
+          margin-bottom: vmin(8);
+        }
+      }
+      .head-left-txt {
+        opacity: 1;
+        color: #666666;
+        font-size: vmin(24);
+        font-weight: 500;
+        font-family: "PingFang SC";
+      }
+    }
+}
+ 
+
+.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/src/LiveGoodsList/Header/index.wxml

@@ -1,36 +1,39 @@
-<!--
-  /*
- * @Descripttion: 
- * @version: 
- * @Author: conlinchen
- * @Date: 2021-10-29 14:42:53
- * @LastEditors: conlinchen
- * @LastEditTime: 2021-11-18 18:10:59
- */
--->
-<view class="popup-header {{isFullScreen?'popup-header-full':''}}">
-  <view wx:if="{{popupType === 0}}" class="van-action-sheet__left">
-    <!-- 搜索商品输入框 -->
-    <view wx:if="{{!searchStatus}}" class="search-container" bindtap="toSearch">
-      <view class="search-input">搜商品/序号</view>
-      <image class="search-icon" src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/mfevtih007oj.svg" />
-    </view>
-    <view class="goods-operate">
-      <view class="left-icon" catchtap="gotoPayRecords">
-        <view class="order-icon"></view>
-        <text class="head-left-txt">订单/售后</text>
-      </view>
-      <view class="left-icon" catchtap="gotoCouponList">
-        <view class="coupon-icon"></view>
-        <text class="head-left-txt">领券</text>
-      </view>
-    </view>
-  </view>
-  <view wx:if="{{popupType !== 0}}" class="back-icon-container">
-    <view wx:if="{{popupType === 1}}" class="back-icon" catchtap="goBack"></view>
-  </view>
-  <view wx:if="{{popupType !== 0}}" class="popup-header-title">{{ headerTitle }}</view>
-  <view wx:if="{{popupType !== 0}}" class="head-right-txt">
-    <van-icon name="cross" bindtap="closePop" wx:if="{{showClose}}" />
-  </view>
-</view>
+<!--
+  /*
+ * @Descripttion: 
+ * @version: 
+ * @Author: conlinchen
+ * @Date: 2021-10-29 14:42:53
+ * @LastEditors: conlinchen
+ * @LastEditTime: 2021-11-18 18:10:59
+ */
+-->
+<view class="popup-header {{isFullScreen?'popup-header-full':''}}">
+  <view wx:if="{{isFullScreen}}" class="header-ttitle">商品列表</view>
+  <view class="header-other {{isFullScreen?'header-other-full':''}}">
+    <view wx:if="{{popupType === 0}}" class="van-action-sheet__left">
+      <!-- 搜索商品输入框 -->
+      <view wx:if="{{!searchStatus}}" class="search-container" bindtap="toSearch">
+        <view class="search-input">搜商品/序号</view>
+        <image class="search-icon" src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/mfevtih007oj.svg" />
+      </view>
+      <view class="goods-operate">
+        <view class="left-icon" catchtap="gotoPayRecords">
+          <view class="order-icon"></view>
+          <text class="head-left-txt">订单/售后</text>
+        </view>
+        <view class="left-icon" catchtap="gotoCouponList">
+          <view class="coupon-icon"></view>
+          <text class="head-left-txt">领券</text>
+        </view>
+      </view>
+    </view>
+    <view wx:if="{{popupType !== 0}}" class="back-icon-container">
+      <view wx:if="{{popupType === 1}}" class="back-icon" catchtap="goBack"></view>
+    </view>
+    <view wx:if="{{popupType !== 0}}" class="popup-header-title">{{ headerTitle }}</view>
+    <view wx:if="{{popupType !== 0}}" class="head-right-txt">
+      <van-icon name="cross" bindtap="closePop" wx:if="{{showClose}}" />
+    </view>
+  </view>
+</view>