diff --git a/api/index/index.js b/api/index/index.js
index 519b041..4891f2a 100644
--- a/api/index/index.js
+++ b/api/index/index.js
@@ -56,6 +56,7 @@ export const discSpinningdraw = (data) => {
})
}
+
export const selectUserMoney = (data) => {
return http.request({
url: '/moneyDetails/selectUserMoney',
diff --git a/api/task/index.js b/api/task/index.js
index 562bab5..2bb9820 100644
--- a/api/task/index.js
+++ b/api/task/index.js
@@ -7,6 +7,14 @@ export const selectTaskCenter = (data) => {
data
})
}
+// 兑换列表
+export const selectTaskCenterUserReward = (data) => {
+ return http.request({
+ url: '/taskCenterReward/selectTaskCenterUserReward',
+ data,
+ isreturm:true
+ })
+}
// 获取签到
export const getUserSignData = (data) => {
return http.request({
@@ -14,6 +22,12 @@ export const getUserSignData = (data) => {
data
})
}
+export const receiveGoods = (data) => {
+ return http.request({
+ url: 'taskCenter/receiveGoods',
+ data
+ })
+}
// 任务-签到
export const taskReceive = (data) => {
return http.request({
diff --git a/http/http.js b/http/http.js
index 201fd1a..97a13e6 100644
--- a/http/http.js
+++ b/http/http.js
@@ -58,7 +58,7 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) {
// 避免混淆重新命名
let bodyData = data;
if (isreturm) {
- return Promise.resolve(bodyData.data || bodyData.page || bodyData);
+ return Promise.resolve(bodyData);
}
if (statusCode == 500) {
isShowErrorToast = true;
diff --git a/pages/task/receiveMember.vue b/pages/task/receiveMember.vue
index 1ab9fb4..c8462a8 100644
--- a/pages/task/receiveMember.vue
+++ b/pages/task/receiveMember.vue
@@ -12,11 +12,35 @@
-
+
{{ item.name }}
+
+
+
+ 领取
+
+
+
+ 领取
+
+
+ 去兑换
+ 已兑换
+
+
+
+
+
+
+
+
@@ -25,169 +49,267 @@
\ No newline at end of file
diff --git a/static/task/receive1.png b/static/task/receive1.png
new file mode 100644
index 0000000..888d1f4
Binary files /dev/null and b/static/task/receive1.png differ
diff --git a/static/task/receive2.png b/static/task/receive2.png
new file mode 100644
index 0000000..e152e87
Binary files /dev/null and b/static/task/receive2.png differ