Skip to content

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

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

# Conflicts:
#	src/boot/utils.js
parents afccc9d9 53b0f3d3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1076 additions and 187 deletions
src/App.vue
View file @ 6576f968
...@@ -49,6 +49,27 @@ body { ...@@ -49,6 +49,27 @@ body {
font-family: "Noto Sans SC", 微软雅黑, "Microsoft YaHei", sans-serif !important; font-family: "Noto Sans SC", 微软雅黑, "Microsoft YaHei", sans-serif !important;
font-weight: 400 !important; font-weight: 400 !important;
} }
.fz14{
font-size: 14px;
}
.fz15{
font-size: 15px;
}
.fz16{
font-size: 16px;
}
.fz17{
font-size: 17px;
}
.fz18{
font-size: 18px;
}
.fz20{
font-size: 20px;
}
.fz28{
font-size: 28px;
}
.text-middle{ .text-middle{
display: flex; display: flex;
align-items: center; align-items: center;
......
src/assets/img/login-bg.png 0 → 100644
View file @ 6576f968
This diff is collapsed.
src/components/car/Map.vue 0 → 100644
View file @ 6576f968
<style scoped>
.card {width: 100vm;
height: 320px;
border: 1px solid #F0EFEF;
border-radius: 8px;}
</style>
<template>
<div class="card" :id="`baidu-map_${center.Id}`"></div>
</template>
<script>
export default {
props:["AddressObj"],
data() {
return {
center:{
Lng: 116.294625,
Lat: 39.961627
}
}
},
watch: {
AddressObj:{
handler(newValue,onldValue) {
this.center = newValue
},
deep:true,
immediate:true
}
},
mounted() {
this.createMap();
this.addMarker();
this.addLabel()
if(this.center.Range&&this.center.Range>0){
this.addCircle()
}
},
methods: {
createMap() {
if (!BMapGL) {
return;
}
let map = new BMapGL.Map(`baidu-map_${this.center.Id}`); // 创建地图实例
let point = new BMapGL.Point(this.center.Lng, this.center.Lat); // 创建点坐标
map.centerAndZoom(point, 15); // 初始化地图，设置中心点坐标和地图级别
this.map = map;
},
addMarker() {
let icon = require(`../../assets/img/marker.png`);
var myIcon = new BMapGL.Icon(icon, new BMapGL.Size(23, 25), {
// 指定定位位置。
// 当标注显示在地图上时，其所指向的地理位置距离图标左上
// 角各偏移10像素和25像素。您可以看到在本例中该位置即是
// 图标中央下端的尖角位置。
anchor: new BMapGL.Size(10, 25),
// 设置图片偏移。
// 当您需要从一幅较大的图片中截取某部分作为标注图标时，您
// 需要指定大图的偏移位置，此做法与css sprites技术类似。
// imageOffset: new BMapGL.Size(0, 0 - 25) // 设置图片偏移
});
let point = new BMapGL.Point(this.center.Lng, this.center.Lat); // 创建点坐标
// 创建标注对象并添加到地图
var marker = new BMapGL.Marker(point, { icon: myIcon });
this.map.addOverlay(marker);
},
addLabel() {
var point = new BMapGL.Point(this.center.Lng, this.center.Lat);
var content = this.center.Address;
var label = new BMapGL.Label(content, {
// 创建文本标注
position: point, // 设置标注的地理位置
offset: new BMapGL.Size(10, -60), // 设置标注的偏移量
});
this.map.addOverlay(label); // 将标注添加到地图中
label.addEventListener("click", function () {
// alert("您点击了标注");
});
label.setStyle({
// 设置label的样式
color: "#000",
fontSize: "18px",
border: "0 solid #1E90FF",
padding: '0 5px',
borderRadius: '3px',
});
},
addCircle(){
var mPoint = new BMapGL.Point(this.center.Lng, this.center.Lat);
var circle = new BMapGL.Circle(mPoint,this.center.Range,{fillColor:"blue", strokeWeight: 1 ,fillOpacity: 0.3, strokeOpacity: 0.3});
this.map.addOverlay(circle);
}
},
}
</script>
\ No newline at end of file
src/components/car/orderPreview.vue
View file @ 6576f968
...@@ -10,7 +10,21 @@ ...@@ -10,7 +10,21 @@
flat flat
/> />
</div> </div>
<div class="text-grey-6 f12 q-my-md">選擇類型</div> <template v-if="dataList.CarType!=3">
<div class="text-grey-6 f12 q-my-md">選擇機場</div>
<div class="row wrap">
<q-btn @click="handleSelectAirport(item)"
:color="item.Id === selectedAirport?'primary':'grey-5'"
unelevated
class="car-tag mr"
v-for="item in AirportList"
:key="item.Id"
>
{{ item.AirportName }}
</q-btn>
</div>
</template>
<div class="text-grey-6 f12 q-my-md">選擇車類型</div>
<div class="row wrap"> <div class="row wrap">
<q-btn @click="handleSelect(item)" <q-btn @click="handleSelect(item)"
:color="item.Id === selectedCar?'primary':'grey-5'" :color="item.Id === selectedCar?'primary':'grey-5'"
...@@ -94,7 +108,13 @@ ...@@ -94,7 +108,13 @@
<span class="text-h6 text-primary product-price">CNY {{ moneyFormat(sumPrice,0) }}</span> <span class="text-h6 text-primary product-price">CNY {{ moneyFormat(sumPrice,0) }}</span>
</div> </div>
<div class="q-mt-md text-right"> <div class="q-mt-md text-right">
<span class="q-mr-lg f12 text-negative" v-if="!p.startDate" >{{$q.platform.is.mobile?'請選擇上面的出行日期':'請選擇左側的出行日期'}} </span> <span class="q-mr-lg f12 text-negative" v-if="!p.startDate" >
{{$q.platform.is.mobile?'請選擇上面的出行日期':'請選擇左側的出行日期'}}
</span>
<span class="q-mr-lg f12 text-negative"
v-if="(p.startDate&&!selectedCar)||(p.startDate&&dataList.CarType!=3&&!selectedAirportObj)" >
{{`請選擇上面的${dataList.CarType==3?'車類型':'機場、車類型'}`}}
</span>
<q-btn color="primary" label="立即訂購" unelevated class="q-px-lg" :disable="sumPrice==0"/> <q-btn color="primary" label="立即訂購" unelevated class="q-px-lg" :disable="sumPrice==0"/>
</div> </div>
</div> </div>
...@@ -103,22 +123,26 @@ ...@@ -103,22 +123,26 @@
<script> <script>
export default { export default {
props: ["price","CarTypeList","configId","Month"], props: ["dataList","price","CarTypeList","AirportList","configId","Month"],
watch: { watch: {
price: { price: {
handler(n, o) { handler(n, o) {
this.p = n; this.p = n;
console.log(n,'-----') if(n&&n.startDate){
this.chosenObj.startDate = n.startDate; this.chosenObj.startDate = n.startDate;
// this.selectedCar = this.CarTypeList[0].Id
// this.selectedObj = this.CarTypeList[0]
}
this.calcMoney() this.calcMoney()
}, },
deep: true, deep: true,
immediate: true immediate: false
}, },
CarTypeList: { CarTypeList: {
handler(n, o) { handler(n, o) {
this.CarTypeList = n; this.CarTypeList = n;
this.selectedCar = this.CarTypeList[0].Id
}, },
deep: true, deep: true,
immediate: true immediate: true
...@@ -129,9 +153,11 @@ export default { ...@@ -129,9 +153,11 @@ export default {
p: {}, p: {},
chosenObj: null, chosenObj: null,
sumPrice:0, sumPrice:0,
selectedCar: 0,
selectedObj: null, selectedObj: null,
priceList: [], priceList: [],
selectedCar: 0 selectedAirport: 0,
selectedAirportObj: null,
}; };
}, },
created() { created() {
...@@ -140,7 +166,8 @@ export default { ...@@ -140,7 +166,8 @@ export default {
this.chosenObj.startDate = this.p.startDate; this.chosenObj.startDate = this.p.startDate;
this.calcMoney() this.calcMoney()
this.getCarPriceData2() this.getCarPriceData2()
this.selectedCar = this.CarTypeList[0].Id // this.selectedCar = this.CarTypeList[0].Id
// this.selectedObj = this.CarTypeList[0]
} }
}, },
...@@ -158,21 +185,49 @@ export default { ...@@ -158,21 +185,49 @@ export default {
}, },
(r) => { (r) => {
if (r.data.resultCode == 1) { if (r.data.resultCode == 1) {
let arr = []
r.data.data.forEach(x=>{ r.data.data.forEach(x=>{
x.startDate = x.Date if(x.Price){
x.originalB2CPrice = x.Price if(this.chosenObj.startDate==x.startDate){
x.remainNum =1 this.p.originalB2CPrice = x.Price
x.Count = 1 }
x.isSupportChildren = 1 let dataObj = {
x.safeMoney = 0 startDate: x.Date,
this.p.originalB2CPrice = x.Price originalB2CPrice: x.Price,
remainNum: 1,
Count: 1,
isSupportChildren: 1,
safeMoney: 0,
}
arr.push(dataObj)
}
}) })
this.$emit('getPriceList',JSON.stringify(r.data.data),this.selectedCar) const temp= JSON.parse(JSON.stringify(r.data.data))
let PriceArr = temp.filter(x=>{ return x.Price>0 })
if(PriceArr.length>0){
this.$emit('getPriceList',JSON.stringify(arr),this.selectedCar)
}else{
let dataObj = {
startDate: '',
originalB2CPrice: '',
remainNum: 0,
Count: 0,
isSupportChildren: 0,
safeMoney: 0,
}
this.priceList.push(dataObj)
this.$emit('getPriceList',JSON.stringify(this.priceList),this.selectedCar)
this.p.originalB2CPrice = 0
this.resetHandler()
}
} }
},null) },null)
}, },
handleSelectAirport(item){
this.selectedAirportObj = item
this.selectedAirport = item.Id
},
handleSelect(item){ handleSelect(item){
this.selectedObj = item this.selectedObj = item
this.selectedCar = item.Id this.selectedCar = item.Id
...@@ -186,9 +241,17 @@ export default { ...@@ -186,9 +241,17 @@ export default {
remark: "", remark: "",
}; };
}, },
resetHandler() { resetHandler(type) {
this.p = {}; if(type&&type!=1){
this.initModel() this.selectedCar = 0
this.selectedObj = null
this.selectedAirportObj = null
this.selectedAirport = 0
}
setTimeout(()=>{
this.p = {};
this.initModel()
},100)
this.$emit("reset"); this.$emit("reset");
}, },
changePeople(val) {}, changePeople(val) {},
......
src/components/navs/hor-big-one.vue
View file @ 6576f968
...@@ -265,15 +265,18 @@ color: #EE4454; ...@@ -265,15 +265,18 @@ color: #EE4454;
</q-menu> </q-menu>
</q-btn> </q-btn>
<q-btn label="帮助中心" flat></q-btn> <q-btn label="帮助中心" flat></q-btn>
<q-btn v-if="LoginUser.accountId <= 0" label="注册" flat></q-btn> <q-btn v-if="LoginUser.id <= 0" label="注册" flat></q-btn>
<template v-if="LoginUser.accountId > 0"> <template v-if="LoginUser.id > 0">
<q-btn-dropdown <q-btn-dropdown
style="color: #444; font-weight: bold" style="color: #444; font-weight: bold"
class="q-ml-lg" class="q-ml-lg"
icon="iconfont iconicon-unlogin"
:label="LoginUser.name"
unelevated unelevated
> >
<template v-slot:label>
<img class="avatar" v-if="LoginUser.photo" :src="LoginUser.photo" />
<img class="avatar" v-else src="../../assets/img/avatar.png" />
<!-- <span>{{LoginUser.name || LoginUser.mailbox}}</span> -->
</template>
<div class="row no-wrap q-pa-md"> <div class="row no-wrap q-pa-md">
<div class="column"> <div class="column">
<q-list> <q-list>
...@@ -510,6 +513,7 @@ export default { ...@@ -510,6 +513,7 @@ export default {
}, },
mounted() { mounted() {
this.isHome = this.$router.history.current.path==='/' || this.$router.history.current.path==='/index' this.isHome = this.$router.history.current.path==='/' || this.$router.history.current.path==='/index'
console.log('JSON.parse(window.localStorage.getItem("b2bUser"))', JSON.parse(window.localStorage.getItem("b2bUser")))
if (localStorage.b2bUser) { if (localStorage.b2bUser) {
this.LoginUser = JSON.parse(window.localStorage.getItem("b2bUser")); this.LoginUser = JSON.parse(window.localStorage.getItem("b2bUser"));
} }
...@@ -710,6 +714,11 @@ export default { ...@@ -710,6 +714,11 @@ export default {
</script> </script>
<style> <style>
.avatar {
width: 38px;
height: 38px;
border-radius: 50%;
}
.nav-items { .nav-items {
position: relative; position: relative;
} }
......
src/components/searchdata/kkday.vue
View file @ 6576f968
...@@ -747,7 +747,7 @@ this.dayArray = this.dayArray.filter(item => arr.includes(item.id)) ...@@ -747,7 +747,7 @@ this.dayArray = this.dayArray.filter(item => arr.includes(item.id))
return return
} }
this.CommonJump( this.CommonJump(
"/detail/" + encodeURIComponent(item.id) + "/" + item.tcid, "/detail/" + encodeURIComponent(item.id) + "/" + item.tcid + "/" + item.configId,
{} {}
); );
}, },
......
src/components/trip/block/index.vue
View file @ 6576f968
<style scoped> <style scoped>
@import url('../../../assets/trip/block/index.css'); @import url('../../../assets/trip/block/index.css');
.fz15{
font-size: 15px;
}
.fz28{
font-size: 28px;
}
</style> </style>
<template> <template>
<div class="trip-box"> <div class="trip-box">
......
src/css/app.scss
View file @ 6576f968
...@@ -102,6 +102,9 @@ ...@@ -102,6 +102,9 @@
.f30 { .f30 {
font-size: 30px; font-size: 30px;
} }
.f34 {
font-size: 34px;
}
.f36 { .f36 {
font-size: 36px; font-size: 36px;
} }
...@@ -121,4 +124,7 @@ ...@@ -121,4 +124,7 @@
display:-webkit-box; /* 盒模型 */ display:-webkit-box; /* 盒模型 */
-webkit-line-clamp:2; /* 限制文本行数 */ -webkit-line-clamp:2; /* 限制文本行数 */
-webkit-box-orient:vertical; /* 盒内子元素布局方向 */ -webkit-box-orient:vertical; /* 盒内子元素布局方向 */
}
.primary {
color: $primary;
} }
\ No newline at end of file
src/index.template.html
View file @ 6576f968
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<!-- <script async defer crossorigin="anonymous" src="https://connect.facebook.net/zh_CN/sdk.js#xfbml=1&version=v7.0" nonce="bDrSmWhp"></script> --> <!-- <script async defer crossorigin="anonymous" src="https://connect.facebook.net/zh_CN/sdk.js#xfbml=1&version=v7.0" nonce="bDrSmWhp"></script> -->
<!-- <script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OBd2bhrqKUSbQGpniCZ996suti9YG7Bc"></script> --> <!-- <script type="text/javascript" src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OBd2bhrqKUSbQGpniCZ996suti9YG7Bc"></script> -->
<script src="https://api.map.baidu.com/api?type=webgl&v=2.0&ak=OBd2bhrqKUSbQGpniCZ996suti9YG7Bc"></script> <script src="https://api.map.baidu.com/api?type=webgl&v=2.0&ak=OBd2bhrqKUSbQGpniCZ996suti9YG7Bc"></script>
<script src="http://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
<script> <script>
function countryCb(r) { function countryCb(r) {
if (!r) { if (!r) {
......
src/pages/details.vue
View file @ 6576f968
...@@ -190,6 +190,8 @@ ...@@ -190,6 +190,8 @@
tcid: 0, tcid: 0,
teamType: 0, teamType: 0,
isGetPriceFlight: true, isGetPriceFlight: true,
pType: 1,//类型 1 来源B2C
newConfigId: 0,//列表里的configId
}, },
isShow: false, isShow: false,
dataList: {}, dataList: {},
...@@ -220,6 +222,9 @@ ...@@ -220,6 +222,9 @@
if (this.$route.params.tcid) { if (this.$route.params.tcid) {
this.msg.tcid = decodeURIComponent(this.$route.params.tcid) this.msg.tcid = decodeURIComponent(this.$route.params.tcid)
} }
if (this.$route.params.newConfigId) {
this.msg.newConfigId = decodeURIComponent(this.$route.params.newConfigId)
}
}, },
mounted() { mounted() {
if (localStorage.baseifo) { if (localStorage.baseifo) {
......
src/pages/detailsCar.vue
View file @ 6576f968
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
> >
<div class="col q-mr-lg"> <div class="col q-mr-lg">
<div class="text-h6 ellipsis-2-lines">{{ dataList.Name }}</div> <div class="text-h6 ellipsis-2-lines">{{ dataList.Name }}</div>
<!-- <div class="text-h6 ellipsis-2-lines">{{ dataList.Description }}</div> --> <div class="text-grey-7 fz17 ellipsis-1-lines">{{ dataList.Description }}</div>
<div class="q-mt-md f12 text-grey-6"> <div class="q-mt-md f12 text-grey-6">
<q-icon <q-icon
name="iconfont icondingweixiao" name="iconfont icondingweixiao"
...@@ -277,9 +277,11 @@ ...@@ -277,9 +277,11 @@
<template v-if="currentPrice && currentPrice.startDate"> <template v-if="currentPrice && currentPrice.startDate">
<order-preview <order-preview
class="q-pa-md" class="q-pa-md"
:dataList="dataList"
:configId="msg.configId" :configId="msg.configId"
:Month="currentYM.str" :Month="currentYM.str"
:CarTypeList="dataList.CarTypeList" :CarTypeList="dataList.CarTypeList"
:AirportList="dataList.AirportList"
:price="currentPrice" :price="currentPrice"
@reset="resetHandler" @reset="resetHandler"
@getPriceList="getPriceList" @getPriceList="getPriceList"
...@@ -302,12 +304,13 @@ ...@@ -302,12 +304,13 @@
> >
<span class="q-mr-md">行程標準出行方案</span> <span class="q-mr-md">行程標準出行方案</span>
<q-chip <q-chip
v-if="dataList.FreeCancelDay>0"
square square
color="orange" color="orange"
size="sm" size="sm"
text-color="grey-2" text-color="grey-2"
class="text-light" class="text-light"
label="3天前可免费取消" :label="`${dataList.FreeCancelDay}天前可免费取消`"
/> />
</div> </div>
<!-- <div class="text-grey f12"> <!-- <div class="text-grey f12">
...@@ -349,10 +352,11 @@ ...@@ -349,10 +352,11 @@
關於此方案 關於此方案
</div> </div>
<q-chip <q-chip
v-if="dataList.FreeCancelDay>0"
class="transparent q-mr-xl no-padding" class="transparent q-mr-xl no-padding"
square square
icon="iconfont iconcancel" icon="iconfont iconcancel"
label="3天前可免費取消" :label="`${dataList.FreeCancelDay}天前可免费取消`"
/> />
</div> </div>
<div class="q-mt-lg row" v-if="$q.platform.is.desktop"> <div class="q-mt-lg row" v-if="$q.platform.is.desktop">
...@@ -365,9 +369,11 @@ ...@@ -365,9 +369,11 @@
</div> </div>
<div class="col q-ml-xl"> <div class="col q-ml-xl">
<order-preview <order-preview
:dataList="dataList"
:configId="msg.configId" :configId="msg.configId"
:Month="currentYM.str" :Month="currentYM.str"
:CarTypeList="dataList.CarTypeList" :CarTypeList="dataList.CarTypeList"
:AirportList="dataList.AirportList"
:price="currentPrice" :price="currentPrice"
@reset="resetHandler" @reset="resetHandler"
@getPriceList="getPriceList" @getPriceList="getPriceList"
...@@ -439,6 +445,60 @@ ...@@ -439,6 +445,60 @@
'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile, 'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}" }"
></div> ></div>
<div
id="assemblypoint"
class="text-h5 text-weight-bold text-left q-mt-xl"
ref="assemblypoint"
:class="{
'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}"
>
接送點範圍
</div>
<div
class="q-mt-lg trip-text rounded-borders q-mb-xl"
style="border: 1px dashed var(--q-color-warning)"
:class="{
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}"
v-for="(x,index) in dataList.PlaceList">
<div class="q-pa-md" style="border-bottom: 1px dashed var(--q-color-warning)">
<div class="text-weight-bold text-h6">地點名稱：{{x.Name}}</div>
<div class="text-grey-9">地址：{{x.Address}}</div>
</div>
<div class="q-pa-md" :class="{
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}">
<componentsMap :AddressObj="x"/>
</div>
</div>
<div
id="experiencelocation"
class="text-h5 text-weight-bold text-left q-mt-xl"
ref="experiencelocation"
:class="{
'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}"
>
機場地點
</div>
<div
class="q-mt-lg trip-text rounded-borders q-mb-xl"
style="border: 1px dashed var(--q-color-warning)"
:class="{
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}"
v-for="(x,index) in dataList.AirportList">
<div class="q-pa-md" style="border-bottom: 1px dashed var(--q-color-warning)">
<div class="text-weight-bold text-h6">地点名称：{{x.Name}}</div>
<div class="text-grey-9">地址：{{x.Address}}</div>
</div>
<div class="q-pa-md" :class="{
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}">
<componentsMap :AddressObj="x"/>
</div>
</div>
<div <div
id="warning" id="warning"
class="text-h5 text-weight-bold text-left q-mt-xl" class="text-h5 text-weight-bold text-left q-mt-xl"
...@@ -544,6 +604,8 @@ import OrderPreview from "src/components/car/orderPreview.vue"; ...@@ -544,6 +604,8 @@ import OrderPreview from "src/components/car/orderPreview.vue";
import smaple from "src/components/trip/smaple.vue"; import smaple from "src/components/trip/smaple.vue";
import Trip from "src/components/trip/trip.vue"; import Trip from "src/components/trip/trip.vue";
import block from "src/components/trip/block/index"; import block from "src/components/trip/block/index";
import { date } from "quasar";
import componentsMap from "../components/car/Map.vue";
import * as dayjs from "dayjs"; import * as dayjs from "dayjs";
export default { export default {
props: [], props: [],
...@@ -626,6 +688,18 @@ export default { ...@@ -626,6 +688,18 @@ export default {
isActive: false, isActive: false,
display: "購買須知", display: "購買須知",
}, },
{
id: "#assemblypoint",
top: 0,
isActive: false,
display: "接送點範圍",
},
{
id: "#experiencelocation",
top: 0,
isActive: false,
display: "機場地點",
},
{ {
id: "#tips", id: "#tips",
top: 0, top: 0,
...@@ -652,6 +726,7 @@ export default { ...@@ -652,6 +726,7 @@ export default {
smaple, smaple,
Trip, Trip,
block, block,
componentsMap
}, },
watch: { watch: {
days: { days: {
...@@ -678,6 +753,13 @@ export default { ...@@ -678,6 +753,13 @@ export default {
} }
}, },
mounted() { mounted() {
const timeStamp = Date.now()
const formattedString = date.formatDate(timeStamp, 'YYYY-MM-DD')
this.currentYM = {
year: date.formatDate(timeStamp, 'YYYY'),
month: date.formatDate(timeStamp, 'MM'),
str: formattedString
}
if (localStorage.baseifo) { if (localStorage.baseifo) {
this.TripConfig = JSON.parse(window.localStorage.getItem("baseifo")); this.TripConfig = JSON.parse(window.localStorage.getItem("baseifo"));
} }
...@@ -842,15 +924,21 @@ export default { ...@@ -842,15 +924,21 @@ export default {
}, },
(r) => { (r) => {
if (r.data.resultCode == 1) { if (r.data.resultCode == 1) {
let arr = []
r.data.data.forEach(x=>{ r.data.data.forEach(x=>{
x.startDate = x.Date if(x.Price){
x.originalB2CPrice = x.Price let dataObj = {
x.remainNum = 1 startDate: x.Date,
x.Count = 1 originalB2CPrice: x.Price,
x.isSupportChildren = 1 remainNum: 1,
x.safeMoney = 0 Count: 1,
isSupportChildren: 1,
safeMoney: 0,
}
arr.push(dataObj)
}
}) })
this.priceList = JSON.parse(JSON.stringify(r.data.data)) this.priceList = JSON.parse(JSON.stringify(arr))
} }
},null) },null)
......
src/pages/detailsHotal.vue
View file @ 6576f968
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
class="col product-price text-subtitle1 text-weight-bold f30" class="col product-price text-subtitle1 text-weight-bold f30"
style="text-align: left" style="text-align: left"
> >
<span>CNY {{ moneyFormat(dataList.MinPrice, 0) }}</span> <span>CNY {{ moneyFormat(MinPrice, 0) }}</span>
<span class="q-ml-sm f16 text-grey-7">起</span> <span class="q-ml-sm f16 text-grey-7">起</span>
</span> </span>
<q-btn <q-btn
...@@ -156,9 +156,9 @@ ...@@ -156,9 +156,9 @@
$q.platform.is.mobile, $q.platform.is.mobile,
}" }"
> >
<div class="product-price f30 bold" v-if="dataList.MinPrice > 0"> <div class="product-price f30 bold" v-if="MinPrice > 0">
<!-- CNY：{{ dataList. }} --> <!-- CNY：{{ dataList. }} -->
CNY：{{ moneyFormat(dataList.MinPrice, 0) }} CNY：{{ moneyFormat(MinPrice, 0) }}
<span class="f16 text-grey-6 normal">起</span> <span class="f16 text-grey-6 normal">起</span>
</div> </div>
<div v-else class="text-subtitle1 f30 bold text-grey-6">暫無報價</div> <div v-else class="text-subtitle1 f30 bold text-grey-6">暫無報價</div>
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
</template> </template>
</div> --> </div> -->
<!--方案选择区 --> <!--方案选择区 -->
<select-room :detail="dataList"></select-room> <select-room @change="(value) => MinPrice = value" :detail="dataList"></select-room>
<div class="text-h6 q-pt-lg" v-if="$q.platform.is.mobile"> <div class="text-h6 q-pt-lg" v-if="$q.platform.is.mobile">
所選方案詳情 所選方案詳情
</div> </div>
...@@ -616,6 +616,7 @@ export default { ...@@ -616,6 +616,7 @@ export default {
}, },
data() { data() {
return { return {
MinPrice: 0,
selectedCar: "", selectedCar: "",
tab: "", tab: "",
searchDate: "", searchDate: "",
...@@ -816,8 +817,10 @@ export default { ...@@ -816,8 +817,10 @@ export default {
console.log("getData", r); console.log("getData", r);
this.dataList = r.data.data; this.dataList = r.data.data;
this.dataList.FacilityServices = JSON.parse(this.dataList.FacilityServices) this.dataList.FacilityServices = JSON.parse(this.dataList.FacilityServices)
this.dataList.imgCover = this.dataList.ImageList; this.dataList.imgCover = this.dataList.List.map(item => {
return item.Path
});
conosle.log(this.dataList.imgCover)
this.isShow = true; this.isShow = true;
this.isDirect = this.dataList.isDirect; this.isDirect = this.dataList.isDirect;
if (this.dataList.videoStr && this.dataList.videoStr != "") { if (this.dataList.videoStr && this.dataList.videoStr != "") {
......
src/pages/detailsNew.vue
View file @ 6576f968
...@@ -621,6 +621,8 @@ export default { ...@@ -621,6 +621,8 @@ export default {
tcid: 0, tcid: 0,
teamType: 0, teamType: 0,
isGetPriceFlight: true, isGetPriceFlight: true,
pType: 1,//类型 1 来源B2C
newConfigId: 0,//列表里的configId
}, },
currentPrice: {}, currentPrice: {},
isShow: false, isShow: false,
...@@ -752,6 +754,9 @@ export default { ...@@ -752,6 +754,9 @@ export default {
if (this.$route.params.tcid) { if (this.$route.params.tcid) {
this.msg.tcid = decodeURIComponent(this.$route.params.tcid); this.msg.tcid = decodeURIComponent(this.$route.params.tcid);
} }
if (this.$route.params.newConfigId) {
this.msg.newConfigId = decodeURIComponent(this.$route.params.newConfigId)
}
}, },
mounted() { mounted() {
window.addEventListener("scroll", this.handleScroll); window.addEventListener("scroll", this.handleScroll);
......
src/pages/hotel/selectRoom.vue
View file @ 6576f968
...@@ -341,6 +341,7 @@ export default { ...@@ -341,6 +341,7 @@ export default {
if(!this.startDate && arr.length) { if(!this.startDate && arr.length) {
this.startDate = day.DateStr this.startDate = day.DateStr
this.minPrice = Math.min(...arr) this.minPrice = Math.min(...arr)
this.$emit('change', this.minPrice)
} }
return { return {
min: Math.min(...arr), min: Math.min(...arr),
......
src/pages/login.vue
View file @ 6576f968
This diff is collapsed.
src/pages/newTrip.vue
View file @ 6576f968
...@@ -1275,7 +1275,9 @@ ...@@ -1275,7 +1275,9 @@
//请求参数 //请求参数
msg: { msg: {
ID: 0, ID: 0,
tcid: 0 tcid: 0,
pType: 1,//类型 1 来源B2C
newConfigId: 0,//列表里的configId
}, },
dataList: {}, dataList: {},
scrollobj: null, scrollobj: null,
...@@ -1307,6 +1309,7 @@ ...@@ -1307,6 +1309,7 @@
mounted() { mounted() {
this.msg.ID = this.$route.query.ID; this.msg.ID = this.$route.query.ID;
this.msg.tcid = this.$route.query.tcid; this.msg.tcid = this.$route.query.tcid;
this.msg.newConfigId = this.$route.query.ConfigId;
this.crtnav = 'tripLine'; this.crtnav = 'tripLine';
this.getTrip(); this.getTrip();
...@@ -1317,6 +1320,7 @@ ...@@ -1317,6 +1320,7 @@
query: { query: {
ID: decodeURIComponent(this.msg.ID), ID: decodeURIComponent(this.msg.ID),
tcid: decodeURIComponent(this.msg.tcid), tcid: decodeURIComponent(this.msg.tcid),
newConfigId: decodeURIComponent(this.msg.newConfigId)
} }
}); });
} }
......
src/pages/resetPassword.vue 0 → 100644
View file @ 6576f968
<style>
.login {
background: url('../assets/img/login-bg.png');background-size: cover;
width: 100%;
height: 100%;
position: fixed;
top: 0;
bottom: 0;
left: 0;
right: 0;
}
.login-box {
width: 436px;
padding: 30px 40px;
margin: 100px auto;
position: absolute;
right: 360px;
background-clip: padding-box;
background: #ffffff;
border-radius: 18px;
}
.login-box .tw_logo {
margin: 0 auto 20px;
display: block;
height: 45px;
width: auto;
}
.login-box .tip-text {
font-size: 16px;
margin-bottom: 15px;
color: #999;
text-align: center;
}
.login-box .tip-text a {
color: #00afff;
}
.login_row {
width: 100%;
}
.form-group {
position: relative;
margin-bottom: 15px;
}
.login_labelName {
margin-top: 34px;
font-size: 16px;
margin-bottom: 16px;
}
.form-group i {
position: absolute;
right: 6px;
bottom: 0;
z-index: 2;
width: 46px;
height: 46px;
text-align: center;
line-height: 46px;
color: #999;
font-size: 28px;
cursor: pointer;
}
.login-box .q-field__control {
height: 46px;
}
.type-item {
width: 50px;
height: 50px;
background: #f5f5f5;
border-radius: 25px;
}
.type-item img {
width: 28px;
height: 28px;
}
</style>
<template>
<div class="login">
<div class="login-box">
<div class="f34 bold">重置密码</div>
<div class="login_row">
<div class="form-group">
<div class="login_labelName">輸入郵箱</div>
<q-input outlined v-model="loginMsg.Mailbox" />
<div class="primary q-mt-sm" v-show="tips">邮箱格式有误,请核实</div>
</div>
<div>
<q-btn
v-if="!isSend" class="q-mb-lg"
unelevated
color="grey-3"
style="width: 100%; color: #8B8B8B !important; height: 50px; margin-top: 20px"
filled
label="发送验证码"
@click="sendVerify"
/>
<div v-else class="mt q-mb-sm">
<q-input outlined v-model="loginMsg.MailCode" type="text" />
<div class="q-mt-sm" :class="cutDown ? 'text-grey-6' : ''">
{{ cutDown ? cutDown + "秒后可重新发送" : "重新發送驗證碼" }}
</div>
</div>
</div>
<div class="form-group">
<div class="login_labelName flex justify-between items-center">
密碼
</div>
<q-input
v-if="flag == 1"
outlined
v-model="loginMsg.PassWord"
type="text"
ref="pwd"
/>
<q-input
v-if="flag == 2"
outlined
v-model="loginMsg.PassWord"
type="PassWord"
ref="pwd"
/>
<i
class="iconfont iconyanjing_xianshi"
v-if="flag == 1"
@click="flag = 2"
></i>
<i
class="iconfont iconbiyan"
v-if="flag == 2"
@click="flag = 1"
></i>
</div>
<div class="q-mb-xl">
<q-btn
color="primary"
unelevated
style="width: 100%; height: 50px; margin-top: 20px"
filled
:label="mylabel"
@click="login"
/>
</div>
</div>
</div>
</div>
</template>
<script>
import QrcodeVue from "qrcode.vue";
export default {
name: "Login",
components: {
QrcodeVue,
},
data() {
return {
isSend: false,
tips: false,
cutDown: 0,
isAgree: false,
isLogin: true,
loginMsg: {
Mailbox: "",
PassWord: "",
MailCode: "",
},
// , 'google', 'facebook', 'apple'
typeList: ["wechat"],
logo: "",
flag: 2,
mylabel: "重置密码",
};
},
created() {},
mounted() {
},
methods: {
sendVerify() {
if(this.inSending) return
this.inSending = true
if (this.verifyEmail()) {
this.apipost('directCustomer_post_SendMail', {Mailbox: this.loginMsg.Mailbox, SendType: 2}, (res) => {
this.inSending = false
if (res.data.resultCode == 1) {
this.isSend = true;
this.cutDown = 60;
this.startCutDown();
} else {
this.$q.notify({
type: "negative",
message: res.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
}, null)
} else {
this.inSending = false
}
},
startCutDown() {
this.timer = setTimeout(() => {
this.cutDown--;
if (this.cutDown) {
this.startCutDown();
}
}, 1000);
},
verifyEmail() {
if (/^[^@\s]+@[^@\s]+\.[^@\s]+$/.test(this.loginMsg.Mailbox)) {
this.tips = false;
return true;
} else {
// 提示用户邮箱格式有误
this.tips = true;
return false;
}
},
login() {
if(this.mylabel === "提交中...") {
return
}
if (this.loginMsg.Mailbox == "") {
this.$q.notify({
type: "negative",
message: "请输入账号",
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
return;
}
if (this.loginMsg.PassWord == "") {
this.$q.notify({
type: "negative",
message: "请输入密码",
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
return;
}
if (this.loginMsg.MailCode == "") {
this.$q.notify({
type: "negative",
message: "请输入邮箱验证码",
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
return;
}
this.mylabel = "提交中...";
this.apipost(
'ResettingPwd_post',
this.loginMsg,
(res) => {
this.mylabel = "重置密码";
if (res.data.resultCode == 1) {
this.CommonJump("/login", {});
} else {
this.$q.notify({
type: "negative",
message: res.data.message,
position: "top",
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
});
}
},
(err) => {}
);
},
},
};
</script>
src/pages/tripMobile.vue
View file @ 6576f968
...@@ -1010,7 +1010,9 @@ ...@@ -1010,7 +1010,9 @@
ID: 0, ID: 0,
tcid: 0, tcid: 0,
isDes:0, isDes:0,
NewId:'' NewId:'',
pType: 1,//类型 1 来源B2C
newConfigId: 0,//列表里的configId
}, },
showMapType:0, showMapType:0,
dataList: {}, dataList: {},
...@@ -1039,13 +1041,15 @@ ...@@ -1039,13 +1041,15 @@
this.isInChina() this.isInChina()
this.msg.ID = this.$route.query.ID; this.msg.ID = this.$route.query.ID;
this.msg.tcid = this.$route.query.tcid; this.msg.tcid = this.$route.query.tcid;
this.msg.newConfigId = this.$route.query.ConfigId;
//判断为pc端 //判断为pc端
if(this.$q.platform.is.desktop){ if(this.$q.platform.is.desktop){
this.$router.push({ this.$router.push({
path: 'newTrip', path: 'newTrip',
query: { query: {
ID: decodeURIComponent(this.msg.ID), ID: decodeURIComponent(this.msg.ID),
tcid: decodeURIComponent(this.msg.tcid) tcid: decodeURIComponent(this.msg.tcid),
newConfigId: decodeURIComponent(this.msg.newConfigId)
} }
}); });
} }
......
src/router/routes.js
View file @ 6576f968
...@@ -37,7 +37,7 @@ const routes = [{ ...@@ -37,7 +37,7 @@ const routes = [{
component: () => component: () =>
import ('pages/detailsHotal.vue') import ('pages/detailsHotal.vue')
}, { // 旅程 }, { // 旅程
path: '/detail/:id/:tcid', path: '/detail/:id/:tcid/:newConfigId',
component: () => component: () =>
import ('pages/detailsNew.vue') import ('pages/detailsNew.vue')
}, { }, {
...@@ -108,6 +108,16 @@ const routes = [{ ...@@ -108,6 +108,16 @@ const routes = [{
import ('pages/login.vue') import ('pages/login.vue')
}] }]
}, },
{
path: '/resetPassword',
component: () =>
import ('pages/resetPassword.vue'),
children: [{
path: '/resetPassword',
component: () =>
import ('pages/resetPassword.vue')
}]
},
{ {
path: '/newTrip', path: '/newTrip',
component: () => component: () =>
......
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