Skip to content

N
new_taobao
Commit 8a803034 authored by wildfirecode13's avatar wildfirecode13
Browse files
Options

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

parents 7a67b4a9 9a227a67
Hide whitespace changes
Inline Side-by-side
Showing with 346 additions and 3 deletions
project/src/components/comcatbackbed/comcatbackbed.jsx 0 → 100644
View file @ 8a803034
'use strict';
import React, { Component } from 'react';
import resList from '../../resconfig/resList';
import './comcatbackbed.less';
class Comcatbackbed extends Component {
constructor(props) {
super(props);
this.state = this.state || { resList: resList };
}
render() {
return (
<div className="catbackbed">
<div className="catbackbed">
<img className="catbackbedbgaccident" src={this.state.resList['98a3f684-846b-479c-91ac-75b588e2b51b'].url} />
<img className="catbackbedbgsurprise" src={this.state.resList['98a3f684-846b-479c-91ac-75b588e2b51b'].url} />
<img className="catbackbedbgunluck" src={this.state.resList['3fa827d6-e333-4b56-a5d9-5f3ae2089127'].url} />
<img className="catbackbedok" src={this.state.resList['b701826c-63c5-4490-a380-52f273dad9af'].url} />
<span className="catbackbedtip2">获得+10000欢乐币</span>
<span className="catbackbedtip">
文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案不要超过50字
</span>
<img className="catbackbedclose" src={this.state.resList['29e80fbb-98ed-40fb-a11b-e14b45fee158'].url} />
<img className="catbackbedcatimg" src={this.state.resList['51c97f4c-1f39-48cf-8865-c1c2fec500d8'].url} />
</div>
</div>
);
}
}
export default Comcatbackbed;
\ No newline at end of file
project/src/components/comcatbackbed/comcatbackbed.less 0 → 100644
View file @ 8a803034
.catbackbed {
width: 750px;
height: 1093px;
opacity: 1;
position: absolute;
transform-origin: 0px 0px 0px;
.catbackbed {
width: 750px;
height: 1093px;
opacity: 1;
position: absolute;
transform-origin: 0px 0px 0px;
.catbackbedbgaccident {
width: 750px;
height: 1093px;
opacity: 1;
position: absolute;
transform-origin: 0px 0px 0px;
display: block;
}
.catbackbedbgsurprise {
width: 750px;
height: 1093px;
opacity: 1;
position: absolute;
transform-origin: 0px 0px 0px;
display: block;
}
.catbackbedbgunluck {
width: 584px;
height: 715px;
opacity: 1;
position: absolute;
transform-origin: 0px 0px 0px;
display: block;
top: 196px;
left: 84px;
}
.catbackbedok {
width: 351px;
height: 105px;
opacity: 1;
left: 201px;
top: 773px;
position: absolute;
transform-origin: 0px 0px 0px;
}
.catbackbedtip2 {
width: 275px;
height: 32px;
opacity: 1;
left: 238px;
top: 706px;
position: absolute;
transform-origin: 0px 0px 0px;
font-size: 32px;
color: rgba(104, 91, 78, 1);
}
.catbackbedtip {
width: 447px;
height: 111px;
opacity: 1;
left: 152px;
top: 563px;
position: absolute;
transform-origin: 0px 0px 0px;
font-size: 28px;
color: rgba(104, 91, 78, 1);
}
.catbackbedclose {
width: 44px;
height: 44px;
opacity: 1;
display: block;
left: 586px;
top: 238px;
position: absolute;
transform-origin: 0px 0px 0px;
}
.catbackbedcatimg {
width: 494px;
height: 262px;
opacity: 1;
display: block;
left: 128px;
top: 290px;
position: absolute;
transform-origin: 0px 0px 0px;
}
}
}
\ No newline at end of file
taobao_mini/client/app.acss
View file @ 8a803034
......@@ -30,6 +30,18 @@ page {
background: rgba(0, 0, 0, 0.7);
}
.btn:active {
transform: scale(0.9);
-ms-transform: scale(0.9);
/* // IE 9 */
-moz-transform: scale(0.9);
/* // Firefox */
-webkit-transform: scale(0.9);
/* // Safari 和 Chrome */
-o-transform: scale(0.9);
/* Opera */
}
.modal-animate-fade-in {
opacity: 0;
......
taobao_mini/client/components/comcatbackbed/comcatbackbed.acss 0 → 100644
View file @ 8a803034
.catbackbed {
width: 750rpx;
height: 1093rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.catbackbed .catbackbed {
width: 750rpx;
height: 1093rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.catbackbed .catbackbed .catbackbedbgaccident {
width: 750rpx;
height: 1093rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
display: block;
}
.catbackbed .catbackbed .catbackbedbgsurprise {
width: 750rpx;
height: 1093rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
display: block;
}
.catbackbed .catbackbed .catbackbedbgunluck {
width: 584rpx;
height: 715rpx;
opacity: 1;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
display: block;
top: 196rpx;
left: 84rpx;
}
.catbackbed .catbackbed .catbackbedok {
width: 351rpx;
height: 105rpx;
opacity: 1;
left: 201rpx;
top: 773rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.catbackbed .catbackbed .catbackbedtip2 {
width: 275rpx;
height: 32rpx;
opacity: 1;
left: 238rpx;
top: 706rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 32rpx;
color: #685b4e;
}
.catbackbed .catbackbed .catbackbedtip {
width: 447rpx;
height: 111rpx;
opacity: 1;
left: 152rpx;
top: 563rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
font-size: 28rpx;
color: #685b4e;
}
.catbackbed .catbackbed .catbackbedclose {
width: 44rpx;
height: 44rpx;
opacity: 1;
display: block;
left: 586rpx;
top: 238rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
.catbackbed .catbackbed .catbackbedcatimg {
width: 494rpx;
height: 262rpx;
opacity: 1;
display: block;
left: 128rpx;
top: 290rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
}
taobao_mini/client/components/comcatbackbed/comcatbackbed.axml 0 → 100644
View file @ 8a803034
<view class="catbackbed">
<view class="catbackbed">
<image class="catbackbedbgaccident" src={{resList['98a3f684-846b-479c-91ac-75b588e2b51b'].url}} />
<image class="catbackbedbgsurprise" src={{resList['98a3f684-846b-479c-91ac-75b588e2b51b'].url}} />
<image class="catbackbedbgunluck" src={{resList['3fa827d6-e333-4b56-a5d9-5f3ae2089127'].url}} />
<image class="catbackbedok" src={{resList['b701826c-63c5-4490-a380-52f273dad9af'].url}} />
<span class="catbackbedtip2">获得+10000欢乐币</span>
<span class="catbackbedtip">
文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案文案不要超过50字
</span>
<image class="catbackbedclose" src={{resList['29e80fbb-98ed-40fb-a11b-e14b45fee158'].url}} />
<image class="catbackbedcatimg" src={{resList['51c97f4c-1f39-48cf-8865-c1c2fec500d8'].url}} />
</view>
</view>
\ No newline at end of file
taobao_mini/client/components/comcatbackbed/comcatbackbed.js 0 → 100644
View file @ 8a803034
'use strict';
import resList from '../../resconfig/resList';
Component({
props: {},
data: {},
methods: {},
onInit(props) {
this.setData(this.data || {
resList: resList
});
}
});
\ No newline at end of file
taobao_mini/client/components/comcatbackbed/comcatbackbed.json 0 → 100644
View file @ 8a803034
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
taobao_mini/client/components/comgetcat/comgetcat.axml
View file @ 8a803034
......@@ -5,4 +5,4 @@
<label class="getcatdialogtext">好了，现在你就是{{catName}}的铲屎官了～</label>
</view>
<image class="getcatgo" onTap="onPostSelectCat" src={{resList['97484cf2-5146-4287-b104-ed1f43c71ee0'].url}} />
</view>
\ No newline at end of file
</view>
\ No newline at end of file
taobao_mini/client/components/comselectcat/comselectcat.acss
View file @ 8a803034
......@@ -209,5 +209,5 @@
left: 185rpx;
top: 804rpx;
position: absolute;
transform-origin: 0rpx 0rpx 0rpx;
transform-origin: 50% 50% 0rpx;
}
taobao_mini/client/components/comselectcat/comselectcat.axml
View file @ 8a803034
......@@ -24,5 +24,5 @@
<label class="orgename">4</label>
<image class="orgesure" a:if="{{curSelect==4}}" src={{resList['f956cda2-5eef-4942-8737-742d171527bd'].url}} />
</view>
<image class="selectcattrue" onTap="selectSure" src={{resList['628fc38b-7dc0-4c69-aac1-279d60c8f1ed'].url}} />
<image class="selectcattrue btn" onTap="selectSure" src={{resList['628fc38b-7dc0-4c69-aac1-279d60c8f1ed'].url}} />
</view>
\ No newline at end of file
taobao_mini/client/resconfig/resList.js
View file @ 8a803034
......@@ -298,5 +298,90 @@ const resList = {
uuid: '29e80fbb-98ed-40fb-a11b-e14b45fee158'
},
'98a3f684-846b-479c-91ac-75b588e2b51b': {
name: 'luckyrewardBg',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/luckyrewardBg.4c0bc5edd46b364eb6b645dde728d1db9be504e2.png',
uuid: '98a3f684-846b-479c-91ac-75b588e2b51b'
},
'3fa827d6-e333-4b56-a5d9-5f3ae2089127': {
name: 'unluckBg',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/unluckBg.c4adcfdcf29f5f1d3994869aebbac5850cd29616.png',
uuid: '3fa827d6-e333-4b56-a5d9-5f3ae2089127'
},
'51c97f4c-1f39-48cf-8865-c1c2fec500d8': {
name: 'bcEnergy',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/bcEnergy.8a91691d9195705595e42fa80b7f1eb9143e27f2.png',
uuid: '51c97f4c-1f39-48cf-8865-c1c2fec500d8'
},
'36279db8-3376-4710-bb1f-89e69130e6dd': {
name: 'bcHappyCoin',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/bcHappyCoin.1a4685f550e88c0b34322d4d975522eafdda5555.png',
uuid: '36279db8-3376-4710-bb1f-89e69130e6dd'
},
'e143c361-01b3-488f-b213-7a97040e245b': {
name: 'bcSleep',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/bcSleep.b432b66593b18881cc6b19e59f30e67d2c053102.png',
uuid: 'e143c361-01b3-488f-b213-7a97040e245b'
},
'0a80398a-972a-4ea2-a9d1-604fe54a9d62': {
name: 'ocEnergy',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/ocEnergy.4c6a2f512b9220dfbcc39ee1fd16316ec0a49a68.png',
uuid: '0a80398a-972a-4ea2-a9d1-604fe54a9d62'
},
'6dc7422e-d6bf-4b03-9fd3-637b71e5e88e': {
name: 'ocHappyCoin',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/ocHappyCoin.dea37104ac8403660bdd947f4906e6f9b23d085f.png',
uuid: '6dc7422e-d6bf-4b03-9fd3-637b71e5e88e'
},
'a1a5d4a5-8039-4a6f-a620-8fb465eec68f': {
name: 'ocSleep',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/ocSleep.042656a3bd29c0f2c82f2667300288f0a3a0ba62.png',
uuid: 'a1a5d4a5-8039-4a6f-a620-8fb465eec68f'
},
'32f6f1ff-1ad7-4296-a922-d9073b31a921': {
name: 'shEnergy',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/shEnergy.81d4b12fc07fb9733f8f358afe5587f78a4a2e25.png',
uuid: '32f6f1ff-1ad7-4296-a922-d9073b31a921'
},
'5c01ebd0-dac7-4ff9-89a5-054ea7214f62': {
name: 'shHappyCoin',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/shHappyCoin.1e228aeb955c78cfe8cf8513313314728a88c99c.png',
uuid: '5c01ebd0-dac7-4ff9-89a5-054ea7214f62'
},
'61869bae-f55f-46e3-be58-23ed6485b18e': {
name: 'shSleep',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/shSleep.fcd3b6c29c68df42570492a69d07f1aaed25910a.png',
uuid: '61869bae-f55f-46e3-be58-23ed6485b18e'
},
'377e50f3-cbec-45a5-9bcd-d4923b9873a6': {
name: 'xlEnergy',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/xlEnergy.04bb169743fd6a2a195427778b447daeb59c3c2c.png',
uuid: '377e50f3-cbec-45a5-9bcd-d4923b9873a6'
},
'e7156f22-22f6-45f5-8002-898c142ba6ae': {
name: 'xlHappyCoin',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/xlHappyCoin.f9405671034006f5175fbab34ed5086a3bdc801e.png',
uuid: 'e7156f22-22f6-45f5-8002-898c142ba6ae'
},
'cfc54c6d-4233-478a-ae00-ef42d58718c1': {
name: 'xlSleep',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/xlSleep.85ef68b7d875a9cb70d30cfe809abbbc8c6ca8ad.png',
uuid: 'cfc54c6d-4233-478a-ae00-ef42d58718c1'
},
};
export default resList;
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