xiaoe_mp_npm 1.0.21 → 1.0.22-test01

package/.prettierrc.js

@@ -1,8 +1,34 @@
 module.exports = {
-    trailingComma: 'none', //尾部不加逗号
-    tabWidth: 2,
-    singleQuote: true,
-    printWidth: 120,
-    // endOfLine: 'auto',
-    arrowParens: 'avoid' //箭头函数单个参数时不加括号
+  printWidth: 120,
+  tabWidth: 2,
+  useTabs: false,
+  semi: false,
+  singleQuote: true,
+  quoteProps: 'as-needed',
+  jsxSingleQuote: false,
+  trailingComma: 'all',
+  bracketSpacing: true,
+  jsxBracketSameLine: true,
+  arrowParens: 'always',
+  requirePragma: false,
+  insertPragma: false,
+  proseWrap: 'preserve',
+  htmlWhitespaceSensitivity: 'ignore',
+  vueIndentScriptAndStyle: false,
+  endOfLine: 'lf',
+  embeddedLanguageFormatting: 'auto',
+  overrides: [
+    {
+      files: '*.wxml',
+      options: { parser: 'html' }
+    },
+    {
+      files: '*.wxss',
+      options: { parser: 'css' }
+    },
+    {
+      files: '*.wxs',
+      options: { parser: 'babel' }
+    }
+  ]
 };

package/miniprogram_dist/GoodsItem/index.json

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

package/miniprogram_dist/GoodsItem/index.wxs

@@ -1,19 +1,19 @@
-var timeFormat = function (time) {
-  if (!time) return
-
-  // 将毫秒转换为天、小时、分钟和秒
-  var days = Math.floor(time / (1000 * 60 * 60 * 24))
-  var hours = Math.floor((time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))
-  var minutes = Math.floor((time % (1000 * 60 * 60)) / (1000 * 60))
-  var seconds = Math.floor((time % (1000 * 60)) / 1000)
-  days = days > 0 ? days + '天 ' : ''
-  hours = hours < 10 ? '0' + hours : hours
-  minutes = minutes < 10 ? '0' + minutes : minutes
-  seconds = seconds < 10 ? '0' + seconds : seconds
-
-  return days + hours + ':' + minutes + ':' + seconds
-}
-
-module.exports = {
-  timeFormat:timeFormat
+var timeFormat = function (time) {
+  if (!time) return
+
+  // 将毫秒转换为天、小时、分钟和秒
+  var days = Math.floor(time / (1000 * 60 * 60 * 24))
+  var hours = Math.floor((time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))
+  var minutes = Math.floor((time % (1000 * 60 * 60)) / (1000 * 60))
+  var seconds = Math.floor((time % (1000 * 60)) / 1000)
+  days = days > 0 ? days + '天 ' : ''
+  hours = hours < 10 ? '0' + hours : hours
+  minutes = minutes < 10 ? '0' + minutes : minutes
+  seconds = seconds < 10 ? '0' + seconds : seconds
+
+  return days + hours + ':' + minutes + ':' + seconds
+}
+
+module.exports = {
+  timeFormat:timeFormat
 }

package/miniprogram_dist/LiveGoodsList/Header/index.js

@@ -1,54 +1,54 @@
-/*
- * @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
-    }
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  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');
-    }
-  }
-});
+/*
+ * @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
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  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');
+    }
+  }
+});

package/miniprogram_dist/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/miniprogram_dist/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/miniprogram_dist/LiveGoodsList/Header/index.scss

@@ -1,106 +1,106 @@
-$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;
-    position: relative;
-    .head-right-txt {
-      display: inline-block;
-      text-align: right;
-      min-width: vmin(104);
-      font-size: vmin(40);
-    }
-    .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;
-      min-width: vmin(104);
-      .left-icon {
-        display: flex;
-        align-items: center;
-        .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==");
-        }
-        .coupon-icon {
-          display: inline-block;
-          width: vmin(40);
-          height: vmin(40);
-          -moz-background-size: 100% 100%;
-          background-size: 100% 100%;
-          background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/luhrfo8g0xa8.png");
-          margin-left: vmin(48);
-        }
-      }
-      .back-icon {
-        width: vmin(32);
-        height: vmin(32);
-        background-size: 100% 100%;
-        background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/lui0decp0tzb.png");
-      }
-      .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;
-    }
+$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;
+    position: relative;
+    .head-right-txt {
+      display: inline-block;
+      text-align: right;
+      min-width: vmin(104);
+      font-size: vmin(40);
+    }
+    .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;
+      min-width: vmin(104);
+      .left-icon {
+        display: flex;
+        align-items: center;
+        .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==");
+        }
+        .coupon-icon {
+          display: inline-block;
+          width: vmin(40);
+          height: vmin(40);
+          -moz-background-size: 100% 100%;
+          background-size: 100% 100%;
+          background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/luhrfo8g0xa8.png");
+          margin-left: vmin(48);
+        }
+      }
+      .back-icon {
+        width: vmin(32);
+        height: vmin(32);
+        background-size: 100% 100%;
+        background-image: url("https://commonresource-1252524126.cdn.xiaoeknow.com/image/lui0decp0tzb.png");
+      }
+      .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.wxml

@@ -1,32 +1,32 @@
-
-<!--
-  /*
- * @Descripttion: 
- * @version: 
- * @Author: conlinchen
- * @Date: 2021-10-29 14:42:53
- * @LastEditors: conlinchen
- * @LastEditTime: 2021-11-18 18:10:59
- */
--->
-<view class="popup-header">
-  <view class="van-action-sheet__left">
-    <block wx:if="{{popupType === 0}}">
-      <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>
-    </block>
-    <block wx:elif="{{popupType === 1}}">
-      <view class="back-icon" catchtap="goBack"></view>
-    </block>
-  </view>
-  <view class="popup-header-title">{{ headerTitle }}</view>
-  <view  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">
+  <view class="van-action-sheet__left">
+    <block wx:if="{{popupType === 0}}">
+      <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>
+    </block>
+    <block wx:elif="{{popupType === 1}}">
+      <view class="back-icon" catchtap="goBack"></view>
+    </block>
+  </view>
+  <view class="popup-header-title">{{ headerTitle }}</view>
+  <view  class="head-right-txt">
+    <van-icon name="cross" bindtap="closePop" wx:if="{{showClose}}"/>
+  </view>
+</view>

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.json

@@ -1,9 +1,9 @@
-{
-  "component": true,
-  "usingComponents": {
-    "goods-item": "../GoodsItem/index",
-    "header": "./Header/index",
-    "custom-popup": "../CustomPopup",
-    "van-dialog": "@vant/weapp/dialog/index"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "goods-item": "../GoodsItem/index",
+    "header": "./Header/index",
+    "custom-popup": "../CustomPopup",
+    "van-dialog": "@vant/weapp/dialog/index"
+  }
 }