xiaoe_mp_npm 1.0.0-live3 → 1.0.0-live5

package/miniprogram_dist/Task/TaskBubble/index.js

@@ -49,7 +49,6 @@ Component({
       this.setData({
         animationData: animation.export(),
       })
-
       // 在动画结束后调用还原元素位置的函数
       setTimeout(() => {
         this.restoreElement()

package/miniprogram_dist/Task/TaskBubble/index.scss

@@ -7,7 +7,6 @@ $deviceWidth: 750;
 @mixin barrage-container {
   color: #fff;
   font-size: vmin(20);
-  margin-bottom: vmin(76);
   .barrage-wrap {
     display: flex;
     .barrage-item {

package/miniprogram_dist/Task/TaskBubble/index.wxss

@@ -1,7 +1,6 @@
 .barrage-container {
   color: #fff;
   font-size: 2.66667vmin;
-  margin-bottom: 10.13333vmin;
 }
 .barrage-container .barrage-wrap {
   display: flex;
@@ -97,7 +96,6 @@
   .barrage-container {
     color: #fff;
     font-size: 1.30208vmin;
-    margin-bottom: 4.94792vmin;
   }
   .barrage-container .barrage-wrap {
     display: flex;
@@ -194,7 +192,6 @@
   .barrage-container {
     color: #fff;
     font-size: 1.30208vmin;
-    margin-bottom: 4.94792vmin;
   }
   .barrage-container .barrage-wrap {
     display: flex;

package/miniprogram_dist/Task/TaskIcon/index.js

@@ -2,14 +2,17 @@ Component({
   /**
    * 组件的属性列表
    */
-  properties: {},
+  properties: {
+    aliveMode:{
+      type: Number,
+      value: 1
+    }
+  },
 
   /**
    * 组件的初始数据
    */
-  data: {
-    alive_mode: 1,
-  },
+  data: {},
 
   /**
    * 组件的方法列表

package/miniprogram_dist/Task/TaskIcon/index.wxml

@@ -1,4 +1,4 @@
-<view class="taskIcon {{alive_mode === 1? 'verticalStyle' : ''}}">
+<view class="taskIcon {{aliveMode === 1? 'verticalStyle' : ''}}">
   <view class="task-icon" />
   <view class="task-text">得奖励</view>
 </view>

package/miniprogram_dist/Task/TaskPopup/component/RewardList/index.js

@@ -1,27 +1,27 @@
-const computedBehavior = require('miniprogram-computed').behavior
-Component({
-  behaviors: [computedBehavior],
-  properties: {
-    rewardList:{
-      type:Array,
-      value:()=>{
-        return []
-      }
-    },
-  },
-  data: {
-    activeNames:["1"],
-  },
-  lifetimes: {
-    // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
-    attached: function () {
-
-    },
-    moved: function () { },
-    detached: function () { },
-  },
-  methods: {
-    onChange(){}
-  },
-  observers: {},
-})
+const computedBehavior = require('miniprogram-computed').behavior
+Component({
+  behaviors: [computedBehavior],
+  properties: {
+    rewardList:{
+      type:Array,
+      value:()=>{
+        return []
+      }
+    },
+  },
+  data: {
+    activeNames:["1"],
+  },
+  lifetimes: {
+    // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
+    attached: function () {
+
+    },
+    moved: function () { },
+    detached: function () { },
+  },
+  methods: {
+    onChange(){}
+  },
+  observers: {},
+})

package/miniprogram_dist/Task/TaskPopup/component/RewardList/index.json

@@ -1,6 +1,6 @@
-{
-  "component": true,
-  "usingComponents": {
-    "task-item":"../TaskItem"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "task-item":"../TaskItem"
+  }
+}

package/miniprogram_dist/Task/TaskPopup/component/RewardList/index.wxml

@@ -1,10 +1,10 @@
-<scroll-view class="goods-list" scroll-y="true" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}">
-  <task-item
-    wx:for="{{rewardList}}"
-    wx:for-item="item"
-    wx:for-index="index"
-    listType="reward"
-    isRadius="{{true}}"
-    taskItem="{{item}}"
-  />
-</scroll-view>
+<scroll-view class="goods-list" scroll-y="true" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}">
+  <task-item
+    wx:for="{{rewardList}}"
+    wx:for-item="item"
+    wx:for-index="index"
+    listType="reward"
+    isRadius="{{true}}"
+    taskItem="{{item}}"
+  />
+</scroll-view>

package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.js

@@ -54,6 +54,7 @@ Component({
   watch:{
     taskItem:function(newVal){
       const { task_type, task_condition } = newVal
+      console.log("taskItem",newVal)
       let taskBelongType;
         // 任务类型归属
         if(task_type === 1){
@@ -84,10 +85,11 @@ Component({
   computed:{
     // 任务标题
     taskTitle(data){
+      console.log("taskItem",data.taskBelongType)
       let title = ""
       switch(data.taskBelongType){
         case 1:
-          let task_condition = data.listType === LIST_TYPE.REWARD?data.taskItem.live_task.task_condition:data.taskItem.task_condition
+          let task_condition = data.taskItem.task_condition
           title = `观看时长${getHoursMinutes(task_condition)}`
           break;
         case 2:
@@ -110,6 +112,11 @@ Component({
         return "去使用"
       }
 
+      // 任务状态已结束
+      if(data.taskItem.state === 2){
+        return "已结束"
+      }
+
       // 任务同步失败列表
       if(data.listType === LIST_TYPE.ERROR){
         return "领奖励"
@@ -126,8 +133,8 @@ Component({
 
     // 奖励内容
     rewardText(data){
-      const { reward_type, reward_value } = data.listType === LIST_TYPE.REWARD?data.taskItem.live_task:data.taskItem
-      return `+${reward_value} ${reward_type===1?'积分':'优惠券'}`
+      const { reward_type, reward_value } = data.taskItem
+      return `+${reward_type===1?reward_value:1} ${reward_type===1?'积分':'优惠券'}`
     },
     
     // 奖励图标
@@ -153,15 +160,11 @@ Component({
     btnClick(){
       if(this.data.btnText === TASK_TYPE_TEXT[2]){
         // 去评论
-        this.triggerEvent("btnClick",{
-          data: "toComment"
-        })
+        this.triggerEvent("btnClick","toComment")
         return
       }else if(this.data.btnText === TASK_TYPE_TEXT[3]){
         // 去转发
-        this.triggerEvent("btnClick",{
-          data: "toShare"
-        })
+        this.triggerEvent("btnClick","toShare")
         return
       }
 

package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.json

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

package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.scss

@@ -1,132 +1,132 @@
-$deviceWidth: 750;
-
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin item-box{
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: vmin(32) vmin(24);
-  background: #FFFFFF;
-  &.line-class{
-    position: relative;
-    &::after{
-      position: absolute;
-      box-sizing: border-box;
-      content: ' ';
-      pointer-events: none;
-      right: vmin(32);
-      bottom: 0;
-      left: vmin(32);
-      border-bottom: 1px solid #ebedf0;
-      -webkit-transform: scaleY(0.5);
-      transform: scaleY(0.5);
-    }
-  }
-  &.bg-change{
-    background: linear-gradient(180deg, #FFF3EB 0%, #FFF 100%);
-  }
-  &.radius{
-    border-radius: vmin(16);
-  }
-  .left{
-    max-width: vmin(462);
-    .first{
-      line-height: vmin(40);
-      display: flex;
-      align-items: center;
-      .title{
-        font-size: vmin(28);
-        font-weight: 500;
-        color: #333333;
-      }
-      .reward{
-        margin-left: vmin(16);
-        color: #FF781F;
-        font-size: vmin(24);
-        display: flex;
-        align-items: center;
-        .reward-img{
-          width: vmin(24);
-          height: vmin(24);
-        }
-        .reward-text{
-          margin-left: vmin(8);
-        }
-      }
-    }
-
-    .time{
-      margin-top: vmin(8);
-      font-size: vmin(24);
-      color: #999999;
-      line-height: vmin(32);
-    }
-
-    .residue-time{
-      margin-top: vmin(8);
-      font-size: vmin(24);
-      color: #FFA114;
-      line-height: vmin(32);
-    }
-  }
-
-  .btn{
-    // padding: 0.12rem 0.36rem;
-    width: vmin(144);
-    height: vmin(56);
-    background: linear-gradient(270deg, #FF781F 0%, #FB0 100%);
-    border-radius: vmin(72);
-    color: #FFFFFF;
-    font-weight: 500;
-    font-size: vmin(24);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    line-height: vmin(32);
-    &.reward-btn{
-      border: vmin(1) solid #1472FF;
-      background: #FFF;
-      color: #1472FF;
-    }
-
-    &.gray-btn{
-      background: #F5F5F5;
-      color: #B2B2B2;
-    }
-  }
-  
-}
-
-.item-box {
-  @include item-box;
-}
-
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .item-box {
-    @include item-box;
-  }
-}
-
-// PC 放大适配
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  $deviceWidth: 1260 !global;
-
-  .item-box {
-    @include item-box;
-  }
-}
-
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .item-box {
-    @include item-box;
-  }
+$deviceWidth: 750;
+
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin item-box{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: vmin(32) vmin(24);
+  background: #FFFFFF;
+  &.line-class{
+    position: relative;
+    &::after{
+      position: absolute;
+      box-sizing: border-box;
+      content: ' ';
+      pointer-events: none;
+      right: vmin(32);
+      bottom: 0;
+      left: vmin(32);
+      border-bottom: 1px solid #ebedf0;
+      -webkit-transform: scaleY(0.5);
+      transform: scaleY(0.5);
+    }
+  }
+  &.bg-change{
+    background: linear-gradient(180deg, #FFF3EB 0%, #FFF 100%);
+  }
+  &.radius{
+    border-radius: vmin(16);
+  }
+  .left{
+    max-width: vmin(462);
+    .first{
+      line-height: vmin(40);
+      display: flex;
+      align-items: center;
+      .title{
+        font-size: vmin(28);
+        font-weight: 500;
+        color: #333333;
+      }
+      .reward{
+        margin-left: vmin(16);
+        color: #FF781F;
+        font-size: vmin(24);
+        display: flex;
+        align-items: center;
+        .reward-img{
+          width: vmin(24);
+          height: vmin(24);
+        }
+        .reward-text{
+          margin-left: vmin(8);
+        }
+      }
+    }
+
+    .time{
+      margin-top: vmin(8);
+      font-size: vmin(24);
+      color: #999999;
+      line-height: vmin(32);
+    }
+
+    .residue-time{
+      margin-top: vmin(8);
+      font-size: vmin(24);
+      color: #FFA114;
+      line-height: vmin(32);
+    }
+  }
+
+  .btn{
+    // padding: 0.12rem 0.36rem;
+    width: vmin(144);
+    height: vmin(56);
+    background: linear-gradient(270deg, #FF781F 0%, #FB0 100%);
+    border-radius: vmin(72);
+    color: #FFFFFF;
+    font-weight: 500;
+    font-size: vmin(24);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    line-height: vmin(32);
+    &.reward-btn{
+      border: vmin(1) solid #1472FF;
+      background: #FFF;
+      color: #1472FF;
+    }
+
+    &.gray-btn{
+      background: #F5F5F5;
+      color: #B2B2B2;
+    }
+  }
+  
+}
+
+.item-box {
+  @include item-box;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .item-box {
+    @include item-box;
+  }
+}
+
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .item-box {
+    @include item-box;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .item-box {
+    @include item-box;
+  }
 }

package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.wxml

@@ -31,8 +31,8 @@
     <!-- 观看剩余时间 -->
     <view
       class="residue-time"
-      wx:if="{{taskBelongType === 1 && listType === 'task' && taskItem.residue_time}}"
-    >再观看 {{filter.secondsToMinutes(taskItem.residue_time)}}分钟 获得奖励</view>
+      wx:if="{{taskItem.task_type === 1 && listType === 'task' && taskItem.residue_time}}"
+    >再观看 {{filter.secondsToMinutes(taskItem.residue_time)}} 分钟 获得奖励</view>
   </view>
 
   <!-- 右侧按钮 -->

package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.js

@@ -27,9 +27,11 @@ Component({
       })
     },
     showTaskList: function (newVal) {
+      // 先给任务列表排个序，观看直播-评论-分享-点赞
+      newVal.sort(this.customSort);
       let typeList = []
       typeList = newVal.reduce((acc,obj)=>{
-        let found = acc.find(item => item.task_type === obj.task_type)
+        let found = acc.find(item => item.task_type === obj.task_type && (item.task_type === 1 || item.task_condition === obj.task_condition))
 
         let title;
         let icon;
@@ -57,7 +59,7 @@ Component({
         if(found){
           found.detailList.push(obj);
         }else{
-          acc.push({task_type: obj.task_type, detailList: [obj], title, icon});
+          acc.push({task_type: obj.task_type,task_condition: obj.task_condition, detailList: [obj], title, icon});
         }
 
         return acc;
@@ -109,6 +111,10 @@ Component({
     },
     btnClick(e){
       this.triggerEvent("btnClick",e.detail)
+    },
+    customSort(a, b) {
+      const order = { 1: 0, 2: 1, 3: 2, 4: 3 }; // 定义排序顺序
+      return order[a.task_type] - order[b.task_type];
     }
   },
 })

package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.json

@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "task-type": "../TaskType",
-    "task-item": "../TaskItem"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "task-type": "../TaskType",
+    "task-item": "../TaskItem"
+  }
+}

package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.scss

@@ -1,47 +1,63 @@
-$deviceWidth: 750;
-
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin task-list{
-  .error-box{
-    background: #fff;
-    padding: vmin(2) vmin(2) 0 vmin(2);
-    position: relative;
-    margin-bottom: vmin(24);
-    border-radius: vmin(16);
-    overflow: hidden;
-  }
-}
-
-.task-list {
-  @include task-list;
-}
-
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .task-list {
-    @include task-list;
-  }
-}
-
-// PC 放大适配
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  $deviceWidth: 1260 !global;
-
-  .task-list {
-    @include task-list;
-  }
-}
-
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .task-list {
-    @include task-list;
-  }
+$deviceWidth: 750;
+
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin task-list{
+  .error-box{
+    background: #fff;
+    padding: vmin(2) vmin(2) 0 vmin(2);
+    position: relative;
+    margin-bottom: vmin(24);
+    border-radius: vmin(16);
+    overflow: hidden;
+  }
+
+  .nothing{
+    display: flex;
+    align-items: center;
+    margin-top: vmin(160);
+    flex-direction: column;
+    image{
+      width: vmin(176);
+      height: vmin(176);
+    }
+    .text{
+      font-size: vmin(28);
+      color: #999999;
+      margin-top: vmin(32);
+    }
+  }
+}
+
+.task-list {
+  @include task-list;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .task-list {
+    @include task-list;
+  }
+}
+
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .task-list {
+    @include task-list;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .task-list {
+    @include task-list;
+  }
 }