Skip to content

M
million
Commit aaf94d58 authored by youjie's avatar youjie
Browse files
Options

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

parents 52a6c477 6576f968
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 600 additions and 123 deletions
src/boot/utils.js
View file @ aaf94d58
...@@ -20,8 +20,7 @@ Vue.prototype.domainManager = function() { ...@@ -20,8 +20,7 @@ Vue.prototype.domainManager = function() {
domainUrl = "http://testapi.oytour.com"; domainUrl = "http://testapi.oytour.com";
} else if (domainNameUrl.indexOf('oytour') !== -1) { } else if (domainNameUrl.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com"; domainUrl = "http://reborn.oytour.com";
// domainUrl = 'http://192.168.10.11:8083' domainUrl = 'http://192.168.10.206:8015'
domainUrl = 'http://192.168.10.206:8015' // 吴春
} }
var obj = { var obj = {
//主地址 //主地址
......
src/components/common/coupon.vue 0 → 100644
View file @ aaf94d58
<template>
<q-card flat class="q-pa-md q-mt-lg">
<div class="row items-center">
<div class="text-subtitle1 text-weight-bolder q-mb-md col">
<span>優惠券</span>
<span class="text-weight-regular q-ml-sm text-body2">（可用優惠券 0 張）</span>
</div>
<q-toggle v-model="showDisable" label="顯示不可用優惠券" style="zoom:0.8;margin-top: -24px;" v-if="isExplends"/>
<q-icon :name="isExplends?'keyboard_arrow_up':'keyboard_arrow_down'" @click="$event=>isExplends=!isExplends" size="32px" color="grey-9" class="q-ml-md cursor-pointer" style="margin-top:-10px;"/>
</div>
<div v-if="isExplends">
<div class="row q-col-gutter-md">
<div :class="filedWidth">
<div class="cursor-pointer">
<div class="coupon-head">
<div class="check-tools">
<q-checkbox v-model="chosenCouponId" :value="1" dense color="teal" />
</div>
<div class="q-pa-lg q-mt-lg">
<div class="row items-center">
<div class="text-h4 text-weight-bold text-white col">
{{ moneyFormat(500,2) }}
</div>
<div class=" f12 text-white">滿 2000 可用</div>
</div>
<div class="q-mt-sm f12" style="color:#195954">有效期至：2023.02.30</div>
</div>
</div>
<div class="q-px-lg q-py-md coupon-content">
<div class="row">
<div class="col-5">適用平台：</div>
<div class="">全平台通用</div>
</div>
<div class="row q-mt-sm">
<div class="col-5">使用品類：</div>
<div class="">多日遊行程適用</div>
</div>
</div>
</div>
</div>
<div :class="filedWidth">
<div class="unUsed">
<div class="coupon-head">
<div class="q-pa-lg q-mt-lg">
<div class="row items-center">
<div class="text-h4 text-weight-bold text-white col">
{{ moneyFormat(500,2) }}
</div>
<div class=" f12 text-white">滿 2000 可用</div>
</div>
<div class="q-mt-sm f12" style="color:#195954">有效期至：2023.02.30</div>
</div>
</div>
<div class="q-px-lg q-py-md coupon-content">
<div class="row">
<div class="col-5">適用平台：</div>
<div class="">全平台通用</div>
</div>
<div class="row q-mt-sm">
<div class="col-5">使用品類：</div>
<div class="">多日遊行程適用</div>
</div>
</div>
</div>
</div>
</div>
<div class="text-center q-mt-lg" v-if="1==2">
<p>
<img src="~assets/sad.svg" style="width: 50px" />
</p>
<p class="f12 text-grey-6">沒有找到可用優惠券</p>
</div>
</div>
</q-card>
</template>
<script>
export default {
props:["goodsInfo"],
computed: {
filedWidth() {
return {
"col-12": this.$q.screen.width < 1200,
"col-4": this.$q.screen.width >= 1200,
};
}
},
data() {
return {
showDisable:false,
isExplends:false,
chosenCouponId:false
};
},
methods: {
changeDiscountHandler(){
}
},
}
</script>
<style>
.coupon-item{
box-shadow: 0px 10px 20px 0px rgb(76 87 125 / 20%) !important;
}
.unUsed .coupon-head{
background: #DDD !important;
}
.unUsed .coupon-head *{
color:#AAA !important;
}
.coupon-head{
height: 138px;
background: #67CAC2;
position: relative;
overflow: hidden;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
}
.coupon-head .check-tools{
position: absolute;
top:10px;
right: 10px;
}
.coupon-content{
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
background: #f9f9f9;
}
.coupon-head::before{
content: ' ';
display: inline-block;
width:30px;
height: 30px;
border-radius: 30px;
background: #FFF;
position: absolute;
top:-15px;
left: 50%;
margin-left: -15px;
}
.coupon-head::after{
content: ' ';
display: block;
position: absolute;
bottom: 0px;
left: 0;
right: 0;
height: 8px;
background-image: radial-gradient(circle, #f9f9f9, #f9f9f9 9px, #f9f9f9 9px, #f9f9f9 10px, transparent 10px, transparent);
background-size: 16px 20px;
}
</style>
\ No newline at end of file
src/components/trip/orderPreview.vue
View file @ aaf94d58
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<q-input <q-input
style="width: 150px" style="width: 150px"
@input="changePeople" @input="changePeople"
v-model="chosenObj.etCount" v-model="chosenObj.etbzcCount"
class="col" class="col"
:class="{ :class="{
'q-ml-sm q-px-none q-pl-none': $q.platform.is.desktop, 'q-ml-sm q-px-none q-pl-none': $q.platform.is.desktop,
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
class="q-px-none" class="q-px-none"
flat flat
icon="remove" icon="remove"
@click="addPeople('etCount', -1)" @click="addPeople('etbzcCount', -1)"
/> />
</template> </template>
<template v-slot:append> <template v-slot:append>
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
class="q-px-none" class="q-px-none"
flat flat
icon="add" icon="add"
@click="addPeople('etCount', 1)" @click="addPeople('etbzcCount', 1)"
/> />
</template> </template>
</q-input> </q-input>
...@@ -131,19 +131,19 @@ ...@@ -131,19 +131,19 @@
<div v-if="$q.platform.is.mobile"> <div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px"> <span class="text-grey-7 product-price" style="font-size: 13px">
CNY CNY
{{ moneyFormat(p.childNeedPrice, 0) }} /每人 {{ moneyFormat(p.childNeedPrice+p.originalB2CPrice, 0) }} /每人
</span> </span>
</div> </div>
</div> </div>
<div class="row items-end"> <div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px"> <span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY CNY
{{ moneyFormat( p.childNeedPrice, 0) }} /每人 {{ moneyFormat( p.childNeedPrice+p.originalB2CPrice, 0) }} /每人
</span> </span>
<q-input <q-input
style="width: 150px" style="width: 150px"
@input="changePeople" @input="changePeople"
v-model="chosenObj.etCount" v-model="chosenObj.etzcCount"
class="col" class="col"
:class="{ :class="{
'q-ml-sm q-px-none q-pl-none': $q.platform.is.desktop, 'q-ml-sm q-px-none q-pl-none': $q.platform.is.desktop,
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
class="q-px-none" class="q-px-none"
flat flat
icon="remove" icon="remove"
@click="addPeople('etCount', -1)" @click="addPeople('etzcCount', -1)"
/> />
</template> </template>
<template v-slot:append> <template v-slot:append>
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
class="q-px-none" class="q-px-none"
flat flat
icon="add" icon="add"
@click="addPeople('etCount', 1)" @click="addPeople('etzcCount', 1)"
/> />
</template> </template>
</q-input> </q-input>
...@@ -357,7 +357,7 @@ export default { ...@@ -357,7 +357,7 @@ export default {
yeCount: 0, yeCount: 0,
lrCount: 0, lrCount: 0,
etbzcCount: 0, etbzcCount: 0,
etzc: 0, etzcCount: 0,
df: 0, df: 0,
dcf: 0, dcf: 0,
srf: 0, srf: 0,
...@@ -392,14 +392,14 @@ export default { ...@@ -392,14 +392,14 @@ export default {
} }
if (!isDf) { if (!isDf) {
if ( if (
this.chosenObj.crCount + this.chosenObj.etCount > this.chosenObj.crCount + this.chosenObj.etzcCount >
this.p.remainNum this.p.remainNum
) { ) {
this.chosenObj[m] = this.chosenObj[m] - 1; this.chosenObj[m] = this.chosenObj[m] - 1;
} }
} else { } else {
if ( if (
this.chosenObj.crCount + this.chosenObj.etCount < this.chosenObj.crCount + this.chosenObj.etzcCount <
this.chosenObj.df this.chosenObj.df
) { ) {
this.chosenObj[m] = this.chosenObj[m] - 1; this.chosenObj[m] = this.chosenObj[m] - 1;
...@@ -412,7 +412,9 @@ export default { ...@@ -412,7 +412,9 @@ export default {
let money = let money =
this.p.originalB2CPrice * this.chosenObj.crCount; this.p.originalB2CPrice * this.chosenObj.crCount;
money += money +=
(this.p.originalB2CPrice-this.p.childNoNeedPrice+this.p.babyChargePrice) * this.chosenObj.etCount; (this.p.originalB2CPrice-this.p.childNoNeedPrice+this.p.babyChargePrice) * this.chosenObj.etbzcCount;
money +=
(this.p.originalB2CPrice+this.p.childNeedPrice+this.p.babyChargePrice) * this.chosenObj.etzcCount;
money += this.p.babyPrice * this.chosenObj.yeCount; money += this.p.babyPrice * this.chosenObj.yeCount;
money += this.p.singleRoomPrice * this.chosenObj.df; money += this.p.singleRoomPrice * this.chosenObj.df;
......
src/pages/line/orderPreview.vue
View file @ aaf94d58
This diff is collapsed.
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