Skip to content

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

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

parents 5e08e4d3 3c3834f1
Hide whitespace changes
Inline Side-by-side
Showing with 512 additions and 346 deletions
README.md
View file @ 274f23e3
...@@ -11,6 +11,11 @@ http://gitlab2.dui88.com/wanghongyuan/hello_canvas ...@@ -11,6 +11,11 @@ http://gitlab2.dui88.com/wanghongyuan/hello_canvas
sendTbNet(TbNetName.showModal, {name:'ruleModal'}, (s, res) => { }) sendTbNet(TbNetName.showModal, {name:'ruleModal'}, (s, res) => { })
``` ```
# 给弹窗传参
```js
sendTbNet(TbNetName.showModal, {name:'messageModal',data:{catName:'喵喵'}}, (s, res) => { })
```
# 切换场景 # 切换场景
```js ```js
sendTbNet(TbNetName.navigateToPage, {name:'pageshop'}, (s, res) => { }) sendTbNet(TbNetName.navigateToPage, {name:'pageshop'}, (s, res) => { })
......
project/src/components/comlevelup/comlevelup.jsx 0 → 100644
View file @ 274f23e3
'use strict';
import React, { Component } from 'react';
import resList from '../../resconfig/resList';
import './comlevelup.less';
class Comlevelup extends Component {
constructor(props) {
super(props);
this.state = { resList: resList };
}
render() {
return (
<div className="levelup ">
<img className="levelup_light " src={this.state.resList['a158cbff-9dcd-49df-bb91-16213d58036e'].url} />
<img className="levelup_bg " src={this.state.resList['b027d194-0fad-45ea-8b1c-3502f7869d2d'].url} />
<img className="levelup_closebtn " src={this.state.resList['d33bbf87-ed39-4959-8673-02a4c31dca77'].url} />
<img className="levelup_bg2 " src={this.state.resList['f88dfc75-c9f1-4e9d-8826-8a1d0e513259'].url} />
<span className="levelup_txt ">精力上限1200 → 精力上限1500</span>
<img className="levelup_title " src={this.state.resList['69bff61a-b5a6-4979-ba8d-9e008aed737a'].url} />
<img className="levelup_imgbg " src={this.state.resList['f56872e2-5e79-4906-99a2-576231f153af'].url} />
<img className="levelup_btn " src={this.state.resList['95520b55-9655-4988-a833-3907978dbffb'].url} />
</div>
);
}
}
export default Comlevelup;
project/src/components/comlevelup/comlevelup.less 0 → 100644
View file @ 274f23e3
.levelup {
width: 750px;
height: 1093px;
opacity: 1;
top: 221px;
position: absolute;
transform-origin: 0px 0px 0px;
.levelup_light {
width: 750px;
height: 1093px;
opacity: 1;
position: absolute;
transform-origin: 0px 0px 0px;
}
.levelup_bg {
width: 584px;
height: 715px;
opacity: 1;
left: 85px;
top: 200px;
position: absolute;
transform-origin: 0px 0px 0px;
}
.levelup_closebtn {
width: 45px;
height: 45px;
opacity: 1;
left: 584px;
top: 236px;
position: absolute;
transform-origin: 0px 0px 0px;
}
.levelup_bg2 {
width: 651px;
height: 784px;
opacity: 1;
left: 52px;
top: 182px;
position: absolute;
transform-origin: 0px 0px 0px;
}
.levelup_txt {
width: 371px;
height: 26px;
opacity: 1;
left: 191px;
top: 711px;
position: absolute;
transform-origin: 0px 0px 0px;
font-size: 26px;
color: rgba(87, 71, 56, 1);
}
.levelup_title {
width: 206px;
height: 35px;
opacity: 1;
left: 274px;
top: 314px;
position: absolute;
transform-origin: 0px 0px 0px;
}
.levelup_imgbg {
width: 360px;
height: 299px;
opacity: 1;
left: 197px;
top: 377px;
position: absolute;
transform-origin: 0px 0px 0px;
}
.levelup_btn {
width: 351px;
height: 105px;
opacity: 1;
left: 201px;
top: 773px;
position: absolute;
transform-origin: 0px 0px 0px;
}
}
project/src/pages/pagegamescene/pagegamescene.jsx → project/src/components/commessage/commessage.jsx
View file @ 274f23e3
...@@ -2,22 +2,22 @@ ...@@ -2,22 +2,22 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import resList from '../../resconfig/resList'; import resList from '../../resconfig/resList';
//import API from '../../api';
import './pagegamescene.less'; import './commessage.less';
class Pagegamescene extends Component { class Commessage extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { resList: resList }; this.state = { resList: resList };
} }
render() { render() {
return ( return (
<div className="gamescene "> <div className="message ">
<div> <img className="message_bg " src={this.state.resList['0c446868-16d2-47f1-a0d6-27dadff681f2'].url} />
<canvas id="canvas" style={{ width: '100%', height: '100%' }}></canvas> <span className="message_txt ">猫咪名字 留</span>
</div> <img className="message_btn " src={this.state.resList['3ad6a924-dda8-49f4-b8fc-0e796347e802'].url} />
<img className="message_closebtn " src={this.state.resList['5488b126-f520-496f-ace6-010a89eb108f'].url} />
</div> </div>
); );
} }
} }
export default Pagegamescene; export default Commessage;
project/src/components/commessage/commessage.less 0 → 100644
View file @ 274f23e3
.message {
width: 676px;
height: 650px;
opacity: 1;
left: 40px;
top: 418px;
position: absolute;
transform-origin: 0px 0px 0px;
.message_bg {
width: 676px;
height: 650px;
opacity: 1;
position: absolute;
transform-origin: 0px 0px 0px;
}
.message_txt {
width: 142px;
height: 25px;
opacity: 1;
left: 268px;
top: 355px;
position: absolute;
transform-origin: 0px 0px 0px;
font-size: 26px;
color: rgba(104, 91, 78, 1);
}
.message_btn {
width: 45px;
height: 45px;
opacity: 1;
left: 577px;
top: 24px;
position: absolute;
transform-origin: 0px 0px 0px;
}
.message_closebtn {
width: 352px;
height: 106px;
opacity: 1;
left: 161px;
top: 510px;
position: absolute;
transform-origin: 0px 0px 0px;
}
}
project/src/pages/pagefrontpage/pagefrontpage.jsx deleted 100644 → 0
View file @ 5e08e4d3
'use strict';
import React, { Component } from 'react';
import resList from '../../resconfig/resList';
//import API from '../../api';
import './pagefrontpage.less';
class Pagefrontpage extends Component {
constructor(props) {
super(props);
this.state = { resList: resList };
}
render() {
return (
<div className="frontpage ">
<div className="div " />
<img className="image " src={this.state.resList['eb602b5e-fd36-4968-bed0-ec786cd8e1c0'].url} />
</div>
);
}
}
export default Pagefrontpage;
project/src/pages/pagefrontpage/pagefrontpage.less deleted 100644 → 0
View file @ 5e08e4d3
.frontpage {
width: 750px;
height: 1624px;
display: block;
position: absolute;
transform-origin: 0px 0px 0px;
left: 228px;
top: 146px;
.div {
width: 300px;
height: 300px;
opacity: 1;
display: block;
position: absolute;
background-color: #ff6600;
transform-origin: 0px 0px 0px;
top: 278px;
left: -142px;
}
.image {
width: 276px;
height: 275px;
opacity: 1;
display: block;
position: absolute;
transform-origin: 0px 0px 0px;
left: -184px;
top: -134px;
}
}
project/src/pages/pagegamescene/pagegamescene.less deleted 100644 → 0
View file @ 5e08e4d3
.gamescene {
top: 0px;
left: 0px;
width: 750px;
height: 1624px;
display: block;
position: absolute;
.gamecanvas {
width: 300px;
height: 300px;
opacity: 1;
display: block;
left: 0px;
top: 0px;
position: absolute;
transform-origin: 0px 0px 0px;
}
}
project/src/pages/pageshop/pageshop.jsx deleted 100644 → 0
View file @ 5e08e4d3
'use strict';
import React, { Component } from 'react';
import resList from '../../resconfig/resList';
//import API from '../../api';
import './pageshop.less';
class Pageshop extends Component {
constructor(props) {
super(props);
this.state = { resList: resList };
}
render() {
return (
<div className="shop">
<img className="shopbg" src={this.state.resList['da6bc001-768a-4b1c-95af-a9a8853ef6f9'].url} />
<div className="shopitem">
<img className="shopitem_bg2" src={this.state.resList['a5230993-3870-4a91-bdd1-ffc4782770d0'].url} />
<img className="shopitem_bg1" src={this.state.resList['dd4ee407-16e4-4cb7-9eba-365b33f466a3'].url} />
<img className="shopitem_disabledbtn" src={this.state.resList['8d08152f-311a-446a-a15a-ff02ebed0139'].url} />
<img className="shopitem_buybtn" src={this.state.resList['dd8ea96e-e33f-4f5d-b31f-29f332c3c867'].url} />
<span className="shopitem_txt">101010</span>
<span className="shopitem_name">商品名商品名商品名</span>
</div>
<span className="shop_gold">101010</span>
<img className="shop_backbtn" src={this.state.resList['bdab9777-8a4d-4659-ba23-66aaddb7fa5b'].url} />
</div>
);
}
}
export default Pageshop;
project/src/pages/pageshop/pageshop.less deleted 100644 → 0
View file @ 5e08e4d3
.shop {
width: 750px;
height: 1624px;
opacity: 1;
position: absolute;
transform-origin: 0px 0px 0px;
.shopbg {
width: 750px;
height: 1624px;
opacity: 1;
position: absolute;
transform-origin: 0px 0px 0px;
}
.shopitem {
width: 309px;
height: 324px;
opacity: 1;
left: 54px;
top: 254px;
position: absolute;
transform-origin: 0px 0px 0px;
.shopitem_bg2 {
width: 309px;
height: 324px;
opacity: 1;
position: absolute;
transform-origin: 0px 0px 0px;
}
.shopitem_bg1 {
width: 224px;
height: 161px;
opacity: 1;
left: 45px;
top: 29px;
position: absolute;
transform-origin: 0px 0px 0px;
}
.shopitem_disabledbtn {
width: 209px;
height: 60px;
opacity: 1;
left: 49px;
top: 241px;
position: absolute;
transform-origin: 0px 0px 0px;
}
.shopitem_buybtn {
width: 217px;
height: 68px;
opacity: 1;
left: 45px;
top: 237px;
position: absolute;
transform-origin: 0px 0px 0px;
}
.shopitem_txt {
width: 88px;
height: 20px;
opacity: 1;
left: 136px;
top: 261px;
position: absolute;
transform-origin: 0px 0px 0px;
font-size: 21.79723px;
color: rgba(71, 69, 67, 1);
}
.shopitem_name {
width: 209px;
height: 23px;
opacity: 1;
left: 51px;
top: 203px;
position: absolute;
transform-origin: 0px 0px 0px;
font-size: 20.12052px;
color: rgba(71, 69, 67, 1);
}
}
.shop_gold {
width: 98px;
height: 21px;
opacity: 1;
left: 348px;
top: 151px;
position: absolute;
transform-origin: 0px 0px 0px;
font-size: 23.47394px;
color: rgba(123, 100, 78, 1);
}
.shop_backbtn {
width: 67px;
height: 67px;
opacity: 1;
left: 48px;
top: 41px;
position: absolute;
transform-origin: 0px 0px 0px;
}
}
\ No newline at end of file
spark.json
View file @ 274f23e3
...@@ -2956,111 +2956,6 @@ ...@@ -2956,111 +2956,6 @@
], ],
"viewType": "Scene" "viewType": "Scene"
}, },
{
"name": "猫咪的留言",
"properties": {
"style": {
"width": 676,
"height": 650,
"opacity": 1,
"left": 40,
"top": 418,
"position": "absolute",
"transformOrigin": "0px 0px 0px"
},
"attrs": {},
"className": ""
},
"uuid": "f8484006-c641-4a5d-ac3b-5a885253f7bc",
"rect": {
"x": 40,
"y": 418,
"width": 676,
"height": 650
},
"componentName": "Div",
"children": [
{
"name": "底51",
"properties": {
"style": {
"width": 676,
"height": 650,
"opacity": 1,
"position": "absolute",
"transformOrigin": "0px 0px 0px"
},
"attrs": {
"source": "asset://2ce802ba-fe74-4bb9-8733-2858e43b6bfc"
},
"className": ""
},
"uuid": "b2ac5ed5-99e0-466a-b5ae-ce99223b9362",
"rect": {
"x": 0,
"y": 0,
"width": 676,
"height": 650
},
"componentName": "Image"
},
{
"name": "猫咪名字留",
"properties": {
"style": {
"width": 142,
"height": 25,
"opacity": 1,
"left": 268,
"top": 355,
"position": "absolute",
"transformOrigin": "0px 0px 0px",
"fontSize": 26,
"color": "rgba(104, 91, 78, 1)"
},
"attrs": {
"text": "猫咪名字 留"
},
"className": ""
},
"uuid": "7632b324-5c78-4628-83e5-7fcb11cced21",
"rect": {
"x": 268,
"y": 355,
"width": 142,
"height": 25
},
"componentName": "Label"
},
{
"name": "按钮50",
"properties": {
"style": {
"width": 352,
"height": 106,
"opacity": 1,
"left": 161,
"top": 510,
"position": "absolute",
"transformOrigin": "0px 0px 0px"
},
"attrs": {
"source": "asset://c68019be-dab4-42bc-bacd-d56091f8d3c2"
},
"className": ""
},
"uuid": "bf12601c-9a78-46e6-a37a-5304f4f43f2d",
"rect": {
"x": 161,
"y": 510,
"width": 352,
"height": 106
},
"componentName": "Image"
}
],
"viewType": "Scene"
},
{ {
"name": "找回猫咪", "name": "找回猫咪",
"properties": { "properties": {
...@@ -7581,6 +7476,137 @@ ...@@ -7581,6 +7476,137 @@
} }
], ],
"viewType": "Panel" "viewType": "Panel"
},
{
"name": "message",
"properties": {
"style": {
"width": 676,
"height": 650,
"opacity": 1,
"left": 40,
"top": 418,
"position": "absolute",
"transformOrigin": "0px 0px 0px"
},
"attrs": {},
"className": ""
},
"uuid": "b1e9bdbc-d5dc-43c8-9596-5a043494d4d3",
"rect": {
"x": 40,
"y": 418,
"width": 676,
"height": 650
},
"componentName": "Div",
"children": [
{
"name": "message_bg",
"properties": {
"style": {
"width": 676,
"height": 650,
"opacity": 1,
"position": "absolute",
"transformOrigin": "0px 0px 0px"
},
"attrs": {
"source": "asset://0c446868-16d2-47f1-a0d6-27dadff681f2"
},
"className": ""
},
"uuid": "9331e78d-7188-4f0f-b592-e304a96d45e7",
"rect": {
"x": 0,
"y": 0,
"width": 676,
"height": 650
},
"componentName": "Image"
},
{
"name": "message_txt",
"properties": {
"style": {
"width": 142,
"height": 25,
"opacity": 1,
"left": 268,
"top": 355,
"position": "absolute",
"transformOrigin": "0px 0px 0px",
"fontSize": 26,
"color": "rgba(104, 91, 78, 1)"
},
"attrs": {
"text": "猫咪名字 留"
},
"className": ""
},
"uuid": "b2180909-2ddf-456b-8c52-b3fcd10569e2",
"rect": {
"x": 268,
"y": 355,
"width": 142,
"height": 25
},
"componentName": "Label"
},
{
"name": "message_btn",
"properties": {
"style": {
"width": 45,
"height": 45,
"opacity": 1,
"left": 577,
"top": 24,
"position": "absolute",
"transformOrigin": "0px 0px 0px"
},
"attrs": {
"source": "asset://3ad6a924-dda8-49f4-b8fc-0e796347e802"
},
"className": ""
},
"uuid": "0aa13659-012a-42f7-a5c5-26930553df98",
"rect": {
"x": 577,
"y": 24,
"width": 45,
"height": 45
},
"componentName": "Image"
},
{
"name": "message_closebtn",
"properties": {
"style": {
"width": 352,
"height": 106,
"opacity": 1,
"left": 161,
"top": 510,
"position": "absolute",
"transformOrigin": "0px 0px 0px"
},
"attrs": {
"source": "asset://5488b126-f520-496f-ace6-010a89eb108f"
},
"className": ""
},
"uuid": "f8c0269d-f6ec-4548-9c5b-b532a89d6242",
"rect": {
"x": 161,
"y": 510,
"width": 352,
"height": 106
},
"componentName": "Image"
}
],
"viewType": "Panel"
} }
] ]
}, },
...@@ -7915,18 +7941,6 @@ ...@@ -7915,18 +7941,6 @@
"uuid": "c6625a32-6100-47e6-a9ed-cd146a7f4bd8", "uuid": "c6625a32-6100-47e6-a9ed-cd146a7f4bd8",
"url": "//yun.duiba.com.cn/spark/assets/2d258d16ae2ff46e1d1b422407b853e98f086a2f.png" "url": "//yun.duiba.com.cn/spark/assets/2d258d16ae2ff46e1d1b422407b853e98f086a2f.png"
}, },
{
"name": "底51",
"ext": ".png",
"uuid": "2ce802ba-fe74-4bb9-8733-2858e43b6bfc",
"url": "//yun.duiba.com.cn/spark/assets/add23849798cc4dc3334c64d28ce8bf7e3a596eb.png"
},
{
"name": "按钮50",
"ext": ".png",
"uuid": "c68019be-dab4-42bc-bacd-d56091f8d3c2",
"url": "//yun.duiba.com.cn/spark/assets/23ede9d65dea3267e4f46ca010c593e5a825f3e9.png"
},
{ {
"name": "底49", "name": "底49",
"ext": ".png", "ext": ".png",
...@@ -8346,6 +8360,24 @@ ...@@ -8346,6 +8360,24 @@
"ext": ".png", "ext": ".png",
"uuid": "95520b55-9655-4988-a833-3907978dbffb", "uuid": "95520b55-9655-4988-a833-3907978dbffb",
"url": "//yun.duiba.com.cn/spark/assets/5193855f40ff72dea9f48022083a6a35240b6dc6.png" "url": "//yun.duiba.com.cn/spark/assets/5193855f40ff72dea9f48022083a6a35240b6dc6.png"
},
{
"name": "message_bg",
"ext": ".png",
"uuid": "0c446868-16d2-47f1-a0d6-27dadff681f2",
"url": "//yun.duiba.com.cn/spark/assets/3b954e2265924a7fd5250a5b2b48627360a0b905.png"
},
{
"name": "message_btn",
"ext": ".png",
"uuid": "3ad6a924-dda8-49f4-b8fc-0e796347e802",
"url": "//yun.duiba.com.cn/spark/assets/2b22fec0227db9f7df6ee42e5161939aa4f9a06f.png"
},
{
"name": "message_closebtn",
"ext": ".png",
"uuid": "5488b126-f520-496f-ace6-010a89eb108f",
"url": "//yun.duiba.com.cn/spark/assets/23ede9d65dea3267e4f46ca010c593e5a825f3e9.png"
} }
], ],
"dependencies": { "dependencies": {
......
taobao_mini/client/app.json
View file @ 274f23e3
{ {
"pages": [ "pages": [
"pages/pagecanvas/pagecanvas", "pages/pagecanvas/pagecanvas",
"pages/index/index",
"pages/pageshop/pageshop", "pages/pageshop/pageshop",
"pages/index/index",
"pages/myprize/myprize" "pages/myprize/myprize"
], ],
"window": { "window": {
......
taobao_mini/client/components/comlevelup1/comlevelup.acss → taobao_mini/client/components/comlevelup/comlevelup.acss
View file @ 274f23e3
.levelup-modal {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 20;
}
.levelup__shade {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.5);
}
.levelup { .levelup {
width: 1116rpx; position: absolute;
width: 750rpx;
height: 1093rpx; height: 1093rpx;
opacity: 1; opacity: 1;
left: -183rpx;
top: 221rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
top:50%;
margin-top: -546rpx;
} }
.levelup .levelup_light { .levelup .levelup_light {
width: 1116rpx; width: 750rpx;
height: 1093rpx; height: 1093rpx;
opacity: 1; opacity: 1;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
.levelup .levelup_bg { .levelup .levelup_bg {
width: 584rpx; width: 584rpx;
height: 715rpx; height: 715rpx;
opacity: 1; opacity: 1;
left: 268rpx; left: 85rpx;
top: 200rpx; top: 200rpx;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
.levelup .levelup_closebtn { .levelup .levelup_closebtn {
width: 45rpx; width: 45rpx;
height: 45rpx; height: 45rpx;
opacity: 1; opacity: 1;
left: 767rpx; left: 584rpx;
top: 236rpx; top: 236rpx;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
.levelup .levelup_bg2 { .levelup .levelup_bg2 {
width: 651rpx; width: 651rpx;
height: 784rpx; height: 784rpx;
opacity: 1; opacity: 1;
left: 235rpx; left: 52rpx;
top: 182rpx; top: 182rpx;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
.levelup .levelup_txt { .levelup .levelup_txt {
width: 371rpx; width: 371rpx;
height: 26rpx; height: 26rpx;
opacity: 1; opacity: 1;
left: 374rpx; left: 191rpx;
top: 711rpx; top: 711rpx;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
font-size: 26rpx; font-size: 26rpx;
color: #574738; color: #574738;
} }
.levelup .levelup_title { .levelup .levelup_title {
width: 206rpx; width: 206rpx;
height: 35rpx; height: 35rpx;
opacity: 1; opacity: 1;
left: 457rpx; left: 274rpx;
top: 314rpx; top: 314rpx;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
.levelup .levelup_imgbg { .levelup .levelup_imgbg {
width: 360rpx; width: 360rpx;
height: 299rpx; height: 299rpx;
opacity: 1; opacity: 1;
left: 380rpx; left: 197rpx;
top: 377rpx; top: 377rpx;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
.levelup .levelup_btn { .levelup .levelup_btn {
width: 351rpx; width: 351rpx;
height: 105rpx; height: 105rpx;
opacity: 1; opacity: 1;
left: 384rpx; left: 201rpx;
top: 773rpx; top: 773rpx;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
\ No newline at end of file
taobao_mini/client/components/comlevelup/comlevelup.axml 0 → 100644
View file @ 274f23e3
<view class="levelup-modal">
<view class="levelup__shade modal-animate-fade-in" />
<view class="levelup modal-animate-zoom-in">
<image class="levelup_light " src={{resList['a158cbff-9dcd-49df-bb91-16213d58036e'].url}} />
<image class="levelup_bg " src={{resList['b027d194-0fad-45ea-8b1c-3502f7869d2d'].url}} />
<image class="levelup_bg2 " src={{resList['f88dfc75-c9f1-4e9d-8826-8a1d0e513259'].url}} />
<label class="levelup_txt ">精力上限1200 → 精力上限1500</label>
<image class="levelup_title " src={{resList['69bff61a-b5a6-4979-ba8d-9e008aed737a'].url}} />
<image class="levelup_imgbg " src={{resList['f56872e2-5e79-4906-99a2-576231f153af'].url}} />
<image class="levelup_btn " onTap="onBtnClick" src={{resList['95520b55-9655-4988-a833-3907978dbffb'].url}} />
<image class="levelup_closebtn " onTap="onModalClose" src={{resList['d33bbf87-ed39-4959-8673-02a4c31dca77'].url}} />
</view>
</view>
\ No newline at end of file
taobao_mini/client/components/comlevelup/comlevelup.js 0 → 100644
View file @ 274f23e3
'use strict';
import resList from '../../resconfig/resList';
Component({
props: {},
data: {
resList: resList
},
methods: {
onBtnClick() {
console.log('onBtnClick');
this.onModalClose();
},
onModalClose() {
const { onModalClose } = this.props;
onModalClose && onModalClose();
console.log('onModalClose')
}
}
});
\ No newline at end of file
taobao_mini/client/components/comlevelup1/comlevelup.axml deleted 100644 → 0
View file @ 5e08e4d3
<view class="levelup ">
<image class="levelup_light " src={{resList['137b39ef-0c25-4991-a57e-0308daaec2dd'].url}} />
<image class="levelup_bg " src={{resList['bca418af-89d1-4fe0-90a8-ae8581ad328c'].url}} />
<image onTap="onModalClose" class="levelup_closebtn " src={{resList['c2adf081-7720-4814-ad9e-e28d13522ee0'].url}} />
<image class="levelup_bg2 " src={{resList['9de58772-9830-4e72-aba8-b07802266b5d'].url}} />
<label class="levelup_txt ">精力上限1200 → 精力上限1500</label>
<image class="levelup_title " src={{resList['be93e436-d2eb-4c29-922c-577810ed6571'].url}} />
<image class="levelup_imgbg " src={{resList['b1c40894-4d50-45e6-8fc8-118ef6d9d598'].url}} />
<image class="levelup_btn " src={{resList['8da5fe13-41a3-4b5b-b079-938e0c7eef5a'].url}} />
</view>
\ No newline at end of file
taobao_mini/client/components/commessage/commessage.acss 0 → 100644
View file @ 274f23e3
.message-modal {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 20;
}
.message__shade {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.5);
}
.message {
width: 676rpx;
height: 650rpx;
opacity: 1;
left: 40rpx;
top:50%;
margin-top: -325rpx;
/* top: 418rpx; */
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.message .message_bg {
width: 676rpx;
height: 650rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.message .message_txt {
width: 142rpx;
height: 25rpx;
opacity: 1;
left: 268rpx;
top: 355rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 26rpx;
color: #685b4e;
}
.message .message_btn {
width: 45rpx;
height: 45rpx;
opacity: 1;
left: 577rpx;
top: 24rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.message .message_closebtn {
width: 352rpx;
height: 106rpx;
opacity: 1;
left: 161rpx;
top: 510rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
taobao_mini/client/components/commessage/commessage.axml 0 → 100644
View file @ 274f23e3
<view class="message-modal">
<view class="message__shade modal-animate-fade-in" />
<view class="message ">
<image class="message_bg " src={{resList['0c446868-16d2-47f1-a0d6-27dadff681f2'].url}} />
<label class="message_txt ">猫咪名字 留</label>
<image class="message_btn " onTap="onModalClose" src={{resList['3ad6a924-dda8-49f4-b8fc-0e796347e802'].url}} />
<image class="message_closebtn " onTap="onModalClose" src={{resList['5488b126-f520-496f-ace6-010a89eb108f'].url}} />
</view>
</view>
\ No newline at end of file
taobao_mini/client/components/comlevelup1/comlevelup.js → taobao_mini/client/components/commessage/commessage.js
View file @ 274f23e3
...@@ -12,6 +12,8 @@ Component({ ...@@ -12,6 +12,8 @@ Component({
onModalClose && onModalClose(); onModalClose && onModalClose();
console.log('onModalClose') console.log('onModalClose')
} }
} },
}); });
\ No newline at end of file
taobao_mini/client/components/commessage/commessage.json 0 → 100644
View file @ 274f23e3
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
taobao_mini/client/pages/pagecanvas/pagecanvas.axml
View file @ 274f23e3
...@@ -6,3 +6,4 @@ ...@@ -6,3 +6,4 @@
<rule-modal a:if="{{ruleModalVisible}}" onModalClose="closeRuleModal"><text>{{rule}}</text></rule-modal> <rule-modal a:if="{{ruleModalVisible}}" onModalClose="closeRuleModal"><text>{{rule}}</text></rule-modal>
<levelup-modal a:if="{{levelupModalVisible}}" onModalClose="closeLevelupModal"></levelup-modal> <levelup-modal a:if="{{levelupModalVisible}}" onModalClose="closeLevelupModal"></levelup-modal>
<message-modal a:if="{{messageModalVisible}}" onModalClose="closeMessageModal"></message-modal>
taobao_mini/client/pages/pagecanvas/pagecanvas.js
View file @ 274f23e3
...@@ -25,8 +25,9 @@ const checkSystem = async () => { ...@@ -25,8 +25,9 @@ const checkSystem = async () => {
Page({ Page({
data: { data: {
messageModalVisible: true,
ruleModalVisible: false, ruleModalVisible: false,
levelupModalVisible: true levelupModalVisible: false
}, },
onLoad(props) { onLoad(props) {
...@@ -234,6 +235,11 @@ Page({ ...@@ -234,6 +235,11 @@ Page({
this.setData({ this.setData({
ruleModalVisible: false ruleModalVisible: false
}); });
},
closeMessageModal() {
this.setData({
messageModalVisible: false
});
} }
}); });
\ No newline at end of file
taobao_mini/client/pages/pagecanvas/pagecanvas.json
View file @ 274f23e3
{ {
"usingComponents": { "usingComponents": {
"rule-modal": "/components/ruleModal/ruleModal", "rule-modal": "/components/ruleModal/ruleModal",
"levelup-modal": "/components/comlevelup/comlevelup" "levelup-modal": "/components/comlevelup/comlevelup",
"message-modal": "/components/commessage/commessage"
} }
} }
\ No newline at end of file
taobao_mini/client/resconfig/resList.js
View file @ 274f23e3
const resList = { const resList = {
'0c446868-16d2-47f1-a0d6-27dadff681f2': {
name: 'message_bg',
ext: '.png',
uuid: '0c446868-16d2-47f1-a0d6-27dadff681f2',
url: '//yun.duiba.com.cn/spark/assets/3b954e2265924a7fd5250a5b2b48627360a0b905.png'
},
'3ad6a924-dda8-49f4-b8fc-0e796347e802': {
name: 'message_btn',
ext: '.png',
uuid: '3ad6a924-dda8-49f4-b8fc-0e796347e802',
url: '//yun.duiba.com.cn/spark/assets/2b22fec0227db9f7df6ee42e5161939aa4f9a06f.png'
},
'5488b126-f520-496f-ace6-010a89eb108f': {
name: 'message_closebtn',
ext: '.png',
uuid: '5488b126-f520-496f-ace6-010a89eb108f',
url: '//yun.duiba.com.cn/spark/assets/23ede9d65dea3267e4f46ca010c593e5a825f3e9.png'
},
'a158cbff-9dcd-49df-bb91-16213d58036e': { 'a158cbff-9dcd-49df-bb91-16213d58036e': {
name: 'levelup_light', name: 'levelup_light',
...@@ -43,7 +62,7 @@ const resList = { ...@@ -43,7 +62,7 @@ const resList = {
ext: '.png', ext: '.png',
uuid: '95520b55-9655-4988-a833-3907978dbffb', uuid: '95520b55-9655-4988-a833-3907978dbffb',
url: '//yun.duiba.com.cn/spark/assets/5193855f40ff72dea9f48022083a6a35240b6dc6.png' url: '//yun.duiba.com.cn/spark/assets/5193855f40ff72dea9f48022083a6a35240b6dc6.png'
} },
......
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