Commit 8091d6d5 authored by zhangjinzhou's avatar zhangjinzhou

Merge branch 'jiaoneiqunuan' of gitlab2.dui88.com:wanghongyuan/new_taobao into jiaoneiqunuan

# Conflicts:
#	taobao_jn/client/pages/pagegamemain/pagegamemain.axml
#	taobao_jn/client/pages/pagegamemain/pagegamemain.js
parents 3eeda169 d3dfabf6
......@@ -16,6 +16,10 @@ App({
tbcc,
onLaunch(options) {
this.handleQuery(options.query || {});
// my.setNavigationBar({
// title: '蕉内抱团取暖',
// backgroundColor: '#000000',
// });
},
onShow(options) {
// 从后台被 scheme 重新打开
......
......@@ -12,12 +12,13 @@ const {
Component({
props: {
gameOverData:{
warms:100,
isWin:true,
prize:{
name:'商品名称',
image: '//yun.duiba.com.cn/spark/assets/万能卡图片.a958c11565bbdb955ee73dd03532a6bbe86cfb1f.png'
}
// warms:100,
// isWin:true,
// prize:{
// name:'商品名称',
// image: '//yun.duiba.com.cn/spark/assets/万能卡图片.a958c11565bbdb955ee73dd03532a6bbe86cfb1f.png'
// },
// unLockStep:2
}
},
data: {
......@@ -30,7 +31,15 @@ Component({
},
methods: {
redirectToIndex(){
my.redirectTo({url:'/pages/pagepageindex/pagepageindex'})
const {isWin,unLockStep} = this.props.gameOverData;
if(isWin&&unLockStep&&unLockStep>1){
const {onLockStep} = this.props;
onLockStep&&onLockStep(this.props.gameOverData)
}else{
const {onClose} = this.props;
onClose&&onClose();
// my.redirectTo({url:'/pages/pagepageindex/pagepageindex'})
}
},
},
......
......@@ -2,14 +2,22 @@
import resList from '../../resconfig/resList';
Component({
props: {},
props: {
gameOverData:{}
},
data: {resList: resList},
methods: {
redirectToIndex(){
my.redirectTo({url:'/pages/pagepageindex/pagepageindex'})
},
onModalClose(){
const {isWin,unLockStep} = this.props.gameOverData;
console.log("获胜没有奖品",this.props.gameOverData)
if(isWin&&unLockStep&&unLockStep>1){
const {onLockStep} = this.props;
onLockStep&&onLockStep(this.props.gameOverData)
}else{
const {onClose} = this.props;
onClose&&onClose();
// my.redirectTo({url:'/pages/pagepageindex/pagepageindex'})
}
}
},
......
......@@ -5,7 +5,7 @@
left: 111rpx;
top: 443rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
transform-origin: 50% 50% 0rpx;
}
.ranknoprizemodal .ranknoprizebg {
width: 527rpx;
......@@ -32,7 +32,7 @@
left: 83rpx;
top: 416rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
transform-origin: 50% 50% 0rpx;
}
.ranknoprizemodal .ranknoprizeclose {
width: 72rpx;
......@@ -41,5 +41,45 @@
left: 228rpx;
top: 562rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
transform-origin: 50% 50% 0rpx;
}
.ranknoprizemodal .ranknoprize500 {
width: 335rpx;
height: 77rpx;
opacity: 1;
left: 96rpx;
top: 200rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.ranknoprizemodal .rankNoPirzeHundred {
width: 88rpx;
height: 77rpx;
opacity: 1;
left: 134rpx;
top: 200rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.ranknoprizemodal .rankNoPirzeTen {
width: 87rpx;
height: 77rpx;
opacity: 1;
left: 222rpx;
top: 198rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.ranknoprizemodal .rankNoPirzeOne {
width: 87rpx;
height: 77rpx;
opacity: 1;
left: 308rpx;
top: 198rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
\ No newline at end of file
<view class="ranknoprizemodal ">
<view class="ranknoprizemodal modal-animate-zoom-in">
<image class="ranknoprizebg " src={{resList['ae93d0a2-7c8b-48a5-96a2-49b819e5b2bf'].url}} />
<span class="ranknoprizeindex ">500+</span>
<image class="ranknoprizebtn " src={{resList['d0c616aa-c606-40dd-b6f1-e9d370f3d053'].url}} />
<image class="ranknoprizeclose " src={{resList['843f7959-252d-403d-8287-e212b46b1fc1'].url}} />
</view>
\ No newline at end of file
<!-- <label class="ranknoprizeindex ">500+</label> -->
<image class="ranknoprize500 " a:if="{{myRank>500}}" src={{resList['14fbf7c8-43e2-4bb9-81c8-d1392455cf39'].url}} />
<image class="rankNoPirzeHundred " a:if="{{myRank<=500}}" src={{resList['55fd44df-0153-4a6b-aa5c-b1aea201cdb8-'+(myRankHundred)].url}} />
<image class="rankNoPirzeTen " a:if="{{myRank<=500}}" src={{resList['55fd44df-0153-4a6b-aa5c-b1aea201cdb8-'+(myRankTen)].url}} />
<image class="rankNoPirzeOne " a:if="{{myRank<=500}}" style="{{{'left':oneLeft}}}" src={{resList['55fd44df-0153-4a6b-aa5c-b1aea201cdb8-'+(myRankOne)].url}} />
<image class="ranknoprizebtn btn" onTap="onCloseModal" src={{resList['d0c616aa-c606-40dd-b6f1-e9d370f3d053'].url}} />
<image class="ranknoprizeclose btn" onTap="onCloseModal" src={{resList['843f7959-252d-403d-8287-e212b46b1fc1'].url}} />
</view>
\ No newline at end of file
......@@ -2,14 +2,42 @@
import resList from '../../resconfig/resList';
Component({
props: {},
data: {},
methods: {},
props: {
gameInfo:{rank:156}
},
data: {
resList: resList,
myRank:0,
myRankHundred:0,
myRankTen:0,
tenLeft:0,
myRankOne:0,
oneLeft:0
},
methods: {
onCloseModal() {
const {
onCloseModal
} = this.props;
onCloseModal && onCloseModal();
},
},
onInit(props) {
didMount(){
const {rank} = this.props.gameInfo;
let hundred = Math.floor(rank%1000/100);
let ten = Math.floor(rank%1000%100/10);
let one = Math.floor(rank%1000%100%10);
console.log("排名",hundred,ten,one)
if(ten<=0){
this.setData({
oneLeft:'222rpx'
})
}
this.setData({
resList: resList
});
myRankHundred:hundred,
myRankTen:ten,
myRankOne:one
})
}
});
\ No newline at end of file
......@@ -30,7 +30,7 @@
left: 651rpx;
top: -91rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
transform-origin: 50% 50% 0rpx;
}
.task .taskmodaltitle {
width: 750rpx;
......
<view class="taskcontainer ">
<view class="task ">
<image class="task_bg " src={{resList['feaed213-a6d1-4e32-8444-5c823923f299'].url}} />
<image class="task_close " onTap="onModalClose" src={{resList['8797382d-2b38-432e-85d3-6a2160304723'].url}} />
<image class="task_close btn" onTap="onModalClose" src={{resList['8797382d-2b38-432e-85d3-6a2160304723'].url}} />
<label class="taskmodaltitle">任务中心</label>
<view class="task_list">
<view class="task_item " a:for="{{list}}">
......@@ -16,7 +16,8 @@
<image class="task_readicon " a:if="{{item.taskType=='browseGoods'}}" src={{resList['e3bef9e1-07a4-408d-b387-a9ac08c4b7f0'].url}} />
<image class="task_favoricon " a:if="{{item.taskType=='collectGoods'}}" src={{resList['a03d17c7-c4f0-42e0-9430-be61f5eb68d5'].url}} />
<label class="task_title ">{{item.title}}</label>
<label class="task_title " a:if="{{item.taskType!='sign'}}">{{item.title}}</label>
<label class="task_title " a:if="{{item.taskType=='sign'}}">{{item.title}}({{item.todayCompleteTimes}}/{{item.times}})</label>
<label class="task_award ">温暖值 +{{item.rewards}}</label>
<block>
<!-- <label class="task_progress " a:if="{{item.taskType=='invites'}}">(不限次数)</label>
......
......@@ -5,7 +5,7 @@
left: 111rpx;
top: 388rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
transform-origin: 50% 50% 0rpx;
}
.unlockstepmodal .unlockstepbg {
width: 527rpx;
......
<view class="unlockstepmodal ">
<view class="unlockstepmodal modal-animate-zoom-in">
<image class="unlockstepbg " src={{resList['cae8e0bb-e05f-4bc7-b77d-24b9f1e9492c'].url}} />
<view class="unlocksteptext ">
<label class="unlocksteptitle1 ">{{title1}}</label>
......
......@@ -18,18 +18,18 @@ Component({
},
methods: {
redirectToIndex(){
const {onCloseModal} = this.props;
onCloseModal&&onCloseModal();
const {onClose} = this.props;
onClose&&onClose();
// my.redirectTo({url:'/pages/pagepageindex/pagepageindex'})
},
navigateToGoodsDetail(){
const unLockStep = this.props.unLockStep;
const {unLockStep} = this.props.gameOverData;
let url = unLockStep==2?'https://detail.tmall.com/item.htm?spm=a212k0.12153887.0.0.4e60687dPr2HpU&id=625400191293':'https://detail.tmall.com/item.htm?spm=a212k0.12153887.0.0.4e60687dPr2HpU&id=627409975355'
navigateToOutside(url)
}
},
didMount(){
const unLockStep = this.props.unLockStep;
const {unLockStep,warms}= this.props.gameOverData;
let str = unLockStep==2?'恭喜您解锁5系赛段':'恭喜您解锁7系赛段';
let str1 = unLockStep==3?'进入三人场':'进入四人场';
this.setData({
......
......@@ -102,11 +102,11 @@
</view>
</view>
</scroll-view>
<view class="popcontainer" a:if="{{pkshow1_v}}"><pkprize-modal onClose="closetohome" gameOverData="{{pk1data}}"></pkprize-modal></view>
<view class="popcontainer" a:if="{{pkshow2_v}}"><pknoprize-modal onClose="closetohome" gameOverData="{{pk2data}}"></pknoprize-modal></view>
<view class="popcontainer" a:if="{{pkshow3_v}}"><pkfailnoprize-modal onClose="closetohome" gameOverData="{{pk3data}}"></pkfailnoprize-modal></view>
<view class="popcontainer" a:if="{{pkshow4_v}}"><pksuccessnoprize-modal onClose="closetohome" gameOverData="{{pk4data}}"></pksuccessnoprize-modal></view>
<view class="popcontainer" a:if="{{pkshow1_v}}"><pkprize-modal onClose="closetohome" onLockStep="openLockStep" gameOverData="{{pk1data}}"></pkprize-modal></view>
<view class="popcontainer" a:if="{{pkshow2_v}}"><pknoprize-modal onClose="closetohome" gameOverData="{{pk1data}}"></pknoprize-modal></view>
<view class="popcontainer" a:if="{{pkshow3_v}}"><pkfailnoprize-modal onClose="closetohome" gameOverData="{{pk1data}}"></pkfailnoprize-modal></view>
<view class="popcontainer" a:if="{{pkshow4_v}}"><pksuccessnoprize-modal onClose="closetohome" onLockStep="openLockStep" gameOverData="{{pk1data}}"></pksuccessnoprize-modal></view>
<view class="popcontainer" a:if="{{toolshow_v}}"><tempitem-modal onClose="usetool1"></tempitem-modal></view>
<view class="popcontainer_down" a:if="{{taskshow_v}}"><task-modal onClose="closeTask"></task-modal></view>
<view class="popcontainer" a:if="{{lockstepshow_v}}"><lockstep-modal onCloseModal="closetohome"></lockstep-modal></view>
<view class="popcontainer" a:if="{{invite_v}}"><gameinvite-modal onClose="closeInvite" inviteData="{{inviteshowdata}}"></gameinvite-modal></view>
\ No newline at end of file
<view class="popcontainer" a:if="{{invite_v}}"><gameinvite-modal onClose="closeInvite" inviteData="{{inviteshowdata}}"></gameinvite-modal></view>
<view class="popcontainer" a:if="{{lockstepshow_v}}"><lockstep-modal gameOverData="{{unLockPkData}}" onClose="closetohome"></lockstep-modal></view>
......@@ -80,6 +80,9 @@ Page({
toolshow_v: false,
taskshow_v: false,
invite_v: false,
unLockPkData:{
},
pk1data: {
warms: 0,
isWin: false,
......@@ -300,7 +303,8 @@ Page({
})
const { success, data } = overdata;
if (success) {
const { warms, isWin, prize, unLockStep } = overdata;
const { warms, isWin, prize, unLockStep } = data;
console.log("over",data)
if (isWin) {
if (prize && prize.image && prize.image.length > 0) {
this.setData({
......@@ -308,12 +312,27 @@ Page({
})
this.openprize1();
} else {
this.setData({
pk1data: data
})
this.openprize4();
}
}else{
if (prize && prize.image && prize.image.length > 0) {
this.setData({
pk1data: data
})
this.openprize1();
} else {
this.setData({
pk1data: data
})
this.openprize3();
}
}
// console.log("结束数据", overdata);
}
this.openprize1();
// this.openprize1();
},
//匹配3s,切换活动
changePashow() {
......@@ -582,7 +601,10 @@ Page({
this.closeprize2();
this.closeprize3();
this.closeprize4();
my.navigateBack();
this.closeLockStep();
this.closeTask();
// my.navigateBack();
my.redirectTo({url:'/pages/pagepageindex/pagepageindex'})
},
//打开道具页面
......@@ -652,10 +674,15 @@ Page({
})
},
openLockStep() {
this.setData({
lockstepshow_v: true
})
openLockStep(data){
this.closeprize1();
this.closeprize2();
this.closeprize3();
this.closeprize4();
this.setData({
unLockPkData:data,
lockstepshow_v:true
})
},
closeLockStep() {
this.setData({
......
......@@ -19,16 +19,16 @@
pointer-events: none;
}
.curWarms {
font-size: 42rpx;
font-weight: bolder;
}
.pageindex {
width: 750rpx;
height: 1624rpx;
opacity: 1;
position: absolute;
left: 50%;
top: 50%;
margin-left: -375rpx;
margin-top: -812rpx;
transform-origin: 0rpx 0rpx 0rpx;
}
.pageindex .bg {
......@@ -39,6 +39,15 @@
transform-origin: 0rpx 0rpx 0rpx;
z-index: 0;
}
.pageindex .jbLogo {
width: 239rpx;
height: 59rpx;
opacity: 1;
left: 256rpx;
top: 130rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.pageindex .sai_duan {
width: 568rpx;
height: 188rpx;
......@@ -177,6 +186,7 @@
height: 35rpx;
opacity: 1;
left: -93rpx;
top: -10rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 36rpx;
......@@ -215,7 +225,7 @@
width: 32rpx;
height: 125rpx;
opacity: 1;
top: 210rpx;
top: 130rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
......@@ -224,7 +234,7 @@
height: 70rpx;
opacity: 1;
left: 678rpx;
top: 238rpx;
top: 158rpx;
position: absolute;
transform-origin: 100% 0rpx 0rpx;
}
<view class="pageindex ">
<image class="bg " src={{resList['3ee62d6c-3e44-470b-b2a5-fb805ec6a6c3'].url}} />
<image class="jbLogo " src={{resList['23b7797e-e924-48b1-8afa-7412722a0bc9'].url}} />
<view class="sai_duan ">
<image class="battle7 " a:if="{{curGameStep<3}}" src={{resList['bc577ab5-4214-43b4-93ff-e9e24c9cec62'].url}} />
<image class="battle5 " a:if="{{curGameStep<2}}" src={{resList['64d76df1-a48b-4d97-9c94-07164242403f'].url}} />
......@@ -22,8 +22,8 @@
<view class="wen_zi2 ">
<label class="superise ">赢2999元惊喜礼包</label>
<view class="lei_ji_sheng_chang ">
<label class="curtemp ">当前温暖值:{{curWarms}}</label>
<label class="currank ">排名位于第 {{curRank}}位</label>
<label class="curtemp ">当前温暖值:<text class="curWarms " style="size:{{'30rpx'}}">{{curWarms}}</text></label>
<label class="currank ">排名位于第 <text class="curWarms " style="size:{{'30rpx'}}">{{curRank}}</text> 位</label>
</view>
</view>
<image class="rankbtn btn" onTap="navigateTo" data-item="pagepagerank" src={{resList['c57b33fc-8a26-4f7c-9a62-d0d16cae3406'].url}} />
......@@ -55,6 +55,14 @@
<view class="popcontainer" a:if="{{modalStatus==5}}">
<invitefail-modal a:if="{{modalStatus==5}}" onCloseModal="closeModal"></invitefail-modal>
</view>
<view class="popcontainer" a:if="{{modalStatus==6}}">
<ranknoprize-modal a:if="{{modalStatus==6}}" onCloseModal="closeModal"></ranknoprize-modal>
</view>
<view class="popcontainer" a:if="{{modalStatus==7}}">
<rankprize-modal a:if="{{modalStatus==7}}" onCloseModal="closeModal"></rankprize-modal>
</view>
......@@ -114,7 +114,7 @@ Page({
console.log("svga" + v);
var mv = stage.addChild(new FYGE.MovieClip(v));
mv.x = 275;
mv.y = 785;
mv.y = 755;
console.log("svgmv", mv)
},
......@@ -128,7 +128,7 @@ Page({
console.log("svga" + v);
var mv = stage.addChild(new FYGE.MovieClip(v));
mv.x = 175;
mv.y = 585;
mv.y = 565;
console.log("svgmv", mv)
},
......@@ -203,12 +203,12 @@ Page({
success,
data
} = await API.getActivityBaseInfoById().catch(r => {
my.hideLoading();
// my.hideLoading();
commonToast(r && r.message)
}) || {};
if (success) {
my.hideLoading();
// my.hideLoading();
app.activityInfo = data;
this.judgeDoHelp();
}
......@@ -234,9 +234,15 @@ Page({
commonToast(r && r.message);
}) || {};
if (success) {
if(data.rankPrize&&data.rankPrize.type==5){
this.setData({modalStatus: modalType['ranknoprize']})
}else if(data.rankPrize.type!=5){
this.setData({modalStatus: modalType['rankprize']})
}
let str = data.rank>500?'500+':data.rank
this.setData({
curWarms: data.warms + '',
curRank: data.rank,
curRank: str,
curGameStep: data.step
})
my.hideLoading();
......@@ -261,6 +267,8 @@ Page({
commonToast("3s入会,即可为好友助力", 1500, () => {
navigateToOutside(data.url);
})
}else{
commonToast(message||'')
}
my.hideLoading();
}
......
......@@ -4,7 +4,10 @@
"invitelist-modal": "/components/cominvitelistmodal/cominvitelistmodal",
"invite-modal": "/components/cominvitemodal/cominvitemodal",
"invitesuccess-modal": "/components/cominvitesuccessmodal/cominvitesuccessmodal",
"invitefail-modal": "/components/cominvitefailmodal/cominvitefailmodal"
"invitefail-modal": "/components/cominvitefailmodal/cominvitefailmodal",
"ranknoprize-modal": "/components/comranknoprizemodal/comranknoprizemodal",
"rankprize-modal": "/components/comrankprizemodal/comrankprizemodal"
}
}
......@@ -535,5 +535,84 @@ const resList = {
uuid: '90b5f539-4c56-4210-937e-8dd359fbb2b0',
url: '//yun.duiba.com.cn/spark/assets/e277525ee0fc79fd8ba839f2787c58dc4c94421b.png'
},
'23b7797e-e924-48b1-8afa-7412722a0bc9': {
name: 'jnlogo',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/jnlogo.9fc9cd6aec47a73db43f0c4f56da6c3c6f94a0bd.png',
uuid: '23b7797e-e924-48b1-8afa-7412722a0bc9'
},
'55fd44df-0153-4a6b-aa5c-b1aea201cdb8-0': {
name: 'rank0',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/rank0.81ff8f5ae5cfe0369f3fe61e57ce1b123c1ec884.png',
uuid: '55fd44df-0153-4a6b-aa5c-b1aea201cdb8'
},
'55fd44df-0153-4a6b-aa5c-b1aea201cdb8-1': {
name: 'rank1',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/rank1.3b176f0f4b8a170e4bdd689351dd66ef1f30df20.png',
uuid: '88bd89e0-62ac-447a-943a-c471245d3142'
},
'55fd44df-0153-4a6b-aa5c-b1aea201cdb8-2': {
name: 'rank2',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/rank2.58aa5303a183609f656c31376248e7923247fa04.png',
uuid: '382feda8-f27b-4818-a915-14729fcda18f'
},
'55fd44df-0153-4a6b-aa5c-b1aea201cdb8-3': {
name: 'rank3',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/rank3.d64dc1132a5bee117d6b5619fe10c6e637143f24.png',
uuid: '47d1444b-afdf-4518-9f94-e23f9b4f92d5'
},
'55fd44df-0153-4a6b-aa5c-b1aea201cdb8-4': {
name: 'rank4',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/rank4.c2594b8517554f9ba0f36dadb63af6d9e97abf78.png',
uuid: '4e118d5c-82f0-4f46-adbc-c689c3f61c89'
},
'55fd44df-0153-4a6b-aa5c-b1aea201cdb8-6': {
name: 'rank5',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/rank6.5459f16894116f26fcb98f1b4c12ba8595400da1.png',
uuid: 'fd11c427-a1e8-4ba7-bdd5-bad4a6b9a8bf'
},
'55fd44df-0153-4a6b-aa5c-b1aea201cdb8-5': {
name: 'rank6',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/rank5.170c3bc71ebcbcd059eda646df490aa80fd71a67.png',
uuid: 'e5e6660d-e697-4f71-ab22-bf4bd1c0cd04'
},
'55fd44df-0153-4a6b-aa5c-b1aea201cdb8-7': {
name: 'rank7',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/rank7.857b63de950a181d98c8da7cafece0a8e7dd3f93.png',
uuid: '3a09cd73-e85a-438f-82db-dd2c32ac8274'
},
'55fd44df-0153-4a6b-aa5c-b1aea201cdb8-9': {
name: 'rank8',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/rank9.386ed803c4919900132c2a3fa976a3c6a6814a17.png',
uuid: '9b5311be-bbf0-4ad7-b07b-9b65566d2433'
},
'14fbf7c8-43e2-4bb9-81c8-d1392455cf39': {
name: 'rank9',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/rank500plus.d30d20e9379279860ff72a2b3c1cd7eeac9dab30.png',
uuid: '14fbf7c8-43e2-4bb9-81c8-d1392455cf39'
},
'55fd44df-0153-4a6b-aa5c-b1aea201cdb8-8': {
name: 'rank500plus',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/rank8.5e23864e930fcb53c9ee861c8fc9a60241b237cc.png',
uuid: '2232e52e-fcf1-4d0b-859a-7f53148367ad'
},
'3202ce2d-89f6-4b02-ba30-8eb0d163d757': {
name: 'rankplus',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/rankplus.41fdb644cd6d89a7835757cb15787385912bae97.png',
uuid: '3202ce2d-89f6-4b02-ba30-8eb0d163d757'
},
};
export default resList;
\ No newline at end of file
......@@ -34,5 +34,7 @@ export const modalType = {
inviteList:2,
invite:3,
invitesuccess:4,
invitefail:5
invitefail:5,
ranknoprize:6,
rankprize:7
}
This diff is collapsed.
......@@ -3,7 +3,7 @@
"success": true,
"data": {
"unLockStep": 2,
"warms": 755717.7361683846,
"warms": 100,
"isWin": true,
"prize": {
"name": "qui amet",
......
......@@ -3,13 +3,13 @@
"success": true,
"data": {
"warms": 59,
"rank": "60",
"rank": 510,
"winTimes": 22180029.681882724,
"step": 2,
"openId": -56636935.38550403,
"rankPrize": {
"name": "reprehenderit voluptate dolore Lorem pariatur",
"type": "ipsum velit",
"type": "5",
"image": "Lorem irure sed"
}
}
......
......@@ -11,7 +11,7 @@
"status": 3,
"completeTimes": 1,
"times": "3",
"todayCompleteTimes": 50139175.796117544,
"todayCompleteTimes": 1,
"itemIds": "fugiat et magna",
"url": "commodo incididunt in sunt"
},
......@@ -23,8 +23,8 @@
"waitReceive": -37886750.95893747,
"status": 1,
"completeTimes": 1,
"times": "3",
"todayCompleteTimes": 11323128.027142286,
"times": "1",
"todayCompleteTimes": 1,
"itemIds": "tempor sunt consequat consectetur ipsum",
"url": "laborum ad ex"
},
......@@ -37,7 +37,7 @@
"status": 1,
"completeTimes": 1,
"times": "3",
"todayCompleteTimes": -92181455.51032442,
"todayCompleteTimes": 1,
"itemIds": "ullamco enim ipsum eu",
"url": "irure sed"
},
......@@ -50,7 +50,7 @@
"status": 1,
"completeTimes": 3,
"times": "3",
"todayCompleteTimes": 76741045.15144086,
"todayCompleteTimes": 1,
"itemIds": "ullamco",
"url": "nisi occaecat aute sit ut"
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment