xiaoe_mp_npm 1.1.21 → 1.1.22-test02

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

@@ -1,67 +1,67 @@
-$deviceWidth: 750;
-
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@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);
-    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;
-  }
+$deviceWidth: 750;
+
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@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);
+    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;
+  }
 }

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

@@ -1,41 +1,41 @@
-<scroll-view
-  class="task-list"
-  scroll-y="true"
-  bindrefresherrefresh="onLoad"
-  refresher-enabled="{{true}}"
-  refresher-triggered="{{ refreshStatus }}"
->
-  <!-- 任务同步失败列表 -->
-  <view class="error-box" wx:if="{{showErrorList.length}}">
-    <task-item
-      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>
-
-  <!-- 任务列表 -->
-  <task-type
-    wx:for="{{typeList}}"
-    wx:for-item="item"
-    wx:for-index="index"
-    typeItem="{{item}}"
-    typeIndex="{{index}}"
-    wx:key="id"
-    bind:btnClick="btnClick"
-    viewingInProgress="{{viewingInProgress}}"
-    teamId="{{teamId}}"
-  ></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>
+<scroll-view
+  class="task-list"
+  scroll-y="true"
+  bindrefresherrefresh="onLoad"
+  refresher-enabled="{{true}}"
+  refresher-triggered="{{ refreshStatus }}"
+>
+  <!-- 任务同步失败列表 -->
+  <view class="error-box" wx:if="{{showErrorList.length}}">
+    <task-item
+      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>
+
+  <!-- 任务列表 -->
+  <task-type
+    wx:for="{{typeList}}"
+    wx:for-item="item"
+    wx:for-index="index"
+    typeItem="{{item}}"
+    typeIndex="{{index}}"
+    wx:key="id"
+    bind:btnClick="btnClick"
+    viewingInProgress="{{viewingInProgress}}"
+    teamId="{{teamId}}"
+  ></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/TaskType/index.js

