Skip to content

M
million
Commit a664c459 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/million

parents 347ef034 ac5697bb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 711 additions and 85 deletions
src/components/car/orderPreview.vue
View file @ a664c459
......@@ -20,7 +20,7 @@
</div>
</div>
</template>
<div class="row no-wrap">
<!-- <div class="row no-wrap">
<div v-if="dataList.CarType!=1" :class="{'col':dataList.PlaceList.length>2}">
<div class="text-grey-6 f12 q-my-md">選擇上車範圍</div>
<div class="row wrap">
......@@ -41,7 +41,7 @@
</div>
</div>
</div>
</div>
</div> -->
<template v-if="TicketIds&&TicketIds.length>0">
<div class="text-grey-6 f12 q-my-md">選擇車類型</div>
......@@ -123,17 +123,14 @@
<span class="f12 text-negative"
:class="{'q-mr-lg':$q.platform.is.desktop}"
v-if="(p.startDate&&!selectedCarObj)
||(p.startDate&&dataList.CarType==1&&(!selectedAirportObj||!unCarObj))
||(p.startDate&&dataList.CarType==2&&(!selectedAirportObj||!onCarObj))
||(p.startDate&&dataList.CarType==3&&(!onCarObj||!unCarObj))" >
{{`請選擇上面的${dataList.CarType==3?'車類型、上車下車點':dataList.CarType==1?'機場、車類型、下車點':'機場、車類型、上車點'}`}}
||(p.startDate&&dataList.CarType==1&&!selectedAirportObj)
||(p.startDate&&dataList.CarType==2&&!selectedAirportObj)" >
{{`請選擇上面的${dataList.CarType==3?'車類型':dataList.CarType==1?'機場、車類型':'機場、車類型'}`}}
</span>
</span>
<q-btn color="primary" label="立即訂購" unelevated class="q-px-lg"
:disable="sumPrice==0||!selectedCarObj
||(dataList.CarType!=3&&!selectedAirportObj)
||(dataList.CarType==1&&!unCarObj)||(dataList.CarType==2&&!onCarObj)
||(dataList.CarType==3&&(!onCarObj||!unCarObj))"
||(dataList.CarType!=3&&!selectedAirportObj)"
@click="goOrderHandler"/>
</div>
......
src/components/navs/hor-big-one.vue
View file @ a664c459
......@@ -187,6 +187,9 @@
class="q-mr-lg q-ml-sm"
@click="CommonJump('/index', {})"
/></div>
<!-- <div style="transform:scale(0.6,0.6)"> -->
<!-- <searchSf2 v-if="$q.platform.is.desktop" :plugData="plugData"></searchSf2> -->
<!-- </div> -->
<!-- pc -->
<div v-if="$q.platform.is.desktop">
<q-btn label="繁體中文" flat>
......@@ -310,6 +313,7 @@
</div>
<!-- 移动端 -->
<div v-else>
<!-- <searchSf2 :plugData="plugData"></searchSf2> -->
<img
@click="avatarClick"
class="avatar q-mt-sm"
......@@ -342,8 +346,9 @@
import popup from "../props/index";
import CityCategoryMobile from "./city-category-mobile.vue";
import cityCategory from "./city-category.vue";
import searchSf2 from '../search_sf/search-top.vue'
export default {
components: { cityCategory, CityCategoryMobile, popup },
components: { cityCategory, CityCategoryMobile, popup,searchSf2 },
props: {
baseData: {
type: Object,
......@@ -360,6 +365,7 @@ export default {
},
data() {
return {
plugData: {details: [], Title: ''},
showDialog: false,
searchDate: "",
searchEndDate: "",
......
src/components/search_sf/search-top.vue 0 → 100644
View file @ a664c459
This diff is collapsed.
src/pages/About.vue
View file @ a664c459
<style lang="scss" scoped>
/deep/.scroll{
overflow: inherit;
}
.banner {
width: 100%;
}
......@@ -227,7 +230,7 @@ margin-right: 70px;
control-type="regular"
padding
arrows
height="100px"
height="115px"
flat
class="bg-transparent rounded-borders q-mt-md"
>
......
src/pages/hotel/orderForm.vue
View file @ a664c459
......@@ -269,7 +269,7 @@
placeholder=""
mask="#"
reverse-fill-mask
:disable="!numberOfChildren?true:false"
/>
<!-- :rules="[(val) => !!val || '請輸儿童數']" -->
</div>
......@@ -713,10 +713,11 @@ export default {
return this.orderKey != "";
},
async submit() {
let roomGroupLen = this.msg.searchroomGroup.length;
//判断选择的人数与入住人数
let Count1=0
let roomGroup = JSON.parse(JSON.stringify(this.parameters.roomGroup))
let roomGroup = this.parameters.roomGroup
roomGroup.forEach(x=>{
Count1+= Number(x.roomMaleCount)+Number(x.roomFemaleCount)+Number(x.roomChildCount)
})
......@@ -727,6 +728,15 @@ export default {
this.$message.error('入住人數與總入住數不匹配');
return;
}
for (let i = 0; i < roomGroup.length; i++) {
roomGroup[i].roomMaleCount = roomGroup[i].roomMaleCount?roomGroup[i].roomMaleCount:0
roomGroup[i].roomFemaleCount = roomGroup[i].roomFemaleCount?roomGroup[i].roomFemaleCount:0
roomGroup[i].roomChildCount = roomGroup[i].roomChildCount?roomGroup[i].roomChildCount:0
if(!roomGroup[i].roomMaleCount&&!roomGroup[i].roomMaleCount){
this.$message.error('一個房間至少入住一人');
return;
}
}
this.parameters.CustomerId = this.userInfo.Id;
this.parameters.EmployeeIdStr = this.userInfo.Surname+this.userInfo.Name
this.$refs.mail.validate()
......@@ -736,12 +746,8 @@ export default {
this.$refs.guestAddress.validate()
this.$refs.checkInTime.validate()
this.parameters.guestEmail = this.userInfo.Mailbox
for (let i = 0; i < this.parameters.roomGroup.length; i++) {
if(!this.parameters.roomGroup[i].roomMaleCount&&!this.parameters.roomGroup[i].roomMaleCount){
this.$message.error('一個房間至少入住一人');
return;
}
}
let flag = true
......
src/pages/usercenter/coupon.vue
View file @ a664c459
......@@ -158,8 +158,12 @@
</div>
</div>
</div>
<div v-if="!couponList.length ">
<none-data></none-data>
<div v-if="!couponList.length " class="text-center q-my-xl">
<none-data
iconType="order"
title="沒有找到您的優惠券信息哦"
subtitle=""
></none-data>
</div>
</div>
<div v-show="pageCount" class="mt flex justify-end">
......@@ -176,7 +180,7 @@
</div>
</template>
<script>
import noneData from '../../components/noneData.vue'
import noneData from 'src/components/common/noneData.vue'
export default {
components: {
noneData
......
src/pages/usercenter/order/carPriceDetail.vue
View file @ a664c459
......@@ -126,7 +126,7 @@ export default {
this.$q.loading.show();
this.apipost(
"CarSingle_post_GetTYMyCarOrderInfo",
"CarSingle_post_GetAdminCarOrderInfo",
{ OrderId: this.orderInfo.ErpOrderId },
(r) => {
if (r.data.resultCode == 1) {
......
src/pages/usercenter/order/hotelMap.vue
View file @ a664c459
......@@ -31,7 +31,9 @@
</div></div>
</template>
<script>
import componentsMap from 'src/components/car/Map.vue';
export default {
components: {componentsMap},
props: {
orderInfo: {
type: Object,
......@@ -52,8 +54,11 @@ export default {
this.$q.loading.show();
this.apipost(
"dmc_post_Get_GetJAPAN_HotelDetail",
{ ProductId: this.orderInfo.GoodsId },
{ groupBookingFlg: "0",
hotelImageSize: 5,
photoGalleryGetFlg: 1,hotelId: this.orderInfo.GoodsId },
(res) => {
console.log('this.travelLngLat', res)
this.$q.loading.hide();
if (res.data.resultCode == 1) {
this.hotelDetails = res.data.data.hotelDetails;
......@@ -64,6 +69,7 @@ export default {
Lng: this.hotelSummary.longitudeW,
Address: this.hotelSummary.hotelName
});
console.log('this.travelLngLat', this.travelLngLat)
} else {
this.$message.error(res.data.message);
}
......
src/pages/usercenter/order/hotelPriceDetail.vue
View file @ a664c459
......@@ -4,28 +4,27 @@
<template>
<div>
<div class="row q-mb-sm items-center">
<div class="col">總金額</div>
<div class="text-subtitle2 text-weight-bolder text-primary">
<div class="q-mr-lg">總金額</div>
<div class="text-subtitle2 text-weight-bolder ">
CNY {{ moneyFormat(sumPrice, 2) }}
</div>
</div>
<hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
<div class="row q-mb-sm items-center" v-if="DiscountsMoney > 0">
<div class="col">優惠金額</div>
<div class="row q-mb-sm items-center">
<div class="q-mr-lg">優惠金額</div>
<div
class="text-subtitle2 text-weight-bolder text-teal"
v-if="DiscountsMoney > 0"
v-if="DiscountMoney > 0"
>
CNY - {{ moneyFormat(DiscountsMoney, 2) }}
CNY - {{ moneyFormat(DiscountMoney, 2) }}
</div>
<div class="text-grey-5" v-else>暫無優惠</div>
</div>
<div class="row q-mb-sm items-center">
<div class="col">支付金額</div>
<div class="text-h6 text-weight-bolder text-primary product-price">
CNY {{ moneyFormat(Money, 2) }}
<!-- <div class="row q-mb-sm items-center">
<div class="q-mr-lg">支付金額</div>
<div class="text-h6 text-weight-bolder product-price">
CNY {{ moneyFormat(TotalPrice, 2) }}
</div>
</div>
</div> -->
</div>
</template>
<script>
......@@ -40,13 +39,12 @@ export default {
return {
details: null,
sumPrice: 0,//总金额
DiscountsMoney: 0,//优惠金额
Money: 0, // 支付金額
DiscountMoney: 0,//优惠金额
TotalPrice: 0, // 支付金額
}
},
mounted() {
this.getGroupData()
this.getCarOrder()
},
methods: {
// 获取团的详情
......@@ -54,23 +52,22 @@ export default {
// this.$q.loading.show();
this.apipost(
"dmc_post_GetThirdHotelOrder",
{ ProductId: this.orderInfo.GoodsId },
{ OrderID: this.orderInfo.ErpOrderId },
(r) => {
if (r.data.resultCode == 1) {
this.dataList = r.data.data;
const {DiscountsMoney,MailingState,Money} = r.data.data;
console.log('getTicket Data', r.data.data,DiscountsMoney,MailingState,Money)
const {DiscountMoney,TotalPrice} = r.data.data;
console.log('getTicket Data', r.data.data)
// sumPrice: 0,//总金额
// DiscountsMoney: 0,//优惠金额
// Money: 0, // 支付金額
// DiscountMoney: 0,//优惠金额
// TotalPrice: 0, // 支付金額
// MailingState: '',//邮寄状态 1自取 2邮寄
this.Money = Money;
this.DiscountsMoney = DiscountsMoney
this.MailingState = MailingState;
this.sumPrice = Money + DiscountsMoney
this.TotalPrice = TotalPrice;
this.DiscountMoney = DiscountMoney
this.sumPrice = TotalPrice + DiscountMoney
// this.sumPrice = this.moneyFormat(this.sumPrice, 2)
// this.Money = this.moneyFormat(this.Money, 2)
// this.DiscountsMoney = this.moneyFormat(this.DiscountsMoney, 2)
// this.TotalPrice = this.moneyFormat(this.TotalPrice, 2)
// this.DiscountMoney = this.moneyFormat(this.DiscountMoney, 2)
} else {
this.$q.notify({
type: "negative",
......
src/pages/usercenter/order/orderDetail.vue
View file @ a664c459
......@@ -12,7 +12,7 @@
</div>
<div class="">
<div class="f12 text-grey-6">訂單編號：#{{detail.OrderNo}}</div>
<div class="f12 text-grey-6 q-mt-md">下單日期：{{detail.CreateTime}}</div>
<div class="f12 text-grey-6 q-mt-md">下單日期：{{detail.SelectStartTime}}</div>
</div>
</div>
<q-separator color="grey-2" class="q-my-md" />
......@@ -29,7 +29,7 @@
<span class="q-ml-sm text-weight-bolder">{{ moneyFormat(detail.TotalPrice,2) }}</span>
</div>
<div class="row items-center">
<q-btn color="primary" flat dense class="q-mr-md q-px-md">
<q-btn color="primary" flat dense class="q-mr-md q-px-md" @click="navigateToWechat">
<i class="iconfont iconmessage1"></i>联系客服</q-btn>
<q-btn color="primary" dense flat class="q-mr-md q-px-md" @click="showCode = true">
<i class="iconfont iconiconfontscan"></i>扫码咨询</q-btn>
......@@ -37,12 +37,12 @@
<q-btn color="primary" unelevated dense label="前往付款" @click="goPayOrder" class="q-px-md"/> -->
<div class="text-right" v-if="detail.OrderStatus==1">
<q-btn color="primary" dense outline class="q-px-sm" label="取消訂單" @click="cancalOrder(item.orderNo)" />
<q-btn color="primary" dense unelevated class="q-px-sm q-ml-sm" label="立即支付" @click="CommonJump('/pay/'+item.orderNo,{},'blank')" />
<q-btn color="primary" dense outline class="q-px-sm" label="取消訂單" @click="cancalOrder(detail.OrderNo)" />
<q-btn color="primary" dense unelevated class="q-px-sm q-ml-sm" label="立即支付" @click="CommonJump('/pay/'+detail.OrderNo,{},'blank')" />
</div>
<div class="text-right" v-else>
<!-- <div class="text-right" v-else>
<q-btn color="dark" dense flat class="q-px-sm" @click="CommonJump('/orderinfo/'+orderNo,{},'blank')" label="查看訂單" />
</div>
</div> -->
</div>
</div>
</q-card>
......@@ -90,13 +90,13 @@
<div class="q-mt-sm text-body1">{{detail.Mailbox}}</div>
</div>
</div>
<div>
<!-- <div>
<q-separator color="grey-2" class="q-my-md" />
<div class="text-subtitle1 text-weight-bolder">用戶備註</div>
<div class="rounded-borders bg-orange-1 col q-mt-md q-pa-md text-orange">
凍死了防控就是大陸飛科技阿斯蒂芬盧卡斯經費達拉斯
{{detail.Remarks}}
</div>
</div>
</div> -->
</q-card>
<q-card class="rounded-borders q-pa-md q-mt-md" flat v-if="![1,2,3].includes(detail.GoodsType)">
<div v-if="detail.OrderNo">
......@@ -120,6 +120,7 @@
</template>
<script>
import noneData from 'src/components/common/noneData.vue'
import componentsMap from "../../../components/car/Map.vue";
import carPriceDetail from './carPriceDetail.vue'
import groupPriceDetail from './groupPriceDetail.vue'
......@@ -130,7 +131,7 @@ import groupMap from './groupMap.vue'
import hotelMap from './hotelMap.vue'
import ticketMap from './ticketMap.vue'
export default {
components: {componentsMap, carPriceDetail,groupPriceDetail,hotelPriceDetail,ticketPriceDetail,carMap,groupMap,hotelMap,ticketMap},
components: {noneData,componentsMap, carPriceDetail,groupPriceDetail,hotelPriceDetail,ticketPriceDetail,carMap,groupMap,hotelMap,ticketMap},
// GoodsType: this.productType,//商品类型（见枚举） 12包车 13 接机 14送机
data() {
return {
......@@ -167,7 +168,7 @@ methods: {
this.apipost('GetCancelOrder_post',{OrderNo: this.orderNo},r=>{
if(r.data.resultCode==1){
this.$message.success('訂單取消成功')
this.getOrderList()
window.location.reload()
}else{
this.$message.error('訂單取消失敗，請重新嘗試')
}
......@@ -194,7 +195,7 @@ methods: {
this.iconColor = ["","blue","blue", "green", "grey"][this.detail.OrderStatus]
console.log('get detail', this.orderIcon, this.iconColor)
this.orderNo=orderNo
this.orderInfo=r.data.data
this.orderInfo=res.data.data
this.loading=false
} else {
// this.$notify(res.data.message);
......@@ -209,6 +210,9 @@ methods: {
null
);
},
navigateToWechat() {
window.open('https://work.weixin.qq.com/kfid/kfcaec7130ac124872a', '_blank')
}
}
}
</script>
......
src/pages/usercenter/order/ticketMap.vue
View file @ a664c459
......@@ -31,7 +31,9 @@
</div></div>
</template>
<script>
import componentsMap from "src/components/car/Map.vue";
export default {
components: {componentsMap},
props: {
orderInfo: {
type: Object,
......@@ -60,7 +62,7 @@ export default {
this.$q.loading.show();
this.apipost(
"b2c_get_GetTicketCouponsDetail",
{ CouponsId: this.msg.configId },
{ CouponsId: this.orderInfo.GoodsId },
(r) => {
if (r.data.resultCode == 1) {
let addList = function (arr) {
......@@ -89,28 +91,6 @@ export default {
}, 1000);
});
}
this.$nextTick(() => {
this.getCarPriceData()
setTimeout(() => {
this.navs.forEach((x) => {
x.top =
this.$refs[x.val].getBoundingClientRect().top + this.currentHeight - 60;
});
this.priceListHeight =
this.$refs.pricelist.getBoundingClientRect().top +
this.currentHeight -
60;
}, 1000);
try {
document
.querySelector("#scrollId .q-page-container")
.addEventListener("scroll", this.handleScrollDay);
} catch (error) {
// console.log(document.querySelector('#scrollId .q-page-container'))
// console.log('异常信息', error)
}
});
} else {
this.$q.notify({
......
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