diff --git a/images/icon_duobao.png b/images/icon_duobao.png
new file mode 100644
index 0000000..341d034
Binary files /dev/null and b/images/icon_duobao.png differ
diff --git a/images/icon_kanjia.png b/images/icon_kanjia.png
new file mode 100644
index 0000000..8abf854
Binary files /dev/null and b/images/icon_kanjia.png differ
diff --git a/images/icon_pintuan.png b/images/icon_pintuan.png
new file mode 100644
index 0000000..0afd7a9
Binary files /dev/null and b/images/icon_pintuan.png differ
diff --git a/images/icon_task_fail.png b/images/icon_task_fail.png
new file mode 100644
index 0000000..b6d02ba
Binary files /dev/null and b/images/icon_task_fail.png differ
diff --git a/images/icon_task_finish.png b/images/icon_task_finish.png
new file mode 100644
index 0000000..f83082c
Binary files /dev/null and b/images/icon_task_finish.png differ
diff --git a/pages/activity_list/activity_list.js b/pages/activity_list/activity_list.js
index a7a7af5..2ef8dae 100644
--- a/pages/activity_list/activity_list.js
+++ b/pages/activity_list/activity_list.js
@@ -115,17 +115,16 @@ Page({
switchType: function (activityType) {
switch (activityType) {
- case 10: return '拼团'
- case 20: return '砍价'
- case 30: return '抽奖'
+ case 10: return '../../images/icon_pintuan.png'
+ case 20: return '../../images/icon_kanjia.png'
+ case 30: return '../../images/icon_duobao.png'
}
},
switchImg: function (status) {
switch (status) {
- case 0: return '../../images/icon_task_finish.png'
case 20: return '../../images/icon_task_finish.png'
- case 90: return '../../images/icon_task_finish.png'
+ case 90: return '../../images/icon_task_fail.png'
}
}
diff --git a/pages/activity_list/activity_list.wxml b/pages/activity_list/activity_list.wxml
index bfd1153..b17d3e1 100644
--- a/pages/activity_list/activity_list.wxml
+++ b/pages/activity_list/activity_list.wxml
@@ -9,7 +9,7 @@
{{ item.activityName }}
- {{ item.activityTypeStr }}
+
参与时间: {{ item.createdAt }}
diff --git a/pages/activity_list/activity_list.wxss b/pages/activity_list/activity_list.wxss
index d79615f..0ad87f4 100644
--- a/pages/activity_list/activity_list.wxss
+++ b/pages/activity_list/activity_list.wxss
@@ -87,7 +87,13 @@
vertical-align: top;
}
-.weui-media-box__type10 {
+.weui-media-box__type{
+ width: 90rpx;
+ height: 40rpx;
+ float: left;
+}
+
+/* .weui-media-box__type10 {
color: #fff;
background: #f36619;
border-radius: 20rpx;
@@ -121,7 +127,7 @@
line-height: 40rpx;
width: 90rpx;
float: left;
-}
+} */
.view_hide {
display: none;