@@ -1,129 +1,129 @@
-const computedBehavior = require('miniprogram-computed').behavior
-import taskBehavior from '../../../common/task'
-
-Component({
-  options: {
-    styleIsolation: 'shared',
-  },
-  behaviors: [computedBehavior, taskBehavior],
-  properties: {
-    typeItem: {
-      type: Object,
-      value: () => {
-        return {}
-      },
-    },
-    typeIndex: {
-      type: Number,
-      value: 0,
-    },
-    viewingInProgress: {
-      type: Array,
-      value: () => {
-        return []
-      },
-    },
-    teamId: {
-      type: String,
-      value: '',
-    },
-  },
-  data: {
-    activeNames: [1],
-    detailList: [],
-    taskItem: {},
-  },
-  lifetimes: {
-    // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
-    attached: function () {},
-    moved: function () {},
-    detached: function () {},
-  },
-  computed: {
-    // 组合任务
-    isCombination(data) {
-      return data.taskItem.task_module === 1
-    },
-    // 顺序组合任务
-    isInOrder(data) {
-      return data.taskItem.task_is_order === 1
-    },
-    showRewards(data) {
-      return data.taskItem.reward_type !== 0 && Number(data.taskItem.reward_value) !== 0
-    },
-    // 当前奖励是否为积分
-    isPointReward(data) {
-      return +data.taskItem?.reward_type === 1;
-    },
-    // 组合任务标题
-    combinationTitle(data) {
-      if (data.isInOrder) {
-        const { reward_type, reward_value } = data.taskItem
-        // 顺序任务 没有总奖励
-        if (reward_type === 0 && Number(reward_value) === 0) {
-          return '按顺序完成以下所有任务，领取对应奖励'
-        } else {
-          return '按顺序完成以下任务获'
-        }
-      } else {
-        return '完成以下所有任务将获得'
-      }
-    },
-  },
-  methods: {
-    onChange(event) {
-      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.replace(/-/g, '/')) - new Date(b.start_at.replace(/-/g, '/'))
-        if (startComparison !== 0) return startComparison
-      }
-
-      // 已结束按结束时间降序排
-      if (a.state === 2 && b.state === 2) {
-        const endComparison = new Date(b.end_at.replace(/-/g, '/')) - new Date(a.end_at.replace(/-/g, '/'))
-        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.replace(/-/g, '/')) - new Date(a.complete_at.replace(/-/g, '/'))
-      }
-
-      return 0
-    },
-  },
-  observers: {
-    typeItem(newVal) {
-      this.setData({
-        taskItem: newVal,
-      })
-    },
-    'typeItem.detailList'(newVal) {
-      let list = JSON.parse(JSON.stringify(newVal))
-      // 组合任务无需进行排序处理
-      if (newVal[0]?.task_module !== 1) {
-        list.sort(this.customSort)
-      }
-
-      this.setData({
-        detailList: list,
-      })
-    },
-  },
-})
+const computedBehavior = require('miniprogram-computed').behavior
+import taskBehavior from '../../../common/task'
+
+Component({
+  options: {
+    styleIsolation: 'shared',
+  },
+  behaviors: [computedBehavior, taskBehavior],
+  properties: {
+    typeItem: {
+      type: Object,
+      value: () => {
+        return {}
+      },
+    },
+    typeIndex: {
+      type: Number,
+      value: 0,
+    },
+    viewingInProgress: {
+      type: Array,
+      value: () => {
+        return []
+      },
+    },
+    teamId: {
+      type: String,
+      value: '',
+    },
+  },
+  data: {
+    activeNames: [1],
+    detailList: [],
+    taskItem: {},
+  },
+  lifetimes: {
+    // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
+    attached: function () {},
+    moved: function () {},
+    detached: function () {},
+  },
+  computed: {
+    // 组合任务
+    isCombination(data) {
+      return data.taskItem.task_module === 1
+    },
+    // 顺序组合任务
+    isInOrder(data) {
+      return data.taskItem.task_is_order === 1
+    },
+    showRewards(data) {
+      return data.taskItem.reward_type !== 0 && Number(data.taskItem.reward_value) !== 0
+    },
+    // 当前奖励是否为积分
+    isPointReward(data) {
+      return +data.taskItem?.reward_type === 1;
+    },
+    // 组合任务标题
+    combinationTitle(data) {
+      if (data.isInOrder) {
+        const { reward_type, reward_value } = data.taskItem
+        // 顺序任务 没有总奖励
+        if (reward_type === 0 && Number(reward_value) === 0) {
+          return '按顺序完成以下所有任务，领取对应奖励'
+        } else {
+          return '按顺序完成以下任务获'
+        }
+      } else {
+        return '完成以下所有任务将获得'
+      }
+    },
+  },
+  methods: {
+    onChange(event) {
+      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.replace(/-/g, '/')) - new Date(b.start_at.replace(/-/g, '/'))
+        if (startComparison !== 0) return startComparison
+      }
+
+      // 已结束按结束时间降序排
+      if (a.state === 2 && b.state === 2) {
+        const endComparison = new Date(b.end_at.replace(/-/g, '/')) - new Date(a.end_at.replace(/-/g, '/'))
+        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.replace(/-/g, '/')) - new Date(a.complete_at.replace(/-/g, '/'))
+      }
+
+      return 0
+    },
+  },
+  observers: {
+    typeItem(newVal) {
+      this.setData({
+        taskItem: newVal,
+      })
+    },
+    'typeItem.detailList'(newVal) {
+      let list = JSON.parse(JSON.stringify(newVal))
+      // 组合任务无需进行排序处理
+      if (newVal[0]?.task_module !== 1) {
+        list.sort(this.customSort)
+      }
+
+      this.setData({
+        detailList: list,
+      })
+    },
+  },
+})

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

@@ -1,13 +1,13 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-collapse": "@vant/weapp/collapse/index",
-    "van-collapse-item": "@vant/weapp/collapse-item/index",
-    "van-icon": "@vant/weapp/icon/index",
-    "task-item": "../TaskItem",
-    "member-integral-multiplier-bar": "/subpkg/MemberIntegralMultiplierBar/index"
-  },
-  "componentPlaceholder": {
-    "member-integral-multiplier-bar": "view"
-  }
-}
+{
+  "component": true,
+  "usingComponents": {
+    "van-collapse": "@vant/weapp/collapse/index",
+    "van-collapse-item": "@vant/weapp/collapse-item/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "task-item": "../TaskItem",
+    "member-integral-multiplier-bar": "/subpkg/MemberIntegralMultiplierBar/index"
+  },
+  "componentPlaceholder": {
+    "member-integral-multiplier-bar": "view"
+  }
+}

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

