Commit a8ce39e2 authored by 罗超's avatar 罗超

新增行程版面功能

parent aa02b786
...@@ -32,3 +32,4 @@ yarn-error.log* ...@@ -32,3 +32,4 @@ yarn-error.log*
*.njsproj *.njsproj
*.sln *.sln
package-lock.json package-lock.json
node_modules.rar
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
"qrcodejs2": "^0.0.2", "qrcodejs2": "^0.0.2",
"quasar": "^1.22.5", "quasar": "^1.22.5",
"v-viewer": "^1.6.4", "v-viewer": "^1.6.4",
"vue-awesome-swiper": "^3.0.4",
"vue-concise-slider": "^4.2.5", "vue-concise-slider": "^4.2.5",
"vue-core-video-player": "^0.2.0", "vue-core-video-player": "^0.2.0",
"vue-core-video-players": "0.0.5", "vue-core-video-players": "0.0.5",
......
...@@ -165,6 +165,7 @@ module.exports = function( /* ctx */ ) { ...@@ -165,6 +165,7 @@ module.exports = function( /* ctx */ ) {
'QParallax', 'QParallax',
'QField', 'QField',
'QTree', 'QTree',
'QRating'
], ],
directives: [ directives: [
...@@ -273,4 +274,4 @@ module.exports = function( /* ctx */ ) { ...@@ -273,4 +274,4 @@ module.exports = function( /* ctx */ ) {
} }
} }
} }
} }
\ No newline at end of file
...@@ -10,7 +10,7 @@ export default { ...@@ -10,7 +10,7 @@ export default {
}; };
</script> </script>
<style> <style>
@import url("//at.alicdn.com/t/c/font_1890699_q162a9wo98a.css"); @import url("//at.alicdn.com/t/c/font_1890699_fpmgpq29nve.css");
@font-face { @font-face {
font-family: "oswald"; font-family: "oswald";
src: url("https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/smallapp/Oswald-Regular.ttf"); src: url("https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/smallapp/Oswald-Regular.ttf");
......
.mall-swiper{
position: relative;
margin-bottom: 15px;
}
.mall-swiper .el-carousel__item img{
width: 100%;
}
.mall-swiper .el-carousel__button {
display: block;
opacity: 1;
width: 18px;
height: 6px;
border-radius: 2px;
}
.mall-swiper .el-carousel__indicators{
right: 30px;
left: auto;
}
.mall-swiper .el-carousel__indicator{
padding: 12px 0 12px 20px;
}
.el-carousel__indicator.is-active button{
width:30px;
background: #EF4455;
}
.mall-swiper .search-box{
width:580px;
height:72px;
background:rgba(0,0,0,.4);
border-radius:4px;
position: absolute;
left: calc(50% - 270px);
bottom: 10px;
z-index: 9999;
padding: 6px;
box-sizing: border-box;
}
.mall-swiper .search-box .chosen-item{
width:65px;
height:26px;
background:rgba(255,255,255,1);
border-radius:4px 4px 0px 0px;
text-align: center;
font-size: 14px;
line-height: 26px;
color:#333;
font-family: 'pingfang';
}
.mall-swiper .search-box .search-content{
height:34px;
background:rgba(255,255,255,1);
border-radius:0px 4px 4px 4px;
line-height:34px;
padding: 0 6px 0 15px
}
.mall-swiper .search-box .search-content i{
font-size: 15px;
color: #AAA;
}
.mall-swiper .search-box .search-content .s-input{
border: none;
outline: none;
width: 100%;
font-size: 14px;
font-family: 'pingfang';
color:#333;
line-height: 30px;
height: 30px;
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head>
<title><%= htmlWebpackPlugin.options.productName %></title> <head>
<title>
<%= htmlWebpackPlugin.options.productName %>
</title>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="description" content="<%= htmlWebpackPlugin.options.productDescription %>"> <meta name="description" content="<%= htmlWebpackPlugin.options.productDescription %>">
...@@ -14,12 +17,61 @@ ...@@ -14,12 +17,61 @@
<link rel="icon" type="image/png" sizes="32x32" href="statics/icons/favicon-32x32.png"> <link rel="icon" type="image/png" sizes="32x32" href="statics/icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="statics/icons/favicon-16x16.png"> <link rel="icon" type="image/png" sizes="16x16" href="statics/icons/favicon-16x16.png">
<link rel="icon" type="image/ico" href="statics/icons/favicon.ico"> <link rel="icon" type="image/ico" href="statics/icons/favicon.ico">
<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> -->
</head> <script src="https://api.map.baidu.com/api?type=webgl&v=2.0&ak=OBd2bhrqKUSbQGpniCZ996suti9YG7Bc"></script>
<body> <script>
function countryCb(r) {
if (!r) {
loadScriptString('https://maps.googleapis.com/maps/api/js?key=AIzaSyCvRZN9lGl3y3EsM0A0sWPf1pZ2olGsyNg&callback=Function.prototype')
setTimeout(() => {
loadScriptString('https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com/1.0.0.1/mark.js')
}, 1000);
} else {
loadScriptString('https://api.map.baidu.com/api?type=webgl&v=2.0&ak=OBd2bhrqKUSbQGpniCZ996suti9YG7Bc')
}
}
function loadScriptString(code) {
var script = document.createElement("script"); //创建一个script标签
script.type = "text/javascript";
script.src = code
document.getElementsByTagName('head')[0].appendChild(script);
}
function isInChina() {
let that = this
var url = '//graph.facebook.com/feed?callback=h';
var xhr = new XMLHttpRequest();
var called = false;
xhr.open('GET', url);
xhr.onreadystatechange = function() {
if (xhr.readyState === 4 && xhr.status === 200) {
called = true;
that.countryCb(false);
}
};
xhr.send();
// timeout 1s, this facebook API is very fast.
setTimeout(function() {
if (!called) {
xhr.abort();
that.countryCb(true);
}
}, 1000);
}
window.onload = function() {
isInChina()
}
</script>
</head>
<body>
<!-- DO NOT touch the following DIV --> <!-- DO NOT touch the following DIV -->
<div id="q-app"></div> <div id="q-app"></div>
</body> </body>
</html>
</html>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
const routes = [{ const routes = [{
path: '/', path: '/',
component: () => component: () =>
import('layouts/HomeLayout.vue'), import ('layouts/HomeLayout.vue'),
children: [{ children: [{
path: '', path: '',
component: () => component: () =>
import('pages/index.vue') import ('pages/index.vue')
}, },
{ {
path: '/index', path: '/index',
component: () => component: () =>
import('pages/index.vue') import ('pages/index.vue')
}, },
{ {
path: '/about', //关于我们 path: '/about', //关于我们
component: () => component: () =>
import('pages/about.vue') import ('pages/about.vue')
}, { }, {
path: '/contract', //契约管理 path: '/contract', //契约管理
component: () => component: () =>
import('pages/contract.vue') import ('pages/contract.vue')
}, { }, {
path: '/tour_visa', //签证护照管理 path: '/tour_visa', //签证护照管理
component: () => component: () =>
import('pages/tour_visa.vue') import ('pages/tour_visa.vue')
}, { //行程 }, { //行程
path: '/details/:id/:tcid', path: '/details/:id/:tcid',
component: () => component: () =>
import('pages/details.vue') import ('pages/details.vue')
}, { //行程2 }, { //行程2
path: '/detail/:id/:tcid', path: '/detail/:id/:tcid',
component: () => component: () =>
import('pages/detailsNew.vue') import ('pages/detailsNew.vue')
}, { }, {
path: '/search', //签证护照管理 path: '/search', //签证护照管理
component: () => component: () =>
import('pages/Search.vue') import ('pages/Search.vue')
}, },
{ {
path: '/account', //用户信息 path: '/account', //用户信息
component: () => component: () =>
import('pages/usercenter/account.vue') import ('pages/usercenter/account.vue')
}, },
{ {
path: '/demandlist', //需求单列表 path: '/demandlist', //需求单列表
component: () => component: () =>
import('pages/usercenter/demandlist.vue') import ('pages/usercenter/demandlist.vue')
}, },
{ {
path: '/demandinfo/:id', //需求单详情 path: '/demandinfo/:id', //需求单详情
component: () => component: () =>
import('pages/usercenter/demandinfo.vue') import ('pages/usercenter/demandinfo.vue')
}, },
{ {
path: '/orderlist', //订单列表 path: '/orderlist', //订单列表
component: () => component: () =>
import('pages/usercenter/orderlist.vue') import ('pages/usercenter/orderlist.vue')
}, },
{ {
path: '/orderinfo/:id', //订单详情 path: '/orderinfo/:id', //订单详情
component: () => component: () =>
import('pages/usercenter/orderinfo.vue') import ('pages/usercenter/orderinfo.vue')
}, },
{ {
path: '/passengerList/:id', //旅客名单 path: '/passengerList/:id', //旅客名单
component: () => component: () =>
import('pages/usercenter/passengerList.vue') import ('pages/usercenter/passengerList.vue')
}, },
{ {
path: '/register', //用户注册 path: '/register', //用户注册
component: () => component: () =>
import('pages/usercenter/register.vue') import ('pages/usercenter/register.vue')
}, },
{ {
path: '/customer/:id', //自定义页面 path: '/customer/:id', //自定义页面
component: () => component: () =>
import('pages/customer.vue') import ('pages/customer.vue')
}, },
{ {
path: '/city/:id', //自定义页面 path: '/city/:id', //自定义页面
component: () => component: () =>
import('pages/city/cityDetail.vue') import ('pages/city/cityDetail.vue')
}, },
] ]
}, },
{ {
path: '/login', path: '/login',
component: () => component: () =>
import('pages/login.vue'), import ('pages/login.vue'),
children: [{ children: [{
path: '/login', path: '/login',
component: () => component: () =>
import('pages/login.vue') import ('pages/login.vue')
}] }]
} },
{
path: '/newTrip',
component: () =>
import ('pages/newTrip.vue')
},
{
path: '/tripMobile',
component: () =>
import ('pages/tripMobile.vue')
}
] ]
// Always leave this as last one // Always leave this as last one
if (process.env.MODE !== 'ssr') { if (process.env.MODE !== 'ssr') {
routes.push({ routes.push({
path: '*', path: '*',
component: () => component: () =>
import('pages/Error404.vue') import ('pages/Error404.vue')
}) })
} }
export default routes export default routes
\ No newline at end of file
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