xiaoe_mp_npm 1.1.4 → 1.1.5-test01

package/src/ShoppingCartBubble/index.js

@@ -1,156 +1,156 @@
-const TYPE_MAP = {
-  BUYING: 1,
-  BUY_SUCCESS: 2,
-}
-const INTERVAL_TIME = 3000 // 单次动画间隔时间
-const DURATION_TIME = 2500 // 动画总时间
-const DEFAULT_ANIMATION_TIME = 400 // 动画时间
-
-import { getSensitiveState } from '../common/utils/index'
-import { getShoppingBarrage } from '../common/api/liveGoodsList'
-
-Component({
-  properties: {
-    aliveInfo: {
-      type: Object,
-      value: {}
-    },
-  },
-  data: {
-    goodsAnimationData: {},
-    bubbleList: [],
-    bubbleInterval: null,
-    animationTimer: null,
-    currentBubbleIndex: 0,
-    isInit: false
-  },
-  lifetimes: {
-    attached() {
-      setTimeout(() => {
-        this.handleInit()
-      }, 0)
-    },
-    detached() {
-      this.resetOptions()
-    },
-  },
-  methods: {
-    handleInit() {
-      const { alive_id, app_id, user_id} = this.properties.aliveInfo;
-      const params = {
-        alive_id,
-        app_id,
-        user_id
-      }
-      getShoppingBarrage(params, false).then(res => {
-        if (res.data.code === 0 && res.data.data.length > 0) {
-          this.setData({
-            bubbleList: res.data.data
-          })
-
-          if (this.data.bubbleList.length <= 0) {
-            this.resetOptions()
-            return
-          }
-    
-          if (this.data.bubbleList.length > 1) {
-            this.startBubbleRotation()
-          } else if (this.data.bubbleList.length === 1) {
-            this.displayBubble(this.data.bubbleList[0])
-          }
-        }
-      }).catch(err => {
-        this.resetOptions()
-        console.log(err)
-        return;
-      }) 
-    },
-    /**
-     * 启动一个定时器定期更新气泡
-     * 
-     * @method startBubbleRotation
-     * @memberof ShoppingCartBubble
-     * @instance
-     */
-    startBubbleRotation() {
-      this.displayBubble(this.data.bubbleList[this.data.currentBubbleIndex])
-      let bubbleInterval = setInterval(() => {
-        this.setData({
-          currentBubbleIndex: (this.data.currentBubbleIndex + 1) % this.data.bubbleList.length,
-        })
-        this.displayBubble(this.data.bubbleList[this.data.currentBubbleIndex])
-      }, INTERVAL_TIME)
-
-      this.setData({
-        bubbleInterval,
-      })
-    },
-    displayBubble(bubble) {
-      this.setData({
-        bubbleUser: bubble.user_name,
-        bubbleDesc: bubble.goods_type === TYPE_MAP.BUYING ? '正在购买' : '购买了',
-        bubbleNum: bubble.order_weight,
-        bubbleSensitiveState: this.handleSensitiveState(bubble.user_id),
-      })
-      this.handleInitAnimation()
-    },
-    handleInitAnimation() {
-      if (!this.data.isInit) {
-        this.setData({
-          isInit: true,
-        })
-      }
-      const animation = wx.createAnimation({
-        duration: DEFAULT_ANIMATION_TIME,
-        timingFunction: 'ease',
-      })
-      animation.translateY(-30).opacity(1).step();
-      this.setData({
-        goodsAnimationData: animation.export(),
-      });
-
-      if (this.data.bubbleList.length > 1) {
-        let animationTimer = setTimeout(() => {
-          const slideOutAnimation = wx.createAnimation({
-          duration: DEFAULT_ANIMATION_TIME,
-          timingFunction: 'ease',
-        })
-        slideOutAnimation.translateY(-35).opacity(0).step();
-        this.setData({
-          goodsAnimationData: slideOutAnimation.export(),
-        });
-
-        setTimeout(() => {
-          const resetAnimation = wx.createAnimation({
-            duration: 0,
-            timingFunction: 'ease',
-          })
-          resetAnimation.translateY(0).opacity(0).step() // 恢复到初始位置
-          this.setData({
-            goodsAnimationData: resetAnimation.export(),
-          })
-        }, DEFAULT_ANIMATION_TIME + 20)
-
-        }, DURATION_TIME);
-
-        this.setData({
-          animationTimer
-        })
-      }
-    },
-    resetOptions() {
-      this.setData({
-        isInit: false,
-      })
-      clearInterval(this.data.bubbleInterval)
-      clearTimeout(this.data.animationTimer)
-    },
-    // 昵称脱敏处理
-    handleSensitiveState(id) {
-      const userType = this.properties.aliveInfo.user_type
-      const isMeOrTeacher = this.properties.aliveInfo.user_id === id || userType
-      const isNeedPrivacy = !isMeOrTeacher && getSensitiveState(userType, this.properties.aliveInfo.alive_conf)
-      return isNeedPrivacy ? getSensitiveState(userType, this.properties.aliveInfo.alive_conf) : 0
-    },
-  },
-})
+const TYPE_MAP = {
+  BUYING: 1,
+  BUY_SUCCESS: 2,
+}
+const INTERVAL_TIME = 3000 // 单次动画间隔时间
+const DURATION_TIME = 2500 // 动画总时间
+const DEFAULT_ANIMATION_TIME = 400 // 动画时间
+
+import { getSensitiveState } from '../common/utils/index'
+import { getShoppingBarrage } from '../common/api/liveGoodsList'
+
+Component({
+  properties: {
+    aliveInfo: {
+      type: Object,
+      value: {}
+    },
+  },
+  data: {
+    goodsAnimationData: {},
+    bubbleList: [],
+    bubbleInterval: null,
+    animationTimer: null,
+    currentBubbleIndex: 0,
+    isInit: false
+  },
+  lifetimes: {
+    attached() {
+      setTimeout(() => {
+        this.handleInit()
+      }, 0)
+    },
+    detached() {
+      this.resetOptions()
+    },
+  },
+  methods: {
+    handleInit() {
+      const { alive_id, app_id, user_id} = this.properties.aliveInfo;
+      const params = {
+        alive_id,
+        app_id,
+        user_id
+      }
+      getShoppingBarrage(params, false).then(res => {
+        if (res.data.code === 0 && res.data.data.length > 0) {
+          this.setData({
+            bubbleList: res.data.data
+          })
+
+          if (this.data.bubbleList.length <= 0) {
+            this.resetOptions()
+            return
+          }
+    
+          if (this.data.bubbleList.length > 1) {
+            this.startBubbleRotation()
+          } else if (this.data.bubbleList.length === 1) {
+            this.displayBubble(this.data.bubbleList[0])
+          }
+        }
+      }).catch(err => {
+        this.resetOptions()
+        console.log(err)
+        return;
+      }) 
+    },
+    /**
+     * 启动一个定时器定期更新气泡
+     * 
+     * @method startBubbleRotation
+     * @memberof ShoppingCartBubble
+     * @instance
+     */
+    startBubbleRotation() {
+      this.displayBubble(this.data.bubbleList[this.data.currentBubbleIndex])
+      let bubbleInterval = setInterval(() => {
+        this.setData({
+          currentBubbleIndex: (this.data.currentBubbleIndex + 1) % this.data.bubbleList.length,
+        })
+        this.displayBubble(this.data.bubbleList[this.data.currentBubbleIndex])
+      }, INTERVAL_TIME)
+
+      this.setData({
+        bubbleInterval,
+      })
+    },
+    displayBubble(bubble) {
+      this.setData({
+        bubbleUser: bubble.user_name,
+        bubbleDesc: bubble.goods_type === TYPE_MAP.BUYING ? '正在购买' : '购买了',
+        bubbleNum: bubble.order_weight,
+        bubbleSensitiveState: this.handleSensitiveState(bubble.user_id),
+      })
+      this.handleInitAnimation()
+    },
+    handleInitAnimation() {
+      if (!this.data.isInit) {
+        this.setData({
+          isInit: true,
+        })
+      }
+      const animation = wx.createAnimation({
+        duration: DEFAULT_ANIMATION_TIME,
+        timingFunction: 'ease',
+      })
+      animation.translateY(-30).opacity(1).step();
+      this.setData({
+        goodsAnimationData: animation.export(),
+      });
+
+      if (this.data.bubbleList.length > 1) {
+        let animationTimer = setTimeout(() => {
+          const slideOutAnimation = wx.createAnimation({
+          duration: DEFAULT_ANIMATION_TIME,
+          timingFunction: 'ease',
+        })
+        slideOutAnimation.translateY(-35).opacity(0).step();
+        this.setData({
+          goodsAnimationData: slideOutAnimation.export(),
+        });
+
+        setTimeout(() => {
+          const resetAnimation = wx.createAnimation({
+            duration: 0,
+            timingFunction: 'ease',
+          })
+          resetAnimation.translateY(0).opacity(0).step() // 恢复到初始位置
+          this.setData({
+            goodsAnimationData: resetAnimation.export(),
+          })
+        }, DEFAULT_ANIMATION_TIME + 20)
+
+        }, DURATION_TIME);
+
+        this.setData({
+          animationTimer
+        })
+      }
+    },
+    resetOptions() {
+      this.setData({
+        isInit: false,
+      })
+      clearInterval(this.data.bubbleInterval)
+      clearTimeout(this.data.animationTimer)
+    },
+    // 昵称脱敏处理
+    handleSensitiveState(id) {
+      const userType = this.properties.aliveInfo.user_type
+      const isMeOrTeacher = this.properties.aliveInfo.user_id === id || userType
+      const isNeedPrivacy = !isMeOrTeacher && getSensitiveState(userType, this.properties.aliveInfo.alive_conf)
+      return isNeedPrivacy ? getSensitiveState(userType, this.properties.aliveInfo.alive_conf) : 0
+    },
+  },
+})

