diff --git a/activeFt/newMan/css/index.css b/activeFt/newMan/css/index.css
index 45ff76b..1ed4700 100644
--- a/activeFt/newMan/css/index.css
+++ b/activeFt/newMan/css/index.css
@@ -539,3 +539,11 @@
top: 4.6rem;
left: 3.3rem;
}
+.new-task-time {
+ width: 9.58rem;
+ position: absolute;
+ bottom: 0.8rem;
+ text-align: center;
+ color: #B43232;
+ font-size: 0.35rem;
+}
diff --git a/activeFt/newMan/css/index.less b/activeFt/newMan/css/index.less
index 77c2d72..e779d7f 100644
--- a/activeFt/newMan/css/index.less
+++ b/activeFt/newMan/css/index.less
@@ -409,6 +409,9 @@
// margin-bottom: 5rem;
overflow: hidden;
}
+.layer-fans{
+
+}
.layer-fans-ul{
width: 9rem;
margin: 0 auto;
@@ -546,3 +549,12 @@
left: 3.3rem;
}
}
+.new-task-time{
+ width: 9.58rem;
+ position: absolute;
+ bottom: 0.8rem;
+ text-align: center;
+ color: #B43232;
+ font-size: 0.35rem;
+
+}
\ No newline at end of file
diff --git a/activeFt/newMan/images/img_v3_02el_fa55c6ba-27fe-43eb-8bca-f15a89c8b38g.png b/activeFt/newMan/images/img_v3_02el_fa55c6ba-27fe-43eb-8bca-f15a89c8b38g.png
new file mode 100644
index 0000000..212ac03
Binary files /dev/null and b/activeFt/newMan/images/img_v3_02el_fa55c6ba-27fe-43eb-8bca-f15a89c8b38g.png differ
diff --git a/activeFt/newMan/index.html b/activeFt/newMan/index.html
index bc7bd13..ff886f1 100644
--- a/activeFt/newMan/index.html
+++ b/activeFt/newMan/index.html
@@ -70,13 +70,13 @@
<div class="top-k k6"></div>
<!-- <p class="mc-box-tips">優先展示當前在線的前四名<br>目標積分520000<span>(獎勵52000羽毛)</span></p> -->
<div class="card-content">
- <div class="card-box">
+ <!-- <div class="card-box">
<img class="card-face" src="https://big.bgp.ourpow.com/comm/user/boy.png?x-oss-process=image/resize,w_110" alt="">
<img class="like-btn" src="images/like.png" alt="">
<p class="card-p1">主播昵称预留</p>
<p class="card-p2"><span>52364</span>/18888</p>
<div class="card-btn">她的粉絲團</div>
- </div>
+ </div> -->
</div>
</div>
</div>
@@ -99,6 +99,7 @@
<div data-type="9" class="task9"></div>
<div data-type="10" class="task10"></div>
<div data-type="11" class="task11"></div>
+ <p class="new-task-time">活動結束時間9月30日24:00</p>
</div>
<div class="task-box">
<div data-type="1" class="task1 "></div>
@@ -148,8 +149,8 @@ $(function(){
$(".one-gift-send").on("click",function(){
layer.msg("前往直播間點擊右上角活動圖標即可送出")
})
- $(".buy-btn").on("click",function(){
-
+ $(".btn-ok").on("click",function(){
+ layer.closeAll()
})
function buy(type){
$.ajax({
@@ -159,6 +160,9 @@ $(function(){
},
success:function(data){
console.log("购买月卡/壁咚",data)
+ if(data.code==-100){
+
+ }
if(data.code!=1){
layer.msg(data.msg)
return;
@@ -324,7 +328,6 @@ $(function(){
}
$(".new-task-box").show()
- console.log(12121)
for(var i=0;i<data.result.newPayUserTaskList.length;i++){
var list=data.result.newPayUserTaskList[i]
if(list.taskStatus==0){
@@ -346,9 +349,9 @@ $(function(){
})
$(".new-task-box .task-btn7").unbind("click").on("click",function(){
var _self=$(this)
- if(_self.attr("data-type")==7){
+ if(_self.attr("data-type")==6){
layer.msg("請前往直播間點擊左上角活動圖標進入")
- }else if(_self.attr("data-type")==6){
+ }else if(_self.attr("data-type")==7){
window.location.href='yazhai://_134306_zone'
}
})
diff --git a/activeFt/newMan/oldView.html b/activeFt/newMan/oldView.html
index a049dba..c0b99dd 100644
--- a/activeFt/newMan/oldView.html
+++ b/activeFt/newMan/oldView.html
@@ -93,9 +93,9 @@ $(function(){
url:$ip+'/actSecretGarden/openPopup.html',
data:{
width:'0',
- popupUrl:$url + "/activeFt/newMan/pop2.html" + location.search+'',
+ popupUrl:$url + "/activeFt/newMan/pop.html" + location.search+'',
height:'0.5',
- heightR:'110',
+ heightR:'70',
x:'0',
y:'0.5',
},
diff --git a/activeFt/newMan/pop2.html b/activeFt/newMan/pop2.html
index c971f5e..8fefcea 100644
--- a/activeFt/newMan/pop2.html
+++ b/activeFt/newMan/pop2.html
@@ -65,6 +65,23 @@ $(function(){
},
success:function(data){
console.log("购买月卡/壁咚",data)
+ if(data.code==-100){
+ layer.msg("寶石不足,即將跳轉儲值")
+ setTimeout(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);
+ },800)
+ return;
+ }
if(data.code!=1){
layer.msg(data.msg)
return;