|
@@ -12,16 +12,23 @@ export default function HuoDongDetail () {
|
12
|
12
|
const { user, setUser } = useModel('user')
|
13
|
13
|
const [DataLock, setDataLock] = useState(false)
|
14
|
14
|
const [HasSign, setHasSign] = useState(false)
|
15
|
|
- const [CurrnetId] = useState(useRouter().params.id) // 当前活动id
|
|
15
|
+ const [CurrnetId, setCurrentId] = useState(useRouter().params.id) // 当前活动id
|
|
16
|
+ const [CurrnetSceneId] = useState(useRouter().params.scene) // 当前活动id
|
16
|
17
|
const [ActivityDetail, setActivityDetail] = useState(null) // 活动详情
|
17
|
18
|
const [JoinInfo, setJoinInfo] = useState(null) // 参加活动详情
|
18
|
19
|
|
19
|
20
|
useEffect(() => {
|
20
|
|
- if (CurrnetId !== null) {
|
|
21
|
+ if (CurrnetId !== null && CurrnetId !== undefined) {
|
21
|
22
|
GetActivityDetail()
|
22
|
23
|
}
|
23
|
24
|
}, [CurrnetId])
|
24
|
25
|
|
|
26
|
+ useEffect(() => {
|
|
27
|
+ if (CurrnetSceneId !== null && CurrnetSceneId !== undefined) {
|
|
28
|
+ GetActivityInfoByScene()
|
|
29
|
+ }
|
|
30
|
+ }, [CurrnetSceneId])
|
|
31
|
+
|
25
|
32
|
useEffect(() => {
|
26
|
33
|
if (ActivityDetail !== null) {
|
27
|
34
|
request({ ...apis.checkActivityJoin, args: { id: CurrnetId } }).then((res) => {
|
|
@@ -30,6 +37,15 @@ export default function HuoDongDetail () {
|
30
|
37
|
}
|
31
|
38
|
}, [ActivityDetail])
|
32
|
39
|
|
|
40
|
+ const GetActivityInfoByScene = () => {
|
|
41
|
+ request({ ...apis.GetActivityInfoByScene, args: { sceneId: CurrnetSceneId } }).then((res) => {
|
|
42
|
+ let Scene = JSON.parse(res).scene
|
|
43
|
+ let startIndex = Scene.indexOf('id=') + 3
|
|
44
|
+ let endIndex = Scene.indexOf('&type=')
|
|
45
|
+ setCurrentId(Scene.substring(startIndex, endIndex))
|
|
46
|
+ })
|
|
47
|
+ }
|
|
48
|
+
|
33
|
49
|
const GetActivityDetail = () => {
|
34
|
50
|
request({ ...apis.getActivityDetail, args: { id: CurrnetId } }).then((res) => {
|
35
|
51
|
setActivityDetail(res)
|
|
@@ -37,7 +53,7 @@ export default function HuoDongDetail () {
|
37
|
53
|
}
|
38
|
54
|
|
39
|
55
|
const ToSign = () => {
|
40
|
|
- if (!DataLock) {
|
|
56
|
+ if (!DataLock && JoinInfo.enlist !== null) {
|
41
|
57
|
setDataLock(true)
|
42
|
58
|
request({ ...apis.activitySign, args: { id: JoinInfo.enlist.enlistId } }).then(() => {
|
43
|
59
|
Taro.showToast({ title: '签到成功,积分+1', icon: 'none' })
|