xiaoe_mp_npm 0.5.42-test5 → 0.5.43

package/.gitlab-ci.yml

@@ -7,7 +7,6 @@ build_test:
     - feature/live_marketing_iteration
     - feature/remove-error-report
     - fix/record-lottery
-    - feature/realtime-update-marketing-zzw
   tags:
     - fe-group-prod-runner-2
   script:

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

@@ -143,7 +143,7 @@ $deviceWidth: 750;
       bottom: vmin(16);
       height: vmin(48);
       line-height: vmin(48);
-      border-radius: vmin(8);
+      border-radius: vmin(28);
       border: 0;
       background: rgba(255, 120, 31, 1);
 

package/miniprogram_dist/CouponList/couponColumn/index.js

@@ -30,13 +30,6 @@ Component({
         observer(newVal) {
           newVal && this.initCouponList()
         }
-      },
-      msgCouponData: {
-        type: Object,
-        value: {},
-        observer(newVal) {
-          newVal.switch && this.handlerListInfo(newVal)
-        }
       }
     },
 
@@ -68,78 +61,6 @@ Component({
      * 组件的方法列表
      */
     methods: {
-      /**
-      * 带货/优惠券实时同步
-      * @param {object} msgData im消息体
-      * @param {string} type 消息类型：带货goods、优惠券coupon
-      */
-      handlerListInfo(msgData) {
-        let type = '', marketInfo = [], couponsList = this.data.couponsList
-
-        // jer todo 还有im接受的相关逻辑需要补充
-        // 遍历获取操作类型
-        for (let key in msgData) {
-          switch (key) {
-            // 新增操作
-            case "conf_list":
-              type = "couponConfList";
-              marketInfo = msgData[key];
-              break;
-            // 修改操作
-            case 'update_list':
-              type = 'couponUpdateList'
-              marketInfo = msgData[key]
-              break
-            // 删除操作
-            case 'batch_del':
-              type = 'couponDelList'
-              marketInfo = msgData[key]
-              break
-            default:
-              break
-          }
-          console.log('jer=========', type, marketInfo)
-          if (marketInfo?.length > 0) {
-            switch (type) {
-              case "couponConfList":
-                couponsList.push(...marketInfo);
-                break;
-              case "couponUpdateList":
-                marketInfo.map((item) => {
-                  for (let index = 0; index < couponsList.length; index++) {
-                    if (item.id === couponsList[index].id) {
-                      // 遍历插入相应的修改值
-                      for (let key in item) {
-                        couponsList[index][key] = item[key];
-                      }
-                    }
-                  }
-                });
-                break;
-              case "couponDelList":
-                console.log("jer===========1111????");
-                marketInfo.map((id) => {
-                  console.log("jer===========1111????", couponsList);
-                  for (let index = 0; index < couponsList.length; index++) {
-                    if (id === couponsList[index].id) {
-                      // 删除操作，获取下标
-                      couponsList.splice(index, 1);
-                      index--;
-                    }
-                  }
-                });
-                break;
-              default:
-                break;
-            }
-            type = ''
-            marketInfo = []
-            this.setData({
-              couponsList: couponsList
-            })
-          }
-        }
-      },
       initCouponList() {
         console.log('couponColumncouponColumncouponColumncouponColumncouponColumncouponColumncouponColumncouponColumncouponColumncouponColumncouponColumn')
         const params = {

package/miniprogram_dist/GoodsItem/index.js

@@ -71,17 +71,7 @@ Component({
           preheating,
           isSeckill,
           checked
-        }, () => {
-          if (
-            (newVal.is_activity && currentActive && newVal.activity_order_num === newVal.activity_stock) ||
-            newVal.stock === 0
-          ) {
-            this.setData({
-              isOver: true,
-            })
-          }
-          this.countTime()
-        })
+        }, () => this.countTime())
       }
     },
     sending: {
@@ -138,10 +128,6 @@ Component({
     isGrayMarketing: {
       type: Boolean,
       value: false
-    },
-    isManage: {
-      type: Boolean,
-      value: false
     }
   },
 
@@ -168,8 +154,7 @@ Component({
     isSeckill: false,
     checked: false,
     switchLoading: false,
-    imageRadius: rpxToVmin(16),
-    isOver: false, //是否已抢光
+    imageRadius: rpxToVmin(16)
   },
   computed: {
     showPreferentialPrice(properties) {
@@ -216,7 +201,7 @@ Component({
     },
     //销量/订阅。只有 实物商品 21 、专栏 6、大专栏 8、会员 5 展示,受B端店铺设置（hide_sub_count）：隐藏商品销量控制 0-显示 1-隐藏
     hasSaleNum(data) {
-      return !data.goodsItem.hide_sub_count && data.goodsItem.order_num > 0
+      return [21, 6, 8, 5, 41, 68].indexOf(data.goodsItem.resource_type) > -1 && !data.goodsItem.hide_sub_count && data.goodsItem.order_num > 0
     },
     //销量/订阅。只有 实物商品 21 、专栏 6、大专栏 8、会员 5 展示
     saleNum(data) {
@@ -235,7 +220,7 @@ Component({
       let svipAllFree = data.goodsItem.resource_rights_type === 1
       if (data.allContactPay || (data.isIOS && !data.IOSMiniProgramCanBuy)) {
         // IOS小程序中不能买的展示去查看，跳转到小程序客服
-        return "购买"
+        return "去查看"
       } else if (data.goodsItem.hasStock && data.goodsItem.leftStock === 0) {
         // 库存为0，已售罄
         return "抢光了"
@@ -249,7 +234,7 @@ Component({
         // 展示券后价
         return "券后"
       } else {
-        return "购买"
+        return "去抢购"
       }
     },
     //当前适用的活动或者超级会员，活动价低就是活动，会员价低就是超级会员,超级会员全免，肯定最低，适用超级会员
@@ -286,42 +271,7 @@ Component({
     },
     filterSrc(data) {
       return utils.replaceCDN(data.goodsItem.img_url, '?imageMogr2/thumbnail/400x400>/ignore-error/1')
-    },
-
-    // 已售百分比
-    percentage(data) {
-      if (data.isOver) return 100
-      // 无库存 拼团、限时抢购
-      if (!data.goodsItem.activity_stock) return 28
-      let num = 0
-      num = (data.goodsItem.activity_order_num / data.goodsItem.activity_stock) * 100
-      // 有库存时，最低占40%
-      return num <= 40 ? 40 : num
-    },
-    // 商品剩余数量
-    residueQuantity(data) {
-      let formatNum = (num) => {
-        if (!num || isNaN(num)) return num
-        num = Number(num)
-        if (Math.abs(num) >= 100000000) {
-          num = num / 100000000
-          return this.isDecimals(Math.floor(num * 100) / 100) ? Math.floor(num * 100) / 100 + '亿' : num + '亿'
-        } else if (Math.abs(num) >= 10000) {
-          num = num / 10000
-          return this.isDecimals(Math.floor(num * 100) / 100) ? Math.floor(num * 100) / 100 + '万' : num + '万'
-        } else {
-          return num
-        }
-      }
-
-      // "已抢光"
-      if (data.isOver) return '已抢光'
-
-      // 没有库存 - 已开抢
-      if (!data.goodsItem.activity_stock) return '已开抢'
-
-      return `仅剩${formatNum(data.goodsItem.activity_stock - data.goodsItem.activity_order_num)}件`
-    },
+    }
   },
   /**
    * 组件的方法列表

package/miniprogram_dist/GoodsItem/index.less

@@ -0,0 +1,299 @@
+@import "../common/css/theme.wxss";
+
+  .goods-explaining {
+    position: absolute;
+    width: 32vmin;
+    height: 4.8vmin;
+    bottom: 0vmin;
+    left: 0vmin;
+}
+  .goods-item {
+    display: flex;
+    min-height: 24vmin;
+    background: #ffffff;
+    margin: 0 4.27vmin 0 4.27vmin;
+    border-radius: 2.13vmin;
+    padding: 2.13vmin;
+    flex-direction: column;
+
+    .main-card{
+      display: flex;
+      flex-direction: row;
+      .left {
+        position: relative;
+        width: 32vmin;
+        height: 24vmin;
+        .index {
+          border-radius: 2.13vmin 0 2.13vmin 0;
+          position: absolute;
+          top: 0;
+          left: 0;
+          display: inline-flex;
+          align-items: center;
+          justify-content: center;
+          min-width: 4.8vmin;
+          height: 3.73vmin;
+          padding: 0.13vmin 0.8vmin;
+          font-size: 2.66vmin;
+          background: rgba(0,0,0,0.6);
+          color: #FFFFFF;
+        }
+        .ios-index {
+          background: rgba(0,0,0,0.25);
+          backdrop-filter: blur(3.2vmin);
+        }
+        .goods-type {
+          position: absolute;
+          right: calc(100% - 30.67vmin);
+          bottom: 1.07vmin;
+          padding: 1.07vmin 1.33vmin;
+          background: rgba(0,0,0,0.4);
+          border-radius: 1.07vmin;
+          color: #fff;
+          font-size: 2.67vmin;
+          width: fit-content;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          height: 2.67vmin;
+          font-weight: 500;
+        }
+        .ios-goods-type {
+          background: rgba(0,0,0,0.25) !important;
+          backdrop-filter: blur(3.2vmin);
+        }
+      }
+      .right {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        margin-left: 2.13vmin;
+        height: 24vmin;
+        width: calc(100% - 34.13vmin);
+        .line-one {
+          display: flex;
+          align-items: center;
+          height: 4.8vmin;
+          .activity-type {
+            background-color: #FFF3EB;
+            color: #FF781F;
+            padding: 0vmin 1.07vmin;
+            font-size: 2.67vmin;
+            height: 4.27vmin;
+            line-height: 4.8vmin;
+            flex-shrink: 0;
+            margin-right: 1.07vmin;
+            border-radius: 0.53vmin;
+            display: flex;
+            width: max-content;
+            align-items: center;
+            font-weight: 500;
+          }
+          .super-activity-type{
+            background: linear-gradient(180.25deg, rgba(51,51,51,1) 0%, rgba(81.6,81.6,81.6,1) 68%, rgba(51,51,51,1) 100%);
+            color: rgba(255,120,31,1);
+            padding: 0.53vmin 1.07vmin;
+            font-size: 2.67vmin;
+            height: 4.27vmin;
+            width: max-content;
+            line-height: 4.8vmin;
+            flex-shrink: 0;
+            margin-right: 1.07vmin;
+            border-radius: 0.53vmin;
+            display: flex;
+            font-weight: 500;
+            align-items: center;
+            .super-activity-txt{
+              background: linear-gradient(to right, #FFE4AD, #FFC266);
+              -webkit-background-clip: text;
+              color: transparent;
+            }
+          }
+          .goods-title {
+            font-size: 3.73vmin;
+            color: #333333;
+            word-break: break-all;
+            display: inline-block;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            display: inline-block;
+            vertical-align: middle;
+            line-height: 4.8vmin;
+            font-weight: 500;
+          }
+        }
+        .sec-kill {
+          color: #FF781F;
+          font-size: 2.67vmin;
+          line-height: 4.27vmin;
+          margin: 1.07vmin 0;
+        }
+        .left-stock {
+          color: #999999;
+          font-size: 2.67vmin;
+          height: 3.2vmin;
+          display: flex;
+          align-items: center;
+          .split{
+            display: inline-block;
+            border-left: 0.13vmin solid #999999;
+            width: 0.27vmin;
+            height: 3.2vmin;
+            margin: 0 1.6vmin;
+          }
+        }
+        .line-three {
+          display: flex;
+          justify-content: space-between;
+          align-items: flex-end;
+          .price {
+            position: relative;
+            min-height: 5.33vmin;
+            font-weight: 500;
+            .price-flow{
+              color: #FF5429;
+              font-size: 3.2vmin;
+            }
+            .price-show {
+              color: #FF5429;
+              font-size: 4.8vmin;
+            }
+            .price-line {
+              font-size: 2.67vmin;
+              text-decoration: line-through;
+              color: #999999;
+              margin-left: 1.07vmin;
+            }
+          }
+          .buy-btn {
+            font-size: 3.2vmin;
+            border-radius: 5.33vmin;
+            width: 21.33vmin;
+            height: 7.47vmin;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: white;
+            line-height: 7.47vmin;
+            font-weight: 500;
+            background: linear-gradient(270deg, rgba(254,101,0,1) 0%, rgba(255,65,2,1) 100%);
+          }
+          .buy-btn-teacher{
+            font-size: 3.2vmin;
+            border-radius: 5.33vmin;
+            width: 21.33vmin;
+            height: 7.47vmin;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: white;
+            line-height: 7.47vmin;
+            font-weight: 500;
+            background: linear-gradient(270deg, rgba(254,101,0,1) 0%, rgba(255,65,2,1) 100%);
+            .load{
+              width: 3.2vmin;
+              height: 3.2vmin;
+              animation: turn 1s linear infinite;
+              margin-right: 1.06vmin;
+            }
+          }
+          .no-stock-btn{
+            font-size: 3.2vmin;
+            border-radius: 5.33vmin;
+            width: 21.33vmin;
+            height: 7.47vmin;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: white;
+            line-height: 7.47vmin;
+            font-weight: 500;
+            opacity: 40%;
+            background: linear-gradient(270deg, rgba(254,101,0,1) 0%, rgba(255,65,2,1) 100%);
+          }
+          .see-btn {
+            font-size: 3.2vmin;
+            border-radius: 5.33vmin;
+            width: 21.33vmin;
+            height: 7.47vmin;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: white;
+            line-height: 7.47vmin;
+            font-weight: 500;
+            margin-left: inherit;
+            margin-right: inherit;
+            background: linear-gradient(270deg, rgba(254,101,0,1) 0%, rgba(255,65,2,1) 100%);
+          }
+          .buy-btn-preferential{
+            font-size: 3.2vmin;
+            border-radius: 5.33vmin;
+            padding: 0 1.33vmin;
+            min-width: 21.33vmin;
+            height: 9.07vmin;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            color: white;
+            flex-flow: column;
+            line-height: 4.27vmin;
+            background: linear-gradient(270deg, rgba(254,101,0,1) 0%, rgba(255,65,2,1) 100%);
+            .go-buy{
+              font-size: 3.2vmin;
+              font-weight: 500;
+            }
+            .preferential-flow{
+              color: rgba(255,255,255,1);
+              font-size: 2.67vmin;
+            }
+            .preferential-show{
+              font-size: 3.73vmin;
+              color: rgba(255,255,255,1);
+            }
+          }
+        }
+      }
+    }
+  }
+  .teacher-switch{
+    height: 4.27vmin;
+    background: #fff;
+    display: flex;
+    margin-top: 2.13vmin;
+    .switch-txt{
+      opacity: 1;
+      color: rgba(51,51,51,1);
+      font-size: 3.2vmin;
+      font-weight: 400;
+      font-family: "PingFang SC";
+      margin-left: 2.13vmin;
+    }
+  }
+  @keyframes turn {
+    0% {
+        transform: rotate(0deg);
+    }
+
+    20% {
+        transform: rotate(72deg);
+    }
+
+    40% {
+        transform: rotate(144deg);
+    }
+
+    60% {
+        transform: rotate(216deg);
+    }
+
+    80% {
+        transform: rotate(288deg);
+    }
+
+    100% {
+        transform: rotate(360deg);
+    }
+  }