助力

2024-02-02 14:05:43 +08:00
parent 65149c38cd 9e24edad28
commit 8f50f42f8c
4 changed files with 178 additions and 0 deletions
--- a/src/jtools/api/activity.js
+++ b/src/jtools/api/activity.js
@@ -15,7 +15,11 @@ export function queryActivityDetail(data) {
    url: 'activity/applet/activity/detail',
    method: 'get',
    data,
+<<<<<<< HEAD
    noToken: true
+=======
+	noToken: true
+>>>>>>> 9e24edad28eff09cb1c9d947314de6e4e3a33d19
  });
 }
 //查询抽奖次数
@@ -62,6 +66,7 @@ export function getLuckyRecord(data) {
    data,
 		noToken: true
  });
+<<<<<<< HEAD
 }

 //查询中奖记录
@@ -116,3 +121,6 @@ export function wxLogin(data) {
 }


+=======
+}
+>>>>>>> 9e24edad28eff09cb1c9d947314de6e4e3a33d19