Skip to content

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

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

# Conflicts:
#	src/components/trip/orderPreview.vue
#	src/layouts/HomeLayout.vue
parents 5b6d0781 035d558d
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3696 additions and 501 deletions
src/assets/json/countries.json 0 → 100644
View file @ 12e9dbf5
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/car/Map.vue
View file @ 12e9dbf5
......@@ -7,7 +7,9 @@
border-radius: 8px;}
</style>
<template>
<div>
<div class="card" :id="`baidu-map_${center.Id}`"></div>
</div>
</template>
<script>
export default {
......@@ -17,7 +19,8 @@
center:{
Lng: 116.294625,
Lat: 39.961627
}
},
keywords: ''
}
},
watch: {
......@@ -27,6 +30,11 @@
},
deep:true,
immediate:true
},
keywords:{
handler(newValue,onldValue) {
this.getLocalSearch()
},
}
},
mounted() {
......@@ -74,7 +82,7 @@
offset: new BMapGL.Size(10, -60), // 设置标注的偏移量
});
this.map.addOverlay(label); // 将标注添加到地图中
label.addEventListener("click", function () {
label.addEventListener("click", function (e) {
// alert("您点击了标注");
});
label.setStyle({
......@@ -90,7 +98,12 @@
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);
}
},
getLocalSearch(){
var mPoint = new BMapGL.Point(this.center.Lng, this.center.Lat);
var local = new BMapGL.LocalSearch(this.map, {renderOptions: {map: this.map, autoViewport: false}});
local.searchNearby(this.keywords,mPoint,this.center.Range);
},
},
}
</script>
src/components/car/orderPreview.vue
View file @ 12e9dbf5
This diff is collapsed.
src/css/app.scss
View file @ 12e9dbf5
......@@ -128,3 +128,6 @@
.primary {
color: $primary;
}
.white {
color: #fff;
}
\ No newline at end of file
src/layouts/HomeLayout.vue
View file @ 12e9dbf5
......@@ -30,11 +30,11 @@
<hor-big-one :base-data="baseinfo" :dataList="dataList" ref="webhead"></hor-big-one>
<!-- <hor-big-two v-if="headType==2" :base-data="baseinfo" ref="webhead"></hor-big-two> -->
<q-page-container>
<!-- <div class="flex" v-if="showUserInfo" style="width: 1200px; margin: 0 auto">
<div class="flex justify-between" v-if="showUserInfo" style="width: 1200px; margin: 0 auto">
<navs></navs>
<router-view />
</div> -->
<router-view/>
</div>
<router-view v-else />
</q-page-container>
<div class="goBackTop bg-primary" :class="{'showGoback':isShowTop}" @click="hangleGoUp">
<i class="iconfont iconarrow-top"></i>
......@@ -62,7 +62,7 @@ import Navs from 'src/pages/usercenter/components/navs.vue';
},
data() {
return {
showUserInfo: true,
showUserInfo: false,
leftDrawerOpen: false,
baseinfo: {
logo: "",
......@@ -83,7 +83,13 @@ import Navs from 'src/pages/usercenter/components/navs.vue';
isShowTop: false
};
},
watch: {
'$route': function() {
this.showUserInfo = Boolean(this.$route.meta.isUserCenter)
}
},
created() {
this.showUserInfo = Boolean(this.$route.meta.isUserCenter)
var nowDay = this.formatDate2(new Date());
this.ToDay = nowDay.CYear + "-" + nowDay.CMonth + "-" + nowDay.CDay;
this.$root.$on('change-head-style', param => {
......
src/pages/Pickuporder/orderForm.vue
View file @ 12e9dbf5
This diff is collapsed.
src/pages/detailsCar.vue
View file @ 12e9dbf5
......@@ -180,6 +180,7 @@
color="primary"
label="選擇方案"
unelevated
:disable="priceList.length>0?false:true"
@click="goScrollHandler('#scheme')"
:class="{ 'q-mt-md full-width': $q.platform.is.desktop }"
/>
......@@ -280,6 +281,7 @@
:dataList="dataList"
:configId="msg.configId"
:Month="currentYM.str"
:PlaceList="dataList.PlaceList"
:CarTypeList="dataList.CarTypeList"
:AirportList="dataList.AirportList"
:price="currentPrice"
......@@ -372,6 +374,7 @@
:dataList="dataList"
:configId="msg.configId"
:Month="currentYM.str"
:PlaceList="dataList.PlaceList"
:CarTypeList="dataList.CarTypeList"
:AirportList="dataList.AirportList"
:price="currentPrice"
......
src/pages/detailsNew.vue
View file @ 12e9dbf5
......@@ -190,6 +190,7 @@
color="primary"
label="選擇方案"
unelevated
:disable="dataList.priceList.length>0?false:true"
@click="goScrollHandler(priceListHeight)"
:class="{ 'q-mt-md full-width': $q.platform.is.desktop }"
/>
......
src/pages/usercenter/components/navs.vue
View file @ 12e9dbf5
......@@ -22,7 +22,7 @@
<img class="avatar" v-if="LoginUser.photo" :src="LoginUser.photo" />
<img class="avatar" v-else src="../../../assets/img/avatar.png" />
</div>
<div class="text-primary text-center q-mt-sm">个人信息</div>
<div class="text-primary text-center q-mt-sm cursor-pointer" @click="navigateTo('/setUserInfo')">个人信息</div>
<div class="q-mt-xl q-pb-lg">
<div
class="nav-item flex justify-between items-center cursor-pointer"
......@@ -106,7 +106,7 @@ export default {
},
{
icon: "",
key: "/setUserInfo",
key: "/setInfo",
label: "账户设置",
number: "",
},
......
src/pages/usercenter/coupon.vue
View file @ 12e9dbf5
......@@ -15,84 +15,97 @@
padding: 0 35px;
line-height: 42px;
}
::v-deep .q-field__control {
height: 40px;
.bg-blue {
background: #70b1fa;
border-radius: 8px 8px 0 0;
.use {
color: #67cac2;
}
}
.title {
margin-top: 20px;
margin-bottom: 10px;
.bg-red {
background: #ee727d;
border-radius: 8px 8px 0 0;
.use {
color: #6F242B;
}
}
.bg-yellow {
background: #f2c16b;
border-radius: 8px 8px 0 0;
.use {
color: #8A5D10;
}
}
.bg-green {
background: #67cac2;
border-radius: 8px 8px 0 0;
.use {
color: #195954 ;
}
}
.card {
margin: 10px;
width: 201px;
height: 310px;
background: #f9f9f9;
border-radius: 8px;
}
.nav-item {
width: 100px;
margin: 0 10px;
text-align: center;
}
.border-bottom {
width: 20px;
height: 4px;
border-radius: 2px;
background-color: $primary;
margin: -8px auto 0 auto;
}
.img {
width: 201px;
margin-bottom: -6px;
}
</style>
<template>
<div class="content q-ma-lg bg-white">
<div class="q-ma-lg">
<div class="tips">密碼管理</div>
<div>
<div>
<div class="q-mt-lg q-mb-sm">
设置密码（8 - 20个字符，须至少包含1个数字、1个字母及1个特殊符号）
<div class="tips flex">
<div
@click="changeCouponType(item)"
class="nav-item cursor-pointer"
v-for="item in ['可使用', '已使用', '已过期']"
:key="item"
>
{{ item }}
<div :class="selectedKey === item ? 'border-bottom' : ''"></div>
</div>
<div class="text-grey-6">高强度密码能提高账号安全性</div>
<q-input
class="form-item"
v-model="form.firstName"
outlined
placeholder="姓"
ref="firstName"
:rules="[(val) => val !== '' || '请输入姓氏']"
></q-input>
<q-input
class="form-item"
v-model="form.firstName"
outlined
placeholder="姓"
ref="firstName"
:rules="[(val) => val !== '' || '请输入姓氏']"
></q-input>
<div>
<q-btn color="primary" unelevated label="确认" @click="submit" />
</div>
<div class="flex flex-wrap">
<div class="card" v-for="item in 10" :key="item">
<div class="bg-blue">
<div class="white text-center f16 q-pt-sm">CYN</div>
<div class="white text-center f26">10</div>
<div class="white text-center">
<span>限用品類：</span><span>滿2000可用</span>
</div>
<div class="use text-center q-pb-sm">
<span>限用品類：</span><span>滿2000可用</span>
</div>
<img class="img" src="../../assets/img/coupon.png">
</div>
<div class="q-ma-lg">
<div class="tips">通知偏好設置</div>
<div>
<div>
<div class="q-mt-lg q-mb-sm">優惠及更新信息</div>
<div class="text-grey-6">
抢先获取印象最新优惠活动、优惠码、折扣信息及最新动向
</div>
<q-checkbox>电子邮件</q-checkbox>
<q-checkbox>短信</q-checkbox>
<div class="q-pa-sm">
<div class="q-my-sm">
<span class="text-grey-6">限用品類：</span><span>滿2000可用</span>
</div>
<div>
<div>消息提醒</div>
<div class="text-grey-6">
获取购物车内活动及支付状态、评价提醒、推荐好友获取优惠等信息
<div class="q-my-sm">
<span class="text-grey-6">限用品類：</span><span>滿2000可用</span>
</div>
<q-checkbox>电子邮件</q-checkbox>
<q-checkbox>短信</q-checkbox>
<div class="flex flex-center q-mt-xl">
<q-btn color="primary" unelevated outline label="立即使用"></q-btn>
</div>
<div>
<div>賬戶通知</div>
<div class="text-grey-6">
接收重要通知，如订单摘要、凭证及活动取消
</div>
<q-checkbox>电子邮件</q-checkbox>
<q-checkbox>短信</q-checkbox>
</div>
<div>
<q-btn
color="primary"
unelevated
label="更改偏好設置"
@click="submit"
/>
</div>
<div class="tips q-mt-lg">註銷賬戶</div>
<div class="q-mt-sm">删除您的Klook客路帐户及个人数据</div>
</div>
</div>
</div>
......@@ -101,6 +114,7 @@
export default {
data() {
return {
selectedKey: "可使用",
form: {
lastName: "",
firstName: "",
......@@ -111,6 +125,9 @@ export default {
};
},
methods: {
changeCouponType(item) {
this.selectedKey = item;
},
submit() {
const verifyArr = ["fastName", "lastName"];
verifyArr.forEach((item) => {
......
src/pages/usercenter/order.vue
View file @ 12e9dbf5
......@@ -7,8 +7,25 @@
.content {
width: 900px;
}
.title {
margin-top: 20px;
margin-bottom: 10px;
}
.card {
margin: 10px;
background: #FFFFFF;
border: 1px solid #EEEEEE;
border-radius: 8px;
}
.card-title {
height: 37px;
height: 37px;
padding: 0 20px;
line-height: 37px;
background: #f5f5f5;
border-radius: 8px 8px 0px 0px;
}
.tips {
width: 100%;
height: 42px;
background: #f5f5f5;
border-radius: 8px;
......@@ -18,81 +35,115 @@
::v-deep .q-field__control {
height: 40px;
}
::v-deep .q-field--auto-height .q-field__control {
min-height: 40px;
}
::v-deep .q-field__marginal {
height: 40px;
}
.title {
margin-top: 20px;
margin-bottom: 10px;
}
.phone {
margin-left: 100px;
}
.name {
width: 300px;
}
.user-name {
width: 120px;
}
.pay-info {
width: 120px;
}
.order-info {
width: 120px;
}
.order-action {
width: 120px;
}
.nav-item {
width: 100px;
margin: 0 10px;
text-align: center;
}
.border-bottom {
width: 20px;
height: 4px;
border-radius: 2px;
background-color: $primary;
margin: -8px auto 0 auto;
}
</style>
<template>
<div class="content q-ma-lg bg-white">
<div class="q-ma-lg">
<div class="tips">密碼管理</div>
<div class="flex justify-between">
<div>
<div>
<div class="q-mt-lg q-mb-sm">
设置密码（8 - 20个字符，须至少包含1个数字、1个字母及1个特殊符号）
</div>
<div class="text-grey-6">高强度密码能提高账号安全性</div>
<q-input
class="form-item"
v-model="form.firstName"
outlined
placeholder="姓"
ref="firstName"
:rules="[(val) => val !== '' || '请输入姓氏']"
></q-input>
<q-input
ref="lastName"
class="form-item"
v-model="form.firstName"
placeholder="名字（需與旅遊證件一致）"
v-model="form.lastName"
outlined
placeholder="姓"
ref="firstName"
:rules="[(val) => val !== '' || '请输入姓氏']"
:rules="[(val) => val !== '' || '请输入名字']"
></q-input>
</div>
<div>
<q-btn color="primary" unelevated label="确认" @click="submit" />
<q-select
square
outlined
class="form-item"
v-model="model"
:options="options"
placeholder="Filled"
></q-select>
</div>
</div>
<div class="tips flex">
<div
@click="changeCouponType(item)"
class="nav-item cursor-pointer"
v-for="item in ['全部', '待付款', '待出行', '已完成', '已取消']"
:key="item"
>
{{ item }}
<div :class="selectedKey === item ? 'border-bottom' : ''"></div>
</div>
</div>
<div class="q-ma-lg">
<div class="tips">通知偏好設置</div>
<div>
<div>
<div class="q-mt-lg q-mb-sm">優惠及更新信息</div>
<div class="text-grey-6">
抢先获取印象最新优惠活动、优惠码、折扣信息及最新动向
<div class="card">
<div class="flex card-title justify-between">
<div class="flex">
<span>订单号</span>
<span class="phone">联系客服</span>
</div>
<q-checkbox>电子邮件</q-checkbox>
<q-checkbox>短信</q-checkbox>
<span>2023-02-23 14:31:52</span>
</div>
<div class="flex q-py-sm">
<img src="../../assets/img/avatar.png" />
<div class="name">
<div>
<div>消息提醒</div>
<div class="text-grey-6">
获取购物车内活动及支付状态、评价提醒、推荐好友获取优惠等信息
【限量300张·售完即止】2023客路春季踏青
卡（春季特惠不约可退+广东省内周边9大路
</div>
<q-checkbox>电子邮件</q-checkbox>
<q-checkbox>短信</q-checkbox>
<div>xl</div>
</div>
<div>
<div>賬戶通知</div>
<div class="text-grey-6">
接收重要通知，如订单摘要、凭证及活动取消
<div class="user-name">王然</div>
<div class="pay-info">
<div>CNY1188.00</div>
<div>在線支付</div>
</div>
<q-checkbox>电子邮件</q-checkbox>
<q-checkbox>短信</q-checkbox>
<div class="order-info">
<div>等待收貨</div>
<div>订单详情</div>
</div>
<div class="order-action">
<div>确认收货</div>
<div>取消订单</div>
<div>查看發票</div>
</div>
<div>
<q-btn
color="primary"
unelevated
label="更改偏好設置"
@click="submit"
/>
</div>
<div class="tips q-mt-lg">註銷賬戶</div>
<div class="q-mt-sm">删除您的Klook客路帐户及个人数据</div>
</div>
</div>
</div>
......@@ -101,6 +152,7 @@
export default {
data() {
return {
selectedKey: "全部",
form: {
lastName: "",
firstName: "",
......@@ -111,6 +163,9 @@ export default {
};
},
methods: {
changeCouponType(item) {
this.selectedKey = item;
},
submit() {
const verifyArr = ["fastName", "lastName"];
verifyArr.forEach((item) => {
......
src/pages/usercenter/setUserInfo.vue
View file @ 12e9dbf5
This diff is collapsed.
src/pages/usercenter/setUsersList.vue
View file @ 12e9dbf5
......@@ -25,8 +25,8 @@
<template>
<div class="content q-ma-lg bg-white q-pa-lg">
<div class="tips">
個人信息<span class="text-grey-6"
>(以下信息仅用于帮助你在支付时自动填写你的个人资料，你的信息将会安全地被印象保存且不会公开)</span
出行人<span class="text-grey-6"
>共計 3人，最多新增20人(含本人)</span
>
</div>
<div>
......
src/router/routes.js
View file @ 12e9dbf5
......@@ -51,74 +51,94 @@ const routes = [{
},
{
path: '/account', //用户信息
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/account.vue')
},
{
path: '/demandlist', //需求单列表
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/demandlist.vue')
},
{
path: '/demandinfo/:id', //需求单详情
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/demandinfo.vue')
},
{
path: '/orderlist', //订单列表
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/orderlist.vue')
},
{
path: '/orderinfo/:id', //订单详情
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/orderinfo.vue')
},
{
path: '/passengerList/:id', //旅客名单
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/passengerList.vue')
},
{
path: '/register', //用户注册
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/register.vue')
},
{
path: '/loginInfo', //账户设置
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/loginInfo.vue')
},
{
path: '/setAddress', //地址管理
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/setAddress.vue')
},
{
path: '/setInfo', //账户设置
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/setInfo.vue')
},
{
path: '/setUserInfo', //用户信息
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/setUserInfo.vue')
},
{
path: '/coupon', //优惠券
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/coupon.vue')
},
{
path: '/order', //用户订单
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/order.vue')
},
{
path: '/setUsersList', //用户订单
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/setUsersList.vue')
},
{
path: '/payInfo', //支付管理
meta: {isUserCenter: true},
component: () =>
import ('pages/usercenter/payInfo.vue')
},
{
path: '/customer/:id', //自定义页面
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