xiaoe_mp_npm 1.0.26 → 1.0.28

package/miniprogram_dist/Task/TaskBubble/index.js

@@ -1,17 +1,17 @@
 const computedBehavior = require('miniprogram-computed').behavior
 const task_title = {
-  2:{
-    "1": "发表评论",
-    "2": "转发直播间",
-    "3": "完成点赞"
+  2: {
+    1: '发表评论',
+    2: '转发直播间',
+    3: '完成点赞',
+  },
+  4: {
+    6: '完成打赏',
+    7: '完成投票',
+    8: '完成问卷',
+    9: '完成签到',
+    10: '完成答题',
   },
-  4:{
-    "6": "完成打赏",
-    "7": "完成投票",
-    "8": "完成问卷",
-    "9": "完成签到",
-    "10": "完成答题"
-  }
 }
 Component({
   behaviors: [computedBehavior],
@@ -27,6 +27,10 @@ Component({
       type: Number,
       value: 1,
     },
+    teamId: {
+      type: String,
+      value: '',
+    },
   },
 
   /**
@@ -35,53 +39,62 @@ Component({
   data: {
     animationData: {},
     taskIcon: {
-        1: "https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltoab3rb0ypq.png",
-        2: "https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltp6qpua0u1u.png",
-        3: "https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltoab3rc0gd6.png",
-        4: "https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltoab3rc0b4q.png",
-        5: "https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltoab3r90jil.png"
-    }
+      1: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltoab3rb0ypq.png',
+      2: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltp6qpua0u1u.png',
+      3: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltoab3rc0gd6.png',
+      4: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltoab3rc0b4q.png',
+      5: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltoab3r90jil.png',
+    },
   },
 
   computed: {
     // 奖品类型
-    rewardValue(data){
-      if(data.taskMsg.live_task?.task_type){
+    rewardValue(data) {
+      if (data.taskMsg.live_task?.task_type) {
         const { task_type, task_condition, reward_frequency } = data.taskMsg.live_task
-        if(task_type === 1){
-          const hours = Math.floor(task_condition / 60);
-          const remainingMinutes = task_condition % 60;
+        if (task_type === 1) {
+          const hours = Math.floor(task_condition / 60)
+          const remainingMinutes = task_condition % 60
 
           if (hours === 0) {
-              return `达${remainingMinutes}分钟`;
+            return `达${remainingMinutes}分钟`
           } else if (remainingMinutes === 0) {
-              return `达${hours}小时`;
+            return `达${hours}小时`
           } else {
-              return `达${hours}小时${remainingMinutes}分钟`;
+            return `达${hours}小时${remainingMinutes}分钟`
           }
-        }else if(task_type === 3){
-          if(task_condition === "4") return `成功消费 ${reward_frequency}笔订单数`
-          if(task_condition === "5") return `成功消费 ${(reward_frequency/100).toFixed(2)}元`
-        }else {
-          console.log("rewardValue",task_title)
+        } else if (task_type === 3) {
+          if (task_condition === '4') return `成功消费 ${reward_frequency}笔订单数`
+          if (task_condition === '5') return `成功消费 ${(reward_frequency / 100).toFixed(2)}元`
+        } else {
+          console.log('rewardValue', task_title)
           return task_title[task_type][task_condition]
         }
-      }       
+      }
     },
     // 奖品icon
-    taskIconImg(data){
+    taskIconImg(data) {
       return data.taskIcon[data.taskMsg.live_task?.reward_type]
     },
     // 奖品数量
-    prizeNum(data){
-      if(data.taskMsg?.live_task){
+    prizeNum(data) {
+      if (data.taskMsg?.live_task) {
         const { coupon_list } = data.taskMsg
-        const { reward_type, reward_value } = data.taskMsg.live_task
-        if(reward_type === 1) return reward_value
-        if(reward_type === 2) return coupon_list.length
+        const { reward_type, reward_value, reward_pay_type, team_pay_config } = data.taskMsg.live_task
+        if (reward_type === 1) return reward_value
+        if (reward_type === 2) return coupon_list.length
+        if (reward_type === 3) {
+          if (reward_pay_type === 0) {
+            return `${(reward_value.money / 100).toFixed(2)}`
+          } else if (reward_pay_type === 10 && team_pay_config) {
+            const storeList = JSON.parse(team_pay_config)
+            const storeItem = storeList.find((item) => item.team_id === data.teamId)
+            if (storeItem) return `${(storeItem.money / 100).toFixed(2)}`
+          }
+        }
         return 1
-      }      
-    }
+      }
+    },
   },
 
   lifetimes: {},
@@ -91,10 +104,10 @@ Component({
    */
   methods: {
     // 气泡点击事件
-    bubbleClick(){
-      this.triggerEvent("bubbleClick")
+    bubbleClick() {
+      this.triggerEvent('bubbleClick')
     },
-  
+
     // 显示气泡动画
     showBubble() {
       const animation = wx.createAnimation({

package/miniprogram_dist/Task/TaskBubble/index.json

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

package/miniprogram_dist/Task/TaskBubble/index.scss

@@ -1,125 +1,125 @@
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-$deviceWidth: 750;
-
-@mixin barrage-container {
-  color: #fff;
-  font-size: vmin(20);
-  .barrage-wrap {
-    display: flex;
-    .barrage-item {
-      position: relative;
-      background: linear-gradient(270deg, #ff552b00 0%, #ff552bc7 21.42%, #ff8b25eb 46.71%, #FC0 100%);
-      height: vmin(64);
-      font-size: vmin(24);
-      line-height: vmin(64);
-      border-radius: vmin(92);
-      transition: 0.3s;
-      transform: translateX(vmin(-500));
-
-      .barrage-content {
-        display: flex;
-        align-items: center;
-      }
-
-      .task-completion-icon {
-        width: vmin(48);
-        height: vmin(48);
-        border-radius: 50%;
-        margin-left: vmin(10);
-        margin-right: vmin(8);
-        flex-shrink: 0;
-      }
-      .task-type {
-        display: flex;
-        flex-direction: column;
-        margin-right: vmin(8);
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        view {
-          width: 100%;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-        }
-      }
-      .prize-icon {
-        width: vmin(56);
-        height: vmin(56);
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin: 0 vmin(8);
-      }
-      .prize-num {
-        color: #FFF5CC;
-        font-weight: 500;
-        margin-right: vmin(8);
-      }
-      .right-arrow-icon{
-        height: vmin(40);
-        width: vmin(40);
-        margin-right: vmin(52);
-      }
-      &.barrage-item-show {
-        animation: taskFadeInLeft 1.5s both;
-      }
-      &.barrage-item-hide {
-        animation: taskFadeOut 1.5s both;
-      }
-    }
-    @keyframes taskFadeInLeft {
-      0% {
-        transform: translateX(vmin(-500));
-        opacity: 1;
-      }
-      100% {
-        transform: translateX(0);
-        opacity: 1;
-      }
-    }
-    @keyframes taskFadeOut {
-      0% {
-        transform: translateX(0);
-        opacity: 1;
-      }
-      100% {
-        transform: translateX(0);
-        opacity: 0;
-      }
-    }
-    @keyframes moveRight {
-      from {
-        transform: translateX(-100%);
-      }
-      to {
-        transform: translateX(0);
-      }
-    }
-  }
-}
-
-.barrage-container {
-  @include barrage-container;
-}
-
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .barrage-container {
-    @include barrage-container;
-  }
-}
-
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .barrage-container {
-    @include barrage-container;
-  }
-}
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+$deviceWidth: 750;
+
+@mixin barrage-container {
+  color: #fff;
+  font-size: vmin(20);
+  .barrage-wrap {
+    display: flex;
+    .barrage-item {
+      position: relative;
+      background: linear-gradient(270deg, #ff552b00 0%, #ff552bc7 21.42%, #ff8b25eb 46.71%, #FC0 100%);
+      height: vmin(64);
+      font-size: vmin(24);
+      line-height: vmin(64);
+      border-radius: vmin(92);
+      transition: 0.3s;
+      transform: translateX(vmin(-500));
+
+      .barrage-content {
+        display: flex;
+        align-items: center;
+      }
+
+      .task-completion-icon {
+        width: vmin(48);
+        height: vmin(48);
+        border-radius: 50%;
+        margin-left: vmin(10);
+        margin-right: vmin(8);
+        flex-shrink: 0;
+      }
+      .task-type {
+        display: flex;
+        flex-direction: column;
+        margin-right: vmin(8);
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        view {
+          width: 100%;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+      }
+      .prize-icon {
+        width: vmin(56);
+        height: vmin(56);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin: 0 vmin(8);
+      }
+      .prize-num {
+        color: #FFF5CC;
+        font-weight: 500;
+        margin-right: vmin(8);
+      }
+      .right-arrow-icon{
+        height: vmin(40);
+        width: vmin(40);
+        margin-right: vmin(52);
+      }
+      &.barrage-item-show {
+        animation: taskFadeInLeft 1.5s both;
+      }
+      &.barrage-item-hide {
+        animation: taskFadeOut 1.5s both;
+      }
+    }
+    @keyframes taskFadeInLeft {
+      0% {
+        transform: translateX(vmin(-500));
+        opacity: 1;
+      }
+      100% {
+        transform: translateX(0);
+        opacity: 1;
+      }
+    }
+    @keyframes taskFadeOut {
+      0% {
+        transform: translateX(0);
+        opacity: 1;
+      }
+      100% {
+        transform: translateX(0);
+        opacity: 0;
+      }
+    }
+    @keyframes moveRight {
+      from {
+        transform: translateX(-100%);
+      }
+      to {
+        transform: translateX(0);
+      }
+    }
+  }
+}
+
+.barrage-container {
+  @include barrage-container;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .barrage-container {
+    @include barrage-container;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .barrage-container {
+    @include barrage-container;
+  }
+}

package/miniprogram_dist/Task/TaskBubble/index.wxml

@@ -1,22 +1,22 @@
-<view class="barrage-container" catch:tap="bubbleClick" style="{{zIndex?'z-index:'+zIndex:''}}">
-  <view class="barrage-wrap">
-    <view class="barrage-item" animation="{{animationData}}">
-      <view class="barrage-content">
-        <image
-          class="task-completion-icon"
-          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopitz1y0c73.png"
-          alt
-        />
-        <view wx:if="{{taskMsg.live_task.task_type === 1}}" class="task-type">观看时长</view>
-        <view>{{ rewardValue }}</view>
-        <image class="prize-icon" src="{{taskIconImg}}" alt="奖励" />
-        <view class="prize-num">+{{ prizeNum }}</view>
-        <image
-          class="right-arrow-icon"
-          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopitz1k0dzj.png"
-          alt
-        />
-      </view>
-    </view>
-  </view>
-</view>
+<view class="barrage-container" catch:tap="bubbleClick" style="{{zIndex?'z-index:'+zIndex:''}}">
+  <view class="barrage-wrap">
+    <view class="barrage-item" animation="{{animationData}}">
+      <view class="barrage-content">
+        <image
+          class="task-completion-icon"
+          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopitz1y0c73.png"
+          alt
+        />
+        <view wx:if="{{taskMsg.live_task.task_type === 1}}" class="task-type">观看时长</view>
+        <view>{{ rewardValue }}</view>
+        <image class="prize-icon" src="{{taskIconImg}}" alt="奖励" />
+        <view class="prize-num">+{{ prizeNum }}</view>
+        <image
+          class="right-arrow-icon"
+          src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopitz1k0dzj.png"
+          alt
+        />
+      </view>
+    </view>
+  </view>
+</view>

package/miniprogram_dist/Task/TaskIcon/index.js

@@ -1,29 +1,29 @@
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    aliveMode:{
-      type: Number,
-      value: 1
-    },
-    iconText:{
-      type: String,
-      value: '得奖励'
-    },
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {},
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    iconClick(){
-      this.triggerEvent("iconClick")
-    }
-  },
-})
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    aliveMode:{
+      type: Number,
+      value: 1
+    },
+    iconText:{
+      type: String,
+      value: '得奖励'
+    },
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {},
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    iconClick(){
+      this.triggerEvent("iconClick")
+    }
+  },
+})

package/miniprogram_dist/Task/TaskIcon/index.json

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

package/miniprogram_dist/Task/TaskIcon/index.scss

@@ -1,70 +1,70 @@
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-$deviceWidth: 750;
-
-@mixin taskIcon {
-  z-index: 9;
-  box-sizing: border-box;
-  width: vmin(72);
-  height: vmin(72);
-  text-align: center;
-  padding: 0;
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  font-size: vmin(16);
-  height: 100%;
-  border-radius: vmin(16);
-  margin: 0 vmin(32) vmin(24) 0;
-  pointer-events: auto;
-  .task-icon {
-      flex-shrink: 0;
-      display: block;
-      width: vmin(64);
-      height: vmin(64);
-      background-image: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopok62p0l77.png');
-      background-size: 100% 100%;
-  }
-  .task-text {
-      width: vmin(64);
-      height: vmin(24);
-      line-height: vmin(24);
-      border-radius: vmin(12);
-      font-size: vmin(16);
-      background: rgba($color: #000000, $alpha: 0.4);
-      color: #fff;
-  }
-  &.verticalStyle{
-    margin: 0;
-    background: rgba($color: #000000, $alpha: 0.2);
-    .task-text{
-      position: absolute;
-      bottom: vmin(-2);
-    }
-  }
-}
-
-.taskIcon {
-  @include taskIcon;
-}
-
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .taskIcon {
-    @include taskIcon;
-  }
-}
-
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .taskIcon {
-    @include taskIcon;
-  }
-}
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+$deviceWidth: 750;
+
+@mixin taskIcon {
+  z-index: 9;
+  box-sizing: border-box;
+  width: vmin(72);
+  height: vmin(72);
+  text-align: center;
+  padding: 0;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  font-size: vmin(16);
+  height: 100%;
+  border-radius: vmin(16);
+  margin: 0 vmin(32) vmin(24) 0;
+  pointer-events: auto;
+  .task-icon {
+      flex-shrink: 0;
+      display: block;
+      width: vmin(64);
+      height: vmin(64);
+      background-image: url('https://commonresource-1252524126.cdn.xiaoeknow.com/image/lopok62p0l77.png');
+      background-size: 100% 100%;
+  }
+  .task-text {
+      width: vmin(64);
+      height: vmin(24);
+      line-height: vmin(24);
+      border-radius: vmin(12);
+      font-size: vmin(16);
+      background: rgba($color: #000000, $alpha: 0.4);
+      color: #fff;
+  }
+  &.verticalStyle{
+    margin: 0;
+    background: rgba($color: #000000, $alpha: 0.2);
+    .task-text{
+      position: absolute;
+      bottom: vmin(-2);
+    }
+  }
+}
+
+.taskIcon {
+  @include taskIcon;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .taskIcon {
+    @include taskIcon;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .taskIcon {
+    @include taskIcon;
+  }
+}

package/miniprogram_dist/Task/TaskIcon/index.wxml

@@ -1,5 +1,5 @@
-<view class="taskIcon {{aliveMode === 1? 'verticalStyle' : ''}}" catch:tap="iconClick">
-  <view class="task-icon" />
-  <view class="task-text">{{iconText}}</view>
-</view>
-
+<view class="taskIcon {{aliveMode === 1? 'verticalStyle' : ''}}" catch:tap="iconClick">
+  <view class="task-icon" />
+  <view class="task-text">{{iconText}}</view>
+</view>
+