xiaoe_mp_npm 1.0.22-test05 → 1.0.22-test07
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.
- package/miniprogram_dist/Task/TaskPopup/component/TaskItem/index.js +1 -1
- package/miniprogram_dist/Task/TaskPopup/component/TaskList/index.js +1 -1
- package/miniprogram_dist/Task/TaskQuizPopup/components/quizRichText/index.js +8 -15
- package/miniprogram_dist/Task/TaskQuizPopup/index.js +8 -19
- package/package.json +1 -1
- package/src/Task/TaskPopup/component/TaskItem/index.js +1 -1
- package/src/Task/TaskPopup/component/TaskList/index.js +1 -1
- package/src/Task/TaskQuizPopup/components/quizRichText/index.js +8 -15
- package/src/Task/TaskQuizPopup/index.js +8 -19
|
@@ -349,7 +349,7 @@ Component({
|
|
|
349
349
|
console.log('data.viewingInProgress btnClick', this.properties.viewingInProgress)
|
|
350
350
|
const { reward_type, task_type, task_condition, reward_value, id } = this.data.taskItem
|
|
351
351
|
if (this.data.listType === 'task') {
|
|
352
|
-
if (['已完成', '未开始', '
|
|
352
|
+
if (['已完成', '未开始', '未完成', '已提交'].includes(this.data.btnText)) return
|
|
353
353
|
const { handle } = this.getTaskConfig(task_type, task_condition)
|
|
354
354
|
if (handle) {
|
|
355
355
|
this.triggerEvent('btnClick', {
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import WxParse from '../wxParse/wxParse'
|
|
2
2
|
Component({
|
|
3
|
-
|
|
4
3
|
/**
|
|
5
4
|
* 组件的属性列表
|
|
6
5
|
*/
|
|
@@ -9,19 +8,17 @@ Component({
|
|
|
9
8
|
richTextContent: {
|
|
10
9
|
type: String,
|
|
11
10
|
value: '',
|
|
12
|
-
observer(val){
|
|
11
|
+
observer(val) {
|
|
13
12
|
// 获取富文本的内容操作
|
|
14
|
-
if(val) this.getRichTextContent(val)
|
|
15
|
-
}
|
|
16
|
-
}
|
|
13
|
+
if (val) this.getRichTextContent(val)
|
|
14
|
+
},
|
|
15
|
+
},
|
|
17
16
|
},
|
|
18
17
|
|
|
19
18
|
/**
|
|
20
19
|
* 组件的初始数据
|
|
21
20
|
*/
|
|
22
|
-
data: {
|
|
23
|
-
|
|
24
|
-
},
|
|
21
|
+
data: {},
|
|
25
22
|
|
|
26
23
|
/**
|
|
27
24
|
* 组件的方法列表
|
|
@@ -30,18 +27,14 @@ Component({
|
|
|
30
27
|
// 获取富文本的内容
|
|
31
28
|
getRichTextContent(richContent) {
|
|
32
29
|
WxParse.wxParse('richContent', 'html', richContent, this)
|
|
33
|
-
setTimeout(() => {
|
|
34
|
-
console.error('jer===========richContent', this.data.richContent);
|
|
35
|
-
}, 0);
|
|
36
30
|
},
|
|
37
31
|
imageInit(e) {
|
|
38
32
|
WxParse.imageLoad(e, this).then(() => {
|
|
39
33
|
// 不知道为啥不响应渲染,所以这里重新setdata一次
|
|
40
34
|
this.setData({
|
|
41
|
-
richContent: this.data.richContent
|
|
35
|
+
richContent: this.data.richContent,
|
|
42
36
|
})
|
|
43
|
-
console.error('jer===========????img', this.data.richTextContent, this.data.richContent);
|
|
44
37
|
})
|
|
45
38
|
},
|
|
46
|
-
}
|
|
47
|
-
})
|
|
39
|
+
},
|
|
40
|
+
})
|
|
@@ -118,16 +118,11 @@ Component({
|
|
|
118
118
|
observers: {
|
|
119
119
|
showPopup(val) {
|
|
120
120
|
if (val) {
|
|
121
|
-
this.setData(
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
},
|
|
127
|
-
() => {
|
|
128
|
-
console.error('jer=========进入弹窗', this.data)
|
|
129
|
-
},
|
|
130
|
-
)
|
|
121
|
+
this.setData({
|
|
122
|
+
currentIndex: 0,
|
|
123
|
+
total: this.data.show_quiz_list.length,
|
|
124
|
+
quizList: this.data[this.data.showAnalysis ? 'show_quiz_analysis_list' : 'show_quiz_list'],
|
|
125
|
+
})
|
|
131
126
|
}
|
|
132
127
|
},
|
|
133
128
|
},
|
|
@@ -212,7 +207,6 @@ Component({
|
|
|
212
207
|
// 点击选项进行操作答题
|
|
213
208
|
clickOption(e) {
|
|
214
209
|
const index = e.detail
|
|
215
|
-
console.error('jer=============选择11111', index)
|
|
216
210
|
const tempQuizItem = this.data.quizList[this.data.currentIndex]
|
|
217
211
|
// 多选题
|
|
218
212
|
if (tempQuizItem.qs_type === 1) {
|
|
@@ -223,14 +217,9 @@ Component({
|
|
|
223
217
|
}
|
|
224
218
|
tempQuizItem.options[index].selected = true
|
|
225
219
|
}
|
|
226
|
-
this.setData(
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
},
|
|
230
|
-
() => {
|
|
231
|
-
console.error('jer============更改之后的数组', this.data.quizList)
|
|
232
|
-
},
|
|
233
|
-
)
|
|
220
|
+
this.setData({
|
|
221
|
+
quizList: this.data.quizList,
|
|
222
|
+
})
|
|
234
223
|
},
|
|
235
224
|
},
|
|
236
225
|
})
|
package/package.json
CHANGED
|
@@ -349,7 +349,7 @@ Component({
|
|
|
349
349
|
console.log('data.viewingInProgress btnClick', this.properties.viewingInProgress)
|
|
350
350
|
const { reward_type, task_type, task_condition, reward_value, id } = this.data.taskItem
|
|
351
351
|
if (this.data.listType === 'task') {
|
|
352
|
-
if (['已完成', '未开始', '
|
|
352
|
+
if (['已完成', '未开始', '未完成', '已提交'].includes(this.data.btnText)) return
|
|
353
353
|
const { handle } = this.getTaskConfig(task_type, task_condition)
|
|
354
354
|
if (handle) {
|
|
355
355
|
this.triggerEvent('btnClick', {
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import WxParse from '../wxParse/wxParse'
|
|
2
2
|
Component({
|
|
3
|
-
|
|
4
3
|
/**
|
|
5
4
|
* 组件的属性列表
|
|
6
5
|
*/
|
|
@@ -9,19 +8,17 @@ Component({
|
|
|
9
8
|
richTextContent: {
|
|
10
9
|
type: String,
|
|
11
10
|
value: '',
|
|
12
|
-
observer(val){
|
|
11
|
+
observer(val) {
|
|
13
12
|
// 获取富文本的内容操作
|
|
14
|
-
if(val) this.getRichTextContent(val)
|
|
15
|
-
}
|
|
16
|
-
}
|
|
13
|
+
if (val) this.getRichTextContent(val)
|
|
14
|
+
},
|
|
15
|
+
},
|
|
17
16
|
},
|
|
18
17
|
|
|
19
18
|
/**
|
|
20
19
|
* 组件的初始数据
|
|
21
20
|
*/
|
|
22
|
-
data: {
|
|
23
|
-
|
|
24
|
-
},
|
|
21
|
+
data: {},
|
|
25
22
|
|
|
26
23
|
/**
|
|
27
24
|
* 组件的方法列表
|
|
@@ -30,18 +27,14 @@ Component({
|
|
|
30
27
|
// 获取富文本的内容
|
|
31
28
|
getRichTextContent(richContent) {
|
|
32
29
|
WxParse.wxParse('richContent', 'html', richContent, this)
|
|
33
|
-
setTimeout(() => {
|
|
34
|
-
console.error('jer===========richContent', this.data.richContent);
|
|
35
|
-
}, 0);
|
|
36
30
|
},
|
|
37
31
|
imageInit(e) {
|
|
38
32
|
WxParse.imageLoad(e, this).then(() => {
|
|
39
33
|
// 不知道为啥不响应渲染,所以这里重新setdata一次
|
|
40
34
|
this.setData({
|
|
41
|
-
richContent: this.data.richContent
|
|
35
|
+
richContent: this.data.richContent,
|
|
42
36
|
})
|
|
43
|
-
console.error('jer===========????img', this.data.richTextContent, this.data.richContent);
|
|
44
37
|
})
|
|
45
38
|
},
|
|
46
|
-
}
|
|
47
|
-
})
|
|
39
|
+
},
|
|
40
|
+
})
|
|
@@ -118,16 +118,11 @@ Component({
|
|
|
118
118
|
observers: {
|
|
119
119
|
showPopup(val) {
|
|
120
120
|
if (val) {
|
|
121
|
-
this.setData(
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
},
|
|
127
|
-
() => {
|
|
128
|
-
console.error('jer=========进入弹窗', this.data)
|
|
129
|
-
},
|
|
130
|
-
)
|
|
121
|
+
this.setData({
|
|
122
|
+
currentIndex: 0,
|
|
123
|
+
total: this.data.show_quiz_list.length,
|
|
124
|
+
quizList: this.data[this.data.showAnalysis ? 'show_quiz_analysis_list' : 'show_quiz_list'],
|
|
125
|
+
})
|
|
131
126
|
}
|
|
132
127
|
},
|
|
133
128
|
},
|
|
@@ -212,7 +207,6 @@ Component({
|
|
|
212
207
|
// 点击选项进行操作答题
|
|
213
208
|
clickOption(e) {
|
|
214
209
|
const index = e.detail
|
|
215
|
-
console.error('jer=============选择11111', index)
|
|
216
210
|
const tempQuizItem = this.data.quizList[this.data.currentIndex]
|
|
217
211
|
// 多选题
|
|
218
212
|
if (tempQuizItem.qs_type === 1) {
|
|
@@ -223,14 +217,9 @@ Component({
|
|
|
223
217
|
}
|
|
224
218
|
tempQuizItem.options[index].selected = true
|
|
225
219
|
}
|
|
226
|
-
this.setData(
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
},
|
|
230
|
-
() => {
|
|
231
|
-
console.error('jer============更改之后的数组', this.data.quizList)
|
|
232
|
-
},
|
|
233
|
-
)
|
|
220
|
+
this.setData({
|
|
221
|
+
quizList: this.data.quizList,
|
|
222
|
+
})
|
|
234
223
|
},
|
|
235
224
|
},
|
|
236
225
|
})
|