助力

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

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


-=======
-}
->>>>>>> 9e24edad28eff09cb1c9d947314de6e4e3a33d19