Skip to content

J
jz_Travel
Commit 2b5140c1 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

parents f23a2d23 e3485307
Show whitespace changes
Inline Side-by-side
Showing with 687 additions and 394 deletions
components/goods/style7.vue
View file @ 2b5140c1
<template> <template>
<view <view style="padding:0 15px;width:100%;" :style="{
style="padding:0 15px;width:100%;"
:style="{
'background-color': goodsInfo.backgroundColor, 'background-color': goodsInfo.backgroundColor,
'background-image': goodsInfo.backgroundPicUrl, 'background-image': goodsInfo.backgroundPicUrl,
'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : '' 'border-color': goodsInfo.goodsStyle == 2 ? 'rgb(226, 226, 226)' : ''
}" }">
> <view class="good-seven" v-for="(item, gli) in goodList" :key="gli" @click="openGood(item)" :style="{
<view
class="good-seven"
v-for="(item, gli) in goodList"
:key="gli"
@click="openGood(item)"
:style="{
border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '', border: goodsInfo.goodsStyle == 2 ? '1px solid rgb(226, 226, 226)' : '',
background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : '' background: goodsInfo.goodsStyle == 1 || goodsInfo.goodsStyle == 2 ? '#FFF' : ''
}" }">
> <view class="tips" v-if="goodsInfo.showGoodsTag">
<view class="tips" v-if="goodsInfo.showGoodsTag"><image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width: 100%;" /></view> <image :src="goodsInfo.goodsTagPicUrl" mode="widthFix" style="width: 100%;" />
</view>
<view class="img-box"> <view class="img-box">
<template v-if="item.imglist&&item.imglist.length==1"> <template v-if="item.imglist&&item.imglist.length==1">
<image class="img-0" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.imglist[0]" /> <image class="img-0" :mode="goodsInfo.fill == 1 ? 'aspectFill' : 'aspectFit'" :src="item.imglist[0]" />
...@@ -40,14 +33,8 @@ ...@@ -40,14 +33,8 @@
<view class="sencond-title" v-if="item.subname">{{item.subname}}</view> <view class="sencond-title" v-if="item.subname">{{item.subname}}</view>
<view class="good-price-info"> <view class="good-price-info">
<view> <view>
<u-rate <u-rate :current="item.courseScore!=null &&item.courseScore>0?item.courseScore:'5'" :active-color="mainColor"
:current="item.courseScore!=null &&item.courseScore>0?item.courseScore:'5'" inactive-color="#DDDDDD" active-icon="star" inactive-icon="star-o" size="34" :disabled="true"></u-rate>
:active-color="mainColor" inactive-color="#DDDDDD"
active-icon="star"
inactive-icon="star-o"
size="34"
:disabled="true"
></u-rate>
<text class="good-rb-text">{{item.courseScore!=null &&item.courseScore>0?item.courseScore.toFixed(1):'5.0'}}分</text> <text class="good-rb-text">{{item.courseScore!=null &&item.courseScore>0?item.courseScore.toFixed(1):'5.0'}}分</text>
</view> </view>
<view class="price" :style="{ color: mainColor }" v-if="item.price>0 && goodsInfo.showGoodsPrice">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }} <view class="price" :style="{ color: mainColor }" v-if="item.price>0 && goodsInfo.showGoodsPrice">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}
...@@ -57,18 +44,11 @@ ...@@ -57,18 +44,11 @@
<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)"> <view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
<u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" /> <u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
<u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" /> <u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
<u-button <u-button type="primary" size="mini" :ripple="true" :color="goodsInfo.buttonColor" :custom-style="
type="primary"
size="mini"
:ripple="true"
:color="goodsInfo.buttonColor"
:custom-style="
`backgroundColor:${goodsInfo.buttonColor},color:${goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'}` `backgroundColor:${goodsInfo.buttonColor},color:${goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4 ? goodsInfo.buttonColor : '#FFF'}`
" "
:plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4" :plain="goodsInfo.buyBtnStyle == 2 || goodsInfo.buyBtnStyle == 4" :shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'"
:shape="goodsInfo.buyBtnStyle == 3 || goodsInfo.buyBtnStyle == 4 ? 'circle' : 'square'" v-else>
v-else
>
{{ goodsInfo.buyBtnText }} {{ goodsInfo.buyBtnText }}
</u-button> </u-button>
</view> </view>
...@@ -81,9 +61,9 @@ ...@@ -81,9 +61,9 @@
</template> </template>
<script> <script>
import goodSku from '../goods/goodsku'; import goodSku from '../goods/goodsku';
import auth from '@/components/auth/index.vue'; import auth from '@/components/auth/index.vue';
export default { export default {
components: { components: {
goodSku, goodSku,
auth auth
...@@ -97,14 +77,15 @@ export default { ...@@ -97,14 +77,15 @@ export default {
sku: {}, sku: {},
showAuth: false, showAuth: false,
u: {}, u: {},
IsEducation:1 IsEducation: 1
}; };
}, },
created() { created() {
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.IsEducation = uni.getStorageSync('basedata') this.IsEducation = uni.getStorageSync('basedata') ?
? (uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation?uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation:0) (uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation ? uni.getStorageSync('basedata').mall.setting.mallStyle
:0; .IsEducation : 0) :
0;
}, },
methods: { methods: {
openGood(item) { openGood(item) {
...@@ -155,11 +136,11 @@ export default { ...@@ -155,11 +136,11 @@ export default {
this.showAuth = false; this.showAuth = false;
} }
} }
}; };
</script> </script>
<style> <style>
.good-seven { .good-seven {
position: relative; position: relative;
margin-bottom: 14px; margin-bottom: 14px;
display: flex; display: flex;
...@@ -171,39 +152,44 @@ export default { ...@@ -171,39 +152,44 @@ export default {
overflow: hidden; overflow: hidden;
padding-bottom: 14px; padding-bottom: 14px;
border-bottom: 1px solid #e2e2e2; border-bottom: 1px solid #e2e2e2;
} }
.good-seven:last-child{
.good-seven:last-child {
padding-bottom: 0; padding-bottom: 0;
border-bottom: none; border-bottom: none;
} }
.good-seven .tips {
.good-seven .tips {
width: 64rpx; width: 64rpx;
height: 64rpx; height: 64rpx;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
z-index: 4; z-index: 4;
} }
.good-seven .img-box {
.good-seven .img-box {
width: 266rpx; width: 266rpx;
height: 260rpx; height: 260rpx;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
border-radius:20rpx; border-radius: 20rpx;
} }
.good-seven .img-box .img-0{
.good-seven .img-box .img-0 {
width: 200rpx; width: 200rpx;
border-radius:20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
height: 260rpx; height: 260rpx;
z-index: 3; z-index: 3;
} }
.good-seven .img-box .img-1{
.good-seven .img-box .img-1 {
width: 200rpx; width: 200rpx;
border-radius:20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
left: 40rpx; left: 40rpx;
...@@ -211,10 +197,11 @@ export default { ...@@ -211,10 +197,11 @@ export default {
height: 220rpx; height: 220rpx;
opacity: 0.6; opacity: 0.6;
z-index: 2; z-index: 2;
} }
.good-seven .img-box .img-2{
.good-seven .img-box .img-2 {
width: 200rpx; width: 200rpx;
border-radius:20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
left: 66rpx; left: 66rpx;
...@@ -222,8 +209,9 @@ export default { ...@@ -222,8 +209,9 @@ export default {
height: 180rpx; height: 180rpx;
opacity: 0.3; opacity: 0.3;
z-index: 1; z-index: 1;
} }
.good-seven .good-info {
.good-seven .good-info {
padding-left: 12px; padding-left: 12px;
flex: 1; flex: 1;
width: 1rpx; width: 1rpx;
...@@ -232,8 +220,9 @@ export default { ...@@ -232,8 +220,9 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
/* width:20%; */ /* width:20%; */
} }
.good-seven .good-info .good-name {
.good-seven .good-info .good-name {
font-size: 30rpx; font-size: 30rpx;
max-height: 80rpx; max-height: 80rpx;
overflow: hidden; overflow: hidden;
...@@ -242,8 +231,9 @@ export default { ...@@ -242,8 +231,9 @@ export default {
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
color: #111; color: #111;
} }
.good-seven .good-info .good-price-info {
.good-seven .good-info .good-price-info {
display: flex; display: flex;
justify-items: center; justify-items: center;
justify-content: space-between; justify-content: space-between;
...@@ -251,29 +241,39 @@ export default { ...@@ -251,29 +241,39 @@ export default {
height: 10px; height: 10px;
flex: 1; flex: 1;
padding-bottom: 10rpx; padding-bottom: 10rpx;
} }
.good-seven .good-info .sencond-title{
.good-seven .good-info .sencond-title {
font-size: 24rpx; font-size: 24rpx;
font-weight: 500; font-weight: 500;
color: #999999; color: #999999;
line-height: 32rpx; line-height: 32rpx;
margin-top: 5px; margin-top: 5px;
} text-overflow: -o-ellipsis-lastline;
.good-seven .good-rb-text { overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
line-clamp: 3;
-webkit-box-orient: vertical;
}
.good-seven .good-rb-text {
font-size: 32rpx; font-size: 32rpx;
color: #999999; color: #999999;
margin-left: 2px; margin-left: 2px;
} }
.good-seven .good-info .good-price-info .price { .good-seven .good-info .good-price-info .price {
color: #ff4544; color: #ff4544;
font-size: 14px; font-size: 14px;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }
.good-seven .good-info .good-price-info .buy {
.good-seven .good-info .good-price-info .buy {
width: 24px; width: 24px;
text-align: right; text-align: right;
} }
</style> </style>
components/pay/pay.vue
View file @ 2b5140c1
...@@ -82,8 +82,12 @@ export default { ...@@ -82,8 +82,12 @@ export default {
url: '/pages/reserve/offline-success?payInfo='+JSON.stringify(that.payInfo) url: '/pages/reserve/offline-success?payInfo='+JSON.stringify(that.payInfo)
}); });
}else{ }else{
uni.navigateTo({ // uni.navigateTo({
url: '/pages/order-submit/pay-success?payInfo='+JSON.stringify(that.payInfo) // url: '/pages/order-submit/pay-success?payInfo='+JSON.stringify(that.payInfo)
// });
uni.reLaunch({
url: '/pages/jiuzhai/paysuccess?PreferPrice='+that.payInfo.total_price+'&isFrom=2'
}); });
} }
......
pages/guidecar/bookaCarList.vue
View file @ 2b5140c1
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
} }
.box-rili-item { .box-rili-item {
// width: 50px;无效 width: 50px;//无效
height: 50px; height: 50px;
border-radius: 10px; border-radius: 10px;
font-size: 13px; font-size: 13px;
...@@ -330,12 +330,18 @@ ...@@ -330,12 +330,18 @@
</view> </view>
<view class="box-rili"> <view class="box-rili">
<view class="box-rili-scroll"> <view class="box-rili-scroll">
<scroll-view :scroll-x='true' style="width: 100%;" @scroll='getscroll' :scroll-left="scrollleft">
<view style="display: flex;align-items: center;">
<view class="box-rili-item" :class="{'box-rili-item2':msg.Q_Date == x.date}" <view class="box-rili-item" :class="{'box-rili-item2':msg.Q_Date == x.date}"
v-for="(x,y) in topdateList" :key='y' @click="choicedatelist(x)"> v-for="(x,y) in topdateList" :key='y' @click="choicedatelist(x)">
<span style='width: 50px;display: inline-block;text-align: center;'>{{x.showdate}}</span> <span style='width: 50px;display: inline-block;text-align: center;'>{{x.showdate}}</span>
<span>{{x.week}}</span> <span>{{x.week}}</span>
</view> </view>
</view> </view>
</scroll-view>
</view>
<view class="porili" @click="showcalendar = true"> <view class="porili" @click="showcalendar = true">
<image <image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/dingcherilitubiao.png" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/dingcherilitubiao.png"
...@@ -565,6 +571,7 @@ ...@@ -565,6 +571,7 @@
StartDate:'', StartDate:'',
EndDate:'', EndDate:'',
}, },
scrollleft:0
} }
...@@ -581,7 +588,9 @@ ...@@ -581,7 +588,9 @@
this.msg.ArriveCityType = this.carMsg.ArriveCityType; this.msg.ArriveCityType = this.carMsg.ArriveCityType;
this.msg.Q_Date = this.carMsg.Q_Date; this.msg.Q_Date = this.carMsg.Q_Date;
} }
this.$nextTick(function() {
this.scrollleft = 0
});
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.gettimeList() this.gettimeList()
this.init(); this.init();
...@@ -592,6 +601,9 @@ ...@@ -592,6 +601,9 @@
}, },
methods: { methods: {
getscroll(e){
console.log(e.detail.scrollLeft)
},
yuding(x){ yuding(x){
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) { if (!this.u) {
...@@ -625,7 +637,8 @@ ...@@ -625,7 +637,8 @@
let nowtime = date1.getFullYear() + "-" + (date1.getMonth() + 1) + "-" + date1.getDate(); let nowtime = date1.getFullYear() + "-" + (date1.getMonth() + 1) + "-" + date1.getDate();
let htime = date2.getFullYear() + "-" + (date2.getMonth() + 1) + "-" + date2.getDate(); let htime = date2.getFullYear() + "-" + (date2.getMonth() + 1) + "-" + date2.getDate();
this.topdateList = this.getDayAll(nowtime, htime) this.topdateList = this.getDayAll(nowtime, htime)
this.startDate = nowtime this.startDate = nowtime;
this.getscollwz()
}, },
getDayAll(starDay, endDay) { //根据2个时间段获取之间的所有日期 getDayAll(starDay, endDay) { //根据2个时间段获取之间的所有日期
...@@ -695,6 +708,26 @@ ...@@ -695,6 +708,26 @@
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.g = []; this.g = [];
this.init() this.init()
this.getscollwz()
},
getscollwz(){//在日历上选择了列表上滚动
let index = 0
this.topdateList.map((x,i)=>{
if(x.date == this.msg.Q_Date){
index = i;
console.log(index)
return
}
})
if(index>3){
this.$nextTick(function() {
this.scrollleft = (index-2)*58
});
}else{
this.$nextTick(function() {
this.scrollleft = 0
});
}
}, },
getclose() { getclose() {
this.showcalendar = false; this.showcalendar = false;
......
pages/guidecar/map.vue
View file @ 2b5140c1
<template> <template>
<view class="map"> <view class="map">
<map id="navmap" style="width: 100%;height: 600px;" :markers="markers" :latitude="src_latitude" :longitude="src_longitude" <map id="navmap" style="width: 100%;height: 600px;" :markers="markers" :latitude="src_latitude" :longitude="src_longitude" :scale="scale"
:hidden="false"> :hidden="false">
</map> </map>
<view class="liststyle" v-if="details.type==1"> <view class="liststyle" v-if="details.type==1">
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
upcar:[], upcar:[],
downcar:[], downcar:[],
mainColor:'', mainColor:'',
scale:9
} }
}, },
onReady(){ onReady(){
......
pages/guidecar/orderList.vue
View file @ 2b5140c1
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
}, 1000); }, 1000);
}, },
onLoad(option) { onLoad(option) {
this.current = option.status || -1; this.current = option.status || 0;
this.getHeadList(); this.getHeadList();
this.payInfo.OpenId = uni.getStorageSync('mall_UserInfo').OpenId; this.payInfo.OpenId = uni.getStorageSync('mall_UserInfo').OpenId;
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
......
pages/hotel/order.vue
View file @ 2b5140c1
...@@ -159,9 +159,7 @@ ...@@ -159,9 +159,7 @@
} }
}, },
created() { created() {
uni.setNavigationBarTitle({
title: this.HotelInfo.HotelName
});
}, },
onLoad(options) { onLoad(options) {
if(options.RoomInfo){ if(options.RoomInfo){
...@@ -173,9 +171,6 @@ ...@@ -173,9 +171,6 @@
if(options.dayObj){ if(options.dayObj){
this.dayObj = JSON.parse(options.dayObj) this.dayObj = JSON.parse(options.dayObj)
} }
console.log(this.RoomInfo,'RoomInfo');
console.log(this.HotelInfo,'HotelInfo');
console.log(this.dayObj,'dayObj');
this.rMsg.HotelId = this.HotelInfo.HotelId; this.rMsg.HotelId = this.HotelInfo.HotelId;
this.rMsg.productId = this.RoomInfo.ID; this.rMsg.productId = this.RoomInfo.ID;
this.rMsg.StartDate = this.dayObj.start; this.rMsg.StartDate = this.dayObj.start;
...@@ -184,7 +179,9 @@ ...@@ -184,7 +179,9 @@
this.orderMsg.Unit_Price = this.RoomInfo.B2BPrice; this.orderMsg.Unit_Price = this.RoomInfo.B2BPrice;
this.orderMsg.StartDate = this.dayObj.start; this.orderMsg.StartDate = this.dayObj.start;
this.orderMsg.EndDate = this.dayObj.end; this.orderMsg.EndDate = this.dayObj.end;
uni.setNavigationBarTitle({
title: this.HotelInfo.HotelName
});
this.CalTotalPrice(); this.CalTotalPrice();
this.getRoomPrice(); this.getRoomPrice();
}, },
...@@ -230,7 +227,7 @@ ...@@ -230,7 +227,7 @@
CalTotalPrice(){ CalTotalPrice(){
this.orderMsg.Final_Price=0; this.orderMsg.Final_Price=0;
this.priceList.forEach(x=>{ this.priceList.forEach(x=>{
if(this.$utils.getretailer){ if(this.$utils.getretailer()){
this.orderMsg.Final_Price += parseInt(this.orderMsg.RoomNumber)*x.B2BPrice; this.orderMsg.Final_Price += parseInt(this.orderMsg.RoomNumber)*x.B2BPrice;
}else{ }else{
this.orderMsg.Final_Price += parseInt(this.orderMsg.RoomNumber)*x.SalesPrice; this.orderMsg.Final_Price += parseInt(this.orderMsg.RoomNumber)*x.SalesPrice;
...@@ -313,7 +310,7 @@ ...@@ -313,7 +310,7 @@
}) })
setTimeout(()=>{ setTimeout(()=>{
uni.redirectTo({ uni.redirectTo({
url: '/pages/jiuzhai/allorderList' url: '/pages/jiuzhai/paysuccess?PreferPrice='+that.orderMsg.Final_Price
}); });
}, 100 ) }, 100 )
}, },
...@@ -322,6 +319,11 @@ ...@@ -322,6 +319,11 @@
uni.showToast({ uni.showToast({
title: "支付失败" title: "支付失败"
}) })
setTimeout(()=>{
uni.redirectTo({
url: '/pages/jiuzhai/allorderList'
});
}, 100 )
} }
}); });
}, },
......
pages/jiuzhai/allorderdetails.vue
View file @ 2b5140c1
...@@ -254,11 +254,18 @@ ...@@ -254,11 +254,18 @@
<view class="box-c-car"> <view class="box-c-car">
<view class="box-c-caritem"> <view class="box-c-caritem">
<view class="box-c-caritem-l">上车地点</view> <view class="box-c-caritem-l">上车地点</view>
<view class="box-c-caritem-r" @click="goopenlocation(x.DepartLonlat)">{{x.DepartAddress}}</view> <view class="box-c-caritem-r" @click="goopenlocation(x.DepartLonlat)" style="display: flex;align-items: flex-start;justify-content: flex-end;">
<u-icon name="location-o" size="34"></u-icon>
{{x.DepartAddress}}
</view>
</view> </view>
<view class="box-c-caritem"> <view class="box-c-caritem">
<view class="box-c-caritem-l">下车地点</view> <view class="box-c-caritem-l">下车地点</view>
<view class="box-c-caritem-r" @click="goopenlocation(x.ArriveLonlat)">{{x.ArriveAddress}}</view> <view class="box-c-caritem-r" @click="goopenlocation(x.ArriveLonlat)" style="display: flex;align-items: flex-start;justify-content: flex-end;">
<u-icon name="location-o" size="34"></u-icon>
{{x.ArriveAddress}}
</view>
</view> </view>
<view class="xian"></view> <view class="xian"></view>
<view class="box-c-caritem"> <view class="box-c-caritem">
...@@ -304,12 +311,12 @@ ...@@ -304,12 +311,12 @@
<view class="box-c-caritem-l">付款方式</view> <view class="box-c-caritem-l">付款方式</view>
<view class="box-c-caritem-r">{{OrderInfo.PaymentWayName}}</view> <view class="box-c-caritem-r">{{OrderInfo.PaymentWayName}}</view>
</view> </view>
<view class="box-c-caritem" > <!-- <view class="box-c-caritem" >
<view class="box-c-caritem-l">应收</view> <view class="box-c-caritem-l">应收</view>
<view class="box-c-caritem-r">￥{{OrderInfo.PreferPrice}}元</view> <view class="box-c-caritem-r">￥{{OrderInfo.PreferPrice}}元</view>
</view> </view> -->
<view class="box-c-caritem" > <view class="box-c-caritem" >
<view class="box-c-caritem-l">实收</view> <view class="box-c-caritem-l">金额</view>
<view class="box-c-caritem-r"><span style='color:#F20707'>￥{{OrderInfo.Income}}元</span></view> <view class="box-c-caritem-r"><span style='color:#F20707'>￥{{OrderInfo.Income}}元</span></view>
</view> </view>
</view> </view>
......
pages/jiuzhai/jz_Line.vue
View file @ 2b5140c1
...@@ -514,6 +514,7 @@ ...@@ -514,6 +514,7 @@
"天数日期", "天数日期",
"出发城市" "出发城市"
], ],
CityId:0
}; };
}, },
created() { created() {
...@@ -534,8 +535,9 @@ ...@@ -534,8 +535,9 @@
this.branchList = res.data.SiteList; this.branchList = res.data.SiteList;
this.startCitys = res.data.CityList; this.startCitys = res.data.CityList;
this.lineList = res.data.linePlaceList; this.lineList = res.data.linePlaceList;
this.msg.companyId = this.branchList[0].BId this.msg.companyId = this.branchList[0].BId;
this.currentBrachName = this.branchList[0].BName this.currentBrachName = this.branchList[0].BName;
this.CityId = this.branchList[0].CityId;
} }
}, },
null null
...@@ -544,6 +546,7 @@ ...@@ -544,6 +546,7 @@
changeBranch(val) { changeBranch(val) {
this.msg.companyId = this.branchList[val].BId this.msg.companyId = this.branchList[val].BId
this.currentBrachName = this.branchList[val].BName this.currentBrachName = this.branchList[val].BName
this.CityId = this.branchList[val].CityId;
this.research(); this.research();
}, },
setDays(day) { setDays(day) {
...@@ -707,7 +710,7 @@ ...@@ -707,7 +710,7 @@
//跳转至详情 //跳转至详情
goJzDetail(tcid, configId) { goJzDetail(tcid, configId) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/jiuzhai/jz_LineDetail?tcid=" + tcid + '&configId=' + configId url: "/pages/jiuzhai/jz_LineDetail?tcid=" + tcid + '&configId=' + configId + '&cityId=' + this.CityId
}); });
}, },
//获取第一张图 //获取第一张图
......
pages/jiuzhai/jz_LineDetail.vue
View file @ 2b5140c1
...@@ -138,6 +138,41 @@ ...@@ -138,6 +138,41 @@
</view> </view>
<view class="jz_Zhankai" style="display:none;">展开全部</view> <view class="jz_Zhankai" style="display:none;">展开全部</view>
</view> </view>
<view class="jz_TripDays">
<span style="display: inline-block;position: relative;margin-bottom:40rpx;">
<text style="position: relative;z-index: 2; color:#1F1F1F;font-size:36rpx;font-weight:bold;">往返交通</text>
<span style="width:40px;background-color: #DFBE6E;height: 6px;bottom: 2px;left: 0;right: 0;position: absolute;z-index: 1;"></span>
</span>
<view class="jz_TripMain">
<view>
<view class="jz_Flight" v-for="(fItem,fIndex) in dataList.currentPriceInfo.priceFlight" :key="fIndex">
<view class="jz_FlightItem">
<view style="width:150rpx;">
<view class="jz_FlightTitle">{{fItem.departureAirPortName}}</view>
<view class="jz_FlightBottom">{{fItem.departureTime}}</view>
</view>
<view class="jz_FlightIcon">
<view style="display: flex;align-items: center;font-size:24rpx;">
<img v-if="fItem.trafficType==1" style="width:30rpx;height:30rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/airfly.png" alt="" />
<img v-if="fItem.trafficType==2" style="width:30rpx;height:30rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/train.png" alt="" />
<view style="margin-left:10rpx;">{{fItem.flightNumber}}</view>
</view>
<view class="jz_Arrow">
<img style="width:110rpx;height:8rpx;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/b_arrow.png" />
</view>
<view class="jz_StartDate">
{{getFlightDay(fItem.startDate)}}
</view>
</view>
<view style="width:150rpx;">
<view class="jz_FlightTitle">{{fItem.arrivalAirPortName}}</view>
<view class="jz_FlightBottom">{{fItem.arrivalTime}}</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="jz_TripDays"> <view class="jz_TripDays">
<span style="display: inline-block;position: relative;margin-bottom:40rpx;"> <span style="display: inline-block;position: relative;margin-bottom:40rpx;">
<text style="position: relative;z-index: 2; color:#1F1F1F;font-size:36rpx;font-weight:bold;">行程特色</text> <text style="position: relative;z-index: 2; color:#1F1F1F;font-size:36rpx;font-weight:bold;">行程特色</text>
...@@ -348,7 +383,8 @@ ...@@ -348,7 +383,8 @@
delMsg: { delMsg: {
tcid: 0, tcid: 0,
configId: 0, configId: 0,
tcnum:'' tcnum:'',
cityId:0
}, },
scenicNum: 0, // 景点数量 scenicNum: 0, // 景点数量
breakfastNum: 0, //早餐数 breakfastNum: 0, //早餐数
...@@ -366,9 +402,10 @@ ...@@ -366,9 +402,10 @@
}, },
onLoad(option) { onLoad(option) {
if (option.tcid && option.configId) { if (option.tcid && option.configId && option.cityId) {
this.delMsg.tcid = option.tcid; this.delMsg.tcid = option.tcid;
this.delMsg.configId = option.configId; this.delMsg.configId = option.configId;
this.delMsg.cityId = option.cityId;
this.getDetails(); this.getDetails();
} }
let that = this let that = this
...@@ -491,6 +528,12 @@ ...@@ -491,6 +528,12 @@
return Myday[1] + '-' + Myday[2] return Myday[1] + '-' + Myday[2]
} }
}, },
getFlightDay(day){
if (day) {
let Myday = day.split('-');
return Myday[1] + '月' + Myday[2] + '日'
}
},
//点击切换 //点击切换
getDayInfo(item){ getDayInfo(item){
if(this.crCount+this.etCount+this.etbCount>=this.currentPrice.totalSeat){ if(this.crCount+this.etCount+this.etbCount>=this.currentPrice.totalSeat){
...@@ -540,6 +583,40 @@ ...@@ -540,6 +583,40 @@
}; };
</script> </script>
<style> <style>
.jz_FlightItem{
display: flex;
justify-content: space-between;
width:90%;
margin:auto;
margin-bottom:45rpx;
}
.jz_FlightTitle{
color:#999999;
font-size:24rpx;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
}
.jz_Arrow{
position: absolute;
top: 17rpx;
}
.jz_StartDate{
color:#999999;
font-size:24rpx;
margin-top:25rpx;
}
.jz_FlightBottom{
color:#111111;
font-size:26rpx;
margin-top:10rpx;
}
.jz_FlightIcon{
text-align: center;
position: relative;
flex-shrink: 0;
}
.jz_LineDetail { .jz_LineDetail {
background-color: #ECF1F4; background-color: #ECF1F4;
padding-bottom:70px; padding-bottom:70px;
...@@ -993,4 +1070,8 @@ ...@@ -993,4 +1070,8 @@
border: none!important; border: none!important;
height:auto!important; height:auto!important;
} }
.jz_Flight{
display: flex;
justify-content: space-between;
}
</style> </style>
\ No newline at end of file
pages/jiuzhai/jz_MyOrder.vue
View file @ 2b5140c1
...@@ -65,9 +65,6 @@ ...@@ -65,9 +65,6 @@
} }
.jz_Zailai { .jz_Zailai {
position: absolute;
right: 40rpx;
bottom: 20rpx;
background-color: #111111; background-color: #111111;
border-radius: 16px; border-radius: 16px;
width: 150rpx; width: 150rpx;
...@@ -81,6 +78,13 @@ ...@@ -81,6 +78,13 @@
.isShowAll { .isShowAll {
height: auto; height: auto;
} }
.jz_BtnContent{
margin-top:15px;
right:40rpx;
bottom:20rpx;
display:flex;
justify-content: flex-end;
}
</style> </style>
<template> <template>
<view class="jz_MyOrder"> <view class="jz_MyOrder">
...@@ -99,7 +103,7 @@ ...@@ -99,7 +103,7 @@
<u-icon name="arrow-up" @click="getShow(item)" v-else color="#2979ff" size="28"></u-icon> <u-icon name="arrow-up" @click="getShow(item)" v-else color="#2979ff" size="28"></u-icon>
</view> </view>
<view class="jz-Oright"> <view class="jz-Oright">
{{item.orderStateName}} {{item.orderStateName=='占位'?'待付款':item.orderStateName}}
</view> </view>
</view> </view>
<view style="display:flex;"> <view style="display:flex;">
...@@ -111,8 +115,12 @@ ...@@ -111,8 +115,12 @@
<view style="margin-top:22rpx;">付款总额：¥{{item.preferPrice}}</view> <view style="margin-top:22rpx;">付款总额：¥{{item.preferPrice}}</view>
</view> </view>
</view> </view>
<view class="jz_Zailai" style="right:90px;" @click="gojz_List">再来一单</view> <view v-if="item.isApplyForCancel==1" style="color:red;font-size:24rpx;margin-left:122rpx;">订单取消，正在确认中！</view>
<view class="jz_Zailai" style="width:60px;" @click="goCancel(item)">取消</view> <view class="jz_BtnContent">
<view class="jz_Zailai" style="margin-right:10rpx;" @click="gojz_List">再来一单</view>
<view v-if="item.orderState==2" class="jz_Zailai" style="width:110rpx;margin-right:10rpx;" @click="goZhifu(item)">付款</view>
<view v-if="item.isApplyForCancel!=1" class="jz_Zailai" style="width:110rpx;" @click="goCancel(item)">取消</view>
</view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
...@@ -141,8 +149,11 @@ ...@@ -141,8 +149,11 @@
name: '待付款', name: '待付款',
Id:2 Id:2
}, { }, {
name: '已付款', name: '已完成',
Id:1 Id:1
},{
name: '已取消',
Id:4
}], }],
current: 0, current: 0,
dataList: [], dataList: [],
...@@ -153,6 +164,7 @@ ...@@ -153,6 +164,7 @@
nomore: "没有更多了", nomore: "没有更多了",
}, },
status: "加载中", status: "加载中",
price:0
}; };
}, },
created() { created() {
...@@ -201,6 +213,10 @@ ...@@ -201,6 +213,10 @@
this.getOrderInfo(1); this.getOrderInfo(1);
}, },
getOrderInfo(type) { getOrderInfo(type) {
uni.showLoading({
title:'加载中',
icon:'none'
})
if(type==1){ if(type==1){
this.dataList=[]; this.dataList=[];
} }
...@@ -208,6 +224,7 @@ ...@@ -208,6 +224,7 @@
this.msg.MiniAppUserId = this.userInfo.UserId this.msg.MiniAppUserId = this.userInfo.UserId
this.apipost("sellorder_post_GetMiniAppTravelOrderList", this.msg, this.apipost("sellorder_post_GetMiniAppTravelOrderList", this.msg,
res => { res => {
uni.hideLoading();
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res, '数据'); console.log(res, '数据');
if(type==1){ if(type==1){
...@@ -258,7 +275,6 @@ ...@@ -258,7 +275,6 @@
this.apipost("sellorder_post_AppletUserCancelOrder", msg , this.apipost("sellorder_post_AppletUserCancelOrder", msg ,
res => { res => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
console.log(res, '数据');
uni.showToast({ uni.showToast({
title: '操作成功', title: '操作成功',
icon: 'success', icon: 'success',
...@@ -272,6 +288,55 @@ ...@@ -272,6 +288,55 @@
null null
); );
} }
},
//付款
goZhifu(item){
console.log(item,'item');
let url='/api/WeChatPay/GetTravlePayInfo'
let GoodsName = item.title;
GoodsName = GoodsName.slice(0, 10);
this.price = item.preferPrice;
this.request2({
url: url,
data: {
OrderId:item.orderId,
GoodsName:GoodsName,
OrderPayType:1,
OpenId:uni.getStorageSync('mall_UserInfo').OpenId,
}
},
res => {
let orderInfo = JSON.parse(res.data);
this.goPay(orderInfo)
}
);
},
goPay(orderInfo){
let that=this;
uni.requestPayment({
provider: 'wxpay',
timeStamp: orderInfo.timeStamp,
nonceStr: orderInfo.nonceStr,
package: orderInfo.package,
signType: orderInfo.signType,
paySign: orderInfo.sign,
success: function(res) {
console.log('success', res);
uni.showToast({
title: "支付成功"
})
//todo
uni.redirectTo({
url: '/pages/jiuzhai/paysuccess?PreferPrice='+that.price+'&isFrom=1'
});
},
fail: function(err) {
console.log('fail:', err);
uni.showToast({
title: "支付失败"
})
}
});
} }
} }
......
pages/jiuzhai/jz_SureOrder.vue
View file @ 2b5140c1
...@@ -199,13 +199,18 @@ ...@@ -199,13 +199,18 @@
title: "支付成功" title: "支付成功"
}) })
//todo //todo
uni.redirectTo({
url: '/pages/jiuzhai/paysuccess?PreferPrice='+that.orderData.PreferPrice+'&isFrom=1'
});
}, },
fail: function(err) { fail: function(err) {
console.log('fail:', err); console.log('fail:', err);
uni.showToast({ uni.showToast({
title: "支付失败" title: "支付失败"
}) })
uni.redirectTo({
url: '/pages/jiuzhai/jz_MyOrder'
});
} }
}); });
} }
......
pages/jiuzhai/paysuccess.vue
View file @ 2b5140c1
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
showCoupons: false, showCoupons: false,
couponMessage: '', couponMessage: '',
PreferPrice:'', PreferPrice:'',
isLineOrder:0,
}; };
}, },
onLoad(option) { onLoad(option) {
...@@ -50,14 +51,27 @@ ...@@ -50,14 +51,27 @@
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.themCustomStyle.color = this.mainColor; this.themCustomStyle.color = this.mainColor;
this.themCustomStyle.borderColor = this.mainColor; this.themCustomStyle.borderColor = this.mainColor;
if(option.isFrom){
this.isLineOrder=option.isFrom
}
}, },
methods: { methods: {
redictToOrders() { redictToOrders() {
if(this.isLineOrder==0){
uni.redirectTo({ uni.redirectTo({
url: '/pages/jiuzhai/allorderList' url: '/pages/jiuzhai/allorderList'
}); });
}else if(this.isLineOrder==1){
uni.redirectTo({
url: '/pages/jiuzhai/jz_MyOrder'
});
}else if(this.isLineOrder==2){//司导订单
uni.redirectTo({
url: '/pages/guidecar/orderList'
});
}
}, },
goHome() { goHome() {
uni.reLaunch({ uni.reLaunch({
......
pages/restaurant/components/buyNotice.vue
View file @ 2b5140c1
...@@ -12,14 +12,16 @@ ...@@ -12,14 +12,16 @@
<text class="ticket-title-bg"></text> <text class="ticket-title-bg"></text>
</view> </view>
<view class="meal-con"> <view class="meal-con">
{{mealData.MealDesc}} <text v-if="mealData.MealDesc">{{mealData.MealDesc}}</text>
<text v-else class="zanwu">暂无</text>
</view> </view>
<view class="ticket-title"> <view class="ticket-title">
购买须知 购买须知
<text class="ticket-title-bg"></text> <text class="ticket-title-bg"></text>
</view> </view>
<view class="buy-notice-con"> <view class="buy-notice-con">
<rich-text :nodes="mealData.OtherTag"></rich-text> <rich-text :nodes="mealData.OtherTag" v-if="mealData.OtherTag"></rich-text>
<text v-else class="zanwu">暂无</text>
</view> </view>
<view class="btn-box"> <view class="btn-box">
<view class="price"> <view class="price">
...@@ -163,4 +165,10 @@ ...@@ -163,4 +165,10 @@
} }
} }
} }
.zanwu{
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 400;
color: #999999;
}
</style> </style>
pages/restaurant/components/package-good.vue
View file @ 2b5140c1
<template> <template>
<view class="package-good"> <view class="package-good">
<view class="rm-left"> <view class="rm-left">
<image :src="data.MealPic" mode="aspectFit"> <image :src="data.MealPic" mode="aspectFill">
</image> </image>
</view> </view>
<view class="rm-right"> <view class="rm-right">
......
pages/restaurant/components/restaurant-type.vue
View file @ 2b5140c1
...@@ -145,11 +145,11 @@ ...@@ -145,11 +145,11 @@
changeHandler(i) { changeHandler(i) {
this.tid = i; this.tid = i;
this.sd = this.d[this.tid].ChildrenList; this.sd = this.d[this.tid].ChildrenList;
this.currentObj=this.d[i]
}, },
clickHandler(item) { clickHandler(item) {
this.currentObj=item this.currentObj=item
this.currentObj.active=this.active this.currentObj.active=this.active
console.log(this.currentObj)
// let Id1 = this.d[this.tid].ID; // let Id1 = this.d[this.tid].ID;
// let Id2 = item.ID; // let Id2 = item.ID;
// let CategoryIds = Id2; // let CategoryIds = Id2;
......
pages/restaurant/components/uni-calendar/uni-calendar.vue
View file @ 2b5140c1
...@@ -268,6 +268,20 @@ ...@@ -268,6 +268,20 @@
*/ */
choiceDate(weeks) { choiceDate(weeks) {
if (weeks.disable) return if (weeks.disable) return
let resDay=Date.parse(weeks.fullDate);
let now=new Date();
now.setHours(0);//设置小时
now.setMinutes(0);//设置分钟
now.setSeconds(0);//设置秒
now.setMilliseconds(0);//设置毫妙
let today= now.getTime();
if(resDay<today){
uni.showToast({
title: "不能选择今天以前的日期",
icon: "none",
});
return
}
this.calendar = weeks this.calendar = weeks
// 设置多选 // 设置多选
this.cale.setMultiple(this.calendar.fullDate) this.cale.setMultiple(this.calendar.fullDate)
......
pages/restaurant/detail.vue
View file @ 2b5140c1
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<view @click="goback"> <view @click="goback">
<u-icon name="arrow-left" size="44"></u-icon> <u-icon name="arrow-left" size="44"></u-icon>
</view> </view>
<view style="flex: 1;margin-left: 30rpx; text-align: left;">{{details.Name}}</view> <view style="flex: 1;margin-left: 30rpx; text-align: left;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{details.Name}}</view>
</view> </view>
<view class="restaurant-content"> <view class="restaurant-content">
<view class="restaurant-base"> <view class="restaurant-base">
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
</view> </view>
<ul class="title-style-one hr"> <ul class="title-style-one hr" v-if="details.FoodRecommendList.length>0">
<li v-for="(item,index) in details.FoodRecommendList" :key="index"> <li v-for="(item,index) in details.FoodRecommendList" :key="index">
<view class="item-title regular">{{item.FoodName}}</view> <view class="item-title regular">{{item.FoodName}}</view>
</li> </li>
...@@ -397,7 +397,7 @@ ...@@ -397,7 +397,7 @@
.chooseDate { .chooseDate {
width: 275rpx; width: 275rpx;
margin-top: 20rpx; margin: 20rpx 0;
/* display: inline-block; */ /* display: inline-block; */
/* height: 60rpx; */ /* height: 60rpx; */
background-color: #ECF1F4; background-color: #ECF1F4;
......
pages/restaurant/list.vue
View file @ 2b5140c1
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
showLoading: false, showLoading: false,
status: "loadmore", status: "loadmore",
currentTypeObj: { currentTypeObj: {
Id: -1, ID: -1,
active: 0 active: 0
}, },
foodType: [], foodType: [],
...@@ -184,9 +184,6 @@ ...@@ -184,9 +184,6 @@
restaurantType restaurantType
}, },
onLoad(options) { onLoad(options) {
if(options && options.Name){
this.msg.Name = options.Name
}
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "美食", title: "美食",
}); });
...@@ -306,6 +303,7 @@ ...@@ -306,6 +303,7 @@
}, },
sureType(item) { sureType(item) {
this.msg.FoodTypeIds = item.ID; this.msg.FoodTypeIds = item.ID;
console.log(this.msg,item)
this.getFoodList(); this.getFoodList();
this.closeDropdown(); this.closeDropdown();
}, },
......
pages/ticketCoupons/components/buyNotice.vue
View file @ 2b5140c1
...@@ -71,17 +71,20 @@ ...@@ -71,17 +71,20 @@
</view> </view>
</view> </view>
<!-- 使用说明 --> <!-- 使用说明 -->
<view class="use-desc" v-if="TicketData.UseInstructionsList.length>0"> <view class="use-desc">
<view class="ticket-title"> <view class="ticket-title">
使用说明 使用说明
<text class="ticket-title-bg"></text> <text class="ticket-title-bg"></text>
</view> </view>
<view v-for="(item,index) in TicketData.UseInstructionsList" :key="index"> <view class="zanwu" v-if="TicketData.UseInstructionsList.length===0||(TicketData.UseInstructionsList[0].title==''&&TicketData.UseInstructionsList[0].Dec=='')">
暂无
</view>
<view v-for="(item,index) in TicketData.UseInstructionsList" :key="index" v-if="TicketData.UseInstructionsList.length>0">
<view class="detail-info-item"> <view class="detail-info-item">
<view class="item2-name"> <view class="item2-name" v-if="item.title">
{{item.title}} {{item.title}}
</view> </view>
<view class="item-desc"> <view class="item-desc" v-if="item.Dec">
{{item.Dec}} {{item.Dec}}
</view> </view>
</view> </view>
...@@ -93,12 +96,15 @@ ...@@ -93,12 +96,15 @@
费用说明 费用说明
<text class="ticket-title-bg"></text> <text class="ticket-title-bg"></text>
</view> </view>
<view v-for="(item,index) in TicketData.PriceInstructionsList" :key="index"> <view class="zanwu" v-if="TicketData.PriceInstructionsList.length===0||(TicketData.PriceInstructionsList[0].title==''&&TicketData.PriceInstructionsList[0].Dec=='')">
暂无
</view>
<view v-for="(item,index) in TicketData.PriceInstructionsList" :key="index" v-if="TicketData.PriceInstructionsList.length>0">
<view class="detail-info-item"> <view class="detail-info-item">
<view class="item2-name"> <view class="item2-name" v-if="item.title">
{{item.title}} {{item.title}}
</view> </view>
<view class="item-desc"> <view class="item-desc" v-if="item.Dec">
{{item.Dec}} {{item.Dec}}
</view> </view>
</view> </view>
...@@ -106,17 +112,20 @@ ...@@ -106,17 +112,20 @@
</view> </view>
<!-- 其他信息 --> <!-- 其他信息 -->
<view class="other-desc"> <view class="other-desc" v-if="TicketData.OtherDescList.length>0">
<view class="ticket-title"> <view class="ticket-title">
其他信息 其他信息
<text class="ticket-title-bg"></text> <text class="ticket-title-bg"></text>
</view> </view>
<view v-for="(item,index) in TicketData.OtherDescList" :key="index"> <view class="zanwu" v-if="TicketData.OtherDescList.length===0||(TicketData.OtherDescList[0].title==''&&TicketData.OtherDescList[0].Dec=='')">
暂无
</view>
<view v-for="(item,index) in TicketData.OtherDescList" :key="index" v-if="TicketData.OtherDescList.length>0">
<view class="detail-info-item"> <view class="detail-info-item">
<view class="item2-name"> <view class="item2-name" v-if="item.title">
{{item.title}} {{item.title}}
</view> </view>
<view class="item-desc"> <view class="item-desc" v-if="item.Dec">
{{item.Dec}} {{item.Dec}}
</view> </view>
</view> </view>
...@@ -307,11 +316,14 @@ ...@@ -307,11 +316,14 @@
.detail-info-item { .detail-info-item {
display: flex; display: flex;
margin-bottom: 30rpx; flex-wrap: wrap;
align-items: center;
margin-bottom: 20rpx;
.item-name { .item-name {
width: 120rpx; // width: 120rpx;
height: 40rpx; // height: 40rpx;
padding: 8rpx;
background-color: #111111; background-color: #111111;
border-radius: 4rpx; border-radius: 4rpx;
font-size: 24rpx; font-size: 24rpx;
...@@ -324,8 +336,9 @@ ...@@ -324,8 +336,9 @@
overflow: hidden; overflow: hidden;
} }
.item2-name { .item2-name {
width: 120rpx; // width: 120rpx;
height: 40rpx; // height: 40rpx;
padding: 8rpx;
background-color: #ECF1F4; background-color: #ECF1F4;
border-radius: 4rpx; border-radius: 4rpx;
font-size: 24rpx; font-size: 24rpx;
...@@ -333,28 +346,34 @@ ...@@ -333,28 +346,34 @@
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
margin-right: 45rpx; margin-right: 45rpx;
margin-bottom: 20rpx;
text-align: center; text-align: center;
line-height: 38rpx; line-height: 38rpx;
overflow: hidden; overflow: hidden;
} }
.item-desc { .item-desc {
width: 500rpx; // width: 500rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 800; font-weight: 800;
color: #111111; color: #111111;
line-height: 28rpx;
// white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
} }
} }
.method { .method {
// width: 660rpx; // width: 660rpx;
height: 225rpx; // height: 225rpx;
background-color: #FCF8F0; background-color: #FCF8F0;
border-radius: 4rpx; border-radius: 4rpx;
position: relative; position: relative;
margin-top: 40rpx; margin-top: 40rpx;
padding: 60rpx 0 0 25rpx; padding: 60rpx 25rpx 25rpx 25rpx;
margin-bottom: 50rpx; margin-bottom: 50rpx;
.method-title { .method-title {
...@@ -397,7 +416,7 @@ ...@@ -397,7 +416,7 @@
padding-left: 25rpx; padding-left: 25rpx;
margin-bottom: 25rpx; margin-bottom: 25rpx;
.tuipiao-name { .tuipiao-name {
height: 40rpx; // height: 40rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
border: 1rpx solid #DFBE6E; border: 1rpx solid #DFBE6E;
border-radius: 4rpx; border-radius: 4rpx;
...@@ -407,12 +426,13 @@ ...@@ -407,12 +426,13 @@
color: #DFBE6E; color: #DFBE6E;
text-align: center; text-align: center;
margin-right: 25rpx; margin-right: 25rpx;
margin-bottom: 25rpx;
padding: 0 10rpx; padding: 0 10rpx;
line-height: 38rpx; line-height: 38rpx;
} }
.tuipiao-desc { .tuipiao-desc {
height: 40rpx; // height: 40rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
...@@ -455,4 +475,10 @@ ...@@ -455,4 +475,10 @@
} }
.zanwu{
font-size: 28rpx;
font-family: PingFang SC;
font-weight: 400;
color: #999999;
}
</style> </style>
pages/ticketCoupons/components/njzz-calendar/njzz-calendar.vue
View file @ 2b5140c1
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</view> </view>
<view class="dayBox"> <view class="dayBox">
<view class="day" v-for="(item,index) in space" v-bind:key="index"></view> <view class="day" v-for="(item,index) in space" v-bind:key="index"></view>
<view class="day" :class="[getDateStr(item.date)==getDateStr(dayActive.date)?'active':'']" v-for="(item,index) in dayList" v-bind:key="index" @tap="selectDate(item)"> <view class="day" :class="[getDateStr(item.date)==defaultSelect?'active':'']" v-for="(item,index) in dayList" v-bind:key="index" @tap="selectDate(item)">
<view :class="[isToday(item.date)?'today':'']">{{isToday(item.date) ? "今天" : item.date.getDate()}}</view> <view :class="[isToday(item.date)?'today':'']">{{isToday(item.date) ? "今天" : item.date.getDate()}}</view>
<view class="calen-text-orange">{{item.price||item.price===0?'&yen;'+item.price:''}}</view> <view class="calen-text-orange">{{item.price||item.price===0?'&yen;'+item.price:''}}</view>
</view> </view>
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
<script> <script>
import uniIcons from "./uni-icons/uni-icons.vue" import uniIcons from "./uni-icons/uni-icons.vue"
/* import {uniIcons} from "../../components/uni-icons" */
export default{ export default{
components:{uniIcons}, components:{uniIcons},
name:"Zcalendar", name:"Zcalendar",
...@@ -70,6 +69,11 @@ ...@@ -70,6 +69,11 @@
space:0//周几占位个数 例如 周二占位2个 space:0//周几占位个数 例如 周二占位2个
} }
}, },
watch:{
defaultSelect(val){
// this.getDefaultData(val)
}
},
mounted() { mounted() {
this.today = new Date(); this.today = new Date();
this.nowMonth = { this.nowMonth = {
...@@ -78,11 +82,11 @@ ...@@ -78,11 +82,11 @@
} }
this.setMonthList() this.setMonthList()
}, },
updated() { // updated() {
if(this.defaultSelect != "" && !this.dayActive){ // if(this.defaultSelect != "" && !this.dayActive){
this.dayActive = this.getDefaultData(this.defaultSelect) // this.dayActive = this.getDefaultData(this.defaultSelect)
} // }
}, // },
computed: { computed: {
monthDatePrice: function () { monthDatePrice: function () {
//过滤出 每个月份的团期价格list 并且按照对象内的价格排序 以用来显示当前月份xxxx金额起,用于mode1 //过滤出 每个月份的团期价格list 并且按照对象内的价格排序 以用来显示当前月份xxxx金额起,用于mode1
...@@ -135,20 +139,20 @@ ...@@ -135,20 +139,20 @@
this.current = index this.current = index
this.$emit('changeMonth',momth) this.$emit('changeMonth',momth)
}, },
getDefaultData(d){ //设置初始值 // getDefaultData(d){ //设置初始值
let list = this.datePrice.filter(item=>item.date==d); // let list = this.datePrice.filter(item=>item.date==d);
let obj={}; // let obj={};
if(list.length>0){ //逻辑依旧是保证没有团期（价格）的不能选中 // if(list.length>0){ //逻辑依旧是保证没有团期（价格）的不能选中
obj = { // obj = {
date:new Date(list[0].date), // date:new Date(list[0].date),
price:list[0].price // price:list[0].price
} // }
}else{ // }else{
obj = false // obj = false
} // }
return obj; // return obj;
}, // },
isToday(date){ isToday(date){
return date.getFullYear()==this.today.getFullYear() && date.getMonth()==this.today.getMonth() && date.getDate() == this.today.getDate() return date.getFullYear()==this.today.getFullYear() && date.getMonth()==this.today.getMonth() && date.getDate() == this.today.getDate()
}, },
...@@ -210,7 +214,6 @@ ...@@ -210,7 +214,6 @@
selectDate(data){ //选择日期 selectDate(data){ //选择日期
//多选模式请在这改造 //多选模式请在这改造
/* this.$set(this.dayActive,"date",date) */ /* this.$set(this.dayActive,"date",date) */
console.log(data)
let resDay=Date.parse(data.date); let resDay=Date.parse(data.date);
let now=new Date(); let now=new Date();
now.setHours(0);//设置小时 now.setHours(0);//设置小时
......
pages/ticketCoupons/components/subscribeTicket.vue
View file @ 2b5140c1
...@@ -64,11 +64,11 @@ ...@@ -64,11 +64,11 @@
type: Number, type: Number,
default: 0 default: 0
}, },
TitekCounponId:{ TitekCounponId: {
type: Number, type: Number,
default: 0 default: 0
}, },
TicketName:{ TicketName: {
type: String, type: String,
default: "" default: ""
} }
...@@ -77,12 +77,12 @@ ...@@ -77,12 +77,12 @@
return { return {
curryear: 0, curryear: 0,
currmonth: 0, currmonth: 0,
defaultSelect:"", defaultSelect: "",
datePrice: [], datePrice: [],
price:"", price: "",
peopleNum:1, peopleNum: 1,
showAuth:false, showAuth: false,
u:{}, u: {},
} }
}, },
watch: { watch: {
...@@ -90,13 +90,17 @@ ...@@ -90,13 +90,17 @@
this.defaultSelect = val; this.defaultSelect = val;
let newMonth = val.split('-')[1] let newMonth = val.split('-')[1]
let oldMonth = oldVal.split('-')[1] let oldMonth = oldVal.split('-')[1]
if(newMonth!=oldMonth&&oldMonth!=undefined){ if (newMonth != oldMonth && oldMonth != undefined) {
this.getGoodsDateList(val) this.getGoodsDateList(val)
} }
let list = this.datePrice.filter(item => item.date == this.dateStr);
if (list.length > 0) {
this.price = list[0].price
}
}, },
TicketID(val){ TicketID(val) {
if(val){ if (val) {
this.getGoodsDateList(this.dateStr) this.getGoodsDateList(this.dateStr)
} }
} }
...@@ -104,16 +108,15 @@ ...@@ -104,16 +108,15 @@
mounted() { mounted() {
let year = new Date().getFullYear(); //年 let year = new Date().getFullYear(); //年
let month = new Date().getMonth() + 1; //月 let month = new Date().getMonth() + 1; //月
if(month<10){ if (month < 10) {
month = ('0' + month) month = ('0' + month)
} }
this.curryear= year this.curryear = year
this.currmonth= month this.currmonth = month
}, },
methods: { methods: {
valChange(e) { valChange(e) {
this.peopleNum=e.value this.peopleNum = e.value
}, },
getGoodsDateList(date) { getGoodsDateList(date) {
this.request2({ this.request2({
...@@ -129,33 +132,34 @@ ...@@ -129,33 +132,34 @@
let datePrice = []; let datePrice = [];
data.forEach(x => { data.forEach(x => {
let obj = {} let obj = {}
obj.date = x.Year+'-'+x.Month+'-'+x.Day; obj.date = x.Year + '-' + x.Month + '-' + x.Day;
if(x.IsHavePrice==1){ if (x.IsHavePrice == 1) {
let p=this.$utils.getretailer()==true? x.HPriceB:x.HPriceC let p = this.$utils.getretailer() == true ? x.HPriceB : x.HPriceC
obj.price =p ; obj.price = p;
}else{ } else {
obj.price = ""; obj.price = "";
} }
datePrice.push(obj) datePrice.push(obj)
}) })
this.datePrice = datePrice this.datePrice = datePrice
let list = this.datePrice.filter(item=>item.date==this.dateStr); let list = this.datePrice.filter(item => item.date == this.dateStr);
this.price=list[0].price if (list.length > 0) {
console.log(144,list,this.datePrice,this.dateStr) this.price = list[0].price
}
} }
); );
}, },
changeDate(data){ //选择日期事件 可以将data绑定到此页面以用来提交等操作 changeDate(data) { //选择日期事件 可以将data绑定到此页面以用来提交等操作
this.defaultSelect = data.date; this.defaultSelect = data.date;
this.price=data.price this.price = data.price
this.$forceUpdate() this.$forceUpdate()
}, },
changeMonth(nowMonth){ changeMonth(nowMonth) {
let Month = nowMonth.year+'-'+nowMonth.month+'-01'; let Month = nowMonth.year + '-' + nowMonth.month + '-01';
this.getGoodsDateList(Month) this.getGoodsDateList(Month)
}, },
nextStep(){ nextStep() {
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) { if (!this.u) {
this.u = { this.u = {
...@@ -165,23 +169,23 @@ ...@@ -165,23 +169,23 @@
this.showAuth = true; this.showAuth = true;
} else { } else {
if(!this.price){ if (!this.price) {
uni.showToast({ uni.showToast({
title: "请选择日期", title: "请选择日期",
icon: "none", icon: "none",
}); });
return return
} }
let data={ let data = {
TicketId:this.TicketID, TicketId: this.TicketID,
TitekCounponId:this.TitekCounponId, TitekCounponId: this.TitekCounponId,
Unit_Price:this.price, Unit_Price: this.price,
Date:this.defaultSelect, Date: this.defaultSelect,
TicketName:this.TicketName, TicketName: this.TicketName,
PeopleNumber:this.peopleNum, PeopleNumber: this.peopleNum,
} }
uni.navigateTo({ uni.navigateTo({
url: "/pages/ticketCoupons/fillOrder?data="+encodeURIComponent(JSON.stringify(data)), url: "/pages/ticketCoupons/fillOrder?data=" + encodeURIComponent(JSON.stringify(data)),
}); });
} }
...@@ -193,7 +197,7 @@ ...@@ -193,7 +197,7 @@
goback() { goback() {
uni.navigateBack() uni.navigateBack()
}, },
close(){ close() {
this.$emit("close") this.$emit("close")
} }
} }
...@@ -203,11 +207,12 @@ ...@@ -203,11 +207,12 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.subscribeTicket { .subscribeTicket {
height: 80vh; height: 70vh;
padding-top: 45rpx; margin: 45rpx 0;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
.title{
.title {
text-align: center; text-align: center;
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC; font-family: PingFang SC;
...@@ -215,21 +220,25 @@ ...@@ -215,21 +220,25 @@
color: #111111; color: #111111;
margin-bottom: 10rpx; margin-bottom: 10rpx;
position: relative; position: relative;
.close-icon{
.close-icon {
position: absolute; position: absolute;
right: 30rpx; right: 30rpx;
top: 0; top: 0;
} }
} }
.chooseTicketAndNum{
.chooseTicketAndNum {
height: 335rpx; height: 335rpx;
padding: 30rpx; padding: 30rpx;
.chooseTicket{
.chooseTicket {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-bottom: 100rpx; margin-bottom: 100rpx;
.TicketName{
.TicketName {
width: auto; width: auto;
height: 60rpx; height: 60rpx;
padding: 0rpx 30rpx; padding: 0rpx 30rpx;
...@@ -242,7 +251,8 @@ ...@@ -242,7 +251,8 @@
color: #FFFFFF; color: #FFFFFF;
} }
} }
.chooseBtn-box{
.chooseBtn-box {
// width: 670px; // width: 670px;
height: 100rpx; height: 100rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
...@@ -252,33 +262,38 @@ ...@@ -252,33 +262,38 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.btn-TicketName-box{
.btn-TicketName-box {
font-size: 24rpx; font-size: 24rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
.btn-TicketName{
.btn-TicketName {
margin-left: 10rpx; margin-left: 10rpx;
} }
} }
.btn-box{
.btn-box {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.icon-box{ .icon-box {
width: 44rpx; width: 44rpx;
font-size: 22rpx; font-size: 22rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #111111; color: #111111;
.kefu-iocn{
.kefu-iocn {
width: 44rpx; width: 44rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
} }
.subscribe-btn{
.subscribe-btn {
width: 190rpx; width: 190rpx;
height: 80rpx; height: 80rpx;
margin-left: 20rpx; margin-left: 20rpx;
......
pages/ticketCoupons/components/uni-calendar/uni-calendar.vue
View file @ 2b5140c1
...@@ -216,6 +216,7 @@ ...@@ -216,6 +216,7 @@
* 确认按钮 * 确认按钮
*/ */
confirm() { confirm() {
this.setEmit('confirm') this.setEmit('confirm')
this.close() this.close()
}, },
...@@ -268,6 +269,20 @@ ...@@ -268,6 +269,20 @@
*/ */
choiceDate(weeks) { choiceDate(weeks) {
if (weeks.disable) return if (weeks.disable) return
let resDay=Date.parse(weeks.fullDate);
let now=new Date();
now.setHours(0);//设置小时
now.setMinutes(0);//设置分钟
now.setSeconds(0);//设置秒
now.setMilliseconds(0);//设置毫妙
let today= now.getTime();
if(resDay<today){
uni.showToast({
title: "不能选择今天以前的日期",
icon: "none",
});
return
}
this.calendar = weeks this.calendar = weeks
// 设置多选 // 设置多选
this.cale.setMultiple(this.calendar.fullDate) this.cale.setMultiple(this.calendar.fullDate)
......
pages/ticketCoupons/detail.vue
View file @ 2b5140c1
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<view @click="goback"> <view @click="goback">
<u-icon name="arrow-left" size="44"></u-icon> <u-icon name="arrow-left" size="44"></u-icon>
</view> </view>
<view style="flex: 1;margin-left: 30rpx; text-align: left;'background-color':'#000'">{{details.Name}} <view style="flex: 1;margin-left: 30rpx; text-align: left;'background-color':'#000';white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{details.Name}}
</view> </view>
</view> </view>
<view style="position: relative;z-index: 2;"> <view style="position: relative;z-index: 2;">
...@@ -128,8 +128,8 @@ ...@@ -128,8 +128,8 @@
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/likeruyuan.png" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/likeruyuan.png"
mode="aspectFit" v-if="_item.IsSameDayBuy==1"></image> mode="aspectFit" v-if="_item.IsSameDayBuy==1"></image>
<view class="tag-item" v-if="_item.SubscribeTime||_item.ChangeTickets"> <view class="tag-item" v-if="_item.SubscribeTime||_item.ChangeTickets">
<text>{{_item.SubscribeTime}}</text> <text v-if="_item.SubscribeTime">随时可买</text>
<text class="gap">{{_item.ChangeTickets}}</text> <text class="gap" v-if="_item.ChangeTickets">无需换票</text>
</view> </view>
</view> </view>
<!-- 无忧退款 --> <!-- 无忧退款 -->
...@@ -246,7 +246,6 @@ ...@@ -246,7 +246,6 @@
this.ID = options.id this.ID = options.id
this.getDetail() this.getDetail()
} }
this.imgBaseUrl = "http://192.168.20.214:8130"
uni.getSystemInfo({ uni.getSystemInfo({
success(res) { success(res) {
that.titleStyle = { that.titleStyle = {
...@@ -808,7 +807,7 @@ ...@@ -808,7 +807,7 @@
.tag { .tag {
display: flex; display: flex;
max-width: 70%; max-width: 70%;
// height: 32rpx; height: 32rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
.tag-img { .tag-img {
......
pages/ticketCoupons/policyDetail.vue
View file @ 2b5140c1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- 政策详情 --> <!-- 政策详情 -->
<view class="policyDetail"> <view class="policyDetail">
<u-tabs :list="typeList" :current="active" name="Name" :is-scroll="false" @change="changeHandler" <u-tabs :list="typeList" :current="active" name="Name" :is-scroll="false" @change="changeHandler"
:active-color="mainColor" bg-color="#FFF" bar-height='4' height="100"></u-tabs> :active-color="mainColor" bg-color="#FFF" :bar-style="barStyle" height="100"></u-tabs>
<view class="officialNotice"> <view class="officialNotice">
<view class="title"> <view class="title">
官方公告信息 官方公告信息
...@@ -72,10 +72,10 @@ ...@@ -72,10 +72,10 @@
active: 0, active: 0,
mainColor: "#DFBE6E", mainColor: "#DFBE6E",
barStyle: { barStyle: {
width: '30rrpx', width: '50rpx ',
height: '6rpx', height: '6rpx !important',
background: '#DFBE6E', backgroundColor: '#DFBE6E !important',
borderRadius: '3rpx' borderRadius: '3rpx !important',
}, },
typeList: [{ typeList: [{
Id: 0, Id: 0,
......
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