package/src/ShoppingCartBubble/index.json

@@ -1,4 +1,4 @@
-{
-  "component": true,
-  "usingComponents": {}
-}
+{
+  "component": true,
+  "usingComponents": {}
+}

package/src/ShoppingCartBubble/index.scss

@@ -1,55 +1,55 @@
-$deviceWidth: 750;
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin shopping-cart-bubble {
-  position: absolute;
-  left: vmin(22);
-  width: auto;
-  opacity: 1;
-  transform: translateY(vmin(-56));
-  
-  .shopping-cart-bubble-info {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: vmin(28);
-    color: rgba(255, 255, 255, 1);
-    font-weight: 700;
-    background: rgba(0, 0, 0, 0.6);
-    border-radius: vmin(50);
-    padding: vmin(4) vmin(16);
-  }
-  .goods-info-num {
-    color: #FCC600;
-  }
-}
-
-.shopping-cart-bubble {
-  @include shopping-cart-bubble
-}
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .shopping-cart-bubble {
-      @include shopping-cart-bubble
-  }
-}
-// PC 放大适配
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  $deviceWidth: 1260 !global;
-
-  .shopping-cart-bubble {
-    @include shopping-cart-bubble;
-  }
-}
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .shopping-cart-bubble {
-      @include shopping-cart-bubble;
-  }
-}
+$deviceWidth: 750;
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin shopping-cart-bubble {
+  position: absolute;
+  left: vmin(22);
+  width: auto;
+  opacity: 1;
+  transform: translateY(vmin(-56));
+  
+  .shopping-cart-bubble-info {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: vmin(28);
+    color: rgba(255, 255, 255, 1);
+    font-weight: 700;
+    background: rgba(0, 0, 0, 0.6);
+    border-radius: vmin(50);
+    padding: vmin(4) vmin(16);
+  }
+  .goods-info-num {
+    color: #FCC600;
+  }
+}
+
+.shopping-cart-bubble {
+  @include shopping-cart-bubble
+}
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .shopping-cart-bubble {
+      @include shopping-cart-bubble
+  }
+}
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .shopping-cart-bubble {
+    @include shopping-cart-bubble;
+  }
+}
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .shopping-cart-bubble {
+      @include shopping-cart-bubble;
+  }
+}

