xiaoe_mp_npm 1.0.0-live2 → 1.0.0-live4

package/miniprogram_dist/Task/TaskIcon/index.js

@@ -14,5 +14,9 @@ Component({
   /**
    * 组件的方法列表
    */
-  methods: {},
+  methods: {
+    iconClick(){
+      this.triggerEvent("iconClick")
+    }
+  },
 })

package/miniprogram_dist/Task/TaskIcon/index.wxml

@@ -1,5 +1,4 @@
-<view class="taskIcon {{alive_mode === 1? 'verticalStyle' : ''}}">
+<view class="taskIcon {{alive_mode === 1? 'verticalStyle' : ''}}" catch:tap="iconClick">
   <view class="task-icon" />
   <view class="task-text">得奖励</view>
 </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){
@@ -61,15 +62,15 @@ Component({
           taskBelongType = 1
         }else if(task_type === 2){
           switch(task_condition){
-            case 1:
+            case "1":
               // 评论
               taskBelongType = 2
               break;
-            case 2:
+            case "2":
               // 转发
               taskBelongType = 3
               break;
-            case 3:
+            case "3":
               // 点赞
               taskBelongType = 4
               break
@@ -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.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;
@@ -39,15 +41,15 @@ Component({
           icon = "https://commonresource-1252524126.cdn.xiaoeknow.com/image/lomu3vma0z2d.png"
         }else if(obj.task_type === 2){
           switch(obj.task_condition){
-            case 1:
+            case "1":
               title = "评论"
               icon = "https://commonresource-1252524126.cdn.xiaoeknow.com/image/lonymngu00pw.png"
               break;
-            case 2:
+            case "2":
               title = "分享"
               icon = "https://commonresource-1252524126.cdn.xiaoeknow.com/image/lonymnhi03sf.png"
               break;
-            case 3:
+            case "3":
               title = "点赞"
               icon = "https://commonresource-1252524126.cdn.xiaoeknow.com/image/lonymnhk0dwo.png"
               break;
@@ -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.scss

@@ -13,6 +13,22 @@ $deviceWidth: 750;
     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 {

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

@@ -22,4 +22,10 @@
     typeIndex="{{index}}"
     bind:btnClick="btnClick"
   ></task-type>
+
+  <!-- 空状态 -->
+  <view class="nothing" wx:if="{{!taskList.length}}">
+    <image src="https://commonresource-1252524126.cdn.xiaoeknow.com/image/lp3nncp20wh3.png"></image>
+    <view class="text">直播间暂还未设置任务~</view>
+  </view>
 </scroll-view>

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

@@ -6,6 +6,21 @@
   border-radius: 2.13333vmin;
   overflow: hidden;
 }
+.task-list .nothing {
+  display: flex;
+  align-items: center;
+  margin-top: 21.33333vmin;
+  flex-direction: column;
+}
+.task-list .nothing image {
+  width: 23.46667vmin;
+  height: 23.46667vmin;
+}
+.task-list .nothing .text {
+  font-size: 3.73333vmin;
+  color: #999999;
+  margin-top: 4.26667vmin;
+}
 @media screen and (min-width: 768px) and (orientation: portrait) {
   .task-list .error-box {
     background: #fff;
@@ -15,6 +30,21 @@
     border-radius: 1.04167vmin;
     overflow: hidden;
   }
+  .task-list .nothing {
+    display: flex;
+    align-items: center;
+    margin-top: 10.41667vmin;
+    flex-direction: column;
+  }
+  .task-list .nothing image {
+    width: 11.45833vmin;
+    height: 11.45833vmin;
+  }
+  .task-list .nothing .text {
+    font-size: 1.82292vmin;
+    color: #999999;
+    margin-top: 2.08333vmin;
+  }
 }
 @media screen and (min-height: 630px) and (orientation: landscape) {
   .task-list .error-box {
@@ -25,6 +55,21 @@
     border-radius: 1.26984vmin;
     overflow: hidden;
   }
+  .task-list .nothing {
+    display: flex;
+    align-items: center;
+    margin-top: 12.69841vmin;
+    flex-direction: column;
+  }
+  .task-list .nothing image {
+    width: 13.96825vmin;
+    height: 13.96825vmin;
+  }
+  .task-list .nothing .text {
+    font-size: 2.22222vmin;
+    color: #999999;
+    margin-top: 2.53968vmin;
+  }
 }
 @media screen and (min-height: 768px) and (orientation: landscape) {
   .task-list .error-box {
@@ -35,4 +80,19 @@
     border-radius: 1.04167vmin;
     overflow: hidden;
   }
+  .task-list .nothing {
+    display: flex;
+    align-items: center;
+    margin-top: 10.41667vmin;
+    flex-direction: column;
+  }
+  .task-list .nothing image {
+    width: 11.45833vmin;
+    height: 11.45833vmin;
+  }
+  .task-list .nothing .text {
+    font-size: 1.82292vmin;
+    color: #999999;
+    margin-top: 2.08333vmin;
+  }
 }

package/miniprogram_dist/Task/TaskPopup/index.js

@@ -49,6 +49,7 @@ Component({
         })
         return
       }
+      this.triggerEvent("toReward")
       this.setData({
         isShowTaskList: false
       })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaoe_mp_npm",
-  "version": "1.0.0-live2",
+  "version": "1.0.0-live4",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {