xiaoe_mp_npm 1.1.21 → 1.1.22-test01

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

@@ -1,69 +1,69 @@
-<view>
-  <van-collapse
-    style="border-radius: 10px;"
-    value="{{ activeNames }}"
-    bind:change="onChange"
-    custom-class="collapse"
-    class="vanCollapse"
-  >
-    <van-collapse-item
-      name="{{1}}"
-      is-link="{{false}}"
-      clickable="true"
-      custom-class="content-item"
-      content-class="content"
-    >
-      <view slot="title">
-        <view class="task-item">
-          <image class="type-img" src="{{typeItem.icon}}" />
-          <view class="type-header">
-            <view class="type-title">{{typeItem.title}}</view>
-            <view class="type-reward" wx:if="{{ isCombination }}">
-              <view wx:if="{{ isCombination }}">{{ combinationTitle }}</view>
-              <view wx:else>完成以下所有任务将获得</view>
-
-              <view  class="reward" wx:if="{{ showRewards }}">
-                <image class="reward-img" src="{{ rewardIcon }}" />
-                <view class="reward-text">{{ rewardText }}</view>
-                <member-integral-multiplier-bar
-                    wx:if="{{ typeItem.reward_type == 1 }}"
-                    levelMembershipSetting="{{ typeItem.point_extend }}"
-                    hasMarginLeft="{{ true }}"
-                    needUseCurrentUser="{{ typeItem.join_state != 2 }}"
-                    originalPoints="{{ typeItem.reward_value }}"
-                />
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <view slot="right-icon" class="icon">
-        <van-icon
-          wx:if="{{activeNames.length}}"
-          name="arrow-up"
-          class="van-icon van-icon-arrow van-cell__right-icon"
-          color="#999999"
-        />
-        <van-icon wx:else name="arrow-down" class="van-icon van-icon-arrow van-cell__right-icon" color="#999999" />
-      </view>
-
-      <view class="taskItems">
-        <task-item
-          wx:for="{{detailList}}"
-          wx:for-item="item"
-          wx:for-index="index"
-          wx:key="{{ item.id }}"
-          taskItem="{{item}}"
-          bind:btnClick="btnClick"
-          viewingInProgress="{{viewingInProgress}}"
-          teamId="{{teamId}}"
-          taskIdx="{{ index }}"
-          taskLength="{{ detailList.length }}"
-          isInOrder="{{ isInOrder }}"
-        />
-      </view>
-
-    </van-collapse-item>
-  </van-collapse>
-</view>
+<view>
+  <van-collapse
+    style="border-radius: 10px;"
+    value="{{ activeNames }}"
+    bind:change="onChange"
+    custom-class="collapse"
+    class="vanCollapse"
+  >
+    <van-collapse-item
+      name="{{1}}"
+      is-link="{{false}}"
+      clickable="true"
+      custom-class="content-item"
+      content-class="content"
+    >
+      <view slot="title">
+        <view class="task-item">
+          <image class="type-img" src="{{typeItem.icon}}" />
+          <view class="type-header">
+            <view class="type-title">{{typeItem.title}}</view>
+            <view class="type-reward" wx:if="{{ isCombination }}">
+              <view wx:if="{{ isCombination }}">{{ combinationTitle }}</view>
+              <view wx:else>完成以下所有任务将获得</view>
+
+              <view  class="reward" wx:if="{{ showRewards }}">
+                <image class="reward-img" src="{{ rewardIcon }}" />
+                <view class="reward-text">{{ rewardText }}</view>
+                <member-integral-multiplier-bar
+                    wx:if="{{ typeItem.reward_type == 1 }}"
+                    levelMembershipSetting="{{ typeItem.point_extend }}"
+                    hasMarginLeft="{{ true }}"
+                    needUseCurrentUser="{{ typeItem.join_state != 2 }}"
+                    originalPoints="{{ typeItem.reward_value }}"
+                />
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <view slot="right-icon" class="icon">
+        <van-icon
+          wx:if="{{activeNames.length}}"
+          name="arrow-up"
+          class="van-icon van-icon-arrow van-cell__right-icon"
+          color="#999999"
+        />
+        <van-icon wx:else name="arrow-down" class="van-icon van-icon-arrow van-cell__right-icon" color="#999999" />
+      </view>
+
+      <view class="taskItems">
+        <task-item
+          wx:for="{{detailList}}"
+          wx:for-item="item"
+          wx:for-index="index"
+          wx:key="{{ item.id }}"
+          taskItem="{{item}}"
+          bind:btnClick="btnClick"
+          viewingInProgress="{{viewingInProgress}}"
+          teamId="{{teamId}}"
+          taskIdx="{{ index }}"
+          taskLength="{{ detailList.length }}"
+          isInOrder="{{ isInOrder }}"
+        />
+      </view>
+
+    </van-collapse-item>
+  </van-collapse>
+</view>

