diff --git a/pages.json b/pages.json
index b844bcf..0950aba 100644
--- a/pages.json
+++ b/pages.json
@@ -89,14 +89,26 @@
{
"path": "line/lineList",
"style": {
- "navigationBarTitleText": "",
+ "navigationBarTitleText": "特色体验",
"navigationStyle": "custom"
}
},
{
"path": "line/detail",
"style": {
- "navigationBarTitleText": "线路详情"
+ "navigationBarTitleText": "特色体验"
+ }
+ },
+ {
+ "path": "line/order",
+ "style": {
+ "navigationBarTitleText": "特色体验"
+ }
+ },
+ {
+ "path": "line/orders",
+ "style": {
+ "navigationBarTitleText": "特色体验"
}
},
{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d29016a..7190c42 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -140,7 +140,7 @@
{
img: 'https://static.ticket.sz-trip.com/tongli/images/index/tsty.png',
text: '特色体验',
- path: '/subPackages/food/foodList'
+ path: '/subPackages/line/lineList'
},
{
img: 'https://static.ticket.sz-trip.com/tongli/images/index/jdms.png',
diff --git a/static/css/base.css b/static/css/base.css
index b79de15..b494b6e 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -142,4 +142,19 @@ view {
}
.font-bold{
font-weight: bold;
+}
+
+.topLeft {
+ width: 60rpx;
+ height: 60rpx;
+ background: rgba(0, 0, 0, .4);
+ border-radius: 50%;
+ position: absolute;
+ left: 26rpx;
+ top: 98rpx;
+ z-index: 2;
+}
+.topLeft .iconfont {
+ font-size: 40rpx;
+ color: #fff;
}
\ No newline at end of file
diff --git a/store/modules/user.js b/store/modules/user.js
index e832da7..5515dcd 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -4,6 +4,7 @@ export default {
userInfo: {}, //保存用户登录信息,
toPath: "", //要跳转过去的页面,
foodInfo:"", //美食套餐信息
+ lineInfo: "", // 线路
},
coupon: "",//下单选择优惠券
// 类似 vue 里的 mothods(同步方法)
@@ -31,5 +32,9 @@ export default {
choseCoupon(state, data) {
state.coupon = data
},
+ // 线路下单
+ changeLineInfo(state, data){
+ state.lineInfo = data
+ }
}
}
diff --git a/subPackages/eventCalendar/detail.vue b/subPackages/eventCalendar/detail.vue
index 42efabd..18f006a 100644
--- a/subPackages/eventCalendar/detail.vue
+++ b/subPackages/eventCalendar/detail.vue
@@ -1,42 +1,55 @@
-
-
+
-
+
-
+
+
+
+
+
+
+
+ {{info.title}}
+
+
+ 地址：{{info.address}}
+ 时间：{{info.start_time}} - {{info.end_time}}
+
+
+
+
-
-
- {{info.title}}
- 地址：{{info.address}}
- 时间：{{info.start_time}} - {{info.end_time}}
-
-
-
-
-
-
-
+
+
+ 详情
+
+
@@ -112,8 +125,45 @@
}
.swipe-box {
- height: 867rpx;
+ height: 309rpx;
position: relative;
+ padding: 38rpx 0 0 26rpx;
+
+ .swipe-headImg {
+ width: 138rpx;
+ height: 212rpx;
+ border-radius: 7rpx;
+ }
+
+ .swipe-content {
+ width: 445rpx;
+ height: 212rpx;
+ margin-left: 25rpx;
+ padding: 8rpx 0;
+ flex-direction: column;
+ align-items: start;
+
+ .swipe-title {
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #FFFFFF;
+ }
+
+ .swipe-subtitle {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #FFFFFF;
+ }
+ }
+
+ .swipe-img {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ filter: blur(3px);
+ }
.swiper-item-num {
width: 90rpx;
@@ -214,11 +264,21 @@
}
.detail-container{
+ .detail-title{
+ font-weight: bold;
+ font-size: 33rpx;
+ color: #000000;
+ margin-bottom: 25rpx;
+ }
+
width: 100%;
- padding: 28rpx;
+ padding: 35rpx 26rpx;
+ border-radius: 20rpx;
+ position: relative;
+ margin-top: -30rpx;
font-family: PingFang SC;
font-weight: 500;
font-size: 28rpx;
- color: #333333;
+ color: #000;
}
diff --git a/subPackages/line/detail.vue b/subPackages/line/detail.vue
index 56b9867..5379cd7 100644
--- a/subPackages/line/detail.vue
+++ b/subPackages/line/detail.vue
@@ -1,7 +1,7 @@
-
@@ -10,43 +10,98 @@
-
- {{swiperCurrent}}/{{info.list_images.split(',').length}}
-
-
-
+
-
-
- {{info.title}}
+
+ {{info.low_money / 100}}
+ {{info.title}}
+
+
+
@@ -83,28 +162,13 @@
}
.bg{
min-height: 100vh;
- background: #F8F8F8;
+ background: #F7F7F7;
+ padding-bottom: 200rpx;
}
.swipe-box {
- height: 867rpx;
+ height: 413rpx;
position: relative;
-
- .swiper-item-num {
- width: 90rpx;
- height: 40rpx;
- background: rgba(0, 0, 0, 0.5);
- border-radius: 20rpx;
- font-size: 24rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #ffffff;
- text-align: center;
- line-height: 40rpx;
- position: absolute;
- right: 30rpx;
- bottom: 50rpx;
- }
.collect{
position: absolute;
@@ -123,62 +187,180 @@
height: 36rpx;
}
}
- .swiper-pointer{
- position: absolute;
- right: 36rpx;
- bottom: 80rpx;
- background: rgba(22,22,22,0.5);
- border-radius: 23rpx;
- font-family: PingFang SC;
- font-weight: 500;
- font-size: 24rpx;
- color: #FFFFFF;
- padding: 6rpx 14rpx;
-
- }
}
.swiper {
- height: 867rpx;
+ height: 413rpx;
position: relative;
.swiper-item {
width: 100%;
- height: 867rpx;
+ height: 413rpx;
.item-img {
width: 750rpx;
- height: 867rpx;
- }
- .item-img.pop-swiper-image{
- height: 347rpx;
- border-radius: 13rpx;
+ height: 413rpx;
}
}
}
- .common-container{
- background: white;
- width: 100%;
+ .top-box {
+ width: 697rpx;
+ background: #FFFFFF;
+ border-radius: 20rpx;
+ position: relative;
+ margin: -30rpx auto 0;
+ padding: 27rpx 42rpx 37rpx;
+
+ .top-price {
+ font-weight: bold;
+ font-size: 40rpx;
+ color: #F02A2A;
+ }
+ .top-price::before {
+ font-size: 32rpx;
+ content: '￥';
+ }
+ .top-price::after {
+ font-size: 24rpx;
+ color: rgba(102, 102, 102, 1);
+ content: '起';
+ }
+
+ .top-title {
+ font-weight: bold;
+ font-size: 31rpx;
+ color: #000000;
+ margin-top: 15rpx;
+ }
+ }
+
+ .scroll-all-box {
+ margin: 24rpx 0;
+
+ .scroll-menus {
+ padding: 0 40rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 29rpx;
+ color: #333;
+ height: 84rpx;
+ border-bottom: 1rpx solid #d9d9d9;
+
+ .scroll-menu-item {
+ position: relative;
+ line-height: 84rpx;
+ }
+
+ .scroll-menu-item.active::after {
+ content: '1';
+ font-size: 0;
+ display: block;
+ position: absolute;
+ width: 46rpx;
+ height: 6rpx;
+ border-radius: 3rpx;
+ background: #248BAA;
+ left: 50%;
+ margin-left: -23rpx;
+ bottom: 0rpx;
+ }
+ }
+
+ .fixed-menus {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ background: white;
+ z-index: 1;
+ }
+
+ .info-box {
+ padding: 20rpx 40rpx;
+
+ .info-title {
+ font-size: 35rpx;
+ font-weight: bold;
+ color: #000;
+ }
+
+ .info-content {
+ width: 697rpx;
+ background: #FFFFFF;
+ border-radius: 20rpx;
+ padding: 22rpx 14rpx;
+ margin-top: 20rpx;
+ }
+ }
}
+ .fixed-bottom {
+ width: 750rpx;
+ height: 152rpx;
+ background: #FFFFFF;
+ box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(6,0,1,0.1);
+ position: fixed;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 0 26rpx 0 48rpx;
+ box-sizing: border-box;
+ font-size: 23rpx;
+ font-family: PingFangSC;
+ font-weight: 400;
+ color: #666666;
+
+ img {
+ width: 48rpx;
+ height: 48rpx;
+ }
+
+ .btn {
+ width: 254rpx;
+ height: 77rpx;
+ background: linear-gradient(270deg, #FC5109, #FC930A);
+ border-radius: 39rpx;
+ text-align: center;
+ line-height: 77rpx;
+ font-size: 32rpx;
+ font-family: PingFangSC;
+ font-weight: 500;
+ color: #FFFFFF;
+ }
+ }
- .info-container{
- padding: 34rpx 25rpx;
- width: 100%;
- font-family: PingFang SC;
- font-weight: bold;
- font-size: 35rpx;
- color: #000000;
- margin-bottom: 21rpx;
+ #contact {
+ -webkit-tap-highlight-color: transparent;
+ background-color: rgba(0, 0, 0, 0);
+ border-radius: 0;
+ box-sizing: border-box;
+ color: transparent;
+ cursor: pointer;
+ display: inline-block;
+ font-size: 0;
+ line-height: 35rpx;
+ margin-left: 0;
+ margin-right: 0;
+ overflow: hidden;
+ padding-left: 0;
+ padding-right: 0;
+ position: relative;
+ text-align: center;
+ text-decoration: none;
+ border: transparent 0px solid;
+ font-size: 23rpx;
+ font-family: PingFangSC;
+ font-weight: 400;
+ color: #666666;
}
- .detail-container{
- width: 100%;
- padding: 28rpx;
- font-family: PingFang SC;
- font-weight: 500;
- font-size: 28rpx;
- color: #333333;
+ button::after {
+ border: none;
+ background-color: rgba(0, 0, 0, 0);
}
diff --git a/subPackages/line/lineList.vue b/subPackages/line/lineList.vue
index eb54a3c..66b92c3 100644
--- a/subPackages/line/lineList.vue
+++ b/subPackages/line/lineList.vue
@@ -1,7 +1,9 @@
-
- ![]()
+
+
+
+ ![]()
@@ -24,9 +26,11 @@
return {
list:[], //列表
finished: false,
+ headImg: ''
}
},
onReady() {
+ this.getHeadImg('line').then(res => {this.headImg = res})
this.getList()
},
methods: {
@@ -70,14 +74,6 @@
padding-bottom: 26rpx;
}
- .topLeft {
- position: absolute;
- left: 26rpx;
- top: 101rpx;
- font-size: 40rpx;
- z-index: 2;
- }
-
.topImg {
width: 750rpx;
height: 440rpx;
diff --git a/subPackages/line/order.vue b/subPackages/line/order.vue
new file mode 100644
index 0000000..69ba045
--- /dev/null
+++ b/subPackages/line/order.vue
@@ -0,0 +1,575 @@
+
+
+
+
+
+ {{ item }}月
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ index + 1 >= 10 ? index + 1 : '0' + (index + 1) }}
+
+
+ ￥{{ prices[months[monthIndex] + '-' + (index + 1)].m_price / 100 }}
+
+
+ 售罄
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+ {{ item.sku_type_info }}
+ -
+ {{ nums[index] }}
+ +
+
+
+ {{ selectDate['info'][index].money / 100 }}
+
+
+
+ 合计：
+ ¥{{ totalPrice() / 100 }}
+ 下一步
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue
new file mode 100644
index 0000000..b2f3b2c
--- /dev/null
+++ b/subPackages/line/orders.vue
@@ -0,0 +1,777 @@
+
+
+
+ {{ product.title }}
+ {{ selectDate.date }}
+
+ {{ item.title }}x{{ item.num }}
+
+
+
+
+ 出行人信息
+
+
+
+ 姓名
+
+
+
+ 手机号
+
+
+
+
+
+
+
+ 优惠券
+
+ 请选择
+
+ -￥{{coupon.CouponActivity.discounts/100}}
+
+ 
+
+
+
+
+
+
+
+ 合计：
+
+ ¥{{ priceTotal() / 100 }}
+
+
+ 去支付
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subPackages/notice/noticeDetail.vue b/subPackages/notice/noticeDetail.vue
index 4a7b98e..b7919df 100644
--- a/subPackages/notice/noticeDetail.vue
+++ b/subPackages/notice/noticeDetail.vue
@@ -1,8 +1,10 @@
-
+
+
+
-
+
{{detail.title}}
{{detail.create_time.slice(0,10)}}
@@ -32,19 +34,11 @@
.bg {
width: 750rpx;
min-height: 100vh;
- background: url('https://static.ticket.sz-trip.com/yandu/images/notice/noticeBg.png') no-repeat bottom;
+ background: url('https://static.ticket.sz-trip.com/tongli/images/notice/noticeBg.png') no-repeat bottom;
background-size: 100% auto;
background-color: #F7F7F7;
}
- .topLeft {
- position: absolute;
- left: 26rpx;
- top: 101rpx;
- font-size: 40rpx;
- z-index: 2;
- }
-
.topBox {
width: 750rpx;
height: 432rpx;
@@ -60,7 +54,7 @@
background: #FFFFFF;
border-radius: 13rpx;
margin: -28rpx auto 0;
- padding: 48rpx 21rpx 98rpx;
+ padding: 48rpx 21rpx 50rpx;
position: relative;
}
\ No newline at end of file
diff --git a/subPackages/notice/noticeList.vue b/subPackages/notice/noticeList.vue
index ce811b6..ce430c0 100644
--- a/subPackages/notice/noticeList.vue
+++ b/subPackages/notice/noticeList.vue
@@ -1,8 +1,10 @@
-
+
+
+
-
+
{{item.title}}
@@ -38,10 +40,12 @@
}
],
typeIndex: 0,
- list: []
+ list: [],
+ headImg: ''
}
},
onShow() {
+ this.getHeadImg('notice').then(res => {this.headImg = res})
this.getList()
},
methods: {
@@ -64,17 +68,9 @@
padding-bottom: 100rpx;
}
- .topLeft {
- position: absolute;
- left: 26rpx;
- top: 101rpx;
- font-size: 40rpx;
- z-index: 2;
- }
-
.topImg {
width: 750rpx;
- height: 432rpx;
+ height: 440rpx;
}
.type-box {
@@ -86,7 +82,7 @@
font-size: 32rpx;
color: #000000;
display: flex;
- margin: -34rpx auto 0;
+ margin: -39rpx auto 0;
overflow: hidden;
position: relative;
@@ -97,7 +93,8 @@
}
.active {
- background: linear-gradient(90deg, #9EE4FE, #7FD491);
+ color: #fff;
+ background: #248BAA;
}
}
diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue
index 469a051..fb4f6b4 100644
--- a/subPackages/order/detail.vue
+++ b/subPackages/order/detail.vue
@@ -9,10 +9,10 @@
订单将在{{info.close_time.slice(-8)}}自动取消
-
+
系统将在1-7个工作日内原路退回您的原支付账户
-
+
您的退款金额已退还到您的原支付账户
@@ -54,11 +54,11 @@
左右滑动核销其他二维码
-
+
-
+
@@ -100,231 +100,248 @@
-
-
+
+
出行人
{{item.specifications_name}}
-
+
姓名：{{item.contact_name}}
-
+
身份证：{{item.id_number}}
-
-
-
-
- 收货地址
- {{info.order_child[0].consignee.name}} {{info.order_child[0].consignee.tel}}
- {{info.order_child[0].consignee.address}}
+
+
+ 出行人
+
+
+ 姓名：{{info.reserve_name}}
+
+
+ 手机号：{{info.reserve_phone}}
+
+
+
+
-
-
- 商家名称
-
-
-
- {{item.goods_title}}
-
- {{item.specifications_name}}
- x{{item.num}}
-
+
+
+
+ 收货地址
+ {{info.order_child[0].consignee.name}} {{info.order_child[0].consignee.tel}}
+ {{info.order_child[0].consignee.address}}
+
+
+
+
+ 商家名称
+
+
+
+ {{item.goods_title}}
+
+ {{item.specifications_name}}
+ x{{item.num}}
+
-
-
-
- 商品总额：￥{{info.money / 100}}
-
-
- 优惠券：-￥{{info.discounts / 100}}
-
-
- 实付金额：￥{{info.pay_money / 100}}
-
+
+
+
+ 商品总额：￥{{info.money / 100}}
+
+
+ 优惠券：-￥{{info.discounts / 100}}
+
+
+ 实付金额：￥{{info.pay_money / 100}}
+
+
+
+
+ 自提信息
+
+
+
+ {{info.order_child[0].contact.name}}
+ {{info.order_child[0].contact.tel}}
+
+
+
-
-
- 自提信息
-
-
-
- {{info.order_child[0].contact.name}}
- {{info.order_child[0].contact.tel}}
+
+ {{info.order_child[0].extract.extract_name}}
+ {{info.order_child[0].extract.detail_addr}}
-
-
-
- {{info.order_child[0].extract.extract_name}}
- {{info.order_child[0].extract.detail_addr}}
+
+
+
+
+ 电话
-
-
-
-
-
- 电话
-
-
-
- 导航
-
+
+
+
+ 导航
+
-
-
-
- 购买信息
-
-
-
- {{foodInfo.title}}
-
-
- {{item}}
-
- x{{info.order_child[0].num}}
+
+
+
+ 购买信息
+
+
+
+ {{foodInfo.title}}
+
+
+ {{item}}
+ x{{info.order_child[0].num}}
-
- {{info.order_child[0].contact_name}}
- {{info.order_child[0].phone}}
-
+
+
+ {{info.order_child[0].contact_name}}
+ {{info.order_child[0].phone}}
+
-
-
-
- 商品总额：￥{{info.money / 100}}
-
-
- 优惠券：-￥{{info.discounts / 100}}
-
-
- 实付金额：￥{{info.pay_money / 100}}
-
+
+
+
+ 商品总额：￥{{info.money / 100}}
+
+
+ 优惠券：-￥{{info.discounts / 100}}
+
+
+ 实付金额：￥{{info.pay_money / 100}}
+
-
- 商家信息
- 店铺名称
-
-
-
-
-
- 营业时间
- {{info.order_child[0].goods_data.open_description}}
-
+
+ 商家信息
+ 店铺名称
+
+
+
+
+
+ 营业时间
+ {{info.order_child[0].goods_data.open_description}}
+
-
-
-
-
-
-
- {{info.order_child[0].goods_data.address}}
-
-
- 距您约{{info.order_child[0].goods_data.distance > 1000 ? (info.order_child[0].goods_data.distance / 1000).toFixed(2) + 'km' : info.order_child[0].goods_data.distance + 'm'}}
-
+
+
+
+
+
+
+ {{info.order_child[0].goods_data.address}}
+
+
+ 距您约{{info.order_child[0].goods_data.distance > 1000 ? (info.order_child[0].goods_data.distance / 1000).toFixed(2) + 'km' : info.order_child[0].goods_data.distance + 'm'}}
+
-
-
-
-
+
+
+
+
+
-
-
-
- 入住信息
- {{info.order_child[0].goods_title}}
+
+
+
+ 入住信息
+ {{info.order_child[0].goods_title}}
-
-
- {{(info.order_child[0].start_date).slice(5)}}
- {{ShowDateDay(new Date(info.order_child[0].start_date).getDay())}}入住
-
- 共{{calDate(info.order_child[0].start_date, info.order_child[0].end_date)}}晚
-
- {{info.order_child[0].end_date.slice(5)}}
- {{ShowDateDay(new Date(info.order_child[0].end_date).getDay())}}离店
-
+
+
+ {{(info.order_child[0].start_date).slice(5)}}
+ {{ShowDateDay(new Date(info.order_child[0].start_date).getDay())}}入住
-
-
-
- {{info.order_child[0].scenic_data.address}}
-
-
- 地图
-
-
-
-
- 电话
-
+ 共{{calDate(info.order_child[0].start_date, info.order_child[0].end_date)}}晚
-
-
- {{info.order_child[0].specifications_name}}
-
- ￥{{info.order_child[0].money / 100}}
- x{{info.order_child[0].num}}
-
+
+ {{info.order_child[0].end_date.slice(5)}}
+ {{ShowDateDay(new Date(info.order_child[0].end_date).getDay())}}离店
-
-
-
-
- 商品总额：￥{{info.money / 100}}
-
-
- 优惠券：-￥{{info.discounts / 100}}
-
-
- 实付金额：￥{{info.pay_money / 100}}
+
+
+
+
+ {{info.order_child[0].scenic_data.address}}
+
+
+ 地图
+
+
+ 电话
+
+
+
+
+ {{info.order_child[0].specifications_name}}
+
+ ￥{{info.order_child[0].money / 100}}
+ x{{info.order_child[0].num}}
+
-
-
- 预订信息
- 房间数：{{info.order_child[0].num}}间
- 入住姓名：{{info.reserve_name}}
- 联系电话：{{info.reserve_phone}}
+
+
+
+
+ 商品总额：￥{{info.money / 100}}
+
+
+ 优惠券：-￥{{info.discounts / 100}}
+
+
+ 实付金额：￥{{info.pay_money / 100}}
+
+
+
+ 预订信息
+ 房间数：{{info.order_child[0].num}}间
+ 入住姓名：{{info.reserve_name}}
+ 联系电话：{{info.reserve_phone}}
+
@@ -333,7 +350,7 @@
订单账号：{{info.order_id}}
-
+
复制
@@ -347,7 +364,7 @@
-
+
联系客服
@@ -375,17 +392,19 @@
立即支付
-
-
+
+
快递查询
-
-
+
+
确认收货
-
+
@@ -405,7 +424,7 @@
-
+
+ 
+