Skip to content

F
FlashMan
Commit 4496d721 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/flashman

parents e3157edb fd021864
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1709 additions and 3 deletions
Common.wxss
View file @ 4496d721
......@@ -35,10 +35,33 @@
.commonF .f40{
font-size:40rpx;
}
.commonF .f46{
font-size:46rpx;
}
.commonF .bold{
font-weight: 600;
}
.commonF .c88{
color:#888888;
}
.commonF .c33{
color:#333333;
}
.commonF .c66{
color:#666666;
}
.commonF .c99{
color:#999999;
}
.commonF .c55{
color:#5597FF;
}
.commonF .p30_2{
padding:0 30rpx;
}
.commonF .p30_4{
padding:30rpx;
}
.commonF .basefix:after {
clear: both;
content: '.';
......@@ -67,6 +90,9 @@
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
.commonF .c11{
color: #111111;
}
.commonF .c33{
color: #333333;
}
......@@ -130,4 +156,9 @@ image{
}
.commonF .inlineBlock>view{
display: inline-block;
}
.commonF .Gray30{
width: 100%;
background: #F4F4F4;
height: 30rpx;
}
\ No newline at end of file
component/amount/amount.js 0 → 100644
View file @ 4496d721
// components/amount/index.js
Component({
/**
* 组件的属性列表
*/
properties: {
count: { // 商品数量
type: Number,
value: 1
}
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
inputChangeHandle: function (event) {
var val = event.detail.value; //通过这个传递数据
var myEventDetail = {
val: val
}
// 数据改变时 向父组件传递新数据
this.triggerEvent('myevent', myEventDetail)
},
subtract: function () {
var count = this.data.count;
count > 0 ? count-- : 0
this.setData({
count: count
})
var myEventDetail = {
val: count
}
this.triggerEvent('myevent', myEventDetail)
this.triggerEvent('subevent')
},
add: function () {
var count = this.data.count;
this.setData({
count: ++count
})
var myEventDetail = {
val: count
}
this.triggerEvent('myevent', myEventDetail)
this.triggerEvent('addevent')
}
}
})
component/amount/amount.json 0 → 100644
View file @ 4496d721
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
component/amount/amount.wxml 0 → 100644
View file @ 4496d721
<view class='num_wrap'>
<button class='btn' catchtap='subtract' disabled='{{count<=0}}'>-</button>
<input type='number' value='{{count}}' bindinput='inputChangeHandle'></input>
<button class='btn' catchtap='add'>+</button>
</view>
component/amount/amount.wxss 0 → 100644
View file @ 4496d721
/* components/amount/index.wxss */
.num_wrap{
/* width: 220rpx; */
vertical-align: middle;
display: flex;
flex-direction: row;
align-items: center;
}
.num_wrap .btn{
width: 40rpx;
height:40rpx;
line-height: 30rpx;
text-align: center;
border-radius: 50%;
padding: 0;
margin:0;
font-size: 36rpx;
border: 1px solid #EE4454;
color: #EE4454;
}
.num_wrap .btn[disabled] {
border: 1px solid #888888;
color: #888888;
}
.btn::after{
border: none;
}
.num_wrap input{
width: 90rpx;
height: 60rpx;
color: #333;
font-size: 24rpx;
text-align: center;
border: none;
margin: 0 2rpx;
}
\ No newline at end of file
component/calendar/calendar.js 0 → 100644
View file @ 4496d721
// component/calendar/calendar.js
var util = require('../../utils/util.js')
Component({
/**
* 组件的属性列表
*/
properties: {
currentDay: {
type: String
},
priceData: {
type: Array
},
},
/**
* 组件的初始数据
*/
data: {
week: ['日', '一', '二', '三', '四', '五', '六'],
DaysInMonth: [],
daysData: [],
},
/**
* 组件的方法列表
*/
methods: {
getYearMonthDay() {
let that = this;
let currentYear = that.data.currentDay.substring(0, 4); //当前年份
let currentMonth = that.data.currentDay.substring(5, 7); //当前月份
let date = new Date();
let strDate = date.getDate();
let strMonth = (date.getMonth() + 1).toString();
// alert(typeof strMonth)
//判断是否是闰年
if (that.isleapYears(currentYear)) {
that.data.DaysInMonth = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
} else {
that.data.DaysInMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
}
let monthDay = that.data.DaysInMonth[Number(currentMonth) - 1]; //当前月的天数
let daysData = [];
//给数据源赋值
for (var i = 0; i < Number(monthDay); i++) {
var priceDict = {
"ymd": `${currentYear}-${currentMonth}-${i+1}`,
'day': String(i + 1),
'price': 0,
'dis': false
};
daysData.push(priceDict);
}
that.setData({
daysData: daysData
})
// that.data.daysData = daysData;
var currentDay = `${currentYear}-${currentMonth}-01`;
var dateObject = new Date(currentDay);
var firstDay = dateObject.getDay(); //得到每个月1号是周几
for (var i in that.data.priceData) {
var price = that.data.priceData[i];
var dayIndex = price.dateStr.substring(price.dateStr.length - 2, price.dateStr.length);
var dayDict = daysData[Number(dayIndex) - 1];
// dayDict.price = that.isLogin !== 1 ? price.price : price.b2BPrice;
if (dayIndex < strDate && strMonth == currentMonth) {
dayDict.price = '';
}
}
if (firstDay > 0) {
var firstDayData = [];
for (var i = 0; i < firstDay; i++) {
var dict = {
"ymd": `${currentYear}-${currentMonth}-${i + 1}`,
'day': ' ',
price: '',
'dis': true
};
firstDayData.push(dict);
}
// that.data.daysData = firstDayData.concat(daysData);
let newData = firstDayData.concat(daysData);
that.setData({
daysData: newData
})
} else {
// that.data.daysData = daysData;
that.setData({
daysData: daysData
})
}
let Arr = that.data.daysData;
let today = new Date().toLocaleDateString().split('/').join('-');
Arr.forEach(item=>{
item.color =false;
if (!util.CompareDate(today, item.ymd)){
item.color=true;
}
})
that.setData({
daysData: Arr
})
// console.log("that.daysData", that.data.daysData)
},
isleapYears(year) {
if (((year % 4) == 0) && ((year % 100) != 0) || ((year % 400) == 0)) {
return true;
} else {
return false;
}
},
}
})
\ No newline at end of file
component/calendar/calendar.json 0 → 100644
View file @ 4496d721
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
component/calendar/calendar.wxml 0 → 100644
View file @ 4496d721
<view>
<view class="Head">
<text wx:for="{{week}}" wx:key="index">{{item}}</text>
</view>
<view class="dayView">
<view class="{{item.color?'black':'grey'}}" wx:for="{{daysData}}" wx:key="index">
<view>{{item.day}}</view>
<view hidden="!{{item.price!=''||item.price!=0}}" class="price">￥{{item.price}}</view>
</view>
</view>
</view>
\ No newline at end of file
component/calendar/calendar.wxss 0 → 100644
View file @ 4496d721
.Head text{
width: 107rpx;
height: 80rpx;
display: inline-block;
line-height: 80rpx;
text-align: center;
font-size: 30rpx;
}
.dayView>view{
width: 107rpx;
height: 80rpx;
display: inline-flex;
flex-direction: column;
align-items: center;
font-size: 30rpx;
}
.dayView .black{
color:#333333;
}
.dayView .grey{
color:#CCCCCC;
}
.dayView .price{
font-size: 20rpx;
}
\ No newline at end of file
pages/GroupTour/ChDateNum/ChDateNum.js 0 → 100644
View file @ 4496d721
// pages/GroupTour/ChDateNum/ChDateNum.js
Page({
/**
* 页面的初始数据
*/
data: {
currentDay:"2019-06-27",
priceData:[],
numer:1,
GoodsView:false,
},
StartYd() {
wx.navigateTo({
url: '/pages/GroupTour/FillOrder/FillOrder',
})
},
CloseGoodsView(e) {
if (e.target.dataset.target == "self") {
this.setData({
GoodsView: false,
})
}
},
OpenGoodsView(){
this.setData({
GoodsView: true,
})
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
this.CreatCalendar();
},
CreatCalendar(){
this.calendar = this.selectComponent('#calendar');
this.calendar.getYearMonthDay();
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/GroupTour/ChDateNum/ChDateNum.json 0 → 100644
View file @ 4496d721
{
"navigationBarTitleText": "选择日期和人数",
"usingComponents": {
"calendar": "/component/calendar/calendar",
"amount": "/component/amount/amount"
}
}
\ No newline at end of file
pages/GroupTour/ChDateNum/ChDateNum.wxml 0 → 100644
View file @ 4496d721
<view class="DateNum commonF">
<view style="margin:15rpx;">
<text class="f30 bold">选择出行时间</text>
</view>
<scroll-view scroll-x class="scroll-header">
<view class="ScrollActive scroll-view-item">
<view>6月</view>
<view>￥488起</view>
</view>
<view class="scroll-view-item">
<view>6月</view>
<view>￥488起</view>
</view>
<view class="scroll-view-item">
<view>6月</view>
<view>￥488起</view>
</view>
<view class="scroll-view-item">
<view>6月</view>
<view>￥488起</view>
</view>
<view class="scroll-view-item">
<view>6月</view>
<view>￥488起</view>
</view>
<view class="scroll-view-item">
<view>6月</view>
<view>￥488起</view>
</view>
<view class="scroll-view-item">
<view>6月</view>
<view>￥488起</view>
</view>
</scroll-view>
<!-- 日历 -->
<view>
<calendar currentDay="{{currentDay}}" :priceData="{{priceData}}" id="calendar"></calendar>
</view>
<view class="Gray30"></view>
<view>
<view class="personItem f30">出行人数</view>
<view class="personItem">
<view>成人</view>
<view>
<amount count='{{numer}}' data-index='{{index}}' bind:myevent="onGetCount" bind:subevent='subCount' bind:addevent='addCount'></amount>
</view>
</view>
<view class="personItem">
<view>儿童占床
<text class='c88'>2-12周岁（不含）</text>
</view>
<view>
<amount count='{{numer}}' data-index='{{index}}' bind:myevent="onGetCount" bind:subevent='subCount' bind:addevent='addCount'></amount>
</view>
</view>
<view class="personItem">
<view>儿童不占床
<text class='c88'>2-12周岁（不含）</text>
</view>
<view>
<amount count='{{numer}}' data-index='{{index}}' bind:myevent="onGetCount" bind:subevent='subCount' bind:addevent='addCount'></amount>
</view>
</view>
<view class="personItem">
<view>婴儿
<text class='c88'>0-2周岁（不含）</text>
</view>
<view>
<amount count='{{numer}}' data-index='{{index}}' bind:myevent="onGetCount" bind:subevent='subCount' bind:addevent='addCount'></amount>
</view>
</view>
</view>
<view class="Gray30"></view>
<view>
<view class="personItem f30">
<view>航班信息</view>
<view class="f24 c88">退改签及购票说明
<image style="width:12rpx;height:24rpx" src="/images/group/chakn.png"></image>
</view>
</view>
</view>
<view class="Gray30"></view>
<view class="p30_4">
<view class="HbanItem">
<view class="HbanItemDes">
<text>成都</text>
<image src="/images/group/hangban.png"></image>
<text>香港（中转）</text>
<image src="/images/group/hangban.png"></image>
<text>香港</text>
</view>
<view style="padding:10rpx 0" class="f22 c88">06:-26 07:30 至 06-26 20:05</view>
<view class="f22 c88">香港航空HX453</view>
</view>
</view>
<view class="{{GoodsView?'payFixed PayView':'PayView'}}">
<view style="width:310rpx;">
<text class="f20">总价:￥</text>
<text class="f46 cee">999</text>
<text class="f20 c88">/人起</text>
<text bindtap='OpenGoodsView' style="padding-left:10rpx" class="f22 c55">明细</text>
<image bindtap='OpenGoodsView' style="width:18rpx;height:8rpx" src="/images/group/mx1.png"></image>
</view>
<view style="width:100rpx;border-left:1px solid #E9E9E9;">
<image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
</view>
<view bindtap='StartYd' class="startPay">开始预定</view>
</view>
<!-- 商品详情 -->
<view hidden="{{!GoodsView}}" bindtap='CloseGoodsView' data-target="self" class='GoodsView'>
<view class="GoodsDes">
<view class="f30 bold" style="padding-top:15rpx">费用明细
<image bindtap='CloseGoodsView' data-target="self" style="width:30rpx;height:30rpx;float:right;margin:15rpx 15rpx 0 0" src="/images/group/close.png"></image>
</view>
<view class="flexbe f26 c11">
<view>基本团费</view>
<view>￥1990</view>
</view>
<view class="flexbe f26 c33">
<view>成人</view>
<view>￥1990</view>
</view>
<view class="flexbe f26 c33">
<view>儿童</view>
<view>￥1990</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
pages/GroupTour/ChDateNum/ChDateNum.wxss 0 → 100644
View file @ 4496d721
.DateNum .scroll-header {
display: flex;
white-space: nowrap;
background: #e5efff;
}
.DateNum .scroll-header .scroll-view-item {
display: inline-flex;
font-size: 24rpx;
color: #111;
width: 166rpx;
height: 90rpx;
align-items: center;
flex-direction: column;
}
.DateNum .scroll-header .ScrollActive {
color: #5597ff;
border-bottom: 1rpx solid #5597ff;
}
.personItem {
width: 100%;
height: 90rpx;
border-top: 1px solid #f4f4f4;
display: flex;
justify-content: space-between;
padding:0 30rpx;
align-items: center;
position: relative;
}
.personItem>view {
display: inline-block;
font-size: 24rpx;
}
.personItem>view text{
position: absolute;
left: 200rpx;
top: 25rpx;
}
.HbanView .HbanItem{
border-bottom:1rpx solid #E9E9E9;
padding-bottom:15rpx;
}
.HbanItemDes{
display: flex;
align-items: center;
}
.HbanItemDes image{
width: 42rpx;
height: 8rpx;
margin: 0 15rpx;
}
.HbanItem text{
font-size: 28rpx;
}
.PayView{
width:100%;
height:100rpx;
line-height:100rpx;
border-top:1px solid #E9E9E9;
display: flex;
align-items: center;
background: #fff;
z-index: 100;
}
.PayView>view{
display: inline-flex;
justify-content: center;
height: 100%;
align-items: center;
}
.startPay{
width:341rpx;
background:rgba(238,68,84,1);
color: #fff;
font-size: 30rpx;
}
.GoodsView{
position: fixed;
top: 0;
left: 0;
width: 100%;
height: calc(100% - 100rpx);
background:rgba(0,0,0,0.5);
z-index: 100;
text-align: center;
}
.GoodsView .GoodsDes{
background: #fff;
border-radius:12rpx 12rpx 0px 0px;
position: absolute;
bottom: 0;
width: 100%;
}
.GoodsView .flexbe{
padding:15rpx 30rpx;
display: flex;
justify-content: space-between;
}
.payFixed{
position: fixed;
bottom: 0;
/* width:100%; */
}
\ No newline at end of file
pages/GroupTour/FillOrder/FillOrder.js 0 → 100644
View file @ 4496d721
// pages/GroupTour/FillOrder/FillOrder.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
StartYd() {
wx.navigateTo({
url: '/pages/GroupTour/Pay/Pay',
})
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/GroupTour/FillOrder/FillOrder.json 0 → 100644
View file @ 4496d721
{}
\ No newline at end of file
pages/GroupTour/FillOrder/FillOrder.wxml 0 → 100644
View file @ 4496d721
<view class="FillOrder commonF">
<view class="OrderDes">
<view class="title f36">
希尔顿假期系列6日5晚跟团游
</view>
<view class="body">
<view class="c66 f26">成都出发 2019-06-05出发2019-06-25返程</view>
<view class="c66 f26">
<text>2成人 , </text>
<text>1儿童</text>
<text> | 1房间</text>
</view>
</view>
</view>
<view class="Gray30"></view>
<view class="Form">
<view class="FormMsg f30" style="padding-left: 30rpx;">联系人信息</view>
<view class="FormMsg">
<view>联系人</view>
<view><input placeholder='请输入联系人名称'></input></view>
</view>
<view class="FormMsg">
<view>手机号码</view>
<view><input placeholder='请输入手机号码'></input></view>
</view>
<view class="FormMsg">
<view>电子邮件</view>
<view><input placeholder='用于接收确认单，非必填'></input></view>
</view>
</view>
<view class="PayView">
<view style="width:310rpx;">
<text class="f20">总价:￥</text>
<text class="f46 cee">999</text>
<text class="f20 c88">/人起</text>
<text bindtap='OpenGoodsView' style="padding-left:10rpx" class="f22 c55">明细</text>
<image bindtap='OpenGoodsView' style="width:18rpx;height:8rpx" src="/images/group/mx1.png"></image>
</view>
<view style="width:100rpx;border-left:1px solid #E9E9E9;">
<image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
</view>
<view bindtap='StartYd' class="startPay">去付款</view>
</view>
</view>
\ No newline at end of file
pages/GroupTour/FillOrder/FillOrder.wxss 0 → 100644
View file @ 4496d721
.FillOrder {
padding: 30rpx 0 0 0;
}
.FillOrder .OrderDes {
margin: 30rpx;
width: calc(100% - 60rpx);
height: 230rpx;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 6rpx 10rpx 0px rgba(76, 76, 76, 0.15);
border-radius: 12rpx;
}
.FillOrder .OrderDes .title {
width: 100%;
height: 90rpx;
line-height: 90rpx;
background: rgba(244, 244, 244, 1);
padding: 0 30rpx;
border-radius: 12rpx 12rpx 0px 0px;
}
.FillOrder .OrderDes .body>view {
padding: 15rpx 0 10rpx 30rpx;
}
.Form .FormMsg {
border-bottom: 1px solid #e9e9e9;
height: 90rpx;
line-height: 90rpx;
display: flex;
align-items: center;
}
.Form .FormMsg:last-child {
border-bottom: none;
}
.Form .FormMsg>view {
display: inline-block;
color: #111;
}
.Form .FormMsg>view:nth-child(1) {
font-size: 28rpx;
width: 200rpx;
padding-left: 30rpx;
}
.Form .FormMsg>view:nth-child(2) {
font-size: 24rpx;
}
.PayView{
width:100%;
height:100rpx;
line-height:100rpx;
border-top:1px solid #E9E9E9;
display: flex;
align-items: center;
background: #fff;
z-index: 100;
position: fixed;
bottom: 0;
}
.PayView>view{
display: inline-flex;
justify-content: center;
height: 100%;
align-items: center;
}
.startPay{
width:341rpx;
background:rgba(238,68,84,1);
color: #fff;
font-size: 30rpx;
}
\ No newline at end of file
pages/GroupTour/GroupDetails/GroupDetails.js 0 → 100644
View file @ 4496d721
// pages/GroupTour/GroupDetails/GroupDetails.js
Page({
/**
* 页面的初始数据
*/
data: {
background: ["http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png", "http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190627100255196.jpg", "http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png", "http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png","http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"]
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
StartYd(){
wx.navigateTo({
url: '/pages/GroupTour/ChDateNum/ChDateNum',
})
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/GroupTour/GroupDetails/GroupDetails.wxml 0 → 100644
View file @ 4496d721
This diff is collapsed.
pages/GroupTour/GroupDetails/GroupDetails.wxss 0 → 100644
View file @ 4496d721
.Details .BigImg {
width: 100%;
height: 500rpx;
position: relative;
}
.Details .BigImg swiper {
width: 100%;
height: 100%;
}
.Details .BigImg .Text {
position: absolute;
bottom: 0;
width: 100%;
height: 70rpx;
background: rgba(17, 17, 17, 0.4);
color: #fff;
font-size: 22rpx;
display: flex;
padding: 0 30rpx;
justify-content: space-between;
align-items: center;
}
.Gray30 {
height: 30rpx;
background: #f4f4f4;
}
.jf .bg {
width: 116rpx;
height: 30rpx;
background: rgba(255, 169, 6, 1);
border-radius: 15rpx;
font-size: 20rpx;
color:#fff;
display: inline-flex;
margin-left:30rpx;
}
.jfItem{
display: flex;
align-items: center;
height: 80rpx;
position: relative;
}
.jfItem .chakan{
width:14rpx;height:26rpx;position:absolute;right:0;
}
.anpai>view{
display: inline-block;
font-size: 22rpx;
width: 48%;
}
.anpai>view text:nth-child(1){
color:#666666;
margin-right: 10rpx;
}
.scroll-header {
display: flex;
white-space: nowrap;
width: 580rpx;
}
.scroll-header .scroll-view-item {
width:118rpx;
height:80rpx;
background:rgba(255,255,255,1);
border:1px solid rgba(204, 204, 204, 1);
border-radius:4rpx;
margin-right: 10rpx;
display: inline-block;
font-size: 22rpx;
text-align: center;
}
.scroll-header .scroll-view-item>view:nth-child(2){
color:#EE4454;
}
.MorebDate{
position: absolute;
right: 0;
top: 0;
width:118rpx;
height:80rpx;
background:rgba(255,255,255,1);
border:1px solid rgba(204, 204, 204, 1);
border-radius:4rpx;
color:#5597FF;
font-size: 22rpx;
text-align: center;
}
.DesTitle{
text-align: center;
margin:20rpx 0;
}
.DesTitle .color{
display: inline-flex;
width:36rpx;
height:2rpx;
background:rgba(238,68,84,1);
}
.DesTitle .sm{
color:#CCCCCC;
font-size:18rpx;
}
.ColorView{
display: flex;
align-items: center;
justify-content: center;
}
.HbanView{
margin-top:30rpx;
}
.HbanView .HbanItem{
border-bottom:1rpx solid #E9E9E9;
padding-bottom:15rpx;
}
.HbanItemDes{
display: flex;
align-items: center;
}
.HbanItemDes image{
width: 42rpx;
height: 8rpx;
margin: 0 15rpx;
}
.HbanItem text{
font-size: 28rpx;
}
.hotelView .imgText{
position: absolute;
text-align: center;
top: 90rpx;
width: 100%;
}
.hotelView .smallImg{
width: 120rpx;
height: 120rpx;
border-radius: 50%;
background: #fff;
padding:3rpx;
position: absolute;
bottom:-60rpx;
right: 50rpx;
box-shadow: 0px 0px 10px 5px #EAEAEA;
}
.hotelView .smallImg image{
border-radius: 50%;
}
.hotelItem .hotelLeft{
position: relative;
width: 204rpx;
display: inline-block;
text-align: center;
}
.hotelItem .hotelLeft .fgView{
position: absolute;
right: 0;
top: 0;
display: flex;
flex-direction: column;
align-items: center;
}
.hotelItem .hotelins{
display: flex;
justify-content: flex-start;
}
.hotelItem .hotelLeft .fgView .fg{
width: 4rpx;
height: 50rpx;
background: #95D7FF;
margin-top:10rpx;
}
.hotelItem .hotelRight{
width: 400rpx;
display: inline-block;
margin-left:30rpx;
}
.hotelItem .hotelRight .title{
margin:15rpx 0 30rpx 0;
}
.hotelItem .hotelRight .title text{
background: #9CDAFF;
padding:6rpx 10rpx;
}
.hotelItem .ImgList{
text-align: center;
}
.hotelItem .ImgList>view{
width: 219rpx;
height: 120rpx;
display: inline-block;
margin:15rpx 8rpx;
}
.DinView{
margin-left:-34rpx;
margin-top:15rpx;
}
.DinView>view{
display: inline-block;
width: 149rpx;
height: 147rpx;
margin-left:34rpx;
}
.TypeItem .icon{
position:absolute;
left:-14rpx;
padding:0 0 10rpx 0;
background: #fff;
}
.TypeItem .icon image{
width: 28rpx;
height: 28rpx;
}
.TypeItem{
position:relative;
border-left: 1px dashed #EE4454;
margin-left:15rpx;
padding-left:40rpx;
margin-top:6rpx;
}
.dayList{
padding-bottom:30rpx;
}
.dayList .TypeItem:last-child{
border:none;
}
.Explain{
padding:15rpx 30rpx;
}
.Explain .Color{
width:4rpx;
height:19rpx;
background:rgba(238,68,84,1);
display: inline-block;
}
.PayView{
width:100%;
height:100rpx;
line-height:100rpx;
border-top:1px solid #E9E9E9;
display: flex;
align-items: center;
}
.PayView>view{
display: inline-flex;
justify-content: center;
height: 100%;
}
.startPay{
width:341rpx;
background:rgba(238,68,84,1);
color: #fff;
font-size: 30rpx;
}
\ No newline at end of file
pages/GroupTour/Pay/Pay.js 0 → 100644
View file @ 4496d721
// pages/GroupTour/FillOrder/FillOrder.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/GroupTour/Pay/Pay.json 0 → 100644
View file @ 4496d721
{}
\ No newline at end of file
pages/GroupTour/Pay/Pay.wxml 0 → 100644
View file @ 4496d721
<view class="FillOrder commonF">
<view class="OrderDes">
<view class="title f36">
希尔顿假期系列6日5晚跟团游
</view>
<view class="body">
<view class="c66 f26">成都出发 2019-06-05出发2019-06-25返程</view>
<view class="c66 f26">
<text>2成人 , </text>
<text>1儿童</text>
<text> | 1房间</text>
</view>
</view>
<view class="money">
<text class="f20 c99">应付总额：</text>
<text class="cee">￥</text>
<text class="f46 cee">9980</text>
</view>
</view>
<view class="Gray30"></view>
<view class='payType'>
<view>
<image style="width:30rpx;height:30rpx" src="/images/group/wx.png"></image>
微信支付
</view>
<view>
<image style="width:30rpx;height:30rpx" src="/images/group/zfb.png"></image>
支付宝支付
</view>
</view>
<!-- <view class="PayView">
<view style="width:310rpx;">
<text class="f20">总价:￥</text>
<text class="f46 cee">999</text>
<text class="f20 c88">/人起</text>
<text bindtap='OpenGoodsView' style="padding-left:10rpx" class="f22 c55">明细</text>
<image bindtap='OpenGoodsView' style="width:18rpx;height:8rpx" src="/images/group/mx1.png"></image>
</view>
<view style="width:100rpx;border-left:1px solid #E9E9E9;">
<image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
</view>
<view bindtap='StartYd' class="startPay">去付款</view>
</view> -->
</view>
\ No newline at end of file
pages/GroupTour/Pay/Pay.wxss 0 → 100644
View file @ 4496d721
.FillOrder {
padding: 30rpx 0 0 0;
}
.FillOrder .OrderDes {
margin: 30rpx;
width: calc(100% - 60rpx);
/* height: 230rpx; */
background: rgba(255, 255, 255, 1);
box-shadow: 0px 6rpx 10rpx 0px rgba(76, 76, 76, 0.15);
border-radius: 12rpx;
}
.FillOrder .OrderDes .title {
width: 100%;
height: 90rpx;
line-height: 90rpx;
background: rgba(244, 244, 244, 1);
padding: 0 30rpx;
border-radius: 12rpx 12rpx 0px 0px;
}
.FillOrder .OrderDes .body{
border-bottom:1px solid #E9E9E9;
}
.FillOrder .OrderDes .body>view {
padding: 15rpx 0 10rpx 30rpx;
}
.FillOrder .OrderDes .money{
height: 90rpx;
line-height: 90rpx;
padding-left: 30rpx;
}
.Form .FormMsg {
border-bottom: 1px solid #e9e9e9;
height: 90rpx;
line-height: 90rpx;
display: flex;
align-items: center;
}
.Form .FormMsg:last-child {
border-bottom: none;
}
.Form .FormMsg>view {
display: inline-block;
color: #111;
}
.Form .FormMsg>view:nth-child(1) {
font-size: 28rpx;
width: 200rpx;
padding-left: 30rpx;
}
.Form .FormMsg>view:nth-child(2) {
font-size: 24rpx;
}
.PayView{
width:100%;
height:100rpx;
line-height:100rpx;
border-top:1px solid #E9E9E9;
display: flex;
align-items: center;
background: #fff;
z-index: 100;
position: fixed;
bottom: 0;
}
.PayView>view{
display: inline-flex;
justify-content: center;
height: 100%;
align-items: center;
}
.startPay{
width:341rpx;
background:rgba(238,68,84,1);
color: #fff;
font-size: 30rpx;
}
.payType>view{
padding-left: 30rpx;
font-size: 30rpx;
display: flex;
align-items: center;
height: 90rpx;
}
.payType>view image{
margin-right: 15rpx;
}
\ No newline at end of file
utils/util.js
View file @ 4496d721
......@@ -8,12 +8,21 @@ const formatTime = date => {
return [year, month, day].map(formatNumber).join('/') + ' ' + [hour, minute, second].map(formatNumber).join(':')
}
const CompareDate=(date1, date2)=> {
var oDate1 = new Date(date1);
var oDate2 = new Date(date2);
if (oDate1.getTime() > oDate2.getTime()) {
return true;
} else {
return false;
}
}
const formatNumber = n => {
n = n.toString()
return n[1] ? n : '0' + n
}
module.exports = {
formatTime: formatTime
formatTime: formatTime,
CompareDate: CompareDate,
}
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