package/src/ShoppingCartBubble/index.wxml

@@ -1,11 +1,11 @@
-<view   
-  class="shopping-cart-bubble" 
-  wx:if="{{ isInit }}" 
-  animation="{{goodsAnimationData}}"
->
-  <view class="shopping-cart-bubble-info">
-    <nickname nickname="{{ bubbleUser }}" sensitiveState="{{ bubbleSensitiveState }}" />
-    <text>{{ bubbleDesc }}</text>
-    <text class="goods-info-num">{{ bubbleNum }}号商品</text>
-  </view>
-</view>
+<view   
+  class="shopping-cart-bubble" 
+  wx:if="{{ isInit }}" 
+  animation="{{goodsAnimationData}}"
+>
+  <view class="shopping-cart-bubble-info">
+    <nickname nickname="{{ bubbleUser }}" sensitiveState="{{ bubbleSensitiveState }}" />
+    <text>{{ bubbleDesc }}</text>
+    <text class="goods-info-num">{{ bubbleNum }}号商品</text>
+  </view>
+</view>

package/src/ShoppingCartBubble/index.wxss

@@ -1 +1 @@
-.shopping-cart-bubble{position:absolute;left:2.93333vmin;width:auto;opacity:1;transform:translateY(-7.46667vmin)}.shopping-cart-bubble .shopping-cart-bubble-info{display:flex;align-items:center;justify-content:center;font-size:3.73333vmin;color:#fff;font-weight:700;background:rgba(0,0,0,0.6);border-radius:6.66667vmin;padding:.53333vmin 2.13333vmin}.shopping-cart-bubble .goods-info-num{color:#FCC600}@media screen and (min-width: 768px) and (orientation: portrait){.shopping-cart-bubble{position:absolute;left:1.43229vmin;width:auto;opacity:1;transform:translateY(-3.64583vmin)}.shopping-cart-bubble .shopping-cart-bubble-info{display:flex;align-items:center;justify-content:center;font-size:1.82292vmin;color:#fff;font-weight:700;background:rgba(0,0,0,0.6);border-radius:3.25521vmin;padding:.26042vmin 1.04167vmin}.shopping-cart-bubble .goods-info-num{color:#FCC600}}@media screen and (min-height: 630px) and (orientation: landscape){.shopping-cart-bubble{position:absolute;left:1.74603vmin;width:auto;opacity:1;transform:translateY(-4.44444vmin)}.shopping-cart-bubble .shopping-cart-bubble-info{display:flex;align-items:center;justify-content:center;font-size:2.22222vmin;color:#fff;font-weight:700;background:rgba(0,0,0,0.6);border-radius:3.96825vmin;padding:.31746vmin 1.26984vmin}.shopping-cart-bubble .goods-info-num{color:#FCC600}}@media screen and (min-height: 768px) and (orientation: landscape){.shopping-cart-bubble{position:absolute;left:1.43229vmin;width:auto;opacity:1;transform:translateY(-3.64583vmin)}.shopping-cart-bubble .shopping-cart-bubble-info{display:flex;align-items:center;justify-content:center;font-size:1.82292vmin;color:#fff;font-weight:700;background:rgba(0,0,0,0.6);border-radius:3.25521vmin;padding:.26042vmin 1.04167vmin}.shopping-cart-bubble .goods-info-num{color:#FCC600}}
+.shopping-cart-bubble{position:absolute;left:2.93333vmin;width:auto;opacity:1;transform:translateY(-7.46667vmin)}.shopping-cart-bubble .shopping-cart-bubble-info{display:flex;align-items:center;justify-content:center;font-size:3.73333vmin;color:#fff;font-weight:700;background:rgba(0,0,0,0.6);border-radius:6.66667vmin;padding:.53333vmin 2.13333vmin}.shopping-cart-bubble .goods-info-num{color:#FCC600}@media screen and (min-width: 768px) and (orientation: portrait){.shopping-cart-bubble{position:absolute;left:1.43229vmin;width:auto;opacity:1;transform:translateY(-3.64583vmin)}.shopping-cart-bubble .shopping-cart-bubble-info{display:flex;align-items:center;justify-content:center;font-size:1.82292vmin;color:#fff;font-weight:700;background:rgba(0,0,0,0.6);border-radius:3.25521vmin;padding:.26042vmin 1.04167vmin}.shopping-cart-bubble .goods-info-num{color:#FCC600}}@media screen and (min-height: 630px) and (orientation: landscape){.shopping-cart-bubble{position:absolute;left:1.74603vmin;width:auto;opacity:1;transform:translateY(-4.44444vmin)}.shopping-cart-bubble .shopping-cart-bubble-info{display:flex;align-items:center;justify-content:center;font-size:2.22222vmin;color:#fff;font-weight:700;background:rgba(0,0,0,0.6);border-radius:3.96825vmin;padding:.31746vmin 1.26984vmin}.shopping-cart-bubble .goods-info-num{color:#FCC600}}@media screen and (min-height: 768px) and (orientation: landscape){.shopping-cart-bubble{position:absolute;left:1.43229vmin;width:auto;opacity:1;transform:translateY(-3.64583vmin)}.shopping-cart-bubble .shopping-cart-bubble-info{display:flex;align-items:center;justify-content:center;font-size:1.82292vmin;color:#fff;font-weight:700;background:rgba(0,0,0,0.6);border-radius:3.25521vmin;padding:.26042vmin 1.04167vmin}.shopping-cart-bubble .goods-info-num{color:#FCC600}}

package/src/Sku/Header/index.js

@@ -1,33 +1,33 @@
-// src/ConfirmOrder/components/Header/index.js
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    showBack: {
-      type: Boolean,
-      value: false
-    },
-    showClose:{
-      type: Boolean,
-      value: true
-    }
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    // 关闭
-    onClose() {
-      this.triggerEvent('onClose')
-    },
-  }
+// src/ConfirmOrder/components/Header/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    showBack: {
+      type: Boolean,
+      value: false
+    },
+    showClose:{
+      type: Boolean,
+      value: true
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // 关闭
+    onClose() {
+      this.triggerEvent('onClose')
+    },
+  }
 })

