Skip to content

U
uni-pdtravel
Commit ff3bbff8 authored by 潘永坪's avatar 潘永坪
Browse files
Options

新组合票开发

parent b2cfec57
Show whitespace changes
Inline Side-by-side
Showing with 125 additions and 137 deletions
pages/combination/distributionCombiChoose/distributionCombiChooseNew.vue
View file @ ff3bbff8
<!-- 修改这个页面时，需要同步更新combiChoose页面的代码 -->
<template>
<view class="wrap">
<scroll-view @scroll="scroll" style="height: 100%;" scroll-y>
<view class="banner">
<u-swiper :list="imgList" @change="e => currentNum = e.current" indicatorStyle="right: 20px;bottom:25px" height="400" circular>
<view slot="indicator" class="indicator-num">
......@@ -40,8 +39,11 @@
</view>
<view class="middle-bottom">
<view class="middle-bottom-left">
长江索道
<view class="merchant-tab" v-for="(item,index) in 5" :key="index" @click="merchantTabChange(index)" :class='{on:merchantIndex==index}'>
云端之眼观景台
</view>
</view>
<scroll-view @scroll="scroll" style="height: 2000px;" scroll-y>
<view class="middle-bottom-right">
<checkbox-group @change="checkboxChange" class="checkbox-box">
<view class="merchantlist" v-for="(item, index) in scenicList" :key="index">
......@@ -71,33 +73,34 @@
:checked="items.ifChecked"
/>
</view>
<view class="product-right">
<view class="product-name">
<text>{{ items.name }}</text>
<text class="product-status" v-if="items.status == 2">{{ items.statusName }}</text>
</view>
<view class="product-price">
<view style="font-size: 20rpx;display: flex;">
<text class="product-rule" v-if="items.productRefundRuleVo">
<view class="product-rule">
<text>随买随用</text>
<template v-if="items.productRefundRuleVo">
<text v-if="items.productRefundRuleVo.refundType == 0">不可退</text>
<text v-if="items.productRefundRuleVo.refundType == 1">有条件退</text>
<text v-if="items.productRefundRuleVo.refundType == 2">随时可退</text>
</text>
<text class="product-rule"> 无需取票 </text>
</template>
<text> 无需取票 </text>
</view>
<view class="product-price">
<view style="display: flex;">
<text @click.stop="showBuyKnow(items)">购买须知</text>
<u-icon name="arrow-right" size='26' color='#B4B4B4'></u-icon>
</view>
<view>
<text class="product-sell"> <text style="font-size: 28rpx">¥</text>{{ items.sellingPrice }} </text>
<view class="product-sell">
<text style="font-size: 28rpx">¥</text>{{ items.sellingPrice }}
</view>
</view>
</view>
</view>
</label>
<view class="product-more" v-if="index > 0 && item.productList.length > 2">
<!-- <view class="product-more" v-if="index > 0 && item.productList.length > 2">
<view v-if="item.productListCopy.length != item.productList.length" @click="showMoreProduct(item)">
更多
<u-icon name="arrow-down" size='24' color='#B4B4B4'></u-icon>
......@@ -107,11 +110,12 @@
收起
<u-icon name="arrow-up" size='24' color='#B4B4B4'></u-icon>
</view>
</view>
</view> -->
</view>
</checkbox-group>
<u-empty text="暂无数据..." mode="list" v-if="scenicList.length == 0" iconSize="160" textSize='24' textColor='#3688FF'></u-empty>
</view>
</scroll-view>
</view>
</view>
......@@ -125,7 +129,6 @@
组合购更优惠
<text class="bottom-three"></text>
</view>
<view class="bottom-detail" @click="showDetail()" :style="{ top: chooseProduct.length > 0 ? '-28rpx' : '0' }">
<text style="margin-right: 10rpx;"> 明细 </text>
<u-icon name="arrow-up" size="32"></u-icon>
......@@ -149,7 +152,6 @@
<!-- 模态框 -->
<u-modal :show="showModal" @confirm="chooseConfirm" @cancel="chooseCancel" title="提示" content="是否更改产品" show-cancel-button="true">
</u-modal>
</scroll-view>
<image class="suodaoImg" v-if="showSuodaoImg" src="https://lx.pangdly.com/img/cjsdFirst.50a2e63.jpg"></image>
<!-- 系统无法访问时弹窗 -->
<u-popup :show="showTip" :round="20">
......@@ -197,44 +199,7 @@ export default {
chooseProduct: [], //选中的产品
showModal: false, //是否显示模态框
chooseMerchantProduct: '', //不支持多产品购买时，选中的景区产品
swiperHeight: 0 ,//swiper高度
albumList: [{
title: '精彩瞬间',
count: '10W+',
image: '../static/scenic/wonderfulMoment.png',
color: '#037EFF'
},
{
title: '网红旅拍',
count: '8W+',
image: '../static/scenic/travalphoto.png',
color: '#826847'
},
{
title: '抱枕DIY',
count: '4W+',
image: '../static/scenic/pillow.png',
color: '#1175B4'
},
{
title: '明信片',
count: '4W+',
image: '../static/scenic/postcard.png',
color: '#3478DC'
},
{
title: '旅游台历定制',
count: '4W+',
image: '../static/scenic/deskCalender.png',
color: '#1A9B45'
},
{
title: '定制相册',
count: '4W+',
image: '../static/scenic/customPic.png',
color: '#D48D46'
}
],
merchantIndex:0,//选中的商家下标
}
},
watch: {
......@@ -392,7 +357,8 @@ export default {
this.scenicList.unshift(item)
item.productListCopy = item.productList
} else {
item.productListCopy = item.productList.slice(0, 2)
// item.productListCopy = item.productList.slice(0, 2)不要更多，暂时注释
item.productListCopy = item.productList
}
//预订时间为当天时，当前时间大于最早预订时间显示未开售，当前时间大于最晚预订时间显示已售罄
let times = new Date().Format('hh:mm:ss')
......@@ -472,6 +438,10 @@ export default {
}
})
},
//---商家下标切换
merchantTabChange(index){
this.merchantIndex=index
},
//---展示明细弹窗
showDetail() {
this.$refs.detail.showPop = true
......@@ -646,6 +616,7 @@ export default {
flex-direction: column;
position: relative;
top: -40rpx;
flex: 1;
}
// 中间上部分
.merchant-info{
......@@ -711,19 +682,31 @@ export default {
//中间下部分
.middle-bottom{
display: flex;
flex: 1;
}
.middle-bottom-left{
width: 128rpx;
margin-right: 24rpx;
margin:24rpx 24rpx 0 0;
font-size: 24rpx;
background: #ffffff;
border-radius: 0 20rpx 20rpx 0;
}
.merchant-tab{
padding: 24rpx 16rpx;
}
.merchant-tab.on{
background: linear-gradient( 124deg, #FF9F00 0%, #FE6600 100%);
border-radius: 0px 20px 20px 0px;
color: #ffffff;
}
.middle-bottom-right{
flex: 1;
}
.merchantlist {
border-radius: 16rpx;
border-radius: 20rpx;
background: #ffffff;
margin-top: 24rpx;
padding: 24rpx;
padding: 24rpx 0 0 24rpx;
}
.merchantlist label{
width: 100%;
......@@ -735,16 +718,14 @@ export default {
.merchantlist label.off .product-name {
color: #999999;
}
.merchantlist label.off .product-rule {
color: #999999;
}
.merchantlist-title {
display: flex;
justify-content: space-between;
align-items: center;
padding-bottom: 16rpx;
padding:0 24rpx 16rpx 0;
}
.merchantlist-name {
flex: 1;
font-size: 36rpx;
margin-right: 10rpx;
font-weight: bold;
......@@ -766,12 +747,12 @@ export default {
display: flex;
}
.product {
padding:16rpx 16rpx 10rpx 16rpx;
padding:24rpx 24rpx 24rpx 0;
background: #ffffff;
border-radius: 8rpx;
display: flex;
align-items: center;
margin-top: 10rpx;
border-bottom: 1px solid #f5f5f5;
}
.product.on {
background: #e2eeff;
......@@ -800,15 +781,12 @@ export default {
top: 30rpx;
right: 80rpx;
}
.product-price {
display: flex;
justify-content: space-between;
align-items: center;
}
.product-rule {
color: $theme;
.product-rule{
font-size: 24rpx;
color: #999999;
margin-top: 16rpx;
}
.product-rule::after {
.product-rule text:not(:last-child) ::after {
display: inline-block;
content: '';
height: 22rpx;
......@@ -816,6 +794,14 @@ export default {
background: #ccc;
width: 1px;
}
.product-price{
display: flex;
margin-top: 10rpx;
align-items: center;
justify-content: space-between;
font-size: 24rpx;
color: #999999;
}
.product-sell {
font-size: 40rpx;
color: $red;
......
pages/indexs/center/center.vue
View file @ ff3bbff8
......@@ -143,6 +143,7 @@
购物车
</view>
</view> -->
<!-- #ifdef MP-WEIXIN -->
<view class="middle3-list" @click="online()">
<view>
<image src="@/static/img/my/center/customer.png"></image>
......@@ -151,6 +152,7 @@
AI客服
</view>
</view>
<!-- #endif -->
<view class="middle3-list" @click="goTravelNotes()">
<view>
<image src="@/static/img/my/center/mark.png"></image>
......
pages/my/order/jointElectronicTicket/jointElectronicTicket.vue
View file @ ff3bbff8
......@@ -1031,7 +1031,7 @@ export default {
},
//---再次预订
orderAgain(){
let query = '?merchantId='+this.orderInfo.merchantId+'&productId=' +this.orderInfo.id +'&orderSource=3'
let query = '?merchantId='+this.orderInfo.merchantId+'&productId=' +this.orderInfo.productId +'&orderSource=3'
uni.navigateTo({
url: '/pages/scenic/scenicJointOrder/scenicJointOrder' + query
})
......
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