xiaoe_mp_npm 1.0.36 → 1.0.37-test02

package/miniprogram_dist/CouponList/components/CouponItem/index.js

@@ -95,11 +95,6 @@ Component({
     isNewList: {
       type: Boolean,
       value: false
-    },
-    // 是优惠券管理
-    isCouponManage: {
-      type: Boolean,
-      value: false
     }
   },
   /**
@@ -362,12 +357,6 @@ Component({
       });
     },
     getCouponFunction() {
-      if (this.data.isCouponManage) {
-        this.triggerEvent('selectCoupon', {
-          couponItem: this.data.item
-        });
-        return
-      }
       if (this.data.isFullscreenList || (this.data.userRole === 'teacher' && !this.data.isFullScreenPopCard)) {
         this.sendCoupon();
       } else if (this.data.coupon_type == 1 || this.data.coupon_type == 2) {
@@ -639,16 +628,6 @@ Component({
           this.setData({ coupon_type: COUPON_TYPE_ENUM.RECEIVED_COMPLETED }); // 展示已领完
         }
       }
-    },
-    showCoupon() {
-      this.triggerEvent('showCoupon', {
-        couponItem: this.data.item
-      });
-    },
-    hideCoupon() {
-      this.triggerEvent('hideCoupon', {
-        couponItem: this.data.item
-      });
-    },
+    }
   }
 });

package/miniprogram_dist/CouponList/components/CouponItem/index.json

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

package/miniprogram_dist/CouponList/components/CouponItem/index.scss

@@ -6,24 +6,15 @@ $deviceWidth: 750;
 
 // 互动页优惠券卡片样式
 @mixin styleType1_wrapper {
-  .hide-img {
-    position: absolute;
-    right: 0;
-    top: 0;
-    width: vmin(110);
-    height: vmin(110);
-  }
   &.pop-card {
     width: vmin(280);
     margin-bottom: 0;
     position: relative;
     height: 100%;
-
     /*  右下角卡片 */
     &.vertical-screen {
       width: vmin(280);
       height: 100%;
-
       .coupon_style1 {
         display: flex;
         flex-direction: column;
@@ -31,7 +22,6 @@ $deviceWidth: 750;
         width: 100%;
         min-height: vmin(360);
         background: none !important;
-
         .couponValue {
           padding: vmin(40) vmin(16) vmin(16) vmin(16);
           width: 98.5%;
@@ -40,8 +30,7 @@ $deviceWidth: 750;
           color: #fff;
           border-radius: vmin(16) vmin(16) 0 0;
           margin: 0;
-
-          .couponUseCondition {
+          .couponUseCondition{
             color: #fff;
             padding-top: vmin(0) !important;
           }
@@ -96,7 +85,6 @@ $deviceWidth: 750;
     &.not-pop-card {
       margin-bottom: vmin(32);
     }
-
     /* 讨论区 */
     .coupon_style1 {
       height: 100%;
@@ -104,32 +92,26 @@ $deviceWidth: 750;
       background: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/lwofsfs60b74.png') no-repeat;
       background-size: 99% 99%;
       box-sizing: border-box;
-
       .couponValue {
         width: vmin(192);
         box-sizing: border-box;
         padding: 0 .4vmin;
-
-        .couponPriceWrap {
+        .couponPriceWrap{
           margin-top: -1.6vmin;
         }
-
-        .coupon-price-long {
+        .coupon-price-long{
           margin-top: 1vmin;
         }
       }
-
       .couponName {
         font-size: vmin(24) !important;
       }
-
       .couponInfo {
         height: vmin(170);
         justify-content: flex-start;
         overflow: hidden;
         padding: vmin(16) vmin(22) vmin(16) vmin(26);
       }
-
       .couponState {
         position: absolute;
         right: vmin(12);
@@ -152,18 +134,16 @@ $deviceWidth: 750;
   &.full-screen-list {
     width: vmin(694);
     margin: vmin(24) vmin(32) 0 vmin(32);
-
     /* 全屏列表 */
     .coupon_style1 {
-      height: vmin(192);
+      height: vmin(176);
     }
   }
 
-
+  
   .is-gray {
     filter: grayscale(100%) opacity(0.5);
   }
-
   .coupon_style1 {
     display: flex;
     align-items: center;
@@ -172,7 +152,6 @@ $deviceWidth: 750;
     width: 100%;
     background: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/lw67cw3y0qse.png') center no-repeat;
     background-size: 99% 99%;
-
     // height: vmin(184);
     .couponValue {
       width: vmin(192);
@@ -184,13 +163,11 @@ $deviceWidth: 750;
       align-items: center;
       justify-content: center;
       position: relative;
-
-      .giftCouponName {
+      .giftCouponName{
         font-size: vmin(36);
         font-weight: 500;
       }
-
-      .giftCouponTitle {
+      .giftCouponTitle{
         font-size: vmin(32);
         font-weight: 500;
         overflow: hidden;
@@ -201,7 +178,6 @@ $deviceWidth: 750;
         text-align: center;
 
       }
-
       .couponPriceWrap {
         position: relative;
         display: flex;
@@ -224,12 +200,10 @@ $deviceWidth: 750;
           font-weight: 500;
         }
       }
-
       .discount-percent {
         margin-top: -2vmin;
         padding-top: vmin(6) !important;
       }
-
       .couponUseCondition {
         width: vmin(160);
         margin: 0 auto;
@@ -245,13 +219,14 @@ $deviceWidth: 750;
 
     .couponInfo {
       // flex: 1;
+      position: relative;
       display: flex;
       flex-direction: column;
       justify-content: space-around;
       max-width: vmin(302);
       height: 100%;
       box-sizing: border-box;
-      padding: vmin(24) 0 vmin(24) vmin(32);
+      padding: vmin(26) 0 vmin(26) vmin(32);
       color: #666;
       font-size: vmin(24);
       line-height: vmin(24);
@@ -270,35 +245,20 @@ $deviceWidth: 750;
         -webkit-line-clamp: 1;
         -webkit-box-orient: vertical;
       }
-
-      .moreCouponInfo {
+      .moreCouponInfo{
         display: flex;
         flex-direction: column;
         justify-content: space-between;
-        font-size: vmin(24);
-        color: #666666;
       }
 
       .couponUseHint {
         margin-bottom: vmin(4);
         line-height: vmin(32);
-        max-width: vmin(222);
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        color: #666666;
-        font-size: vmin(24);
       }
 
       .couponUseTime {
         line-height: vmin(32);
         // margin-bottom: 4.8vmin;
-        font-size: vmin(24);
-        color: #666666;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        max-width: vmin(222)
       }
 
       .moreInfo {
@@ -314,7 +274,6 @@ $deviceWidth: 750;
         }
       }
     }
-
     .blank-item {
       flex: 1;
     }
@@ -328,28 +287,6 @@ $deviceWidth: 750;
       border: none;
       cursor: pointer;
       margin-right: vmin(24);
-      flex-shrink: 1;
-
-      &.teacher-btn{
-        .couponBtn{
-          position: absolute;
-          bottom: vmin(24);
-          right: vmin(28);
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          width: vmin(96);
-          height: vmin(56);
-          flex-shrink: 1;
-          &.is-line{
-            background: initial;
-            color: #ff5429;
-            border: 1px #ff5429 solid;
-            right: vmin(138);
-            box-sizing: border-box;
-          }
-        }
-      }
 
       &.fullscreen-btn {
         width: vmin(144);
@@ -369,7 +306,6 @@ $deviceWidth: 750;
         text-align: center;
         font-family: "PingFang SC";
       }
-
       .received {
         opacity: 0.4;
       }
@@ -436,8 +372,7 @@ $deviceWidth: 750;
       width: 100%;
       height: 100%;
     }
-
-    .giftCouponInfo {
+    .giftCouponInfo{
       display: flex;
       flex-direction: column;
       justify-content: center;
@@ -450,8 +385,7 @@ $deviceWidth: 750;
       line-height: vmin(24);
       font-weight: 400;
       padding: 0 vmin(16);
-
-      .giftCouponName {
+      .giftCouponName{
         font-size: vmin(36);
         font-weight: 500;
         height: vmin(32);
@@ -459,7 +393,6 @@ $deviceWidth: 750;
         margin-bottom: vmin(40);
       }
     }
-
     .couponInfo {
       display: inline-flex;
       flex-direction: column;
@@ -583,26 +516,22 @@ $deviceWidth: 750;
       width: vmin(476);
       margin-bottom: 0;
     }
-
+    
     .coupon_style1 {
       height: 100%;
       width: 100%;
       background: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/lwofsfs60b74.png') no-repeat !important;
       background-size: 99% 99%;
-
       .couponValue {
         width: vmin(190);
       }
-
       .couponName {
         font-size: vmin(24) !important;
       }
-
       .couponInfo {
         justify-content: flex-start;
         padding: vmin(16) vmin(22) vmin(16) vmin(26);
       }
-
       .couponState {
         position: absolute;
         right: vmin(12);
@@ -638,7 +567,6 @@ $deviceWidth: 750;
     width: 100%;
     background: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/lw67cw3y0qse.png') center no-repeat;
     background-size: 100% 100%;
-
     // height: vmin(184);
     .couponValue {
       padding: vmin(25) 0;
@@ -651,11 +579,10 @@ $deviceWidth: 750;
       justify-content: center;
       position: relative;
 
-      .giftCouponName {
+      .giftCouponName{
         font-size: vmin(36);
         font-weight: 500;
       }
-
       .couponPriceWrap {
         position: relative;
         display: flex;
@@ -673,7 +600,6 @@ $deviceWidth: 750;
           align-items: baseline;
           font-weight: 500;
           font-size: vmin(64) !important;
-
           &.discount-percent {
             margin-top: -1vmin;
           }
@@ -688,12 +614,12 @@ $deviceWidth: 750;
           font-weight: 500;
         }
 
-        .discount-decimal {
+        .discount-decimal{
           display: flex;
           align-items: center;
         }
 
-        &.couponPriceWrap-discount-v {
+        &.couponPriceWrap-discount-v{
           align-items: baseline;
         }
       }
@@ -816,156 +742,141 @@ $deviceWidth: 750;
   background-size: 100% 100%;
   padding-top: vmin(80);
   box-sizing: border-box;
-
   .coupon-title {
-    width: vmin(248);
-    margin: 0 auto;
-    text-align: center;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    color: #fffce0;
-    font-size: vmin(24);
-    font-weight: 500;
-    line-height: vmin(32);
-    margin-top: vmin(24);
-  }
-
-  .coupon-discount {
-    margin-top: vmin(8);
-    color: #fffce0;
-    line-height: vmin(64);
-    font-size: vmin(56);
-    font-weight: 600;
-    text-align: center;
-
-    .disc-logo {
-      font-family: "D-DIN";
-      font-size: vmin(40);
-      line-height: vmin(40);
-    }
-
-    .disc-detail {
-      font-family: "D-DIN";
-    }
-
-    .discount-detail {
-      color: #fffce0;
-      text-align: center;
-      font-size: vmin(24);
-      line-height: vmin(32);
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    .disc-bpart {
-      font-size: vmin(40);
-      line-height: vmin(40);
-    }
-  }
-
-  .coupon-gift {
-    //height: 2.56rem;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-direction: column;
-
-    &-label {
       width: vmin(248);
+      margin: 0 auto;
       text-align: center;
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
       color: #fffce0;
-      font-family: "PingFang SC";
-      font-size: vmin(40);
-      font-weight: 600;
-      height: vmin(56);
-      line-height: vmin(56);
+      font-size: vmin(24);
+      font-weight: 500;
+      line-height: vmin(32);
       margin-top: vmin(24);
-      margin-bottom: vmin(8);
-    }
-
-    &-title {
+  }
+  .coupon-discount {
+      margin-top: vmin(8);
+      color: #fffce0;
+      line-height: vmin(64);
+      font-size: vmin(56);
+      font-weight: 600;
+      text-align: center;
+      .disc-logo {
+          font-family: "D-DIN";
+          font-size: vmin(40);
+          line-height: vmin(40);
+      }
+      .disc-detail {
+          font-family: "D-DIN";
+      }
+      .discount-detail {
+          color: #fffce0;
+          text-align: center;
+          font-size: vmin(24);
+          line-height: vmin(32);
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+      }
+      .disc-bpart {
+          font-size: vmin(40);
+          line-height: vmin(40);
+      }
+  }
+  .coupon-gift {
+      //height: 2.56rem;
       display: flex;
       justify-content: center;
       align-items: center;
-      height: vmin(72);
-
-      .title-txt {
-        width: vmin(248);
-        color: #fffce0;
-        text-align: center;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 2;
-        font-family: "PingFang SC";
-        font-size: vmin(24);
-        font-weight: 600;
-        line-height: vmin(36);
-        overflow: hidden;
+      flex-direction: column;
+      &-label {
+          width: vmin(248);
+          text-align: center;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          color: #fffce0;
+          font-family: "PingFang SC";
+          font-size: vmin(40);
+          font-weight: 600;
+          height: vmin(56);
+          line-height: vmin(56);
+          margin-top: vmin(24);
+          margin-bottom: vmin(8);
+      }
+      &-title {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          height: vmin(72);
+          .title-txt {
+              width: vmin(248);
+              color: #fffce0;
+              text-align: center;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 2;
+              font-family: "PingFang SC";
+              font-size: vmin(24);
+              font-weight: 600;
+              line-height: vmin(36);
+              overflow: hidden;
+          }
       }
-    }
   }
-
   .coupon-usage {
-    margin-top: vmin(32);
-    font-size: vmin(24);
-    font-weight: 400;
-    line-height: vmin(32);
-    overflow: hidden;
-    color: #ffffff;
-    text-align: center;
-    text-overflow: ellipsis;
-
-    .qlive-coupon-btn {
-      margin: vmin(24) auto 0;
-      width: vmin(224);
-      display: flex;
-      height: vmin(56);
-      justify-content: center;
-      align-items: center;
-      gap: vmin(8);
-      border-radius: vmin(28);
-      border: vmin(2) solid #f8ffaa;
-      background: linear-gradient(0deg, #ffffe9 0%, #ffe499 100%);
-      box-shadow: 0 vmin(4) vmin(12) 0 #ff5034, 0 vmin(8) vmin(8) 0 #ffffff33 inset;
-      box-sizing: border-box;
-      color: #ff5429;
-      text-align: center;
-      font-size: vmin(28);
-      font-weight: 600;
-    }
-
-    .disable-btn {
-      border: none;
-      background: #ebebeb;
-      color: #b2b2b2;
-    }
-
-    .received-btn {
-      border: 1px solid #f8ffaa;
-      opacity: 0.4;
-      background: linear-gradient(0deg, #ffffe9 0%, #ffe499 100%);
-      color: #ff5429;
-    }
-
-    .discount-date-new {
-      width: vmin(248);
+      margin-top: vmin(32);
+      font-size: vmin(24);
+      font-weight: 400;
+      line-height: vmin(32);
+      overflow: hidden;
       color: #ffffff;
       text-align: center;
-      overflow: hidden;
-      white-space: nowrap;
       text-overflow: ellipsis;
-      font-family: "PingFang SC";
-      font-size: vmin(22);
-      font-style: normal;
-      font-weight: 400;
-      line-height: vmin(32);
-      margin: 0 auto;
-    }
+      .qlive-coupon-btn {
+          margin: vmin(24) auto 0;
+          width: vmin(224);
+          display: flex;
+          height: vmin(56);
+          justify-content: center;
+          align-items: center;
+          gap: vmin(8);
+          border-radius: vmin(28);
+          border: vmin(2) solid #f8ffaa;
+          background: linear-gradient(0deg, #ffffe9 0%, #ffe499 100%);
+          box-shadow: 0 vmin(4) vmin(12) 0 #ff5034, 0 vmin(8) vmin(8) 0 #ffffff33 inset;
+          box-sizing: border-box;
+          color: #ff5429;
+          text-align: center;
+          font-size: vmin(28);
+          font-weight: 600;
+      }
+      .disable-btn {
+          border: none;
+          background: #ebebeb;
+          color: #b2b2b2;
+      }
+      .received-btn {
+          border: 1px solid #f8ffaa;
+          opacity: 0.4;
+          background: linear-gradient(0deg, #ffffe9 0%, #ffe499 100%);
+          color: #ff5429;
+      }
+      .discount-date-new {
+          width: vmin(248);
+          color: #ffffff;
+          text-align: center;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          font-family: "PingFang SC";
+          font-size: vmin(22);
+          font-style: normal;
+          font-weight: 400;
+          line-height: vmin(32);
+          margin: 0 auto;
+      }
   }
 }
 
@@ -1006,7 +917,6 @@ $deviceWidth: 750;
     @include coupon-container;
   }
 }
-
 // PC 放大适配
 @media screen and (min-height: 630px) and (orientation: landscape) {
   $deviceWidth: 1260 !global;
@@ -1027,7 +937,6 @@ $deviceWidth: 750;
     @include coupon-container;
   }
 }
-
 // 横屏pad
 @media screen and (min-height: 768px) and (orientation: landscape) {
   $deviceWidth: 1536 !global;
@@ -1048,8 +957,3 @@ $deviceWidth: 750;
     @include coupon-container;
   }
 }
-
-.coupon-manage {
-  display: flex;
-  align-items: center;
-}