ft活动上线

activeFt/newMan/oldView.html

@@ -52,33 +52,7 @@ $(function(){
         $(".txt1").text("PROG")
         $(".txt1").text("PROG")
         $(".txt2").text("rank")
         $(".txt2").text("rank")
     }
     }
-    $(".act-room-bg").on("click",function(){
-        var obj = {
-            "cid": 12,
-            "reqCode": new Date().getTime(),
-            "data": {
-                "msg": '跳转集合功能',
-                "jumptype": 3,
-                "url": $url + "/activeFt/newMan/index.html" + location.search+'&jump=1',
-            }
-        }
-        var obj2 = JSON.stringify(obj);
-        appCollaboration(obj2);
-        // $.ajax({
-        //     url:$ip+'/actSecretGarden/openPopup.html',
-        //     data:{
-        //         width:'0',
-        //         popupUrl:'http://test.ybact.yazhaiyabo.com/games/fireGarden2/index.html',
-        //         height:'0.5',
-        //         heightR:'121',
-        //         x:'0',
-        //         y:'0.5',
-        //     },
-        //     success:function(){
-
-        //     }
-        // })
-    })
+
     if(sessionStorage.lang!=2){
     if(sessionStorage.lang!=2){
 
 
     }
     }
@@ -110,9 +84,61 @@ $(function(){
             success:function(data){
             success:function(data){
                 console.log('圖標數據',data)
                 console.log('圖標數據',data)
                 if(data.result.userData.isNewUserGiftVoucher==1){
                 if(data.result.userData.isNewUserGiftVoucher==1){
+                    if(data.result.userData.newUserAwardTaskNum>=5){
+                        $(".act-room-bg").fadeIn(200).removeClass("act-room-bg2")
+                    }else{
                         $(".act-room-bg").fadeIn(200)
                         $(".act-room-bg").fadeIn(200)
+                        if(data.result.userData.isNewUserGiftSend==0){
+                            $(".act-room-bg").unbind("click").on("click",function(){
+                                $.ajax({
+                                    url:$ip+'/actSecretGarden/openPopup.html',
+                                    data:{
+                                        width:'0',
+                                        popupUrl:$url + "/activeFt/newMan/pop2.html" + location.search+'&jump=1',
+                                        height:'0.5',
+                                        heightR:'110',
+                                        x:'0',
+                                        y:'0.5',
+                                    },
+                                    success:function(){
+                                    
+                                    }
+                                })
+                            })
+                        }else{
+                            $(".act-room-bg").unbind("click").on("click",function(){
+                                var obj = {
+                                    "cid": 12,
+                                    "reqCode": new Date().getTime(),
+                                    "data": {
+                                        "msg": '跳转集合功能',
+                                        "jumptype": 3,
+                                        "url": $url + "/activeFt/newMan/index.html" + location.search+'&jump=1',
+                                    }
+                                }
+                                var obj2 = JSON.stringify(obj);
+                                appCollaboration(obj2);
+                            })
+                        }
+         
+                    }
+
+            
                 }else{
                 }else{
                     $(".act-room-bg").fadeIn(200).removeClass("act-room-bg2")
                     $(".act-room-bg").fadeIn(200).removeClass("act-room-bg2")
+                    $(".act-room-bg").unbind("click").on("click",function(){
+                        var obj = {
+                            "cid": 12,
+                            "reqCode": new Date().getTime(),
+                            "data": {
+                                "msg": '跳转集合功能',
+                                "jumptype": 3,
+                                "url": $url + "/activeFt/newMan/index.html" + location.search+'&jump=1',
+                            }
+                        }
+                        var obj2 = JSON.stringify(obj);
+                        appCollaboration(obj2);
+                    })
                 }
                 }
                 $(".act-title").text(titleName[data.result.roomData.level])
                 $(".act-title").text(titleName[data.result.roomData.level])
                 $(".act-room-p2").text(data.result.roomData.score)
                 $(".act-room-p2").text(data.result.roomData.score)