Commit c60de007d1cc7303142e226338218e3be6b8e867

Authored by vking
1 parent d0054f0c

master-activity

... ... @@ -35,7 +35,8 @@
"pages/reserve/remark",
"pages/reserve/findSeller",
"pages/customer/cancel",
"pack-activity/pages/index"
"pack-activity/pages/index",
"pack-activity/pages/money"
],
"subpackages": [
{
... ...
... ... @@ -12,12 +12,18 @@ Component({
*/
data: {
activity:null,
displayType:0,//0|1 浮层|弹框
},
/**
* 组件的方法列表
*/
methods: {
close(){
this.setData({
displayType:0,
})
},
hasActivity(e){//有通知就可以参加活动
console.log('hasActivity.enter',e)
this.getActivity()
... ... @@ -25,6 +31,7 @@ Component({
getActivity(){
//
this.setData({
displayType:1,
activity:{
id:1,
background:'#F04866',
... ...
<!--components/activity/enter.wxml-->
<has bindevent="hasActivity"></has>
<view class="mask" wx:if="{{activity}}" bindtap="close">
<view class="close"></view>
<view class="activity" bindcatch="bindcatch">
<view class="enter">
</view>
<view class="money">
<block wx:if="{{activity}}">
<view class="mask" wx:if="{{displayType==1}}">
<view class="close" bindtap="close"></view>
<view class="activity" bindcatch="bindcatch">
<view class="enter">
<view class="enter-txt">请客订包间,就用周到安排</view>
<view class="enter-hot flex-cc">
<view class="enter-icon lt"></view>
<view class="enter-hot-txt">开工专享红包</view>
<view class="enter-icon gt"></view>
</view>
</view>
<view class="money">
<view class="money-tip flex-cc">订包间,消费抵现金</view>
<view class="money-views flex-bc">
<view class="money-number">18.8</view>
<view class="money-dw">元</view>
</view>
<navigator url="/pack-activity/pages/index?id={{activity.id}}" hover-class="navigator-hover">
<view class="money-button flex-cc">开心收下</view>
</navigator>
</view>
</view>
</view>
</view>
<navigator wx:else="" hover-class="navigator-hover"
url="/pack-activity/pages/index?id={{activity.id}}" >
<view class="mask-tips"></view>
</navigator>
</block>
... ...
... ... @@ -21,6 +21,44 @@
background-image: url("http://qn.colorcun.com/activity/images/enter/enter.png");
background-size: 100% 100%;
margin-left:calc(50% - 282rpx);
box-sizing: border-box;
padding-top: 146rpx;
}
.enter-txt{
height:34rpx;
font-size:24rpx;
font-weight:500;
color:rgba(255,227,192,1);
line-height:34rpx;
letter-spacing:1rpx;
text-align: center;
}
.enter-hot{
height:50rpx;
font-size:36rpx;
font-weight:600;
color:rgba(255,227,192,1);
line-height:50rpx;
letter-spacing:2rpx;
margin-top: 46rpx;
}
.enter-hot-txt{
width:236rpx;
overflow: hidden;
white-space: nowrap;
margin: 0 20rpx 0;
text-align: center;
}
.enter-icon{
background-size: 100% 100%;
width:70rpx;
height:16rpx;
}
.enter-icon.lt{
background-image: url("http://qn.colorcun.com/activity/images/enter/lt-1.png");
}
.enter-icon.gt{
background-image: url("http://qn.colorcun.com/activity/images/enter/gt-1.png");
}
.money{
width: 400rpx;
... ... @@ -29,4 +67,68 @@
background-size: 100% 100%;
margin-left:calc(50% - 200rpx + 13rpx);
margin-top: -143rpx;
box-sizing: border-box;
padding-top: 40rpx;
}
.money-tip{
height:34rpx;
font-size:24rpx;
font-weight:600;
color:rgba(204,17,39,1);
line-height:34rpx;
letter-spacing:1rpx;
}
.money-views{
height:106rpx;
font-size:76rpx;
font-weight:600;
color:rgba(204,17,39,1);
line-height:106rpx;
letter-spacing:1rpx;
margin-top: 16rpx;
}
.money-dw{
width:26rpx;
height:34rpx;
font-size:24rpx;
font-weight:600;
color:rgba(204,17,39,1);
line-height:34rpx;
letter-spacing:1rpx;
margin-left: 10rpx;
}
.money-button{
width:290rpx;
height:70rpx;
background:linear-gradient(180deg,rgba(231,66,88,1) 0%,rgba(243,53,78,1) 100%);
box-shadow:0rpx 2rpx 2rpx 0rpx rgba(209,33,54,1);
border-radius:35rpx;
font-size:32rpx;
font-weight:600;
color:rgba(255,227,192,1);
letter-spacing:1rpx;
text-shadow:0rpx 4rpx 8rpx rgba(207,31,51,1);
position: relative;
margin-top: 60rpx;
margin-left: 54rpx;
}
.money-button:after{
display: block;
position: absolute;
content: "";
width:36rpx;
height:36rpx;
background-size: 100% 100%;
background-image: url("http://qn.colorcun.com/activity/images/enter/more.png");
top:16rpx;
right:28rpx;
}
.mask-tips{
background-color: #1AAD19;
width: 140rpx;
height: 200rpx;
position: fixed;
left: 20rpx;
bottom: 500rpx;
}
\ No newline at end of file
... ...
... ... @@ -6,13 +6,15 @@
<view class="guize">活动 规则</view>
</view>
<view class="content">
<view class="tips flex-lr">
<view>活动累计收入:{{count}}元</view>
<view class="flex-rr">
查看余额
<view class="more"></view>
<navigator url="/pack-activity/pages/money" hover-class="navigator-hover">
<view class="tips flex-lr">
<view>活动累计收入:{{count}}元</view>
<view class="flex-rr">
查看余额
<view class="more"></view>
</view>
</view>
</view>
</navigator>
<view class="list">
<view class="header flex-cc">
<view class="header-img lt"></view>
... ...
// pack-activity/pages/money.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
})
\ No newline at end of file
... ...
{
"backgroundTextStyle":"light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle":"black",
"usingComponents": {
"nav":"/components/nav/nav"
}
}
\ No newline at end of file
... ...
<!--pack-activity/pages/money.wxml-->
<nav hasHome>我的余额</nav>
<view class="pages">
<view class="pages-view">
<view class="money-block">
<view class="money-views-top">我的余额</view>
<view class="money-views flex-bc">
<view class="money-number">18.8</view>
<view class="money-dw">元</view>
</view>
</view>
</view>
<view class="list-view">
<view class="item">
<view class="flex-lr name">
<view>活动红包</view>
<view>+100</view>
</view>
<view class="flex-lr date">
<view>11-10 17:19</view>
<view>余额 788.00</view>
</view>
</view>
<view class="item">
<view class="flex-lr name">
<view>活动红包</view>
<view>+100</view>
</view>
<view class="flex-lr date">
<view>11-10 17:19</view>
<view>余额 788.00</view>
</view>
</view>
<view class="item">
<view class="flex-lr name">
<view>活动红包</view>
<view>+100</view>
</view>
<view class="flex-lr date">
<view>11-10 17:19</view>
<view>余额 788.00</view>
</view>
</view>
</view>
</view>
... ...
/* pack-activity/pages/money.wxss */
page{
background-color: #FBE0B8;
}
.pages{
background-image: url("http://qn.colorcun.com/activity/images/money-header.png");
background-size: 100% auto;
background-repeat: no-repeat;
min-height: 500rpx;
padding-top: 80rpx;
}
.pages-view{
width: calc(100% - 40rpx);
margin-left: 20rpx;
height:340rpx;
background:rgba(251,236,217,1);
box-shadow:0rpx 4rpx 8rpx 0rpx rgba(232,194,139,1);
border-radius:20rpx;
box-sizing: border-box;
padding: 20rpx;
}
.money-block{
height:300rpx;
background:rgba(255,255,255,1);
box-shadow:0rpx 4rpx 8rpx 0rpx rgba(251,224,184,1);
border-radius:20rpx;
padding-top: 50rpx;
box-sizing: border-box;
}
.money-views-top{
background-image: url("http://qn.colorcun.com/activity/images/money-top.png");
background-size: 100% 100%;
width: 252rpx;
height: 50rpx;
font-size:28rpx;
font-weight:500;
color:rgba(109,61,19,1);
line-height:50rpx;
margin-left: calc(50% - 126rpx);
text-align: center;
}
.money-views{
height:100rpx;
font-size:72rpx;
font-weight:600;
color:rgba(227,31,53,1);
line-height:100rpx;
margin-top: 50rpx;
}
.money-dw{
width:32rpx;
height:44rpx;
font-size:32rpx;
font-weight:600;
color:rgba(227,31,53,1);
line-height:44rpx;
margin-left: 20rpx;
}
.list-view{
width: calc(100% - 40rpx);
margin-left: 20rpx;
background:rgba(255,255,255,1);
box-shadow:0rpx 4rpx 8rpx 0rpx rgba(232,194,139,1);
border-radius:20rpx;
box-sizing: border-box;
padding: 2rpx 40rpx 0;
margin-top: 20rpx;
}
.item{
height: 166rpx;
box-sizing: border-box;
border-bottom: 2rpx solid #F5F5F5;
line-height: 166rpx;
padding-top: 40rpx;
}
.item:last-child{
border-bottom-width: 0;
}
.item .name{
height:44rpx;
font-size:32rpx;
font-weight:500;
color:rgba(53,53,53,1);
line-height:44rpx;
box-sizing: border-box;
}
.item .date{
height:34rpx;
font-size:24rpx;
font-weight:500;
color:rgba(153,153,153,1);
line-height:34rpx;
margin-top: 10rpx;
}
\ No newline at end of file
... ...
... ... @@ -602,6 +602,13 @@
"pathName": "pack-activity/pages/index",
"query": "id=1",
"scene": null
},
{
"id": -1,
"name": "pack-activity/pages/money",
"pathName": "pack-activity/pages/money",
"query": "",
"scene": null
}
]
}
... ...