Skip to content

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

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

parents c1f8dba3 e91a5c53
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8703 additions and 21 deletions
.DS_Store
View file @ 6c928df7
No preview for this file type
spark.json 0 → 100644
View file @ 6c928df7
This diff is collapsed.
taobao_mini/client/app.acss 0 → 100644
View file @ 6c928df7
page {
background: #f7f7f7;
font-family: 'Helvetica Neue', Helvetica, Hiragino Sans GB, 'Microsoft Yahei', STHeiTi, Arial, sans-serif;
}
* {
box-sizing: border-box;
}
.d-flex {
display: flex
}
.d-flex__item {
flex: 1;
}
.d-flex--aligncenter {
align-items: center;
}
.modal-animate-fade-in {
opacity: 0;
animation: modalAnimateFadeIn .3s forwards;
}
.modal-animate-zoom-in {
transform: scale(0);
animation: modalAnimateZoomIn .3s forwards;
}
.modal-animate-fly-in {
transform: translateY(100%);
animation: modalAnimateFlyIn .3s forwards;
}
.btn-animate-pulse {
animation: btnAnimatePulse .8s infinite;
}
@keyframes modalAnimateFadeIn {
to {
opacity: 1;
}
}
@keyframes modalAnimateZoomIn {
to {
transform: scale(1);
}
}
@keyframes modalAnimateFlyIn {
to {
transform: translateY(0);
}
}
@keyframes btnAnimatePulse {
from {
transform: scale(1);
}
50% {
transform: scale(1.1);
}
to {
transform: scale(1);
}
}
\ No newline at end of file
taobao_mini/client/app.json
View file @ 6c928df7
{ {
"pages": [ "pages": [
"pages/index/index",
"pages/pagecanvas/pagecanvas", "pages/pagecanvas/pagecanvas",
"pages/index/index",
"pages/pageshop/pageshop", "pages/pageshop/pageshop",
"pages/myprize/myprize" "pages/myprize/myprize"
], ],
......
taobao_mini/client/components/comlevelup1/comlevelup.acss 0 → 100644
View file @ 6c928df7
.levelup {
width: 1116rpx;
height: 1093rpx;
opacity: 1;
left: -183rpx;
top: 221rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.levelup .levelup_light {
width: 1116rpx;
height: 1093rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.levelup .levelup_bg {
width: 584rpx;
height: 715rpx;
opacity: 1;
left: 268rpx;
top: 200rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.levelup .levelup_closebtn {
width: 45rpx;
height: 45rpx;
opacity: 1;
left: 767rpx;
top: 236rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.levelup .levelup_bg2 {
width: 651rpx;
height: 784rpx;
opacity: 1;
left: 235rpx;
top: 182rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.levelup .levelup_txt {
width: 371rpx;
height: 26rpx;
opacity: 1;
left: 374rpx;
top: 711rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 26rpx;
color: #574738;
}
.levelup .levelup_title {
width: 206rpx;
height: 35rpx;
opacity: 1;
left: 457rpx;
top: 314rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.levelup .levelup_imgbg {
width: 360rpx;
height: 299rpx;
opacity: 1;
left: 380rpx;
top: 377rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.levelup .levelup_btn {
width: 351rpx;
height: 105rpx;
opacity: 1;
left: 384rpx;
top: 773rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
taobao_mini/client/components/comlevelup1/comlevelup.axml 0 → 100644
View file @ 6c928df7
<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/comlevelup1/comlevelup.js 0 → 100644
View file @ 6c928df7
'use strict';
import resList from '../../resconfig/resList';
Component({
props: {},
data: {
resList: resList
},
methods: {
onModalClose() {
const { onModalClose } = this.props;
onModalClose && onModalClose();
console.log('onModalClose')
}
}
});
\ No newline at end of file
taobao_mini/client/components/comlevelup1/comlevelup.json 0 → 100644
View file @ 6c928df7
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
taobao_mini/client/pages/pagecanvas/pagecanvas.axml
View file @ 6c928df7
...@@ -4,4 +4,5 @@ ...@@ -4,4 +4,5 @@
</canvas> </canvas>
</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>
\ No newline at end of file <levelup-modal a:if="{{levelupModalVisible}}" onModalClose="closeLevelupModal"></levelup-modal>
taobao_mini/client/pages/pagecanvas/pagecanvas.js
View file @ 6c928df7
...@@ -25,7 +25,8 @@ const checkSystem = async () => { ...@@ -25,7 +25,8 @@ const checkSystem = async () => {
Page({ Page({
data: { data: {
ruleModalVisible: false ruleModalVisible: false,
levelupModalVisible: true
}, },
onLoad(props) { onLoad(props) {
...@@ -224,6 +225,11 @@ Page({ ...@@ -224,6 +225,11 @@ Page({
this.init(); this.init();
} }
}, },
closeLevelupModal() {
this.setData({
levelupModalVisible: false
});
},
closeRuleModal() { closeRuleModal() {
this.setData({ this.setData({
ruleModalVisible: false ruleModalVisible: false
......
taobao_mini/client/pages/pagecanvas/pagecanvas.json
View file @ 6c928df7
{ {
"usingComponents": { "usingComponents": {
"rule-modal": "/components/ruleModal/ruleModal" "rule-modal": "/components/ruleModal/ruleModal",
"levelup-modal": "/components/comlevelup/comlevelup"
} }
} }
\ No newline at end of file
taobao_mini/client/pages/pageshop/pageshop.acss
View file @ 6c928df7
.shop {
}
.shop-page { .shop-page {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
...@@ -10,6 +8,26 @@ ...@@ -10,6 +8,26 @@
overflow: hidden; overflow: hidden;
/* background: url('') no-repeat center top/cover; */ /* 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 { .shop .shopbg {
width: 750rpx; width: 750rpx;
height: 1624rpx; height: 1624rpx;
...@@ -17,15 +35,21 @@ ...@@ -17,15 +35,21 @@
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
.shop .shopitem { .shop .shopitem {
position: relative;
/* display: flex;
justify-content: center;
align-items: center; */
box-sizing: border-box;
width: 309rpx; width: 309rpx;
height: 324rpx; height: 324rpx;
opacity: 1; opacity: 1;
left: 54rpx; margin: 0 30rpx 30rpx 0;
top: 254rpx; /* left: 54rpx;
position: absolute; top: 254rpx; */
transform-origin: 0rpx 0rpx 0rpx;
} }
.shop .shopitem .shopitem_bg2 { .shop .shopitem .shopitem_bg2 {
width: 309rpx; width: 309rpx;
height: 324rpx; height: 324rpx;
...@@ -33,6 +57,7 @@ ...@@ -33,6 +57,7 @@
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
.shop .shopitem .shopitem_bg1 { .shop .shopitem .shopitem_bg1 {
width: 224rpx; width: 224rpx;
height: 161rpx; height: 161rpx;
...@@ -42,6 +67,7 @@ ...@@ -42,6 +67,7 @@
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
.shop .shopitem .shopitem_disabledbtn { .shop .shopitem .shopitem_disabledbtn {
width: 209rpx; width: 209rpx;
height: 60rpx; height: 60rpx;
...@@ -51,6 +77,7 @@ ...@@ -51,6 +77,7 @@
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
.shop .shopitem .shopitem_buybtn { .shop .shopitem .shopitem_buybtn {
width: 217rpx; width: 217rpx;
height: 68rpx; height: 68rpx;
...@@ -60,6 +87,7 @@ ...@@ -60,6 +87,7 @@
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
.shop .shopitem .shopitem_txt { .shop .shopitem .shopitem_txt {
width: 88rpx; width: 88rpx;
height: 20rpx; height: 20rpx;
...@@ -71,6 +99,7 @@ ...@@ -71,6 +99,7 @@
font-size: 21.79723rpx; font-size: 21.79723rpx;
color: #474543; color: #474543;
} }
.shop .shopitem .shopitem_name { .shop .shopitem .shopitem_name {
width: 209rpx; width: 209rpx;
height: 23rpx; height: 23rpx;
...@@ -81,7 +110,11 @@ ...@@ -81,7 +110,11 @@
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
font-size: 20.12052rpx; font-size: 20.12052rpx;
color: #474543; color: #474543;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.shop .shop_gold { .shop .shop_gold {
width: 98rpx; width: 98rpx;
height: 21rpx; height: 21rpx;
...@@ -93,6 +126,7 @@ ...@@ -93,6 +126,7 @@
font-size: 23.47394rpx; font-size: 23.47394rpx;
color: #7b644e; color: #7b644e;
} }
.shop .shop_backbtn { .shop .shop_backbtn {
width: 67rpx; width: 67rpx;
height: 67rpx; height: 67rpx;
...@@ -101,4 +135,4 @@ ...@@ -101,4 +135,4 @@
top: 41rpx; top: 41rpx;
position: absolute; position: absolute;
transform-origin: 0rpx 0rpx 0rpx; transform-origin: 0rpx 0rpx 0rpx;
} }
\ No newline at end of file
taobao_mini/client/pages/pageshop/pageshop.axml
View file @ 6c928df7
<view class="shop"> <view class="shop">
<view class="shop-page" style="{{{'background':`url(${resList['da6bc001-768a-4b1c-95af-a9a8853ef6f9'].url}) no-repeat center top/cover`}}}"> <view class="shop-page" style="{{{'background':`url(${resList['da6bc001-768a-4b1c-95af-a9a8853ef6f9'].url}) no-repeat center top/cover`}}}">
<!-- <image class="shopbg" src={{resList['da6bc001-768a-4b1c-95af-a9a8853ef6f9'].url}} /> -->
<view class="shopitem">
<image class="shopitem_bg2" src={{resList['a5230993-3870-4a91-bdd1-ffc4782770d0'].url}} />
<image class="shopitem_bg1" src={{resList['dd4ee407-16e4-4cb7-9eba-365b33f466a3'].url}} />
<image class="shopitem_disabledbtn" src={{resList['8d08152f-311a-446a-a15a-ff02ebed0139'].url}} />
<image class="shopitem_buybtn" src={{resList['dd8ea96e-e33f-4f5d-b31f-29f332c3c867'].url}} />
<label class="shopitem_txt">101010</label>
<label class="shopitem_name">商品名商品名商品名</label>
</view>
<label class="shop_gold">101010</label> <label class="shop_gold">101010</label>
<image a:if={{false}} class="shop_backbtn" src={{resList['bdab9777-8a4d-4659-ba23-66aaddb7fa5b'].url}} /> <image a:if={{false}} class="shop_backbtn" src={{resList['bdab9777-8a4d-4659-ba23-66aaddb7fa5b'].url}} />
<view class="shop-wrap">
<view class="shop-list">
<!--<image class="shopbg" src={{resList['da6bc001-768a-4b1c-95af-a9a8853ef6f9'].url}} /> -->
<view class="shopitem" a:for="{{list}}">
<image class="shopitem_bg2" src={{resList['a5230993-3870-4a91-bdd1-ffc4782770d0'].url}} />
<image class="shopitem_bg1" src={{resList['dd4ee407-16e4-4cb7-9eba-365b33f466a3'].url}} />
<image class="shopitem_disabledbtn" src={{resList['8d08152f-311a-446a-a15a-ff02ebed0139'].url}} />
<image class="shopitem_buybtn" src={{resList['dd8ea96e-e33f-4f5d-b31f-29f332c3c867'].url}} />
<label class="shopitem_txt">101010</label>
<label class="shopitem_name">start{{item}}eeeeeeend</label>
</view>
</view>
</view>
</view> </view>
</view> </view>
\ No newline at end of file
taobao_mini/client/pages/pageshop/pageshop.js
View file @ 6c928df7
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
import resList from '../../resconfig/resList'; //import API from '../../api'; import resList from '../../resconfig/resList'; //import API from '../../api';
Page({ Page({
data: {}, data: {
list:[1,2,3,4,5]
},
onLoad(props) { onLoad(props) {
this.setData( { this.setData( {
......
taobao_mini/client/resconfig/resList.js
View file @ 6c928df7
const resList = { const resList = {
'a158cbff-9dcd-49df-bb91-16213d58036e': {
name: 'levelup_light',
ext: '.png',
uuid: 'a158cbff-9dcd-49df-bb91-16213d58036e',
url: '//yun.duiba.com.cn/spark/assets/87bdbe797ad68e59540e0f5ab3984b6b7e79894d.png'
},
'b027d194-0fad-45ea-8b1c-3502f7869d2d': {
name: 'levelup_bg',
ext: '.png',
uuid: 'b027d194-0fad-45ea-8b1c-3502f7869d2d',
url: '//yun.duiba.com.cn/spark/assets/2b70fadb540ea098ab1305551d4fdc4d96b050ed.png'
},
'd33bbf87-ed39-4959-8673-02a4c31dca77': {
name: 'levelup_closebtn',
ext: '.png',
uuid: 'd33bbf87-ed39-4959-8673-02a4c31dca77',
url: '//yun.duiba.com.cn/spark/assets/2b22fec0227db9f7df6ee42e5161939aa4f9a06f.png'
},
'f88dfc75-c9f1-4e9d-8826-8a1d0e513259': {
name: 'levelup_bg2',
ext: '.png',
uuid: 'f88dfc75-c9f1-4e9d-8826-8a1d0e513259',
url: '//yun.duiba.com.cn/spark/assets/3626273026f000df09d73b2b37a92aca68ed7feb.png'
},
'69bff61a-b5a6-4979-ba8d-9e008aed737a': {
name: 'levelup_title',
ext: '.png',
uuid: '69bff61a-b5a6-4979-ba8d-9e008aed737a',
url: '//yun.duiba.com.cn/spark/assets/f88ebf9dad3fb309575d72f91ab0a8704291574f.png'
},
'f56872e2-5e79-4906-99a2-576231f153af': {
name: 'levelup_imgbg',
ext: '.png',
uuid: 'f56872e2-5e79-4906-99a2-576231f153af',
url: '//yun.duiba.com.cn/spark/assets/adbbe665822e7e67c405ee5a62b56859521ab715.png'
},
'95520b55-9655-4988-a833-3907978dbffb': {
name: 'levelup_btn',
ext: '.png',
uuid: '95520b55-9655-4988-a833-3907978dbffb',
url: '//yun.duiba.com.cn/spark/assets/5193855f40ff72dea9f48022083a6a35240b6dc6.png'
}
'137b39ef-0c25-4991-a57e-0308daaec2dd': {
name: 'levelup_light',
ext: '.png',
uuid: '137b39ef-0c25-4991-a57e-0308daaec2dd',
url: '//yun.duiba.com.cn/spark/assets/0928fc8aa144851335f0588f4418df0a12f4e232.png'
},
'bca418af-89d1-4fe0-90a8-ae8581ad328c': {
name: 'levelup_bg',
ext: '.png',
uuid: 'bca418af-89d1-4fe0-90a8-ae8581ad328c',
url: '//yun.duiba.com.cn/spark/assets/2b70fadb540ea098ab1305551d4fdc4d96b050ed.png'
},
'c2adf081-7720-4814-ad9e-e28d13522ee0': {
name: 'levelup_closebtn',
ext: '.png',
uuid: 'c2adf081-7720-4814-ad9e-e28d13522ee0',
url: '//yun.duiba.com.cn/spark/assets/2b22fec0227db9f7df6ee42e5161939aa4f9a06f.png'
},
'9de58772-9830-4e72-aba8-b07802266b5d': {
name: 'levelup_bg2',
ext: '.png',
uuid: '9de58772-9830-4e72-aba8-b07802266b5d',
url: '//yun.duiba.com.cn/spark/assets/3626273026f000df09d73b2b37a92aca68ed7feb.png'
},
'be93e436-d2eb-4c29-922c-577810ed6571': {
name: 'levelup_title',
ext: '.png',
uuid: 'be93e436-d2eb-4c29-922c-577810ed6571',
url: '//yun.duiba.com.cn/spark/assets/f88ebf9dad3fb309575d72f91ab0a8704291574f.png'
},
'b1c40894-4d50-45e6-8fc8-118ef6d9d598': {
name: 'levelup_imgbg',
ext: '.png',
uuid: 'b1c40894-4d50-45e6-8fc8-118ef6d9d598',
url: '//yun.duiba.com.cn/spark/assets/adbbe665822e7e67c405ee5a62b56859521ab715.png'
},
'8da5fe13-41a3-4b5b-b079-938e0c7eef5a': {
name: 'levelup_btn',
ext: '.png',
uuid: '8da5fe13-41a3-4b5b-b079-938e0c7eef5a',
url: '//yun.duiba.com.cn/spark/assets/5193855f40ff72dea9f48022083a6a35240b6dc6.png'
},
'da6bc001-768a-4b1c-95af-a9a8853ef6f9': { 'da6bc001-768a-4b1c-95af-a9a8853ef6f9': {
name: 'shopbg', name: 'shopbg',
ext: '.png', ext: '.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