@@ -1,90 +1,90 @@
-$deviceWidth: 750;
-
-@function vmin($rpx) {
-  @return #{$rpx * 100 / $deviceWidth}vmin;
-}
-
-@mixin collapse {
-  margin-bottom: vmin(24);
-  border-radius: vmin(16);
-  overflow: hidden;
-  .taskItems {
-    padding-top: vmin(32);
-    padding-bottom: vmin(32);
-  }
-  .content {
-    padding: 0;
-  }
-  .task-item {
-    display: flex;
-    align-items: center;
-    .type-img {
-      width: vmin(80);
-      height: vmin(80);
-    }
-    .type-header {
-      display: flex;
-      flex-direction: column;
-      margin-left: vmin(16);
-    }
-    .type-reward {
-      color: #ff5429;
-      font-size: vmin(22);
-    }
-    .type-reward,
-    .reward {
-      display: flex;
-      align-items: center;
-    }
-    .type-title {
-      font-size: vmin(28);
-      font-weight: 500;
-      color: #333333;
-    }
-    .reward-img {
-      width: vmin(24);
-      height: vmin(24);
-      margin-left: vmin(8);
-      margin-right: vmin(8);
-    }
-    .reward-text {
-      word-wrap: break-word;
-      word-break: break-all;
-    }
-  }
-  .icon {
-    display: flex;
-    align-items: center;
-  }
-}
-
-.collapse {
-  @include collapse;
-}
-
-// 竖屏pad
-@media screen and (min-width: 768px) and (orientation: portrait) {
-  $deviceWidth: 1536 !global;
-
-  .collapse {
-    @include collapse;
-  }
-}
-
-// PC 放大适配
-@media screen and (min-height: 630px) and (orientation: landscape) {
-  $deviceWidth: 1260 !global;
-
-  .collapse {
-    @include collapse;
-  }
-}
-
-// 横屏pad
-@media screen and (min-height: 768px) and (orientation: landscape) {
-  $deviceWidth: 1536 !global;
-
-  .collapse {
-    @include collapse;
-  }
-}
+$deviceWidth: 750;
+
+@function vmin($rpx) {
+  @return #{$rpx * 100 / $deviceWidth}vmin;
+}
+
+@mixin collapse {
+  margin-bottom: vmin(24);
+  border-radius: vmin(16);
+  overflow: hidden;
+  .taskItems {
+    padding-top: vmin(32);
+    padding-bottom: vmin(32);
+  }
+  .content {
+    padding: 0;
+  }
+  .task-item {
+    display: flex;
+    align-items: center;
+    .type-img {
+      width: vmin(80);
+      height: vmin(80);
+    }
+    .type-header {
+      display: flex;
+      flex-direction: column;
+      margin-left: vmin(16);
+    }
+    .type-reward {
+      color: #ff5429;
+      font-size: vmin(22);
+    }
+    .type-reward,
+    .reward {
+      display: flex;
+      align-items: center;
+    }
+    .type-title {
+      font-size: vmin(28);
+      font-weight: 500;
+      color: #333333;
+    }
+    .reward-img {
+      width: vmin(24);
+      height: vmin(24);
+      margin-left: vmin(8);
+      margin-right: vmin(8);
+    }
+    .reward-text {
+      word-wrap: break-word;
+      word-break: break-all;
+    }
+  }
+  .icon {
+    display: flex;
+    align-items: center;
+  }
+}
+
+.collapse {
+  @include collapse;
+}
+
+// 竖屏pad
+@media screen and (min-width: 768px) and (orientation: portrait) {
+  $deviceWidth: 1536 !global;
+
+  .collapse {
+    @include collapse;
+  }
+}
+
+// PC 放大适配
+@media screen and (min-height: 630px) and (orientation: landscape) {
+  $deviceWidth: 1260 !global;
+
+  .collapse {
+    @include collapse;
+  }
+}
+
+// 横屏pad
+@media screen and (min-height: 768px) and (orientation: landscape) {
+  $deviceWidth: 1536 !global;
+
+  .collapse {
+    @include collapse;
+  }
+}