package/src/Sku/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/src/Sku/Header/index.less

@@ -1,31 +1,31 @@
-.header-content {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  height: 12.8vmin;
-  width: 100%;
-  position: sticky;
-  top: 0;
-  left: 0;
-  background-color: #ffffff;
-  z-index: 2;
-
-  .header-back {
-    padding-left: 4.27vmin;
-
-    .img {
-      width: 4.27vmin;
-      height: 4.27vmin;
-    }
-  }
-
-  .header-close {
-    padding-right: 4.27vmin;
-
-    .img {
-      width: 4.27vmin;
-      height: 4.27vmin;
-    }
-  }
+.header-content {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  height: 12.8vmin;
+  width: 100%;
+  position: sticky;
+  top: 0;
+  left: 0;
+  background-color: #ffffff;
+  z-index: 2;
+
+  .header-back {
+    padding-left: 4.27vmin;
+
+    .img {
+      width: 4.27vmin;
+      height: 4.27vmin;
+    }
+  }
+
+  .header-close {
+    padding-right: 4.27vmin;
+
+    .img {
+      width: 4.27vmin;
+      height: 4.27vmin;
+    }
+  }
 }

package/src/Sku/Header/index.wxml

@@ -1,10 +1,10 @@
-<!--src/ConfirmOrder/components/Header/index.wxml-->
-<view class="header-content">
-  <view class="header-back">
-    <image src="../../common/assets/images/left.png" class="img" bindtap="onClose" wx:if="{{ showBack }}"></image>
-  </view>
-  <view class="header-title">选择规格</view>
-  <view class="header-close">
-    <image class="img" src="../../common/assets/images/close.png" bindtap="onClose" wx:if="{{ showClose }}" ></image>
-  </view>
+<!--src/ConfirmOrder/components/Header/index.wxml-->
+<view class="header-content">
+  <view class="header-back">
+    <image src="../../common/assets/images/left.png" class="img" bindtap="onClose" wx:if="{{ showBack }}"></image>
+  </view>
+  <view class="header-title">选择规格</view>
+  <view class="header-close">
+    <image class="img" src="../../common/assets/images/close.png" bindtap="onClose" wx:if="{{ showClose }}" ></image>
+  </view>
 </view>