Commit 37e6a2aa58719cbf521ef768fb1f28344267158f

Authored by vking
1 parent 07f9f5ad

master-activity

... ... @@ -37,8 +37,8 @@ Component({
methods: {
onpos(e){
let location=e.detail
location.latitude=39.6242016100
location.longitude=118.1174469000
//location.latitude=39.6242016100
//location.longitude=118.1174469000
//console.log('hasActivity',location);
if(location.latitude && location.longitude){
TSPOS.latitude.push(location.latitude)
... ...
... ... @@ -14,16 +14,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
App.User.GetBalance().then(res=>{
this.setData({
user:res.data
})
})
App.User.GetConsume().then(res=>{
this.setData({
list:res.data
})
})
},
/**
... ... @@ -67,5 +58,4 @@ Page({
onReachBottom: function () {
},
})
\ No newline at end of file
... ...
<!--pack-activity/pages/money.wxml-->
<wxs src="../../utils/util.wxs" module="util" />
<nav hasHome>我的余额</nav>
<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 class="text">进入客服消息后,点击右下角快捷图片,长 按图片关注【周到安排】</view>
<image src="http://qn.colorcun.com/activity/images/kefux.png" mode="widthFix" style="width: 100%;"></image>
</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 class="bottom">
<view class="bottom-view flex-vc">
<button class="button-love" open-type="contact"
send-message-title="周到安排"
send-message-img="http://qn.colorcun.com/activity/images/kefu.jpg"
show-message-card>去客服页面关注</button>
<view class="tips">关注公众号,及时获取订包间专属优惠信息</view>
</view>
</view>
... ...
/* pack-activity/pages/money.wxss */
page{
background-color: #F5F5F5;
background-color: #ffffff;
}
.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-image: url("http://qn.colorcun.com/activity/images/money-header.png");
background-size: 100% auto;
background-repeat: no-repeat;
min-height: 500rpx;
... ... @@ -17,113 +16,41 @@ page{
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;
padding: 40rpx 20rpx;
}
.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;
.text{
padding: 0 30rpx;
font-size:32rpx;
font-weight:600;
color:#353535;
color:rgba(53,53,53,1);
line-height:44rpx;
margin-left: 20rpx;
margin-bottom: 80rpx;
}
.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;
.bottom{
position: fixed;
bottom: 0;
height: 220rpx;
width: 100%;
}
.item:last-child{
border-bottom-width: 0;
.bottom-view{
width: 100%;
}
.item .name{
height:44rpx;
.button-love{
width:674rpx;
height:80rpx;
background:linear-gradient(360deg,rgba(220,44,75,1) 0%,rgba(244,143,161,1) 100%);
border-radius:40rpx;
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:600;
color:rgba(255,255,255,1);
line-height:80rpx;
letter-spacing:1rpx;
}
.tips{
margin-top: 24rpx;
height:36rpx;
font-size:26rpx;
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;
line-height:36rpx;
}
\ No newline at end of file
... ...
... ... @@ -14,16 +14,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
App.User.GetBalance().then(res=>{
this.setData({
user:res.data
})
})
App.User.GetConsume().then(res=>{
this.setData({
list:res.data
})
})
},
/**
... ... @@ -67,5 +58,4 @@ Page({
onReachBottom: function () {
},
})
\ No newline at end of file
... ...
<!--pack-activity/pages/money.wxml-->
<wxs src="../../utils/util.wxs" module="util" />
<nav hasHome>我的余额</nav>
<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 class="text">【周到安排】已为您分配专属客服,订包间相关的任何问题,都可以撩我</view>
<image src="http://qn.colorcun.com/activity/images/kefux.png" mode="widthFix" style="width: 100%;"></image>
</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 class="bottom">
<view class="bottom-view flex-vc">
<button class="button-love" open-type="contact"
send-message-title="周到安排"
send-message-img="http://qn.colorcun.com/activity/images/kefu.jpg"
show-message-card>去客服页面关注</button>
<view class="tips">添加企业微信,及时获知红包领取详情</view>
</view>
</view>
... ...
/* pack-activity/pages/money.wxss */
page{
background-color: #F5F5F5;
background-color: #ffffff;
}
.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-image: url("http://qn.colorcun.com/activity/images/money-header.png");
background-size: 100% auto;
background-repeat: no-repeat;
min-height: 500rpx;
... ... @@ -17,113 +16,41 @@ page{
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;
padding: 40rpx 20rpx;
}
.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;
.text{
padding: 0 30rpx;
font-size:32rpx;
font-weight:600;
color:#353535;
color:rgba(53,53,53,1);
line-height:44rpx;
margin-left: 20rpx;
margin-bottom: 80rpx;
}
.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;
.bottom{
position: fixed;
bottom: 0;
height: 220rpx;
width: 100%;
}
.item:last-child{
border-bottom-width: 0;
.bottom-view{
width: 100%;
}
.item .name{
height:44rpx;
.button-love{
width:674rpx;
height:80rpx;
background:linear-gradient(360deg,rgba(220,44,75,1) 0%,rgba(244,143,161,1) 100%);
border-radius:40rpx;
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:600;
color:rgba(255,255,255,1);
line-height:80rpx;
letter-spacing:1rpx;
}
.tips{
margin-top: 24rpx;
height:36rpx;
font-size:26rpx;
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;
line-height:36rpx;
}
\ No newline at end of file
... ...
... ... @@ -29,7 +29,9 @@
"projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A",
"isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"simulatorPluginLibVersion": {
"qywx_simulator_plugin": "2.4.0"
},
"condition": {
"search": {
"current": -1,
... ... @@ -616,6 +618,13 @@
"pathName": "pages/customer/detail_owner",
"query": "id=59113",
"scene": null
},
{
"id": -1,
"name": "pack-activity/pages/kefu",
"pathName": "pack-activity/pages/kefu",
"query": "",
"scene": null
}
]
}
... ...