xiaoe_mp_npm 1.0.0-live9 → 1.0.0

package/miniprogram_dist/Task/TaskBubble/index.js

@@ -9,6 +9,10 @@ Component({
       type: Object,
       value: {},
     },
+    zIndex: {
+      type: Number,
+      value: 1,
+    },
   },
 
   /**
@@ -25,7 +29,20 @@ Component({
   computed: {
     // 奖品类型
     rewardValue(data){
-        return data.taskMsg.live_task?.task_type === 1? this.convertMinutesToHoursAndMinutes(data.taskMsg.live_task?.reward_value) : ['', '发表评论', '转发直播间', '完成点赞'][data.taskMsg.live_task?.task_condition] || ''
+      if(data.taskMsg.live_task?.task_type === 1){
+        const hours = Math.floor(data.taskMsg.live_task?.task_condition / 60);
+        const remainingMinutes = data.taskMsg.live_task?.task_condition % 60;
+
+        if (hours === 0) {
+            return `达${remainingMinutes}分钟`;
+        } else if (remainingMinutes === 0) {
+            return `达${hours}小时`;
+        } else {
+            return `达${hours}小时${remainingMinutes}分钟`;
+        }
+      }else {
+        return ['', '发表评论', '转发直播间', '完成点赞'][data.taskMsg.live_task?.task_condition] || ''
+      }
     },
     // 奖品icon
     taskIconImg(data){
@@ -96,22 +113,5 @@ Component({
         animationData: animation.export(),
       })
     },
-
-    convertMinutesToHoursAndMinutes(minutes) {
-      if (isNaN(minutes) || minutes < 0) {
-          return;
-      }
-
-      const hours = Math.floor(minutes / 60);
-      const remainingMinutes = minutes % 60;
-
-      if (hours === 0) {
-          return `达${remainingMinutes}分钟`;
-      } else if (remainingMinutes === 0) {
-          return `达${hours}小时`;
-      } else {
-          return `达${hours}小时${remainingMinutes}分钟`;
-      }
-  },
   },
 })

package/miniprogram_dist/Task/TaskBubble/index.wxml

@@ -1,4 +1,4 @@
-<view class="barrage-container" catch:tap="bubbleClick">
+<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">
@@ -9,11 +9,7 @@
         />
         <view wx:if="{{taskMsg.live_task.task_type === 1}}" class="task-type">观看时长</view>
         <view>{{ rewardValue }}</view>
-        <image
-          class="prize-icon"
-          src="{{taskIconImg}}"
-          alt="奖励"
-        />
+        <image class="prize-icon" src="{{taskIconImg}}" alt="奖励" />
         <view class="prize-num">+{{ prizeNum }}</view>
         <image
           class="right-arrow-icon"
@@ -24,4 +20,3 @@
     </view>
   </view>
 </view>
-

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

@@ -8,6 +8,10 @@ Component({
         return []
       }
     },
+    refreshStatus:{
+      type:Boolean,
+      value: false
+    }
   },
   data: {
     activeNames:["1"],
@@ -24,6 +28,12 @@ Component({
     btnClick(e){
       this.triggerEvent("btnClick",e.detail)
     },
+    onLoad(){
+      this.triggerEvent("onLoad","rewardList")
+    },
+    getMoreList(){
+      this.triggerEvent("getMoreList","rewardList")
+    }
   },
   observers: {},
 })

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

@@ -0,0 +1,40 @@
+$deviceWidth: 750;
+
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin reward-list{
+  height: 100%;
+}
+
+.reward-list {
+  @include reward-list;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .reward-list {
+    @include reward-list;
+  }
+}
+
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .reward-list {
+    @include reward-list;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .reward-list {
+    @include reward-list;
+  }
+}

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

@@ -1,4 +1,11 @@
-<scroll-view class="goods-list" scroll-y="true" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}">
+<scroll-view
+  class="reward-list"
+  scroll-y="true"
+  bindrefresherrefresh="onLoad"
+  refresher-enabled="{{true}}"
+  refresher-triggered="{{ refreshStatus }}"
+  bindscrolltolower="getMoreList"
+>
   <task-item
     wx:for="{{rewardList}}"
     wx:for-item="item"

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

@@ -0,0 +1,18 @@
+.reward-list {
+  height: 100%;
+}
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  .reward-list {
+    height: 100%;
+  }
+}
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  .reward-list {
+    height: 100%;
+  }
+}
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  .reward-list {
+    height: 100%;
+  }
+}

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

@@ -25,6 +25,13 @@ const TASK_TYPE_TEXT = {
   4: "去点赞",
 };
 
+const taskType = {
+  1: "view",
+  2: "input",
+  3: "share",
+  4: "like"
+}
+
 Component({
   behaviors: [computedBehavior],
   properties: {
@@ -114,21 +121,25 @@ Component({
         return "去使用"
       }
 
-      // 任务状态已结束
-      if(data.taskItem.state === 2){
-        return "已结束"
-      }
-
       // 任务同步失败列表
       if(data.listType === LIST_TYPE.ERROR){
         return "领奖励"
       }
 
-      // 任务状态 join_state 0-未开始 2-已完成 3-已结束
-      if (JOIN_STATE_TEXT[data.taskItem.join_state]) {
-        return JOIN_STATE_TEXT[data.taskItem.join_state];
+      // 任务状态已结束
+      if(data.taskItem.join_state === 2){
+        return "已完成"
       }
 
+      // 任务状态已结束
+      if(data.taskItem.state === 2){
+        return "已结束"
+      }
+
+      if(data.taskItem.join_state === 0){
+        return "未开始"
+      }     
+
       // 正常参与任务
       return TASK_TYPE_TEXT[data.taskBelongType] || "去参与"
     },
@@ -160,6 +171,7 @@ Component({
       return `${hours>0?hours+'小时':''}${remainingMinutes>0?remainingMinutes+'分钟':''}`
     },
     btnClick(){
+      const { reward_type } = this.data.taskItem
       if(this.data.btnText === TASK_TYPE_TEXT[2]){
         // 去评论
         this.triggerEvent("btnClick","toComment")
@@ -169,8 +181,18 @@ Component({
         this.triggerEvent("btnClick","toShare")
         return
       }else if(this.data.btnText === "去使用"){
+        // 去使用
+        this.triggerEvent("btnClick",{
+          type:"reward",
+          reward_type
+        })
+        return
+      }else if(this.data.btnText === "领奖励"){
         // 去转发
-        this.triggerEvent("btnClick","reward")
+        this.triggerEvent("btnClick",{
+          type:"toRetry",
+          taskBelongType: taskType[this.data.taskBelongType] 
+        })
         return
       }
 

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

@@ -35,7 +35,7 @@ $deviceWidth: 750;
     margin-bottom: vmin(24);
   }
   .left{
-    max-width: vmin(462);
+    max-width: vmin(485);
     .first{
       line-height: vmin(40);
       display: flex;
@@ -44,6 +44,9 @@ $deviceWidth: 750;
         font-size: vmin(28);
         font-weight: 500;
         color: #333333;
+        word-wrap: break-word;
+        word-break: break-all;
+        max-width: vmin(290);
       }
       .reward{
         margin-left: vmin(16);
@@ -57,6 +60,8 @@ $deviceWidth: 750;
         }
         .reward-text{
           margin-left: vmin(8);
+          word-wrap: break-word;
+        word-break: break-all;
         }
       }
     }

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

@@ -31,13 +31,13 @@
     <!-- 观看剩余时间 -->
     <view
       class="residue-time"
-      wx:if="{{taskItem.task_type === 1 && listType === 'task' && taskItem.join_state === 1}}"
+      wx:if="{{taskItem.task_type === 1 && listType === 'task' && taskItem.join_state === 1 && taskItem.residue_time && taskItem.state !==2}}"
     >{{taskItem.residue_time > 60 ? '再观看 '+ filter.secondsToMinutes(taskItem.residue_time) + '分钟 '+ '获得奖励':'即将获得奖励'}}</view>
   </view>
 
   <!-- 右侧按钮 -->
   <view
-    class="btn {{listType === 'reward'?'reward-btn':''}} {{listType==='task' && (taskItem.join_state === 2 || taskItem.join_state === 3 || taskItem.join_state === 0)?'gray-btn':''}}"
+    class="btn {{listType === 'reward'?'reward-btn':''}} {{listType==='task' && (taskItem.join_state === 2 || taskItem.join_state === 3 || taskItem.join_state === 0 || taskItem.state === 2)?'gray-btn':''}}"
     catch:tap="btnClick"
   >{{btnText}}</view>
 </view>

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

@@ -30,7 +30,7 @@
   margin-bottom: 3.2vmin;
 }
 .item-box .left {
-  max-width: 61.6vmin;
+  max-width: 64.66667vmin;
 }
 .item-box .left .first {
   line-height: 5.33333vmin;
@@ -41,6 +41,9 @@
   font-size: 3.73333vmin;
   font-weight: 500;
   color: #333333;
+  word-wrap: break-word;
+  word-break: break-all;
+  max-width: 38.66667vmin;
 }
 .item-box .left .first .reward {
   margin-left: 2.13333vmin;
@@ -55,6 +58,8 @@
 }
 .item-box .left .first .reward .reward-text {
   margin-left: 1.06667vmin;
+  word-wrap: break-word;
+  word-break: break-all;
 }
 .item-box .left .time {
   margin-top: 1.06667vmin;
@@ -123,7 +128,7 @@
     margin-bottom: 1.5625vmin;
   }
   .item-box .left {
-    max-width: 30.07812vmin;
+    max-width: 31.57552vmin;
   }
   .item-box .left .first {
     line-height: 2.60417vmin;
@@ -134,6 +139,9 @@
     font-size: 1.82292vmin;
     font-weight: 500;
     color: #333333;
+    word-wrap: break-word;
+    word-break: break-all;
+    max-width: 18.88021vmin;
   }
   .item-box .left .first .reward {
     margin-left: 1.04167vmin;
@@ -148,6 +156,8 @@
   }
   .item-box .left .first .reward .reward-text {
     margin-left: 0.52083vmin;
+    word-wrap: break-word;
+    word-break: break-all;
   }
   .item-box .left .time {
     margin-top: 0.52083vmin;
@@ -217,7 +227,7 @@
     margin-bottom: 1.90476vmin;
   }
   .item-box .left {
-    max-width: 36.66667vmin;
+    max-width: 38.49206vmin;
   }
   .item-box .left .first {
     line-height: 3.1746vmin;
@@ -228,6 +238,9 @@
     font-size: 2.22222vmin;
     font-weight: 500;
     color: #333333;
+    word-wrap: break-word;
+    word-break: break-all;
+    max-width: 23.01587vmin;
   }
   .item-box .left .first .reward {
     margin-left: 1.26984vmin;
@@ -242,6 +255,8 @@
   }
   .item-box .left .first .reward .reward-text {
     margin-left: 0.63492vmin;
+    word-wrap: break-word;
+    word-break: break-all;
   }
   .item-box .left .time {
     margin-top: 0.63492vmin;
@@ -311,7 +326,7 @@
     margin-bottom: 1.5625vmin;
   }
   .item-box .left {
-    max-width: 30.07812vmin;
+    max-width: 31.57552vmin;
   }
   .item-box .left .first {
     line-height: 2.60417vmin;
@@ -322,6 +337,9 @@
     font-size: 1.82292vmin;
     font-weight: 500;
     color: #333333;
+    word-wrap: break-word;
+    word-break: break-all;
+    max-width: 18.88021vmin;
   }
   .item-box .left .first .reward {
     margin-left: 1.04167vmin;
@@ -336,6 +354,8 @@
   }
   .item-box .left .first .reward .reward-text {
     margin-left: 0.52083vmin;
+    word-wrap: break-word;
+    word-break: break-all;
   }
   .item-box .left .time {
     margin-top: 0.52083vmin;

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

@@ -14,21 +14,28 @@ Component({
         return []
       }
     },
+    refreshStatus:{
+      type:Boolean,
+      value: false
+    }
   },
   data: {
     showTaskList: [],
     typeList: [],
-    errorsList: []
+    showErrorList: [],
   },
   observers: {
     taskList: function (newVal) {
+      let showList = newVal
+      if(this.data.showErrorList.length){
+        showList = newVal.filter(item1 => !this.data.showErrorList.some(item2 => item2.id === item1.id))
+      }
       this.setData({
-        showTaskList: newVal
+        showTaskList: showList
       })
     },
     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 && (item.task_type === 1 || item.task_condition === obj.task_condition))
@@ -64,27 +71,25 @@ Component({
 
         return acc;
       },[])
+      typeList.sort(this.customSort)
       this.setData({
         typeList
       })
     },
     errorList: function (newVal) {
       let list = [];
-      let filteredTaskList = this.properties.taskList.filter(item => {
-        return !newVal.includes(item.id);
-      });
+      let filteredTaskList = []
 
       this.properties.taskList.forEach(item=>{
-        newVal.forEach(i=>{
-          if(item.id === i){
-            list.push(item)
-          }
-        })
+        if(newVal.includes(item.id)){
+          list.push(item)
+        }else{
+          filteredTaskList.push(item)
+        }
       })
 
-      this.showTaskList = filteredTaskList
       this.setData({
-        errorsList: list,
+        showErrorList: list,
         showTaskList: filteredTaskList
       })
     }
@@ -98,6 +103,29 @@ Component({
     detached: function () { },
   },
   methods: {
+    customSort(a,b){
+      const orderMap = {
+        1: 0,
+        '2-1': 2,
+        '2-2': 3,
+        '2-3': 4
+      };
+
+      const getTypeOrder = (item) => {
+        if (item.task_type === 1) {
+          return 1;
+        } else if (item.task_type === 2 && item.task_condition) {
+          return orderMap[`2-${item.task_condition}`];
+        } else {
+          return 0;
+        }
+      };
+
+      const typeOrderA = getTypeOrder(a);
+      const typeOrderB = getTypeOrder(b);
+
+      return typeOrderA - typeOrderB;
+    },
     toReward(){
       this.setData({
         isShowTaskList: false
@@ -111,9 +139,8 @@ 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];
+    onLoad(){
+      this.triggerEvent("onLoad","taskList")
     }
   },
 })

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

@@ -5,6 +5,10 @@ $deviceWidth: 750;
 }
 
 @mixin task-list{
+  height: 100%;
+  min-height: 40vmin;
+  // padding-bottom: vmin(32);
+  box-sizing: border-box;
   .error-box{
     background: #fff;
     padding: vmin(2) vmin(2) 0 vmin(2);

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

@@ -1,14 +1,21 @@
-<scroll-view class="task-list" scroll-y="true" bindrefresherrefresh="onLoad" refresher-enabled="{{true}}">
+<scroll-view
+  class="task-list"
+  scroll-y="true"
+  bindrefresherrefresh="onLoad"
+  refresher-enabled="{{true}}"
+  refresher-triggered="{{ refreshStatus }}"
+>
   <!-- 任务同步失败列表 -->
-  <view class="error-box" wx:if="{{errorsList.length}}">
+  <view class="error-box" wx:if="{{showErrorList.length}}">
     <task-item
-      wx:for="{{errorsList}}"
+      wx:for="{{showErrorList}}"
       wx:for-item="item"
       wx:for-index="index"
       taskItem="{{item}}"
       listType="error"
       isRadius="{{true}}"
       itemIndex="{{index}}"
+      wx:key="id"
       bind:btnClick="btnClick"
     />
   </view>
@@ -20,6 +27,7 @@
     wx:for-index="index"
     typeItem="{{item}}"
     typeIndex="{{index}}"
+    wx:key="id"
     bind:btnClick="btnClick"
   ></task-type>
 

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

@@ -1,3 +1,8 @@
+.task-list {
+  height: 100%;
+  min-height: 40vmin;
+  box-sizing: border-box;
+}
 .task-list .error-box {
   background: #fff;
   padding: 0.26667vmin 0.26667vmin 0 0.26667vmin;
@@ -22,6 +27,11 @@
   margin-top: 4.26667vmin;
 }
 @media screen and (min-width: 768px) and (orientation: portrait) {
+  .task-list {
+    height: 100%;
+    min-height: 40vmin;
+    box-sizing: border-box;
+  }
   .task-list .error-box {
     background: #fff;
     padding: 0.13021vmin 0.13021vmin 0 0.13021vmin;
@@ -47,6 +57,11 @@
   }
 }
 @media screen and (min-height: 630px) and (orientation: landscape) {
+  .task-list {
+    height: 100%;
+    min-height: 40vmin;
+    box-sizing: border-box;
+  }
   .task-list .error-box {
     background: #fff;
     padding: 0.15873vmin 0.15873vmin 0 0.15873vmin;
@@ -72,6 +87,11 @@
   }
 }
 @media screen and (min-height: 768px) and (orientation: landscape) {
+  .task-list {
+    height: 100%;
+    min-height: 40vmin;
+    box-sizing: border-box;
+  }
   .task-list .error-box {
     background: #fff;
     padding: 0.13021vmin 0.13021vmin 0 0.13021vmin;

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

@@ -14,7 +14,8 @@ Component({
     }
   },
   data: {
-    activeNames:[1]
+    activeNames:[1],
+    detailList:[]
   },
   lifetimes: {
     // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
@@ -26,14 +27,49 @@ Component({
   },
   methods: {
     onChange(event){
-      console.log("event.detail",event.detail)
       this.setData({
         activeNames: event.detail
       })
     },
     btnClick(e){
       this.triggerEvent("btnClick",e.detail)
+    },
+    customSort(a,b){
+      // 根据参与状态和状态排序顺序
+      const stateOrder = { "1": 0, "0": 1, "2": 2 };
+      const stateComparison = stateOrder[a.join_state.toString()] - stateOrder[b.join_state.toString()];
+      if (stateComparison !== 0) return stateComparison;
+
+      const liveState = stateOrder[a.state.toString()] - stateOrder[b.state.toString()];
+      if (liveState !== 0) return liveState;
+
+      // 参与中和未参与按开始时间升序排
+      if ((a.join_state === 1 || a.join_state === 0) && (b.join_state === 1 || b.join_state === 0)) {
+        const startComparison = new Date(a.start_at) - new Date(b.start_at);
+        if (startComparison !== 0) return startComparison;
+      }
+
+      // 已结束按结束时间降序排
+      if (a.state === 2 && b.state === 2) {
+        const endComparison = new Date(b.end_at) - new Date(a.end_at);
+        if (endComparison !== 0) return endComparison;
+      }
+
+      // 已完成按完成时间降序排
+      if (a.join_state === 2 && b.join_state === 2 && a.complete_at && b.complete_at) {
+        return new Date(b.complete_at) - new Date(a.complete_at);
+      }
+
+      return 0;
+    }
+  },
+  observers: {
+    "typeItem.detailList"(newVal) {
+      let list = JSON.parse(JSON.stringify(newVal))
+      list.sort(this.customSort)
+      this.setData({
+        detailList: list
+      })
     }
   },
-  observers: {},
 })

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

@@ -31,7 +31,7 @@
       </view>
 
       <task-item
-        wx:for="{{typeItem.detailList}}"
+        wx:for="{{detailList}}"
         wx:for-item="item"
         wx:for-index="index"
         taskItem="{{item}}"