Commit da233093 authored by wildfirecode13's avatar wildfirecode13

1

parent 57030a90
{ {
"pages": [ "pages": [
"pages/pageshop/pageshop",
"pages/pagecanvas/pagecanvas", "pages/pagecanvas/pagecanvas",
"pages/index/index", "pages/index/index",
"pages/pageshop/pageshop",
"pages/myprize/myprize" "pages/myprize/myprize"
], ],
"window": { "window": {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<image class="levelup_light " src={{resList['a158cbff-9dcd-49df-bb91-16213d58036e'].url}} /> <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_bg " src={{resList['b027d194-0fad-45ea-8b1c-3502f7869d2d'].url}} />
<image class="levelup_bg2 " src={{resList['f88dfc75-c9f1-4e9d-8826-8a1d0e513259'].url}} /> <image class="levelup_bg2 " src={{resList['f88dfc75-c9f1-4e9d-8826-8a1d0e513259'].url}} />
<label class="levelup_txt ">精力上限1200 → 精力上限1500</label> <label class="levelup_txt ">{{mydata.tips}}</label>
<image class="levelup_title " src={{resList['69bff61a-b5a6-4979-ba8d-9e008aed737a'].url}} /> <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_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_btn " onTap="onBtnClick" src={{resList['95520b55-9655-4988-a833-3907978dbffb'].url}} />
......
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
import resList from '../../resconfig/resList'; import resList from '../../resconfig/resList';
Component({ Component({
props: {}, props: {
mydata:{}
},
data: { data: {
resList: resList resList: resList
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</view> </view>
<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}}" mydata="{{levelupModalData}}" onModalClose="closeLevelupModal"></levelup-modal>
<message-modal a:if="{{messageModalVisible}}" mydata="{{messageModalData}}" onModalClose="closeMessageModal"></message-modal> <message-modal a:if="{{messageModalVisible}}" mydata="{{messageModalData}}" onModalClose="closeMessageModal"></message-modal>
<view class="popcontainer" a:if="{{selectcatModalVisible}}"><selectcat-modal onModalClose="closeSelectcatModal" onSelectCat="selectCat"></selectcat-modal></view> <view class="popcontainer" a:if="{{selectcatModalVisible}}"><selectcat-modal onModalClose="closeSelectcatModal" onSelectCat="selectCat"></selectcat-modal></view>
<view class="popcontainer" a:if="{{catnameModalVisible}}" ><catname-modal selectType="{{catType}}" onModalClose="closeCatnameModal" onSelectCatOk="selectCatOk" /></view> <view class="popcontainer" a:if="{{catnameModalVisible}}" ><catname-modal selectType="{{catType}}" onModalClose="closeCatnameModal" onSelectCatOk="selectCatOk" /></view>
......
...@@ -31,11 +31,12 @@ Page({ ...@@ -31,11 +31,12 @@ Page({
messageModalVisible: false, messageModalVisible: false,
messageModalData: {}, messageModalData: {},
ruleModalVisible: false, ruleModalVisible: false,
levelupModalVisible: false, levelupModalVisible: 0,
levelupModalData: null,
selectcatModalVisible: false, selectcatModalVisible: false,
catnameModalVisible: false, catnameModalVisible: false,
recallcatModalVisible:false, recallcatModalVisible: false,
getcatModalVisible:false getcatModalVisible: false
}, },
onLoad(props) { onLoad(props) {
...@@ -72,6 +73,17 @@ Page({ ...@@ -72,6 +73,17 @@ Page({
my.__onMessage__ = (e) => { my.__onMessage__ = (e) => {
this.onMessage(e) this.onMessage(e)
} }
my.__showModal__ = (key,data) => {
this.onMessage({
data: {
netName: 'mine.showModal',
parameter: {
name: key+'Modal',
data: data
}
}
});
}
}, },
init() { init() {
...@@ -272,21 +284,21 @@ Page({ ...@@ -272,21 +284,21 @@ Page({
selectCat(type) { selectCat(type) {
// this.catType = type; // this.catType = type;
this.setData({ this.setData({
catType:type, catType: type,
catnameModalVisible:true catnameModalVisible: true
}) })
console.log("选择了", type) console.log("选择了", type)
}, },
/**选择好猫咪后打开getCat弹窗 */ /**选择好猫咪后打开getCat弹窗 */
selectCatOk(name){ selectCatOk(name) {
this.setData({ this.setData({
catName:name, catName: name,
getcatModalVisible:true getcatModalVisible: true
}) })
}, },
/**领养完猫咪之后传输消息给主页 */ /**领养完猫咪之后传输消息给主页 */
postSelectCat(r){ postSelectCat(r) {
this.main.dispatchGlobalEvent("selectEnd",r); this.main.dispatchGlobalEvent("selectEnd", r);
}, },
closeLevelupModal() { closeLevelupModal() {
this.setData({ this.setData({
...@@ -313,14 +325,14 @@ Page({ ...@@ -313,14 +325,14 @@ Page({
selectcatModalVisible: false selectcatModalVisible: false
}) })
}, },
closeRecallcatModal(){ closeRecallcatModal() {
this.setData({ this.setData({
recallcatModalVisible:false recallcatModalVisible: false
}) })
}, },
closeGetcatModal(){ closeGetcatModal() {
this.setData({ this.setData({
getcatModalVisible:false getcatModalVisible: false
}) })
} }
}); });
\ No newline at end of file
.shop-page {
width: 100vw;
height: 100vh;
opacity: 1;
position: absolute;
top: 0;
left: 0;
overflow: hidden;
/* background: url('') no-repeat center top/cover; */
}
.shop-wrap {
width: 100%;
position: absolute;
bottom: 0;
top: 254rpx;
padding-left: 54rpx;
right:0;
overflow-x: auto;
}
.shop-list {
width: 100%;
height: auto;
/* background-color: black; */
display: flex;
flex-flow: row wrap;
align-content: flex-start;
}
.shop .shopbg {
width: 750rpx;
height: 1624rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.shop .shopitem {
position: relative;
/* display: flex;
justify-content: center;
align-items: center; */
box-sizing: border-box;
width: 309rpx;
height: 324rpx;
opacity: 1;
margin: 0 30rpx 30rpx 0;
/* left: 54rpx;
top: 254rpx; */
}
.shop .shopitem .shopitem_bg2 {
width: 309rpx;
height: 324rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.shop .shopitem .shopitem_bg1 {
width: 224rpx;
height: 161rpx;
opacity: 1;
left: 45rpx;
top: 29rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.shop .shopitem .shopitem_disabledbtn {
width: 209rpx;
height: 60rpx;
opacity: 1;
left: 49rpx;
top: 241rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.shop .shopitem .shopitem_buybtn {
width: 217rpx;
height: 68rpx;
opacity: 1;
left: 45rpx;
top: 237rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.shop .shopitem .shopitem_txt {
pointer-events: none;
width: 88rpx;
/* height: 20rpx; */
opacity: 1;
left: 136rpx;
top: 261rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 21.79723rpx;
color: #474543;
}
.shop .shopitem .shopitem_name {
width: 209rpx;
/* height: 23rpx; */
opacity: 1;
left: 51rpx;
top: 203rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 20.12052rpx;
color: #474543;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.shop .shop_gold {
width: 98rpx;
height: 21rpx;
opacity: 1;
left: 348rpx;
top: 151rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 23.47394rpx;
color: #7b644e;
}
.shop .shop_backbtn {
width: 67rpx;
height: 67rpx;
opacity: 1;
left: 48rpx;
top: 41rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
\ No newline at end of file
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