ft活动上线

activeFt/newMan/index.html

@@ -8,7 +8,7 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
     <meta content="telephone=no" name="format-detection">
     <meta name="wap-font-scale" content="no">
-    <title>幸運女神降臨</title>
+    <title>尋星旅團</title>
     <script src="lib/fsize.js"></script>
     <link rel="stylesheet" href="css/base.css">
     <link rel="stylesheet" href="css/layer.css">
@@ -183,7 +183,7 @@ $(function(){
     }
     function getTask(type,e){
         $.ajax({
-            url:$ip+'/actStarSearchTour/userBuyGoods.html',
+            url:$ip+'/actStarSearchTour/receiveTaskRewards.html',
             data:{
                 taskType:type,
                 taskId:e
@@ -305,24 +305,24 @@ $(function(){
                 console.log('获取任务数据',data)
                 $("#target").text(data.result.dailyTaskList[3].speakMsg)
                 //非付费用户
-                if(data.result.userData.isPaid==0){
-                    $(".reg-btn").show()
-                    $(".reg-btn").unbind("click").on("click",function(){
-                        var obj = {
-                            "cid": 12,
-                            "reqCode": new Date().getTime(),
-                            "data": {
-                                "msg": '去儲值',
-                                "jumptype": 16,  //16: 去储值  18: 跳转到座驾  3：跳转集合功能   28:跳转直播间  29：空间  26:设置  40:半屏宝石储值  41：礼物列表  42：背包列表 // 43: 跳转新人主播引导
-                                "hideTitle": 0 // 1隐藏头部，0 不隐藏， 默认为0
+                if(data.result.userData.isPaid==0||data.result.userData.isNewUserGiftVoucher==1){
+                    if(data.result.userData.isPaid==0){
+                        $(".reg-btn").show()
+                        $(".reg-btn").unbind("click").on("click",function(){
+                            var obj = {
+                                "cid": 12,
+                                "reqCode": new Date().getTime(),
+                                "data": {
+                                    "msg": '去儲值',
+                                    "jumptype": 16,  //16: 去储值  18: 跳转到座驾  3：跳转集合功能   28:跳转直播间  29：空间  26:设置  40:半屏宝石储值  41：礼物列表  42：背包列表 // 43: 跳转新人主播引导
+                                    "hideTitle": 0 // 1隐藏头部，0 不隐藏， 默认为0
+                                }
                             }
-                        }
-                        var obj2 = JSON.stringify(obj);
-                        appCollaboration(obj2);
-                    })
-                }
-                if(data.result.userData.isNewUserGiftVoucher==1){
-                    // data.result.userData.isPaid==0 
+                            var obj2 = JSON.stringify(obj);
+                            appCollaboration(obj2);
+                        })
+                    }
+
                     $(".new-task-box").show()
                     for(var i=0;i<data.result.newPayUserTaskList.length;i++){
                         var list=data.result.newPayUserTaskList[i]
@@ -352,6 +352,7 @@ $(function(){
                         }
                     })
                 }
+
                 //新人礼物没赠送
                 if(data.result.userData.isNewUserGiftVoucher==1&&data.result.userData.isNewUserGiftSend==0){
                     $(".one-gift-box").show()

activeFt/newMan/lib/default.js

@@ -69,7 +69,7 @@ if(sessionStorage.open==undefined)sessionStorage.open=1
  }
  if (bbb.indexOf("file:///E:") > -1) {
      sessionStorage.lang=2
-     sessionStorage.uid =210102;
+     sessionStorage.uid =11144909;
      sessionStorage.token = 'debug'
      sessionStorage.roomId=11134747;
      sessionStorage.version=8890

activeFt/newMan/oldView.html

@@ -83,47 +83,63 @@ $(function(){
             url:$ip+'/actStarSearchTour/getRoomPartData.html',
             success:function(data){
                 console.log('圖標數據',data)
-                if(data.result.userData.isNewUserGiftVoucher==1){
-                    if(data.result.userData.newUserAwardTaskNum>=5){
-                        $(".act-room-bg").fadeIn(200).removeClass("act-room-bg2")
-                    }else{
+                if(data.result.userData.isPaid==0||data.result.userData.isNewUserGiftVoucher==1){
+                   //進入新人流程
+                    if(data.result.userData.newUserAwardTaskNum<5){
                         $(".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+'',
-                                        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',
-                                    }
+                         $(".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+'',
+                                         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{
+                        $(".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+'&',
                                 }
-                                var obj2 = JSON.stringify(obj);
-                                appCollaboration(obj2);
-                            })
-                        }
-         
+                            }
+                            var obj2 = JSON.stringify(obj);
+                            appCollaboration(obj2);
+                        })
                     }
 
-            
                 }else{
                     $(".act-room-bg").fadeIn(200).removeClass("act-room-bg2")
                     $(".act-room-bg").unbind("click").on("click",function(){