Skip to content

N
new_taobao
Commit dbe73d44 authored by Edwise's avatar Edwise 🍷
Browse files
Options

Merge remote-tracking branch 'refs/remotes/origin/jiaoneiqunuan' into jiaoneiqunuan

parents 106e728b 8091d6d5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 377 additions and 103 deletions
taobao_jn/client/app.json
View file @ dbe73d44
{
"pages": [
"pages/pagegamemain/pagegamemain",
"pages/pagepageindex/pagepageindex",
"pages/pagegamemain/pagegamemain",
"pages/pagepagerank/pagepagerank",
"pages/tbccDemo/tbccDemo",
"pages/goodsPage/goodsPage",
......
taobao_jn/client/components/comgameinvitemodal/comgameinvitemodal.axml
View file @ dbe73d44
<view class="gameinvitemodal ">
<image class="gameinvitebg " src={{resList['cb276914-4e1e-4153-96a2-038ce9e6b89a'].url}} />
<view class="gameinvitetext ">
<span class="gameinvitetitle ">恭喜你</span>
<span class="gameinvitecnt ">成功邀请了X名好友</span>
<span class="gameinvitetemp ">队伍升温了XX度</span>
<label class="gameinvitetitle ">恭喜你</label>
<label class="gameinvitecnt ">成功邀请了{{invitenum}}名好友</label>
<label class="gameinvitetemp ">队伍升温了{{warmprize}}度</label>
</view>
<image class="gameinvitebtn " src={{resList['bbbfb7af-4106-4835-b44e-d98b9b93b632'].url}} />
<image class="gameinviteclose " src={{resList['5eee69bb-482c-4ce0-beb1-c7c38cdb6fe4'].url}} />
<image class="gameinvitebtn " src={{resList['bbbfb7af-4106-4835-b44e-d98b9b93b632'].url}} onTap="onClose" />
<image class="gameinviteclose " src={{resList['5eee69bb-482c-4ce0-beb1-c7c38cdb6fe4'].url}} onTap="onClose" />
</view>
\ No newline at end of file
taobao_jn/client/components/comgameinvitemodal/comgameinvitemodal.js
View file @ dbe73d44
......@@ -2,14 +2,26 @@
import resList from '../../resconfig/resList';
Component({
props: {},
data: {},
methods: {},
props: {
onInit(props) {
},
data: {
resList: resList,
invitenum:0,
warmprize:0,
},
methods: {
onClose() {
const { onClose } = this.props;
onClose && onClose();
},
},
didMount() {
let {chacount,chawarm} = this.props.inviteData;
this.setData({
resList: resList
invitenum:chacount,
warmprize:chawarm
});
}
});
\ No newline at end of file
taobao_jn/client/pages/pagegamemain/pagegamemain.acss
View file @ dbe73d44
.gcanvas {
width:100%;
height:100%;
z-index: 99;
pointer-events: none;
}
.gamemain {
top: 0rpx;
left: 0rpx;
......@@ -500,6 +506,54 @@ letter-spacing: 3rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.gamemain .gamembot .gamemsharegro .gamemhrolei {
width: 80rpx;
height: 80rpx;
opacity: 1;
display: block;
left: 2.5rpx;
top: 2rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
mask-image: url(//yun.duiba.com.cn/spark/assets/gamea1toobg1.2de09b090890e833c949d3b8fe17f5192461aee7.png);
mask-size: 80rpx 80rpx;
}
.gamemain .gamembot .gamemsharegro .gamenrolei1 {
width: 80rpx;
height: 80rpx;
opacity: 1;
display: block;
left: 112.5rpx;
top: 2rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
mask-image: url(//yun.duiba.com.cn/spark/assets/gamea1toobg1.2de09b090890e833c949d3b8fe17f5192461aee7.png);
mask-size: 80rpx 80rpx;
}
.gamemain .gamembot .gamemsharegro .gamenrolei2 {
width: 80rpx;
height: 80rpx;
opacity: 1;
display: block;
left: 222.5rpx;
top: 2rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
mask-image: url(//yun.duiba.com.cn/spark/assets/gamea1toobg1.2de09b090890e833c949d3b8fe17f5192461aee7.png);
mask-size: 80rpx 80rpx;
}
.gamemain .gamembot .gamemsharegro .gamenrolei3 {
width: 80rpx;
height: 80rpx;
opacity: 1;
display: block;
left: 332.5rpx;
top: 2rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
mask-image: url(//yun.duiba.com.cn/spark/assets/gamea1toobg1.2de09b090890e833c949d3b8fe17f5192461aee7.png);
mask-size: 80rpx 80rpx;
}
.gamemain .gamembot .gamemsharegro .gamemsharebtn {
width: 404rpx;
height: 74rpx;
......@@ -713,10 +767,11 @@ letter-spacing: 3rpx;
opacity: 1;
display: block;
left: 0rpx;
top: 0rpx;
top: 405rpx;
letter-spacing: 2rpx;
position: absolute;
font-size: 37rpx;
color: #000000;
color: #ffffff;
transform-origin: 0rpx 0rpx 0rpx;
text-align: center;
}
......@@ -770,6 +825,54 @@ letter-spacing: 3rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.gamemain .gamempipei .gamemppload .gamemppimga1 {
width: 110rpx;
height: 110rpx;
opacity: 1;
display: block;
left: 94rpx;
top: 4rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
mask-image: url(//yun.duiba.com.cn/spark/assets/gamea1toobg1.2de09b090890e833c949d3b8fe17f5192461aee7.png);
mask-size: 110rpx 110rpx;
}
.gamemain .gamempipei .gamemppload .gamemppimga2 {
width: 110rpx;
height: 110rpx;
opacity: 1;
display: block;
left: 242rpx;
top: 4rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
mask-image: url(//yun.duiba.com.cn/spark/assets/gamea1toobg1.2de09b090890e833c949d3b8fe17f5192461aee7.png);
mask-size: 110rpx 110rpx;
}
.gamemain .gamempipei .gamemppload .gamemppimga3 {
width: 110rpx;
height: 110rpx;
opacity: 1;
display: block;
left: 390rpx;
top: 4rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
mask-image: url(//yun.duiba.com.cn/spark/assets/gamea1toobg1.2de09b090890e833c949d3b8fe17f5192461aee7.png);
mask-size: 110rpx 110rpx;
}
.gamemain .gamempipei .gamemppload .gamemppimga4 {
width: 110rpx;
height: 110rpx;
opacity: 1;
display: block;
left: 538rpx;
top: 4rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
mask-image: url(//yun.duiba.com.cn/spark/assets/gamea1toobg1.2de09b090890e833c949d3b8fe17f5192461aee7.png);
mask-size: 110rpx 110rpx;
}
.blackWhiteFilter{
filter: grayscale(100%);
}
taobao_jn/client/pages/pagegamemain/pagegamemain.axml
View file @ dbe73d44
<scroll-view class="gamemain" scroll-y={{true}} scroll-top={{86}} disable-scroll={{false}}>
<image class="gamembg" a:if="{{show_v!=1}}" src={{resList['8bcca487-d698-4e01-93e1-8e78ae10107d'].url}} />
<canvas disable-scroll="true" id="gcanvas" class="gcanvas" onReady="canvasOnReady">
</canvas>
<view class="gamemcont" a:if="{{show_v!=1}}">
<view class="gamemdaojishi">
<image class="gamemdjsbg" src={{resList['6a67309c-0c54-47e3-8955-9756ed4e8c21'].url}} />
......@@ -51,10 +53,14 @@
</view>
<view class="gamemsharegro">
<image class="gamemhrole" onTap="invitefriends" data-sidx=0 src={{invitedata[0]?resList['7b03a2af-445c-4ce6-b57b-a900e1eedfed'].url:resList['b33526ac-42e8-4f93-b8e8-dc5d44dce6aa'].url}} />
<image class="gamenrole1" onTap="invitefriends" data-sidx=0 src={{invitedata[1]?resList['7b03a2af-445c-4ce6-b57b-a900e1eedfed'].url:resList['b33526ac-42e8-4f93-b8e8-dc5d44dce6aa'].url}} />
<image class="gamenrole2" onTap="invitefriends" data-sidx=0 src={{invitedata[2]?resList['7b03a2af-445c-4ce6-b57b-a900e1eedfed'].url:resList['b33526ac-42e8-4f93-b8e8-dc5d44dce6aa'].url}} />
<image class="gamenrole3" onTap="invitefriends" data-sidx=0 src={{invitedata[3]?resList['7b03a2af-445c-4ce6-b57b-a900e1eedfed'].url:resList['b33526ac-42e8-4f93-b8e8-dc5d44dce6aa'].url}} />
<image class="gamenrole4" onTap="invitefriends" data-sidx=0 src={{invitedata[4]?resList['7b03a2af-445c-4ce6-b57b-a900e1eedfed'].url:resList['b33526ac-42e8-4f93-b8e8-dc5d44dce6aa'].url}} />
<image class="gamenrole1" onTap="invitefriends" data-sidx=1 src={{invitedata[1]?resList['7b03a2af-445c-4ce6-b57b-a900e1eedfed'].url:resList['b33526ac-42e8-4f93-b8e8-dc5d44dce6aa'].url}} />
<image class="gamenrole2" onTap="invitefriends" data-sidx=2 src={{invitedata[2]?resList['7b03a2af-445c-4ce6-b57b-a900e1eedfed'].url:resList['b33526ac-42e8-4f93-b8e8-dc5d44dce6aa'].url}} />
<image class="gamenrole3" onTap="invitefriends" data-sidx=3 src={{invitedata[3]?resList['7b03a2af-445c-4ce6-b57b-a900e1eedfed'].url:resList['b33526ac-42e8-4f93-b8e8-dc5d44dce6aa'].url}} />
<image class="gamenrole4" onTap="invitefriends" data-sidx=4 src={{resList['b33526ac-42e8-4f93-b8e8-dc5d44dce6aa'].url}} />
<image class="gamemhrolei" a:if="{{invitedata[0]}}" src={{invitedata[0].avatar}} />
<image class="gamenrolei1" a:if="{{invitedata[1]}}" src={{invitedata[1].avatar}} />
<image class="gamenrolei2" a:if="{{invitedata[2]}}" src={{invitedata[2].avatar}} />
<image class="gamenrolei3" a:if="{{invitedata[3]}}" src={{invitedata[3].avatar}} />
<image class="gamemsharebtn" onTap="shareact" src={{resList['8c1a94d3-8181-41f4-9d47-1eb0c7719f3d'].url}} />
</view>
<view class="gamemtask">
......@@ -85,9 +91,14 @@
<label class="gamempptxt">正在努力寻找玩家，请稍后</label>
<view class="gamemppload">
<image class="gamemppimg1" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
<image class="gamemppimg2" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
<image class="gamemppimg3" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
<image class="gamemppimg4" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
<image class="gamemppimg2" style="{{roomnums==2?'left:534rpx':roomnums==3?'left:315.5rpx':'left:238rpx'}}" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
<image class="gamemppimg3" a:if="{{roomnums>2}}" style="{{roomnums==3?'left:534rpx':'left:386rpx'}}" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
<image class="gamemppimg4" a:if="{{roomnums>3}}" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
<image class="gamemppimga1" src={{avatar1}} />
<image class="gamemppimga2" src={{avatar2}} style="{{roomnums==2?'left:538rpx':roomnums==3?'left:319.5rpx':'left:242rpx'}}" />
<image class="gamemppimga3" a:if="{{roomnums>2}}" src={{avatar3}} style="{{roomnums==3?'left:538rpx':'left:390rpx'}}" />
<image class="gamemppimga4" a:if="{{roomnums>3}}" src={{avatar4}} />
</view>
</view>
</scroll-view>
......@@ -97,4 +108,5 @@
<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="{{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>
taobao_jn/client/pages/pagegamemain/pagegamemain.json
View file @ dbe73d44
......@@ -6,6 +6,7 @@
"pksuccessnoprize-modal": "/components/compksuccessnoprizemodal/compksuccessnoprizemodal",
"tempitem-modal": "/components/comtempitemmodal/comtempitemmodal",
"task-modal": "/components/comtask/comtask",
"lockstep-modal": "/components/comunlockstepmodal/comunlockstepmodal"
"lockstep-modal": "/components/comunlockstepmodal/comunlockstepmodal",
"gameinvite-modal": "/components/comgameinvitemodal/comgameinvitemodal"
}
}
\ No newline at end of file
taobao_jn/mocks/jn.getInviteListByCurGame.json
View file @ dbe73d44
......@@ -4,51 +4,51 @@
"data": [
{
"openId": "ex laboris reprehenderit enim in",
"avatar": "aliqua incididunt nulla laborum fugiat",
"avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=OFhhPCIYMFleO8*IXHQbv0c4vkxLMCc0vmNyvmg0MmQT&width=80&height=80&type=sns",
"userNick": "sit consectetur enim"
},
{
"openId": "id Ut culpa",
"avatar": "consequat ex eu officia veniam",
"avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=OFhhPCIYMFleO8*IXHQbv0c4vkxLMCc0vmNyvmg0MmQT&width=80&height=80&type=sns",
"userNick": "cillum officia consequat in"
},
{
"openId": "id do esse",
"avatar": "Excepteur sit Lorem ipsum",
"avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=OFhhPCIYMFleO8*IXHQbv0c4vkxLMCc0vmNyvmg0MmQT&width=80&height=80&type=sns",
"userNick": "ut Ut fugiat"
},
{
"openId": "anim dolor",
"avatar": "ut irure dolor cillum aliqua",
"avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=OFhhPCIYMFleO8*IXHQbv0c4vkxLMCc0vmNyvmg0MmQT&width=80&height=80&type=sns",
"userNick": "non ex"
},
{
"openId": "eiusmod exercitation nisi sit laborum",
"avatar": "nostrud sunt laboris cupidatat minim",
"avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=OFhhPCIYMFleO8*IXHQbv0c4vkxLMCc0vmNyvmg0MmQT&width=80&height=80&type=sns",
"userNick": "est in"
},
{
"openId": "proident id reprehenderit Ut dolor",
"avatar": "sed in",
"avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=OFhhPCIYMFleO8*IXHQbv0c4vkxLMCc0vmNyvmg0MmQT&width=80&height=80&type=sns",
"userNick": "veniam"
},
{
"openId": "irure non ut",
"avatar": "in ullamco",
"avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=OFhhPCIYMFleO8*IXHQbv0c4vkxLMCc0vmNyvmg0MmQT&width=80&height=80&type=sns",
"userNick": "cupidatat"
},
{
"openId": "ullamco magna nisi",
"avatar": "id laboris aliqua reprehenderit pariatur",
"avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=OFhhPCIYMFleO8*IXHQbv0c4vkxLMCc0vmNyvmg0MmQT&width=80&height=80&type=sns",
"userNick": "pariatur dolore nisi"
},
{
"openId": "dolore occaecat elit",
"avatar": "aute ullamco",
"avatar": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=OFhhPCIYMFleO8*IXHQbv0c4vkxLMCc0vmNyvmg0MmQT&width=80&height=80&type=sns",
"userNick": "Excepteur esse Ut voluptate est"
},
{
"openId": "occaecat",
"openId": "http://wwc.alicdn.com/avatar/getAvatar.do?userIdStr=OFhhPCIYMFleO8*IXHQbv0c4vkxLMCc0vmNyvmg0MmQT&width=80&height=80&type=sns",
"avatar": "veniam dolore Ut laborum",
"userNick": "in"
}
......
taobao_jn/mocks/jn.getWarmDetailListByCurGame.json
View file @ dbe73d44
......@@ -4,8 +4,8 @@
"data": {
"total": 0,
"invite": {
"count": 0,
"warms": 0
"count": 2,
"warms": 3
},
"tool": {
"count": 0,
......
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