xiaoe_mp_npm 0.5.39 → 0.5.40-alpha2

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

@@ -4,17 +4,7 @@ import { receiveCoupon } from "../../../common/api/couponlist"
 import { debounce } from '../../../common/utils/tool.js'
 import {getInfoCollectionData} from "../../../common/utils/getInfoCollectionData"
 import { sensorLog }  from "live-mp-tools";
-
-const TOAST_TYPE = {
-  4: "优惠券链接已失效，请联系商家重新获取",
-  6: "优惠券链接已失效，请联系商家重新获取",
-  7: "操作频繁，稍后再试",
-  101: "优惠券已经被领完啦",
-  102: "该优惠券领取次数已达上限",
-  103: "领取已结束",
-  104: "优惠券已过期",
-  105: "优惠券绑定的商品权益变更，无法领取"
-}
+import { rpxToVmin } from '../../../common/utils/index.js'
 
 Component({
    
@@ -80,14 +70,14 @@ Component({
         if (data.item && data.item.price) {
             let tempPrice = data.item.price / 100; 
             if (tempPrice.toString().length >=6 ) {
-              return "4.27vmin"
+              return rpxToVmin(32)
             } else if (tempPrice.toString().length >= 5) {
-              return "4.8vmin"
+              return rpxToVmin(36)
             } else {
-              return "6.4vmin"
+              return rpxToVmin(48)
             } 
         } else {
-            return "6.4vmin";
+            return rpxToVmin(48);
         }
       },
       // 判断金额长度，不同金额区间端显示不同样式(互动页优惠券样式)
@@ -95,16 +85,16 @@ Component({
         if (data.item && data.item.price) {
           let tempPrice = data.item.price / 100; 
           if (tempPrice.toString().length >=6 ) {
-            return "4.27vmin"
+            return rpxToVmin(32)
           } else if (tempPrice.toString().length >= 5) {
-            return "4.8vmin"
+            return rpxToVmin(36)
           } else if (tempPrice.toString().length >= 4) {
-            return "6.4vmin"
+            return rpxToVmin(48)
           } else {
-            return "7.47vmin"
+            return rpxToVmin(56)
           } 
         } else {
-            return "7.47vmin";
+            return rpxToVmin(56)
         }
       },
       // 判断金额长度，不同金额区间端显示不同样式(竖屏互动页优惠券样式)
@@ -117,14 +107,13 @@ Component({
         }
         return false
       },
-    // 格式化使用说明
-    getDesInfo (data) {
-      if (!data.item.instructions) {
-        return '';
+      // 格式化使用说明
+      getDesInfo (data) {
+        if (!data.item.instructions) {
+          return '';
+        }
+        return data.item.instructions.replace(/\r\n/g, '<br/>');
       }
-      return data.item.instructions.replace(/\r\n/g, '<br/>');
-    }
-      
     },
     observers: {
       item(val) {
@@ -212,46 +201,81 @@ Component({
           console.log("领取单个优惠券信息", data);
           const code = data.code
           let dataInfo = data.data
-          switch (code) {
-            case 0:
-              this.handleLimitCoupon(dataInfo);
-              break;
-            case 101:
-              this.setData({
-                coupon_type: 3
+          if (code == 0) { //code为0包含普通优惠券和专属优惠券，通过dataInfo.is_limit区别
+            if (dataInfo.is_limit == 1) { // 专属优惠券
+              wx.showToast({
+                title: dataInfo.limit_tips,
+                icon: 'none'
               })
-              break;
-            case 102:
+              return
+            } else { // 普通优惠券
               this.setData({
-                coupon_type: 6
+                coupon_type: 2,
+                has_received: true
               })
-              break;
-            case 103://103;已手动结束--B端操作停止使优惠券失效
-              this.setData({
-                coupon_type: 5
+              // 达到领取上限，隐藏按钮
+              if (dataInfo.receive_rule && dataInfo.receive_rule === dataInfo.current_user_received_count) {
+                this.setData({
+                  coupon_type: 6
+                })
+              }
+              this.triggerEvent('receivedSuccess') //优惠券领取成功抛出方法用于直播间热度上报
+              wx.showToast({
+                title: '领取成功',
+                icon: 'none'
               })
-              break;
-            case 104:// 已过期
+              // 全屏端领取成功关闭优惠券弹窗
+              if (this.properties.isFullScreen) {
+                this.triggerEvent('closeCounpon')
+              }
+              return
+            }
+          } else if(code == 101) { 
               this.setData({
-                coupon_type: 4
+                coupon_type: 3
               })
-              break;
-            case 105:// 105：领取失败，券已失效
-            case 4:// 4:数据库错误,该优惠券领取次数已达上限 
-            case 6://6：获取不到指定记录,无效的优惠券信息
-              this.setData({
-                coupon_type: 7
+              wx.showToast({
+                title: '优惠券已经被领完啦',
+                icon: 'none'
+              })
+          } else if (code == 102) {
+            this.setData({
+              coupon_type: 6
+            })
+              wx.showToast({
+                title: '该优惠券领取次数已达上限',
+                icon: 'none'
+              })
+          } else if (code == 103) { //103;已手动结束--B端操作停止使优惠券失效
+            this.setData({
+              coupon_type: 5
+            })
+              wx.showToast({
+                title: '该优惠券已失效',
+                icon: 'none'
+              })
+          } else if (code == 104) { // 已过期
+            this.setData({
+              coupon_type: 4
+            })
+              wx.showToast({
+                title: '该优惠券已过期',
+                icon: 'none'
+              })
+          } else if (code == 105 || code == 6) { // 105：已失效，6：删除
+            this.setData({
+              coupon_type: 7
+            })
+              wx.showToast({
+                title: '该优惠券已失效',
+                icon: 'none'
+              })
+          } else {
+              wx.showToast({
+                title: data.msg,
+                icon: 'none'
               })
-              break;
-            default:
-              break;
           }
-          // code 为0的时候有自己的toast
-          if(code === 0) return;
-          wx.showToast({
-            title: TOAST_TYPE[code] || data.msg,
-            icon: 'none'
-          })
           // 竖屏领取上限后需要消失
           if (code !== 0 && this.data.aliveMode === 1) this.triggerEvent("closeCounpon");
         })
@@ -274,37 +298,5 @@ Component({
             is_viewUsingInfo: !this.data.is_viewUsingInfo
           })
       },
-      // 处理领取优惠券接口code为0的情况
-      handleLimitCoupon(dataInfo) {
-        if (dataInfo.is_limit == 1) { // 专属优惠券
-          wx.showToast({
-            title: dataInfo.limit_tips,
-            icon: 'none'
-          })
-        } else { // 普通优惠券
-          this.setData({
-            coupon_type: 2,
-            has_received: true
-          })
-          // 达到领取上限，隐藏按钮
-          if (dataInfo.receive_rule && dataInfo.receive_rule === dataInfo.current_user_received_count) {
-            this.setData({
-              coupon_type: 6
-            })
-          }
-          this.triggerEvent('receivedSuccess') //优惠券领取成功抛出方法用于直播间热度上报
-          wx.showToast({
-            title: '领取成功',
-            icon: 'none'
-          })
-          // 全屏端领取成功关闭优惠券弹窗
-          if (this.properties.isFullScreen) {
-            this.triggerEvent('closeCounpon')
-          }
-        }
-      }
-  
   }
-    
-    
 })