xiaoe_mp_npm 1.1.21 → 1.1.22-test02

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

@@ -1,298 +1,298 @@
-const computedBehavior = require('miniprogram-computed').behavior
-// 任务类型配置 icon title
-const taskTypeConfig = {
-  1: {
-    1: {
-      title: '观看直播',
-      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfayng0weq.png',
-    },
-  },
-  2: {
-    1: {
-      title: '评论',
-      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfawy70vm8.png',
-    },
-    2: {
-      title: '分享',
-      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfawyb0tp8.png',
-    },
-    3: {
-      title: '点赞',
-      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfawyc0bcb.png',
-    },
-  },
-  3: {
-    4: {
-      title: '下单笔数',
-      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfawyd0v3a.png',
-    },
-    5: {
-      title: '消费金额',
-      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfawye0a1y.png',
-    },
-  },
-  4: {
-    6: {
-      title: '打赏',
-      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfayjp0czr.png',
-    },
-    7: {
-      title: '投票',
-      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfayjs03r2.png',
-    },
-    8: {
-      title: '问卷',
-      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfayjx00ts.png',
-    },
-    9: {
-      title: '签到',
-      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfaylp019h.png',
-    },
-    10: {
-      title: '答题',
-      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/lzl1plgd0mex.png',
-    },
-  },
-}
-Component({
-  behaviors: [computedBehavior],
-  properties: {
-    taskList: {
-      type: Array,
-      value: () => {
-        return []
-      },
-    },
-    errorList: {
-      type: Array,
-      value: () => {
-        return []
-      },
-    },
-    refreshStatus: {
-      type: Boolean,
-      value: false,
-    },
-    viewingInProgress: {
-      type: Array,
-      value: () => {
-        return []
-      },
-    },
-    teamId: {
-      type: String,
-      value: '',
-    },
-  },
-  data: {
-    showTaskList: [],
-    typeList: [],
-    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: showList,
-      })
-    },
-    showTaskList: function (newVal) {
-      let typeList = []
-      // 三种分享类型，转发、拉人、拉新
-      const shareCondition = [2, 21, 22]
-      // 任务分类
-      typeList = newVal.reduce((acc, obj) => {
-        let { task_type, task_condition } = obj
-        // 找出是否有相同类型的任务
-        let found = acc.find(
-          (item) =>
-            item.task_type === task_type &&
-            (item.task_type === 1 ||
-              item.task_condition === task_condition ||
-              (shareCondition.includes(+item.task_condition) && shareCondition.includes(+obj.task_condition))), // 聚合分享任务， 2-分享任务，21-分享邀请任务，22-分享拉新任务),
-        )
-        let { title, icon } = this.getTypeConfig(obj)
-
-        // task_module = 1 组合任务暂不处理
-        if (found && obj.task_module === 0) {
-          found.detailList.push(obj)
-        } else {
-          let detailList = [obj]
-          if (obj.task_module === 1 && obj.child_tasks.length > 0) {
-            detailList = []
-            obj.child_tasks.forEach((item) => {
-              item.progress = 0
-              detailList.push(item)
-            })
-
-            // 顺序任务进度展示逻辑
-            if (obj.task_is_order === 1) {
-              for (let idx = 0; idx < detailList.length; idx++) {
-                const tasks = detailList[idx]
-
-                // progress 2->完成 1->进行中 0->未开始
-                if (idx === 0) {
-                  // 第一个任务进行中 后续的子任务都是待解锁
-                  if (tasks?.join_state !== 2 && tasks.state !== 2) {
-                    tasks.progress = 1
-                    break
-                  }
-
-                  if (tasks?.state === 2 || tasks?.join_state === 2) {
-                    tasks.progress = 2
-                    // 顺序任务如果第一个没在时间内完成 下面子任务就是直接无法完成
-                    // unDone 标志后续的任务都过期
-                    if (tasks?.join_state !== 2) {
-                      detailList.forEach((detailItem, idx) => {
-                        if (idx !== 0) detailItem.unDone = true
-                      })
-                      break
-                    }
-                    continue
-                  }
-                }
-
-                const prevTaskState = detailList[idx - 1]
-                const curTaskState = tasks
-                // 答题任务不满足条件
-                if (
-                  prevTaskState.task_type === 4 &&
-                  prevTaskState.task_condition === '10' &&
-                  !prevTaskState.qs_is_pass
-                ) {
-                  curTaskState.progress = 0
-                  break
-                }
-
-                // 上一个子任务完成了 才可以解锁当前子任务的情况
-                if (prevTaskState.progress !== 0 && prevTaskState?.join_state === 2) {
-                  curTaskState.progress = curTaskState.join_state === 2 ? 2 : 1
-                } else {
-                  curTaskState.progress = 0
-                }
-              }
-            }
-          }
-
-          const {
-            task_type,
-            task_condition,
-            task_module,
-            reward_type,
-            reward_value,
-            reward_pay_type,
-            team_pay_config,
-            task_is_order,
-          } = obj
-          acc.push({
-            task_type,
-            task_condition,
-            task_module,
-            reward_type,
-            reward_value,
-            reward_pay_type,
-            team_pay_config,
-            task_is_order,
-            detailList,
-            title,
-            icon,
-          })
-        }
-        return acc
-      }, [])
-      // 先给任务列表排个序，观看直播-评论-分享-点赞
-      typeList.sort(this.customSort)
-      this.setData({
-        typeList,
-      })
-    },
-    errorList: function (newVal) {
-      let list = []
-      let filteredTaskList = []
-
-      this.properties.taskList.forEach((item) => {
-        if (newVal.includes(item.id) && (item.reward_type === 1 || item.reward_type === 2)) {
-          list.push(item)
-        } else {
-          filteredTaskList.push(item)
-        }
-      })
-
-      this.setData({
-        showErrorList: list,
-        showTaskList: filteredTaskList,
-      })
-    },
-  },
-  lifetimes: {
-    // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
-    attached: function () {},
-    moved: function () {},
-    detached: function () {},
-  },
-  methods: {
-    getTypeConfig(obj) {
-      let { task_type, task_condition, task_module, task_title, child_tasks } = obj
-      if (task_type === 1) task_condition = 1
-      // 组合任务
-      if (task_module === 1) {
-        let task_progress = obj?.task_progress || 0
-        const res = {
-          title: `${task_title} (${task_progress}/${child_tasks.length})`,
-          icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/m0yof8mp0wtp.png',
-        }
-        return res
-      } else {
-        // 21-转发拉人任务 22-转发拉新任务 做兼容
-        const taskCondition = [2, 21, 22].includes(+task_condition) ? 2 : task_condition
-        return taskTypeConfig[task_type][taskCondition]
-      }
-    },
-    customSort(a, b) {
-      const orderMap = {
-        1: 0,
-        '2-1': 2,
-        '2-2': 3,
-        '2-3': 4,
-        '3-4': 5,
-        '3-5': 6,
-        '4-6': 7,
-        '4-7': 8,
-        '4-8': 9,
-        '4-9': 10,
-      }
-
-      const getTypeOrder = (item) => {
-        if (item.task_type === 1) {
-          return 1
-        } else {
-          return orderMap[`${item.task_type}-${item.task_condition}`]
-        }
-      }
-
-      const typeOrderA = getTypeOrder(a)
-      const typeOrderB = getTypeOrder(b)
-
-      return typeOrderA - typeOrderB
-    },
-    toReward() {
-      this.setData({
-        isShowTaskList: false,
-      })
-    },
-    toBack() {
-      this.setData({
-        isShowTaskList: true,
-      })
-    },
-    btnClick(e) {
-      this.triggerEvent('btnClick', e.detail)
-    },
-    onLoad() {
-      this.triggerEvent('onLoad', 'taskList')
-    },
-  },
-})
+const computedBehavior = require('miniprogram-computed').behavior
+// 任务类型配置 icon title
+const taskTypeConfig = {
+  1: {
+    1: {
+      title: '观看直播',
+      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfayng0weq.png',
+    },
+  },
+  2: {
+    1: {
+      title: '评论',
+      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfawy70vm8.png',
+    },
+    2: {
+      title: '分享',
+      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfawyb0tp8.png',
+    },
+    3: {
+      title: '点赞',
+      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfawyc0bcb.png',
+    },
+  },
+  3: {
+    4: {
+      title: '下单笔数',
+      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfawyd0v3a.png',
+    },
+    5: {
+      title: '消费金额',
+      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfawye0a1y.png',
+    },
+  },
+  4: {
+    6: {
+      title: '打赏',
+      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfayjp0czr.png',
+    },
+    7: {
+      title: '投票',
+      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfayjs03r2.png',
+    },
+    8: {
+      title: '问卷',
+      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfayjx00ts.png',
+    },
+    9: {
+      title: '签到',
+      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltpfaylp019h.png',
+    },
+    10: {
+      title: '答题',
+      icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/lzl1plgd0mex.png',
+    },
+  },
+}
+Component({
+  behaviors: [computedBehavior],
+  properties: {
+    taskList: {
+      type: Array,
+      value: () => {
+        return []
+      },
+    },
+    errorList: {
+      type: Array,
+      value: () => {
+        return []
+      },
+    },
+    refreshStatus: {
+      type: Boolean,
+      value: false,
+    },
+    viewingInProgress: {
+      type: Array,
+      value: () => {
+        return []
+      },
+    },
+    teamId: {
+      type: String,
+      value: '',
+    },
+  },
+  data: {
+    showTaskList: [],
+    typeList: [],
+    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: showList,
+      })
+    },
+    showTaskList: function (newVal) {
+      let typeList = []
+      // 三种分享类型，转发、拉人、拉新
+      const shareCondition = [2, 21, 22]
+      // 任务分类
+      typeList = newVal.reduce((acc, obj) => {
+        let { task_type, task_condition } = obj
+        // 找出是否有相同类型的任务
+        let found = acc.find(
+          (item) =>
+            item.task_type === task_type &&
+            (item.task_type === 1 ||
+              item.task_condition === task_condition ||
+              (shareCondition.includes(+item.task_condition) && shareCondition.includes(+obj.task_condition))), // 聚合分享任务， 2-分享任务，21-分享邀请任务，22-分享拉新任务),
+        )
+        let { title, icon } = this.getTypeConfig(obj)
+
+        // task_module = 1 组合任务暂不处理
+        if (found && obj.task_module === 0) {
+          found.detailList.push(obj)
+        } else {
+          let detailList = [obj]
+          if (obj.task_module === 1 && obj.child_tasks.length > 0) {
+            detailList = []
+            obj.child_tasks.forEach((item) => {
+              item.progress = 0
+              detailList.push(item)
+            })
+
+            // 顺序任务进度展示逻辑
+            if (obj.task_is_order === 1) {
+              for (let idx = 0; idx < detailList.length; idx++) {
+                const tasks = detailList[idx]
+
+                // progress 2->完成 1->进行中 0->未开始
+                if (idx === 0) {
+                  // 第一个任务进行中 后续的子任务都是待解锁
+                  if (tasks?.join_state !== 2 && tasks.state !== 2) {
+                    tasks.progress = 1
+                    break
+                  }
+
+                  if (tasks?.state === 2 || tasks?.join_state === 2) {
+                    tasks.progress = 2
+                    // 顺序任务如果第一个没在时间内完成 下面子任务就是直接无法完成
+                    // unDone 标志后续的任务都过期
+                    if (tasks?.join_state !== 2) {
+                      detailList.forEach((detailItem, idx) => {
+                        if (idx !== 0) detailItem.unDone = true
+                      })
+                      break
+                    }
+                    continue
+                  }
+                }
+
+                const prevTaskState = detailList[idx - 1]
+                const curTaskState = tasks
+                // 答题任务不满足条件
+                if (
+                  prevTaskState.task_type === 4 &&
+                  prevTaskState.task_condition === '10' &&
+                  !prevTaskState.qs_is_pass
+                ) {
+                  curTaskState.progress = 0
+                  break
+                }
+
+                // 上一个子任务完成了 才可以解锁当前子任务的情况
+                if (prevTaskState.progress !== 0 && prevTaskState?.join_state === 2) {
+                  curTaskState.progress = curTaskState.join_state === 2 ? 2 : 1
+                } else {
+                  curTaskState.progress = 0
+                }
+              }
+            }
+          }
+
+          const {
+            task_type,
+            task_condition,
+            task_module,
+            reward_type,
+            reward_value,
+            reward_pay_type,
+            team_pay_config,
+            task_is_order,
+          } = obj
+          acc.push({
+            task_type,
+            task_condition,
+            task_module,
+            reward_type,
+            reward_value,
+            reward_pay_type,
+            team_pay_config,
+            task_is_order,
+            detailList,
+            title,
+            icon,
+          })
+        }
+        return acc
+      }, [])
+      // 先给任务列表排个序，观看直播-评论-分享-点赞
+      typeList.sort(this.customSort)
+      this.setData({
+        typeList,
+      })
+    },
+    errorList: function (newVal) {
+      let list = []
+      let filteredTaskList = []
+
+      this.properties.taskList.forEach((item) => {
+        if (newVal.includes(item.id) && (item.reward_type === 1 || item.reward_type === 2)) {
+          list.push(item)
+        } else {
+          filteredTaskList.push(item)
+        }
+      })
+
+      this.setData({
+        showErrorList: list,
+        showTaskList: filteredTaskList,
+      })
+    },
+  },
+  lifetimes: {
+    // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
+    attached: function () {},
+    moved: function () {},
+    detached: function () {},
+  },
+  methods: {
+    getTypeConfig(obj) {
+      let { task_type, task_condition, task_module, task_title, child_tasks } = obj
+      if (task_type === 1) task_condition = 1
+      // 组合任务
+      if (task_module === 1) {
+        let task_progress = obj?.task_progress || 0
+        const res = {
+          title: `${task_title} (${task_progress}/${child_tasks.length})`,
+          icon: 'https://commonresource-1252524126.cdn.xiaoeknow.com/image/m0yof8mp0wtp.png',
+        }
+        return res
+      } else {
+        // 21-转发拉人任务 22-转发拉新任务 做兼容
+        const taskCondition = [2, 21, 22].includes(+task_condition) ? 2 : task_condition
+        return taskTypeConfig[task_type][taskCondition]
+      }
+    },
+    customSort(a, b) {
+      const orderMap = {
+        1: 0,
+        '2-1': 2,
+        '2-2': 3,
+        '2-3': 4,
+        '3-4': 5,
+        '3-5': 6,
+        '4-6': 7,
+        '4-7': 8,
+        '4-8': 9,
+        '4-9': 10,
+      }
+
+      const getTypeOrder = (item) => {
+        if (item.task_type === 1) {
+          return 1
+        } else {
+          return orderMap[`${item.task_type}-${item.task_condition}`]
+        }
+      }
+
+      const typeOrderA = getTypeOrder(a)
+      const typeOrderB = getTypeOrder(b)
+
+      return typeOrderA - typeOrderB
+    },
+    toReward() {
+      this.setData({
+        isShowTaskList: false,
+      })
+    },
+    toBack() {
+      this.setData({
+        isShowTaskList: true,
+      })
+    },
+    btnClick(e) {
+      this.triggerEvent('btnClick', e.detail)
+    },
+    onLoad() {
+      this.triggerEvent('onLoad', 'taskList')
+    },
+  },
+})

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"
+  }
+}