xiaoe_mp_npm 0.5.48 → 1.0.0-live1

package/.gitlab-ci.yml

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

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

@@ -167,15 +167,6 @@ Component({
      * 组件的方法列表
      */
      methods: {
-      getCouponFunction(){
-        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){
-          this.getCoupon()
-        }else {
-          return
-        }
-      },
       sendCoupon(data) {
         this.triggerEvent("sendCoupon", {
           couponItem: this.data.item
@@ -302,12 +293,10 @@ Component({
             })
           }
           this.triggerEvent('receivedSuccess') //优惠券领取成功抛出方法用于直播间热度上报
-          // wx.showToast({
-          //   title: '领取成功',
-          //   icon: 'none'
-          // })
-          // 抛出方法拉起弹窗
-          this.triggerEvent('showReceivePopup',{couponInfo: this.data.item})
+          wx.showToast({
+            title: '领取成功',
+            icon: 'none'
+          })
           // 全屏端领取成功关闭优惠券弹窗
           if (this.properties.isFullScreen) {
             this.triggerEvent('closeCounpon')

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/components/CouponItem/index.wxml

@@ -1,11 +1,7 @@
 <!-- 优惠券形式分为2类：一行和列表 -->
 <!-- styleType===1 时是互动页讲师发放优惠券时的优惠券列表形式 -->
-<view 
-  class="styleType1_wrapper {{aliveMode? 'styleType1_wrapper-v' : ''}} {{ isFullScreenPopCard? 'pop-card' : 'not-pop-card'}} {{isFullscreenList ? 'full-screen-list' : 'vertical-screen'}}" 
-  wx:if="{{styleType === 1}}"
-  catchtap
->
-  <view class="coupon_style1" catchtap="getCouponFunction">
+<view class="styleType1_wrapper {{aliveMode? 'styleType1_wrapper-v' : ''}} {{ isFullScreenPopCard? 'pop-card' : 'not-pop-card'}} {{isFullscreenList ? 'full-screen-list' : 'vertical-screen'}}" wx:if="{{styleType === 1}}">
+  <view class="coupon_style1">
     <view class="couponValue">
       <view class="couponPriceWrap {{item.discount_way == 2 && aliveMode?'couponPriceWrap-discount-v':''}}">
         <!-- discount_way优惠方式 1-满减券 2-折扣券 -->

package/miniprogram_dist/CouponList/couponColumn/index.js

@@ -30,13 +30,6 @@ Component({
         observer(newVal) {
           newVal && this.initCouponList()
         }
-      },
-      msgCouponData: {
-        type: Object,
-        value: {},
-        observer(newVal) {
-          this.handlerListInfo(newVal)
-        }
       }
     },
 
@@ -68,75 +61,6 @@ Component({
      * 组件的方法列表
      */
     methods: {
-      /**
-      * 带货/优惠券实时同步
-      * @param {object} msgData im消息体
-      * @param {string} type 消息类型：带货goods、优惠券coupon
-      */
-      handlerListInfo(msgData) {
-        let type = '', marketInfo = [], couponsList = this.data.couponsList
-
-        // 遍历获取操作类型
-        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('[couponColumn] 带货实时同步im', 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":
-                marketInfo.map((id) => {
-                  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 = {
@@ -168,9 +92,6 @@ Component({
         this.triggerEvent("sendCoupon", {
           couponItem: detail.couponItem
         })
-      },
-      showReceivePopup(e) {
-        this.triggerEvent('showReceivePopup',e.detail.couponInfo)
       }
     }
 })

package/miniprogram_dist/CouponList/couponColumn/index.wxml

@@ -20,7 +20,6 @@
           bindreceivedSuccess="receivedSuccess" 
           bind:sendCoupon="sendCoupon"
           isFullscreenList="{{isFullscreenList}}"
-          bind:showReceivePopup="showReceivePopup"
       />
     </view>
     <view class="no-data" wx:elif="{{ isFullScreen && (!aliveConf.is_coupon_on || !isInitePage && couponsList.length === 0) }}">

package/miniprogram_dist/GoodsItem/index.js

@@ -13,7 +13,7 @@ import {
   PUNCH_CARD
 } from "../common/utils/constants.js";
 
-const { utils, sensorLog } = require("live-mp-tools");
+const {utils, sensorLog } = require("live-mp-tools");
 import { showGoods } from "../common/api/liveGoodsList"
 
 const computedBehavior = require('miniprogram-computed').behavior
@@ -31,8 +31,6 @@ Component({
       type: Object,
       value: {},
       observer(newVal) {
-        // 商品没有的话，不处理
-        if (!newVal.id) return
         //超级会员全免权益
         let svipAllFree = newVal.resource_rights_type === 1
         let currentActive = ''
@@ -60,7 +58,7 @@ Component({
         let nowTime = new Date().getTime()
         let preheating = hasPreheat && nowTime > preHeatTime.getTime() && startTime2.getTime() > nowTime
         let isSeckill = currentActive === '秒杀'
-        let checked = newVal.is_display_package === 1
+        let checked  = newVal.is_display_package === 1
 
 
         this.setData({
@@ -73,17 +71,7 @@ Component({
           preheating,
           isSeckill,
           checked
-        }, () => {
-          const isOver =
-            newVal.stock === 0 ||
-            (newVal.is_activity &&
-              (newVal.activity_type === 8 || newVal.activity_type === 3) &&
-              newVal.activity_stock - newVal.activity_order_num === 0)
-          this.setData({
-            isOver,
-          })
-          this.countTime()
-        })
+        }, () => this.countTime())
       }
     },
     sending: {
@@ -128,11 +116,11 @@ Component({
       type: Boolean,
       value: false
     },
-    style: {
+    style:{
       type: String,
       value: ''
     },
-    index: {
+    index:{
       type: Number,
       value: -1
     },
@@ -140,15 +128,7 @@ Component({
     isGrayMarketing: {
       type: Boolean,
       value: false
-    },
-    isManage: {
-      type: Boolean,
-      value: false
-    },
-    sendingGoodId: {
-      type: String,
-      value: '',
-    },
+    }
   },
 
   lifetimes: {
@@ -174,8 +154,7 @@ Component({
     isSeckill: false,
     checked: false,
     switchLoading: false,
-    imageRadius: rpxToVmin(16),
-    isOver: false, //是否已抢光
+    imageRadius: rpxToVmin(16)
   },
   computed: {
     showPreferentialPrice(properties) {
@@ -222,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) {
@@ -242,9 +221,9 @@ Component({
       if (data.allContactPay || (data.isIOS && !data.IOSMiniProgramCanBuy)) {
         // IOS小程序中不能买的展示去查看，跳转到小程序客服
         return "去查看"
-      } else if (data.isOver) {
+      } else if (data.goodsItem.hasStock && data.goodsItem.leftStock === 0) {
         // 库存为0，已售罄
-        return "已抢光"
+        return "抢光了"
       } else if (data.goodsItem.err_code) {
         // 券后价接口报错，领取不了优惠券的情况
         return "查看详情"
@@ -253,9 +232,9 @@ Component({
         return "免费领取"
       } else if (data.showPreferentialPrice) {
         // 展示券后价
-        return "购买"
+        return "券后"
       } else {
-        return "购买"
+        return "去抢购"
       }
     },
     //当前适用的活动或者超级会员，活动价低就是活动，会员价低就是超级会员,超级会员全免，肯定最低，适用超级会员
@@ -292,63 +271,6 @@ 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)}件`
-    },
-    // 配送方式（-1:全部 1:快递配送 2:自提）
-    distributionWay(data) {
-      let text = ''
-      switch (data.goodsItem.distribution_pattern) {
-        case -1:
-          text = '自提·快递'
-          break
-        case 1:
-          text = '快递'
-          break
-        case 2:
-          text = '自提'
-          break
-        default:
-          text = ''
-          break
-      }
-      return text
-    },
-    distributionPattern(data) {
-      return [-1,1,2].indexOf(data.goodsItem.distribution_pattern) !== -1
     }
   },
   /**
@@ -380,19 +302,19 @@ Component({
         cmm3: isFullScreen ? '全屏' : '非全屏'
       })
       // 线下课29课时包42/拼团 --判断权益
-      if ([29, 42].indexOf(this.data.goodsItem.resource_type) > -1 || this.data.goodsItem.activity_type === 6) {
+      if([29,42].indexOf(this.data.goodsItem.resource_type) > -1 || this.data.goodsItem.activity_type === 6){
         this.judgePermission()
         return
       }
       let params = {
-        id: this.data.goodsItem.id,
-        resource_id: this.data.goodsItem.resource_id,
-        resource_type: this.data.goodsItem.resource_type,
-        price: this.data.goodsItem.price,
-        app_id: this.data.aliveInfo.app_id,
-        user_id: this.data.aliveInfo.user_id,
-        coupon_id: this.data.goodsItem.coupon_id,
-        alive_id: this.data.aliveInfo.alive_id
+          id: this.data.goodsItem.id,
+          resource_id: this.data.goodsItem.resource_id,
+          resource_type: this.data.goodsItem.resource_type,
+          price: this.data.goodsItem.price,
+          app_id:this.data.aliveInfo.app_id,
+          user_id:this.data.aliveInfo.user_id,
+          coupon_id: this.data.goodsItem.coupon_id,
+          alive_id: this.data.aliveInfo.alive_id
       }
       const url = this.properties.isGrayMarketing ? snapCheckNew : snapCheck
       url(params).then(res => {
@@ -458,10 +380,10 @@ Component({
       console.log("permission", permission)
       // 有权益的情况下
       if (permission) {
-        // 电子书20/班课35 鹅学习不支持，无权益的情况下,内嵌h5, 有权益TOAST提示
+          // 电子书20/班课35 鹅学习不支持，无权益的情况下,内嵌h5, 有权益TOAST提示
         if ([20, 35].indexOf(this.data.goodsItem.resource_type) > -1) {
           this.showToast('您已拥有该课程，小程序内暂不支持学习此课程')
-        } else {
+        }else {
           // 弹出提示去小程序学习 有三种可能 -圈子小程序 -小鹅通小程序 -打卡小程序
           this.showdialog(this.data.goodsItem)
         }
@@ -474,8 +396,8 @@ Component({
       return new Promise((resolve, reject) => {
         let params = {
           id: this.data.goodsItem.id,
-          app_id: this.data.aliveInfo.app_id,
-          user_id: this.data.aliveInfo.user_id,
+          app_id:this.data.aliveInfo.app_id,
+          user_id:this.data.aliveInfo.user_id,
         }
         const url = this.properties.isGrayMarketing ? getUserPermissionNew : getUserPermission
         url(params).then((res) => {
@@ -608,111 +530,111 @@ Component({
         })
       }
     },
-    //judgePermission里面 showDialog 外部弹窗调用
-    toMiniProgram(goodsInfo) {
-      let { aliveInfo, sensorReportParams } = this.properties
-      sensorLog.sensors.track('click_butt', {
-        page_id: 'e_alive#mini#first#alive_room',
-        page_name: '直播间页面',
-        l_program: '鹅直播',
-        page_path: '鹅直播#小程序#首页#直播间页面',
-        page_button: "前往",
-        app_id: aliveInfo.app_id,
-        c_user_id: aliveInfo.user_id,
-        union_id: wx.getStorageSync('userInfo').universal_union_id,
-        current_role: sensorReportParams.current_role,
-        resource_id: aliveInfo.alive_id,
-        $url_path: `alive/${aliveInfo.alive_id}`,
-        type: sensorReportParams.type,
-        cmm1: sensorReportParams.alive_type,
-        cmm2: sensorReportParams.version_type,
-        comm2: sensorReportParams.pay_type
-      })
-      let spu_type = goodsInfo.spu_type
-      switch (spu_type) {
-        case ASSOCIATION:
-          this.toAssociation(goodsInfo);
-          break;
-        case PUNCH_CARD:
-          this.toPunchCard(goodsInfo);
-          break;
-        default:
-          this.toXiaoeLearn(goodsInfo);
-          break;
-      }
-    },
-    toXiaoeLearn(goodsInfo) {
-      let { aliveInfo } = this.properties
-      let h5_url = this.formatUrl(goodsInfo)
-      var path
-      // 音频 视频 
-      if (goodsInfo.resource_type === 2 || goodsInfo.resource_type === 3) {
-        path = `/pages/index/authorizePage?user_id=${aliveInfo.user_id}&app_id=${aliveInfo.app_id}&resource_id=${goodsInfo.id}&unique_type=elive`
-      } else {
-        // 其他
-        path = `/pages/index/authorizePage?user_id=${aliveInfo.user_id}&app_id=${aliveInfo.app_id}&h5_url=${h5_url}`
-      }
-      let params = {
-        appId: "wxa3589f1193170aa3",
-        path,
-      }
-      if (this.properties.envName == 'inside' || this.properties.envName == 'test') { //开发环境 测试环境 加上这个参数可以跳转去鹅学习体验版
-        params.appId = 'wx9eb4d7b3f2a3e003'
-        params.envVersion = 'trial'
-      }
-      wx.navigateToMiniProgram(params)
-    },
-    toPunchCard(goodsInfo) {
-      let { aliveInfo } = this.properties
-      let path = `/pages-participate-progress/pages/participate/participate?app_id=${aliveInfo.app_id}&&activity_id=${goodsInfo.resource_id}`
-      let params = {
-        appId: "wx839728854b1e23ad", //现网
-        path,
-      }
-      if (this.properties.envName == 'inside') { //开发环境
-        params.appId = 'wx802f346b1c7dcdd9'
-      } else if (this.properties.envName == 'test') { // 测试环境
-        params.appId = 'wx778bc88236be97d9'
-      }
-      wx.navigateToMiniProgram(params)
-    },
-    toAssociation(goodsInfo) {
-      let { aliveInfo } = this.properties
-      let path = `/pages-community/pages/home/index?appId=${aliveInfo.app_id}&&communityId=${goodsInfo.resource_id}`
-      let params = {
-        appId: "wxd0ad7e76d51ae4cc",
-        path,
-      }
-      if (this.properties.envName == 'inside') {
-        params.appId = 'wx52419e90dc6dd535' //开发环境
-      } else if (this.properties.envName == 'test') { //测试环境
-        params.appId = 'wxb245d452213c48c9' //测试环境
-      }
-      wx.navigateToMiniProgram(params)
-    },
-    sendGoodsCard(e) {
-      let dataset = e.currentTarget.dataset;
-      // 触发父组件的send
-      this.triggerEvent('sendGoodsCard', {
-        datas: dataset
-      });
-    },
-    changeShowType() {
-      if (this.data.goodsItem.teacher_auth != 2) {
-        this.showToast('暂无权限')
-        return
-      }
-      this.setData({
-        switchLoading: true
-      })
+  //judgePermission里面 showDialog 外部弹窗调用
+  toMiniProgram(goodsInfo){
+    let { aliveInfo, sensorReportParams } = this.properties
+    sensorLog.sensors.track('click_butt',{
+      page_id:'e_alive#mini#first#alive_room',
+      page_name:'直播间页面',
+      l_program: '鹅直播',
+      page_path: '鹅直播#小程序#首页#直播间页面',
+      page_button: "前往",
+      app_id: aliveInfo.app_id,
+      c_user_id: aliveInfo.user_id,
+      union_id: wx.getStorageSync('userInfo').universal_union_id,
+      current_role: sensorReportParams.current_role,
+      resource_id: aliveInfo.alive_id,
+      $url_path: `alive/${aliveInfo.alive_id}`,
+      type: sensorReportParams.type,
+      cmm1: sensorReportParams.alive_type,
+      cmm2: sensorReportParams.version_type,
+      comm2: sensorReportParams.pay_type
+    })
+    let spu_type = goodsInfo.spu_type
+    switch(spu_type){
+      case ASSOCIATION: 
+      this.toAssociation(goodsInfo);
+      break;
+      case PUNCH_CARD: 
+      this.toPunchCard(goodsInfo);
+      break;
+      default: 
+      this.toXiaoeLearn(goodsInfo);
+      break;
+    }
+  },
+  toXiaoeLearn(goodsInfo){
+    let { aliveInfo } = this.properties
+    let h5_url = this.formatUrl(goodsInfo)
+    var path
+    // 音频 视频 
+    if(goodsInfo.resource_type === 2 || goodsInfo.resource_type === 3){
+      path = `/pages/index/authorizePage?user_id=${aliveInfo.user_id}&app_id=${aliveInfo.app_id}&resource_id=${goodsInfo.id}&unique_type=elive`
+    }else {
+      // 其他
+      path = `/pages/index/authorizePage?user_id=${aliveInfo.user_id}&app_id=${aliveInfo.app_id}&h5_url=${h5_url}`
+    }
+    let params = {
+      appId: "wxa3589f1193170aa3",
+      path,
+    }
+    if(this.properties.envName == 'inside' || this.properties.envName == 'test'){ //开发环境 测试环境 加上这个参数可以跳转去鹅学习体验版
+      params.appId = 'wx9eb4d7b3f2a3e003'
+      params.envVersion='trial'
+    }
+    wx.navigateToMiniProgram(params)
+  },
+  toPunchCard(goodsInfo){ 
+    let { aliveInfo } = this.properties
+    let path = `/pages-participate-progress/pages/participate/participate?app_id=${aliveInfo.app_id}&&activity_id=${goodsInfo.resource_id}`
+    let params = {
+      appId: "wx839728854b1e23ad", //现网
+      path,
+    }
+    if(this.properties.envName == 'inside'){ //开发环境
+      params.appId = 'wx802f346b1c7dcdd9'
+    }else if(this.properties.envName == 'test'){ // 测试环境
+      params.appId = 'wx778bc88236be97d9'
+    }
+    wx.navigateToMiniProgram(params)
+  },
+  toAssociation(goodsInfo){
+    let { aliveInfo } = this.properties
+    let path = `/pages-community/pages/home/index?appId=${aliveInfo.app_id}&&communityId=${goodsInfo.resource_id}`
+    let params = {
+      appId: "wxd0ad7e76d51ae4cc",
+      path,
+    }
+    if(this.properties.envName == 'inside'){
+      params.appId = 'wx52419e90dc6dd535' //开发环境
+    }else if(this.properties.envName == 'test'){ //测试环境
+      params.appId = 'wxb245d452213c48c9' //测试环境
+    }
+    wx.navigateToMiniProgram(params)
+  },
+  sendGoodsCard(e) {
+    let dataset = e.currentTarget.dataset;
+    // 触发父组件的send
+    this.triggerEvent('sendGoodsCard', {
+      datas: dataset
+    });
+  },
+  changeShowType(){
+    if(this.data.goodsItem.teacher_auth != 2){
+      this.showToast('暂无权限')
+      return
+    }
+    this.setData({
+      switchLoading: true
+    })
       let params = {
         alive_id: this.properties.aliveInfo.alive_id,
         app_id: this.properties.aliveInfo.app_id,
         resource_id: this.data.goodsItem.id,
         is_display_package: this.data.checked ? 0 : 1
       };
-      showGoods(params).then((res) => {
-        console.log(res, "resres")
+      showGoods(params).then( (res) => {
+        console.log(res,"resres")
         let { code } = res.data
         if (code === 0) {
           this.setData({
@@ -720,7 +642,7 @@ Component({
             checked: !this.data.checked
           })
           this.showToast('操作成功')
-        } else {
+        }else{
           this.setData({
             switchLoading: false
           })

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"
+  }
+}