package/miniprogram_dist/Task/TaskPopup/index.js

@@ -1,174 +1,174 @@
-const computedBehavior = require('miniprogram-computed').behavior
-import { rpxToVmin } from '../../npm-compoent/miniprogram_npm/xiaoe_mp_npm/common/utils/index.js'
-
-Component({
-  options: {
-    styleIsolation: 'shared',
-  },
-  behaviors: [computedBehavior],
-  properties: {
-    showPopup: {
-      type: Boolean,
-      value: false,
-    },
-    taskList: {
-      type: Array,
-      value: () => {
-        return []
-      },
-    },
-    errorList: {
-      type: Array,
-      value: () => {
-        return []
-      },
-    },
-    rewardList: {
-      type: Array,
-      value: () => {
-        return []
-      },
-    },
-    hasRewardRecord: {
-      type: Boolean,
-      value: false,
-    },
-    popPosition: {
-      type: String,
-      value: 'bottom',
-    },
-    isShowClose: {
-      type: Boolean,
-      value: true,
-    },
-    rewardListRefreshStatus: {
-      type: Boolean,
-      value: false,
-    },
-    taskListRefreshStatus: {
-      type: Boolean,
-      value: false,
-    },
-    orientation: {
-      type: String,
-      value: 'hor',
-    },
-    isFull: {
-      type: Boolean,
-      value: false,
-    },
-    viewingInProgress: {
-      type: Array,
-      value: () => {
-        return []
-      },
-    },
-    teamId: {
-      type: String,
-      value: '',
-    },
-    // 是否新商户
-    isNewChants: {
-      type: Number,
-      value: 0,
-    },
-    roomInfo: {
-      type: Object,
-      value: () => {
-        return {}
-      },
-    },
-  },
-  data: {
-    isShowTaskList: true,
-  },
-  lifetimes: {
-    // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
-    attached: function () {},
-    moved: function () {},
-    detached: function () {},
-  },
-  computed: {
-    customStyle(properties) {
-      const { popPosition, orientation } = properties
-      const position = `position: ${orientation === 'ver' ? 'fixed' : 'absolute'}; left: 0; bottom: 0`
-      return popPosition === 'bottom'
-        ? `${position}; width: ${orientation === 'ver' ? '100%' : ''}; height: calc(100% - ${rpxToVmin(422)});`
-        : 'height: 100%;width: 100vmin;'
-    },
-    popupContentBackground(data) {
-      if (data.isShowTaskList) {
-        return data.isFull
-          ? 'background-image: url(https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltzgkkz00m0m.png)'
-          : 'background-image: url(https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqz384w02n9.png);'
-      } else {
-        return 'background: #FFEFD7;'
-      }
-    },
-    //是否展示红包提现提醒
-    isShowTips(data) {
-      const { isNewChants, taskList } = data
-      const isShowTips =
-        isNewChants === 1 &&
-        taskList.some(
-          (item) =>
-            (item.reward_type === 3 && item.join_state === 2) ||
-            item.child_task?.some((childItem) => childItem.reward_type === 3 && childItem.join_state === 2),
-        )
-      return isShowTips
-    },
-  },
-  methods: {
-    toReward() {
-      if (!this.properties.hasRewardRecord) {
-        wx.showToast({
-          title: '还未完成任务，加油~',
-          icon: 'none',
-        })
-        return
-      }
-      this.triggerEvent('toReward')
-      this.setData({
-        isShowTaskList: false,
-      })
-    },
-    toBack() {
-      this.setData({
-        isShowTaskList: true,
-      })
-    },
-    // 更改弹窗状态
-    openRedpacketRewardList() {
-      if (this.data.isFull) {
-        wx.showToast({
-          title: '请退出全屏模式后提现',
-          icon: 'none',
-          duration: 1000,
-        })
-      }
-      this.triggerEvent('closePop')
-      this.triggerEvent('openRedpacketRewardList')
-    },
-    closePop() {
-      this.triggerEvent('closePop')
-    },
-    btnClick(e) {
-      this.triggerEvent('btnClick', e.detail)
-    },
-    onLoad(e) {
-      this.triggerEvent('onLoad', e)
-    },
-    getMoreList(e) {
-      this.triggerEvent('getMoreList', e)
-    },
-  },
-  observers: {
-    showPopup(newVal) {
-      if (newVal) {
-        this.setData({
-          isShowTaskList: true,
-        })
-      }
-    },
-  },
-})
+const computedBehavior = require('miniprogram-computed').behavior
+import { rpxToVmin } from '../../npm-compoent/miniprogram_npm/xiaoe_mp_npm/common/utils/index.js'
+
+Component({
+  options: {
+    styleIsolation: 'shared',
+  },
+  behaviors: [computedBehavior],
+  properties: {
+    showPopup: {
+      type: Boolean,
+      value: false,
+    },
+    taskList: {
+      type: Array,
+      value: () => {
+        return []
+      },
+    },
+    errorList: {
+      type: Array,
+      value: () => {
+        return []
+      },
+    },
+    rewardList: {
+      type: Array,
+      value: () => {
+        return []
+      },
+    },
+    hasRewardRecord: {
+      type: Boolean,
+      value: false,
+    },
+    popPosition: {
+      type: String,
+      value: 'bottom',
+    },
+    isShowClose: {
+      type: Boolean,
+      value: true,
+    },
+    rewardListRefreshStatus: {
+      type: Boolean,
+      value: false,
+    },
+    taskListRefreshStatus: {
+      type: Boolean,
+      value: false,
+    },
+    orientation: {
+      type: String,
+      value: 'hor',
+    },
+    isFull: {
+      type: Boolean,
+      value: false,
+    },
+    viewingInProgress: {
+      type: Array,
+      value: () => {
+        return []
+      },
+    },
+    teamId: {
+      type: String,
+      value: '',
+    },
+    // 是否新商户
+    isNewChants: {
+      type: Number,
+      value: 0,
+    },
+    roomInfo: {
+      type: Object,
+      value: () => {
+        return {}
+      },
+    },
+  },
+  data: {
+    isShowTaskList: true,
+  },
+  lifetimes: {
+    // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
+    attached: function () {},
+    moved: function () {},
+    detached: function () {},
+  },
+  computed: {
+    customStyle(properties) {
+      const { popPosition, orientation } = properties
+      const position = `position: ${orientation === 'ver' ? 'fixed' : 'absolute'}; left: 0; bottom: 0`
+      return popPosition === 'bottom'
+        ? `${position}; width: ${orientation === 'ver' ? '100%' : ''}; height: calc(100% - ${rpxToVmin(422)});`
+        : 'height: 100%;width: 100vmin;'
+    },
+    popupContentBackground(data) {
+      if (data.isShowTaskList) {
+        return data.isFull
+          ? 'background-image: url(https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltzgkkz00m0m.png)'
+          : 'background-image: url(https://commonresource-1252524126.cdn.xiaoeknow.com/image/ltqz384w02n9.png);'
+      } else {
+        return 'background: #FFEFD7;'
+      }
+    },
+    //是否展示红包提现提醒
+    isShowTips(data) {
+      const { isNewChants, taskList } = data
+      const isShowTips =
+        isNewChants === 1 &&
+        taskList.some(
+          (item) =>
+            (item.reward_type === 3 && item.join_state === 2) ||
+            item.child_task?.some((childItem) => childItem.reward_type === 3 && childItem.join_state === 2),
+        )
+      return isShowTips
+    },
+  },
+  methods: {
+    toReward() {
+      if (!this.properties.hasRewardRecord) {
+        wx.showToast({
+          title: '还未完成任务，加油~',
+          icon: 'none',
+        })
+        return
+      }
+      this.triggerEvent('toReward')
+      this.setData({
+        isShowTaskList: false,
+      })
+    },
+    toBack() {
+      this.setData({
+        isShowTaskList: true,
+      })
+    },
+    // 更改弹窗状态
+    openRedpacketRewardList() {
+      if (this.data.isFull) {
+        wx.showToast({
+          title: '请退出全屏模式后提现',
+          icon: 'none',
+          duration: 1000,
+        })
+      }
+      this.triggerEvent('closePop')
+      this.triggerEvent('openRedpacketRewardList')
+    },
+    closePop() {
+      this.triggerEvent('closePop')
+    },
+    btnClick(e) {
+      this.triggerEvent('btnClick', e.detail)
+    },
+    onLoad(e) {
+      this.triggerEvent('onLoad', e)
+    },
+    getMoreList(e) {
+      this.triggerEvent('getMoreList', e)
+    },
+  },
+  observers: {
+    showPopup(newVal) {
+      if (newVal) {
+        this.setData({
+          isShowTaskList: true,
+        })
+      }
+    },
+  },
+})

package/miniprogram_dist/Task/TaskPopup/index.json

@@ -1,8 +1,8 @@
-{
-  "component": true,
-  "usingComponents": {
-    "custom-popup": "../../npm-compoent/miniprogram_npm/xiaoe_mp_npm/CustomPopup/index",
-    "task-list": "./component/TaskList",
-    "reward-list": "./component/RewardList"
-  }
+{
+  "component": true,
+  "usingComponents": {
+    "custom-popup": "../../npm-compoent/miniprogram_npm/xiaoe_mp_npm/CustomPopup/index",
+    "task-list": "./component/TaskList",
+    "reward-list": "./component/RewardList"
+  }
 }