xiaoe_mp_npm 1.0.36-test01 → 1.0.37-test01

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.js +1 -1
  2. package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.js +2 -1
  3. package/package.json +1 -1
  4. package/src/Task/TaskPopup/component/TaskItem/index.js +1 -1
  5. package/src/Task/TaskPopup/component/TaskList/index.js +2 -1
package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.js CHANGED
@@ -271,7 +271,7 @@ Component({
271
271
  [TASK_TYPE_MAP.TASK_SIGNIN]: `签到${num}次`,
272
272
  [TASK_TYPE_MAP.TASK_QUIZ]: `完成答题，并答对${reward_frequency}题`,
273
273
  [TASK_TYPE_MAP.TASK_SHARE_OTHER]: '转发直播间',
274
- [TASK_TYPE_MAP.TASK_SHARE_NEW]: '转发拉新',
274
+ [TASK_TYPE_MAP.TASK_SHARE_NEW]: '转发直播间(新用户)',
275
275
  }
276
276
  let res = titleObj[data.taskBelongType]
277
277
  if (listType === 'reward' && data.isCombination) {
package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.js CHANGED
@@ -101,6 +101,7 @@ Component({
101
101
  },
102
102
  showTaskList: function (newVal) {
103
103
  let typeList = []
104
+ const shareCondition = [2, 21, 22]
104
105
  // 任务分类
105
106
  typeList = newVal.reduce((acc, obj) => {
106
107
  let { task_type, task_condition } = obj
@@ -110,7 +111,7 @@ Component({
110
111
  item.task_type === task_type &&
111
112
  (item.task_type === 1 ||
112
113
  item.task_condition === task_condition ||
113
- [2, 21, 22].includes(+obj.task_condition)), // 聚合分享任务， 2-分享任务，21-分享邀请任务，22-分享拉新任务),
114
+ (shareCondition.includes(+item.task_condition) && shareCondition.includes(+obj.task_condition)), // 聚合分享任务， 2-分享任务，21-分享邀请任务，22-分享拉新任务),
114
115
  )
115
116
  let { title, icon } = this.getTypeConfig(obj)
116
117
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xiaoe_mp_npm",
3
- "version": "1.0.36-test01",
3
+ "version": "1.0.37-test01",
4
4
  "description": "",
5
5
  "main": "miniprogram_dist/index.js",
6
6
  "scripts": {
package/src/Task/TaskPopup/component/TaskItem/index.js CHANGED
@@ -271,7 +271,7 @@ Component({
271
271
  [TASK_TYPE_MAP.TASK_SIGNIN]: `签到${num}次`,
272
272
  [TASK_TYPE_MAP.TASK_QUIZ]: `完成答题，并答对${reward_frequency}题`,
273
273
  [TASK_TYPE_MAP.TASK_SHARE_OTHER]: '转发直播间',
274
- [TASK_TYPE_MAP.TASK_SHARE_NEW]: '转发拉新',
274
+ [TASK_TYPE_MAP.TASK_SHARE_NEW]: '转发直播间(新用户)',
275
275
  }
276
276
  let res = titleObj[data.taskBelongType]
277
277
  if (listType === 'reward' && data.isCombination) {
package/src/Task/TaskPopup/component/TaskList/index.js CHANGED
@@ -101,6 +101,7 @@ Component({
101
101
  },
102
102
  showTaskList: function (newVal) {
103
103
  let typeList = []
104
+ const shareCondition = [2, 21, 22]
104
105
  // 任务分类
105
106
  typeList = newVal.reduce((acc, obj) => {
106
107
  let { task_type, task_condition } = obj
@@ -110,7 +111,7 @@ Component({
110
111
  item.task_type === task_type &&
111
112
  (item.task_type === 1 ||
112
113
  item.task_condition === task_condition ||
113
- [2, 21, 22].includes(+obj.task_condition)), // 聚合分享任务， 2-分享任务，21-分享邀请任务，22-分享拉新任务),
114
+ (shareCondition.includes(+item.task_condition) && shareCondition.includes(+obj.task_condition)), // 聚合分享任务， 2-分享任务，21-分享邀请任务，22-分享拉新任务),
114
115
  )
115
116
  let { title, icon } = this.getTypeConfig(obj)
116
117