Merge branch 'dev-stage2-20191125' of...

Merge branch 'dev-stage2-20191125' of http://192.168.110.53/com.pica.cloud.foundation.frontend/year-end-activitiy into dev-stage2-20191125

service/activityMainpage.js

@@ -47,5 +47,20 @@ export const goToUpdateClock = (params) => {
   })
 }
 
+// 获取activityId
+export const getActivityId = () => {
+	return request({
+    url: `contents/commonComstant/selectByTypeCode?code=C015`,
+    method: 'get',
+    withCredentials: true,
+  })
+}
 
-
+// 获取任务列表
+export const getTimsActivityInfo = (id) => {
+	return request({
+    url: `campaign/tims/timsActivityInfo?activityId=${id}`,
+    method: 'get',
+    withCredentials: true,
+  })
+}