@@ -1,8 +1,8 @@ | |||
/* pages/agreement/agreement.wxss */ | |||
image{ | |||
.closeXieyi,.xieyi{ | |||
display: block; | |||
} | |||
view{ | |||
.xieyiGroup{ | |||
-webkit-overflow-scrolling: touch; | |||
} | |||
.main{ |
@@ -14,6 +14,7 @@ | |||
width: 100%; | |||
height: 100%; | |||
background-color: rgba(000, 000, 000, 0.8); | |||
padding-bottom: 150rpx; | |||
} | |||
.contentGroup{ | |||
position: absolute; |
@@ -22,7 +22,7 @@ Page({ | |||
isAddress:false,//是否有地址 | |||
getReward:null, | |||
tipWindow:0, | |||
hiddenFriendFrame:false, | |||
}, | |||
/** | |||
* 关闭任务窗 | |||
@@ -40,17 +40,12 @@ Page({ | |||
app.wxRequest(app.globalData.urlRoot +"task/signToday",{},res=>{ | |||
if (res.code == 200) { | |||
this.getShareId(); | |||
if (!this.data.shareId) { | |||
this.setData({ | |||
maskShow: false | |||
}) | |||
} else { | |||
this.setData({ | |||
isSign: false, | |||
isShare: true, | |||
showClose: true | |||
}) | |||
} | |||
this.setData({ | |||
maskShow: false, | |||
isSign: false, | |||
isShare: false, | |||
showClose: true | |||
}) | |||
}else{ | |||
wx.showToast({ | |||
title: res.msg, | |||
@@ -105,10 +100,11 @@ Page({ | |||
}, | |||
loadFun: function () { | |||
this.getTaskProgress(); | |||
this.getSignInfo(); | |||
this.getAddress(); | |||
if (this.data.isFriendShare) { | |||
this.useShareId(); | |||
}else{ | |||
this.getSignInfo(); | |||
} | |||
}, | |||
/** | |||
@@ -272,10 +268,19 @@ Page({ | |||
}, | |||
useShareId: function (shareId) {//发起助力 | |||
app.wxRequest(app.globalData.urlRoot + "task/useShareId", { shareId: this.data.isFriendShare}, res => { | |||
console.log(res); | |||
this.setData({ | |||
maskShow:false | |||
}) | |||
if(res.code==200){ | |||
this.setData({ | |||
hiddenFriendFrame: true, | |||
useShareData: res.data, | |||
maskShow: false | |||
}) | |||
} else { | |||
this.getSignInfo(); | |||
// wx.showToast({ | |||
// title: res.msg, | |||
// icon:"none" | |||
// }) | |||
} | |||
}, this,"POST") | |||
}, | |||
swiperChange(e) {//通过鼠标滑动改变swiper时 | |||
@@ -289,5 +294,11 @@ Page({ | |||
this.setData({ | |||
showRule: e.currentTarget.dataset.state | |||
}) | |||
}, | |||
hiddenFriendTip: function () { | |||
this.getSignInfo(); | |||
this.setData({ | |||
hiddenFriendFrame:false | |||
}) | |||
} | |||
}) |
@@ -94,4 +94,15 @@ | |||
<view class="startRegister" wx:if="{{tipWindow==2}}" bindtap="userRegister">立即注册</view> | |||
</view> | |||
</view> | |||
<view class="successPop" wx:if="{{hiddenFriendFrame}}"> | |||
<view class="friendTip"> | |||
<text class="closeBtn" style="right:-40rpx;top:-40rpx;" bindtap="hiddenFriendTip"></text> | |||
<view class="friendTipTitle">恭喜您</view> | |||
<view class="tipText">您已经成功为 {{useShareData.nickName}} 获得了</view> | |||
<view class="tipText">一片{{useShareData.taskName}}碎片</view> | |||
<view class="tipText">集齐4片即可获得一份</view> | |||
<view class="tipText">启辰星购车红包</view> | |||
<view class="joinBtn" bindtap="hiddenFriendTip">我也要玩</view> | |||
</view> | |||
</view> | |||
<tabBar></tabBar> |
@@ -438,4 +438,48 @@ | |||
color:rgba(255,255,255,1); | |||
line-height:50rpx; | |||
position: relative; | |||
} | |||
.friendTip{ | |||
position: relative; | |||
width:568rpx; | |||
height:486rpx; | |||
border-radius: 20rpx; | |||
background-color: white; | |||
display: flex; | |||
flex-direction: column; | |||
align-items: center; | |||
} | |||
.friendTipTitle{ | |||
width:568rpx; | |||
height:78rpx; | |||
line-height: 78rpx; | |||
font-size:34rpx; | |||
font-family:PingFang; | |||
font-weight:bold; | |||
color:rgba(255,255,255,1); | |||
background-color: #355485; | |||
border-top-left-radius: 20rpx; | |||
border-top-right-radius: 20rpx; | |||
text-align: center; | |||
margin-bottom: 61rpx; | |||
} | |||
.tipText{ | |||
font-size:26rpx; | |||
font-family:PingFang; | |||
font-weight:500; | |||
color:rgba(35,24,21,1); | |||
line-height:46rpx; | |||
} | |||
.joinBtn{ | |||
margin-top: 53rpx; | |||
width:347rpx; | |||
height:63rpx; | |||
background-color: #355485; | |||
text-align: center; | |||
font-size:30rpx; | |||
font-family:PingFang; | |||
font-weight:400; | |||
color:rgba(255,255,255,1); | |||
line-height: 63rpx; | |||
border-radius: 20rpx; | |||
} |
@@ -311,7 +311,8 @@ Page({ | |||
}, | |||
closeWindow:function(){//关闭中奖 | |||
this.setData({ | |||
pizeTip:0 | |||
pizeTip:0, | |||
ruleShow:true | |||
}) | |||
}, | |||
getGameAwardList: function () {//获取游戏中奖数据 |
@@ -14,8 +14,8 @@ | |||
<view class="prizeTipLine"></view> | |||
</view> | |||
<view class="tipContentGroup"> | |||
<scroll-view class="scrollSty" bindscrolltolower="getMore" scroll-left="{{scrollNum}}" scroll-x="{{true}}"><view class="tipContent" style="width: 672rpx;"></view><view class="tipContent" wx:for="{{gameAwardList}}" wx:key="index">{{"恭喜"+item.nickName+"获得"+item.awardName}}</view></scroll-view> | |||
<!-- <view class="scrollMask"></view> --> | |||
<scroll-view class="scrollSty" bindscrolltolower="getMore" scroll-left="{{scrollNum}}" scroll-x="{{true}}"><view class="tipContent" style="width: 750rpx;"></view><view class="tipContent" wx:for="{{gameAwardList}}" wx:key="index">{{"恭喜"+(item.nickName?item.nickName:'***')+"获得"+(item.awardName?item.awardName:'***')}}</view><view class="tipContent" style="width: 750rpx;"></view></scroll-view> | |||
<view class="scrollMask"></view> | |||
</view> | |||
<view class="prizeLookGroup"> | |||
<view class="prizeLook" bindtap="prizeLook">活动奖品</view> | |||
@@ -51,8 +51,8 @@ | |||
<!-- <view class="prizeName">头等舱机票一张</view> --> | |||
<image class="prizePic" src="{{endGameData.awardPicUrl}}" mode="aspectFit"></image> | |||
<view class="prizeName">{{endGameData.awardName}}</view> | |||
<view class="startRegister" wx:if="{{(isAddress || endGameData.needAddress==0)}}" bindtap="receive">立即领取</view> | |||
<view class="startRegister" wx:if="{{(!isAddress && endGameData.needAddress!=0)}}" bindtap="userRegister">立即注册</view> | |||
<!-- <view class="startRegister" wx:if="{{(isAddress || endGameData.needAddress==0)}}" bindtap="receive">立即领取</view> --> | |||
<view class="startRegister" wx:if="{{(!isAddress && endGameData.needAddress!=0)}}" bindtap="userRegister">立即领取</view> | |||
</view> | |||
<view class="successGroup" wx:if="{{pizeTip==2 || pizeTip==3}}"> | |||
<image class="gameRuleClose" bindtap="closeWindow" style="top:-31rpx;right:-29rpx;" src="{{imgUrl+'/images/gameRuleClose.png'}}"></image> |
@@ -193,7 +193,7 @@ | |||
<image bindtap="lookDesc" data-value="{{false}}" class="closeDescIcon" src="{{imgUrl+'/images/closeDescIcon.png'}}"></image> | |||
</view> | |||
</view> | |||
<view class="prizeDesc" catchtouchmove="ture" style="background-color:'rgba(000,000,000,0.8)';" wx:if="{{ruleShow}}"> | |||
<view class="prizeDesc" style="background-color:'rgba(000,000,000,0.8)';" wx:if="{{ruleShow}}"> | |||
<view class="ruleImgGroup"> | |||
<view class="ruleImgGroup" style="overflow: auto;"> | |||
<image class="ruleImg" src="{{imgUrl+'/star/xingRule.png?v=002'}}"></image> |
@@ -6,7 +6,8 @@ view{ | |||
-webkit-overflow-scrolling: touch; | |||
} | |||
.main{ | |||
height: calc(100vh - 150rpx); | |||
/* height: calc(100vh - 150rpx); */ | |||
padding-bottom: 150rpx; | |||
overflow: auto; | |||
} | |||
.msgGroup{ | |||
@@ -172,7 +173,7 @@ view{ | |||
width:325rpx; | |||
height:15rpx; | |||
box-sizing: border-box; | |||
border: 1rpx solid #CBC8CB; | |||
border: 2rpx solid #CBC8CB; | |||
border-radius: 20rpx; | |||
overflow: hidden; | |||
} | |||
@@ -521,7 +522,6 @@ view{ | |||
display: flex; | |||
align-items: center; | |||
justify-content: center; | |||
padding-bottom: 150rpx; | |||
box-sizing: border-box; | |||
} | |||
.prizeImgGroup{ |
@@ -273,10 +273,23 @@ Page({ | |||
} | |||
}, | |||
getCertificationCount: function () {//获取星探计划人数 | |||
app.wxRequest(app.globalData.urlRoot +"userInfo/getCertificationCount",{},res=>{ | |||
app.wxRequest(app.globalData.urlRoot +"userInfo/getUserInfo",{},res=>{ | |||
this.createQrcode(); | |||
if(res.code==200){ | |||
this.data.rankNum = res.data.total.toString().split(""); | |||
if (res.data.certificationNum){ | |||
if (res.data.certificationNum<10){ | |||
this.data.rankNum = ("000" + res.data.certificationNum.toString()).split(""); | |||
} else if (res.data.certificationNum < 100) { | |||
this.data.rankNum = ("00" + res.data.certificationNum.toString()).split(""); | |||
} else if (res.data.certificationNum < 1000) { | |||
this.data.rankNum = ("0" + res.data.certificationNum.toString()).split(""); | |||
} else { | |||
this.data.rankNum = res.data.certificationNum.toString().split(""); | |||
} | |||
}else{ | |||
this.data.rankNum = "0000".split(""); | |||
} | |||
console.log(this.data.rankNum); | |||
this.setData({ | |||
rankNum: this.data.rankNum | |||
}) |
@@ -41,10 +41,18 @@ | |||
"current": -1, | |||
"list": [] | |||
}, | |||
"plugin": { | |||
"current": -1, | |||
"list": [] | |||
}, | |||
"game": { | |||
"currentL": -1, | |||
"list": [] | |||
}, | |||
"gamePlugin": { | |||
"current": -1, | |||
"list": [] | |||
}, | |||
"miniprogram": { | |||
"current": -1, | |||
"list": [ | |||
@@ -85,10 +93,11 @@ | |||
"query": "" | |||
}, | |||
{ | |||
"id": -1, | |||
"id": 6, | |||
"name": "集碎片", | |||
"pathName": "pages/everyday/everyday", | |||
"query": "" | |||
"query": "", | |||
"scene": null | |||
}, | |||
{ | |||
"id": -1, |