Commit ba19896c authored by 沈良进's avatar 沈良进

Merge branch 'master' of http://gitlab.oytour.com/luochao/bigwood

parents 0579b720 f609b663
......@@ -374,4 +374,11 @@ body
.w200{
width: 200px;
}
.ellipsis2{
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
</style>
......@@ -10,28 +10,37 @@
<template v-if="$q.platform.is.desktop">{{ $t('v102.ticket.sj') }}</template>
{{x.serviceName}} {{x.servicePhone}}
</span> -->
<span class="f12 text-grey-6">{{ $t('hotelorder.createTime') }}:{{x.createDate}}</span>
<div :class="{'row':$q.platform.is.desktop,'column':$q.platform.is.mobile,}">
<span class="f12 text-grey-6">{{ $t('hotelorder.createTime') }}:{{x.createDate}}</span>
<div :class="{'row justify-end':$q.platform.is.mobile}">
<div class="q-ml-md f12" :class="[x.typeInfo.Color]">
<q-icon :name="x.typeInfo.Icon" />
<span class="q-ml-sm">{{ x.typeInfo.StatusName }}</span>
</div>
</div>
</div>
</div>
<div class="q-pt-sm" :class="{'row justify-between':$q.platform.is.desktop,'col':$q.platform.is.mobile}">
<div :class="{'row col':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}">
<div :style="{'width':$q.platform.is.desktop?'150px':'100%'}">
<q-img class="rounded-borders" :style="{'width':$q.platform.is.desktop?'150px':'100%'}" :ratio="16 / 9" src="http://imgfile.oytour.com/Upload/DMC/yEiRE8pRWE5ZF8cPNRnAiQST8WbyaGQc.jpg" spinner-color="grey" spinner-size="50px" fit="cover"/>
<q-img class="rounded-borders" :style="{'width':$q.platform.is.desktop?'150px':'100%'}" style="height: 100%;" :ratio="16 / 9" src="http://imgfile.oytour.com/Upload/DMC/yEiRE8pRWE5ZF8cPNRnAiQST8WbyaGQc.jpg" spinner-color="grey" spinner-size="50px" fit="cover"/>
</div>
<div class="column col" :class="{'q-pl-lg':$q.platform.is.desktop,'q-pt-sm':$q.platform.is.mobile}">
<div class="ellipsis" style="overflow: hidden;width: 100%;">
<span class="text-subtitle1 text-weight-bolder" >{{x.title}}</span>
<span class="text-subtitle1 text-weight-bolder">{{x.title}}</span>
</div>
<span class="f12 text-grey-700 ellipsis q-py-sm">{{x.ltName}}</span>
<span class="f13 text-grey-700">{{$t('v103.scheduledTripOrder.number')}}:{{x.tcid}} ( <span class="text-red">{{ x.guestNum }} </span>{{$t('v103.scheduledTripOrder.passenger')}} ) </span>
</div>
</div>
<div :class="{'row items-end':$q.platform.is.desktop}" :style="{'flex-shrink': $q.platform.is.desktop?0:'inherit'}">
<div class="column text-right">
<div class="fz13" :class="{'row justify-end q-pt-lg q-pb-xs':$q.platform.is.desktop}">
<span class="">{{$t('v103.scheduledTripOrder.total')}}:<span class="fz15">CNY {{moneyFormat(x.preferPrice)}}</span> </span>
<div v-if="x.discountMoney>0" class="q-pl-lg" :class="{'':$q.platform.is.desktop}">
<div class="q-pl-lg" :class="{'row items-end':$q.platform.is.desktop}" :style="{'flex-shrink': $q.platform.is.desktop?0:'inherit'}">
<div class="column" :class="{'text-left':$q.platform.is.desktop,'text-right':$q.platform.is.mobile}">
<div class="fz13" :class="{'column q-pt-lg q-pb-xs':$q.platform.is.desktop}">
<div v-if="x.discountMoney>0" :class="{'':$q.platform.is.desktop}">
<span class=" text-red">{{$t('v103.scheduledTripOrder.hui')}}:<span class="fz15">CNY {{moneyFormat(x.discountMoney)}}</span></span>
</div>
<span class="q-pt-xs">{{$t('v103.scheduledTripOrder.total')}}:<span class="fz15">CNY {{moneyFormat(x.preferPrice)}}</span> </span>
</div>
<span class="fz14 text-orange-7">{{$t('v103.scheduledTripOrder.paid')}}:<span class="fz17">CNY {{moneyFormat(x.customerPayMoney)}}</span> </span>
<div class="q-pt-sm" v-if="x.orderState==1||x.orderState==2">
......
......@@ -371,7 +371,6 @@ export default defineComponent({
CustomerId = Store.state.user?.userDetail?.customerId
}
console.log(CustomerId,'-----')
scheduledTripService.GetCustomerSummary({})
.then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) {
......
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