xt / xcx-book · Commits

Go to a project

Commit 07f9f5ad9a890533d50668dd4e544ee58836a42c

Authored by vking
1 parent 9bd8fb7f
build: skipped

master-activity

Inline Side-by-side
Showing 17 changed files with 506 additions and 10 deletions
... ... @@ -34,12 +34,21 @@
"pages/me/history",
"pages/reserve/remark",
"pages/reserve/findSeller",
"pages/customer/cancel",
"pack-activity/pages/index",
"pack-activity/pages/money"
"pages/customer/cancel"
],
"subpackages": [
{
"root": "pack-activity",
"name": "红包活动包",
"pages": [
"pages/index",
"pages/money",
"pages/kefu",
"pages/qiye",
"pages/yuding"
]
},
{
"root": "pack-cookbook",
"name": "提前点餐包",
"pages": [
... ...
... ... @@ -26,7 +26,7 @@
</view>
<navigator wx:else="" hover-class="navigator-hover"
url="/pack-activity/pages/index?id={{activity.id}}" >
<view class="mask-tips {{floclass}}"></view>
<view class="mask-tips {{floclass}}" style="background-image: url({{activity.task.flo_url}})"></view>
</navigator>
</block>
... ...
... ... @@ -130,7 +130,7 @@
position: fixed;
left: 20rpx;
bottom: 520rpx;
background-image: url("http://qn.colorcun.com/activity/images/fl.png");
/*background-image: url("http://qn.colorcun.com/activity/images/fl.png");*/
background-size: 100% 100%;
}
.mask-tips.detail_owner{
... ...
... ... @@ -92,7 +92,8 @@ Page({
let index=util.attr(e,'index')
let task=this.data.activity.list[index]
let tid=task.id
,path=util.http_build_query({aid:this.data.activity.id,tid:tid},task.task_url||'demo')
,path=util.http_build_query({aid:this.data.activity.id,tid:tid},task.task_url||'/pack-activity/pages/yuding')
console.log(path)
if(task.status==0){
App.Task.SetTaskInfo({//领取任务
aid:this.data.activity.id,
... ...
// pack-activity/pages/money.js
import util from '../../utils/util';
import App from '../../utils/api';
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
App.User.GetBalance().then(res=>{
this.setData({
user:res.data
})
})
App.User.GetConsume().then(res=>{
this.setData({
list:res.data
})
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
})
\ No newline at end of file
... ...
<!--pack-activity/pages/money.wxml-->
<wxs src="../../utils/util.wxs" module="util" />
<nav hasHome>我的余额</nav>
<view class="pages">
<view class="pages-view">
<view class="money-block">
<view class="money-views-top">
<view class="txt">我的余额</view>
</view>
<view class="money-views flex-bc">
<view class="money-number">{{user.price}}</view>
<view class="money-dw">元</view>
</view>
<navigator url="/pages/reserve/index" open-type="switchTab" hover-class="other-navigator-hover">
<view class="yuding flex-cc">
<view class="icon"></view>
去订包间
</view>
</navigator>
</view>
</view>
<view class="list-view" wx:if="{{list.length>0}}">
<view class="item" wx:for="{{list}}" wx:key="list">
<view class="flex-lr name">
<view>{{item.remark}}</view>
<view>{{item.type==1?'+':'-'}}{{item.consumeprice}}</view>
</view>
<view class="flex-lr date">
<view>{{util.unixtoTime(item.createtime,"MM-DD HH:II")}}</view>
<view>余额 {{item.currprice}}</view>
</view>
</view>
</view>
</view>
... ...
/* pack-activity/pages/money.wxss */
page{
background-color: #F5F5F5;
}
.pages{
/*background-image: url("http://qn.colorcun.com/activity/images/money-header.png");*/
background-image: url("http://qn.colorcun.com/activity/images/bg-black.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:#ffffff;
border-radius:20rpx;
box-sizing: border-box;
padding: 20rpx;
}
.money-block{
height:300rpx;
background:rgba(255,255,255,1);
border-radius:20rpx;
padding-top: 40rpx;
box-sizing: border-box;
}
.money-views-top{
width: 258rpx;
height: 40rpx;
font-size:28rpx;
margin-left: calc(50% - 126rpx);
text-align: center;
font-weight:500;
color:rgba(153,153,153,1);
line-height:40rpx;
position: relative;
}
.money-views-top:before{
position: absolute;
display: block;
content: "";
width: 100%;
height: 2rpx;
left:0;
top:19rpx;
background-color: #E0E0E0;
}
.money-views-top .txt{
width: 138rpx;
background-color: #ffffff;
left:60rpx;
position: absolute;
}
.money-views{
height:100rpx;
font-size:72rpx;
font-weight:600;
color:#353535;
line-height:100rpx;
margin-top: 10rpx;
}
.money-dw{
width:32rpx;
height:44rpx;
font-size:32rpx;
font-weight:600;
color:#353535;
line-height:44rpx;
margin-left: 20rpx;
}
.list-view{
width: calc(100% - 40rpx);
margin-left: 20rpx;
background:rgba(255,255,255,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;
}
.yuding{
width:320rpx;
height:70rpx;
background:linear-gradient(360deg,rgba(192,163,105,1) 0%,rgba(252,210,167,1) 100%);
border-radius:35rpx;
font-size:32rpx;
font-family:PingFangSC-Semibold,PingFang SC;
font-weight:600;
color:rgba(123,81,42,1);
line-height:70rpx;
margin-left: calc(50% - 160rpx);
margin-top: 40rpx;
}
.yuding .icon{
background-size: 100% 100%;
width: 30rpx;
height: 30rpx;
background-image: url("http://qn.colorcun.com/activity/images/addr.png");
margin-right: 20rpx;
}
\ No newline at end of file
... ...
... ... @@ -11,10 +11,12 @@
<view class="money-number">{{user.price}}</view>
<view class="money-dw">元</view>
</view>
<view class="yuding flex-cc">
<view class="icon"></view>
去订包间
</view>
<navigator url="/pages/reserve/index" open-type="switchTab" hover-class="other-navigator-hover">
<view class="yuding flex-cc">
<view class="icon"></view>
去订包间
</view>
</navigator>
</view>
</view>
<view class="list-view" wx:if="{{list.length>0}}">
... ...
// pack-activity/pages/money.js
import util from '../../utils/util';
import App from '../../utils/api';
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
App.User.GetBalance().then(res=>{
this.setData({
user:res.data
})
})
App.User.GetConsume().then(res=>{
this.setData({
list:res.data
})
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
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-->
<wxs src="../../utils/util.wxs" module="util" />
<nav hasHome>我的余额</nav>
<view class="pages">
<view class="pages-view">
<view class="money-block">
<view class="money-views-top">
<view class="txt">我的余额</view>
</view>
<view class="money-views flex-bc">
<view class="money-number">{{user.price}}</view>
<view class="money-dw">元</view>
</view>
<navigator url="/pages/reserve/index" open-type="switchTab" hover-class="other-navigator-hover">
<view class="yuding flex-cc">
<view class="icon"></view>
去订包间
</view>
</navigator>
</view>
</view>
<view class="list-view" wx:if="{{list.length>0}}">
<view class="item" wx:for="{{list}}" wx:key="list">
<view class="flex-lr name">
<view>{{item.remark}}</view>
<view>{{item.type==1?'+':'-'}}{{item.consumeprice}}</view>
</view>
<view class="flex-lr date">
<view>{{util.unixtoTime(item.createtime,"MM-DD HH:II")}}</view>
<view>余额 {{item.currprice}}</view>
</view>
</view>
</view>
</view>
... ...
/* pack-activity/pages/money.wxss */
page{
background-color: #F5F5F5;
}
.pages{
/*background-image: url("http://qn.colorcun.com/activity/images/money-header.png");*/
background-image: url("http://qn.colorcun.com/activity/images/bg-black.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:#ffffff;
border-radius:20rpx;
box-sizing: border-box;
padding: 20rpx;
}
.money-block{
height:300rpx;
background:rgba(255,255,255,1);
border-radius:20rpx;
padding-top: 40rpx;
box-sizing: border-box;
}
.money-views-top{
width: 258rpx;
height: 40rpx;
font-size:28rpx;
margin-left: calc(50% - 126rpx);
text-align: center;
font-weight:500;
color:rgba(153,153,153,1);
line-height:40rpx;
position: relative;
}
.money-views-top:before{
position: absolute;
display: block;
content: "";
width: 100%;
height: 2rpx;
left:0;
top:19rpx;
background-color: #E0E0E0;
}
.money-views-top .txt{
width: 138rpx;
background-color: #ffffff;
left:60rpx;
position: absolute;
}
.money-views{
height:100rpx;
font-size:72rpx;
font-weight:600;
color:#353535;
line-height:100rpx;
margin-top: 10rpx;
}
.money-dw{
width:32rpx;
height:44rpx;
font-size:32rpx;
font-weight:600;
color:#353535;
line-height:44rpx;
margin-left: 20rpx;
}
.list-view{
width: calc(100% - 40rpx);
margin-left: 20rpx;
background:rgba(255,255,255,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;
}
.yuding{
width:320rpx;
height:70rpx;
background:linear-gradient(360deg,rgba(192,163,105,1) 0%,rgba(252,210,167,1) 100%);
border-radius:35rpx;
font-size:32rpx;
font-family:PingFangSC-Semibold,PingFang SC;
font-weight:600;
color:rgba(123,81,42,1);
line-height:70rpx;
margin-left: calc(50% - 160rpx);
margin-top: 40rpx;
}
.yuding .icon{
background-size: 100% 100%;
width: 30rpx;
height: 30rpx;
background-image: url("http://qn.colorcun.com/activity/images/addr.png");
margin-right: 20rpx;
}
\ No newline at end of file
... ...
{
"backgroundTextStyle":"light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle":"black",
"usingComponents": {
"nav":"/components/nav/nav"
}
}
\ No newline at end of file
... ...