Commit db8a449d authored by 罗超's avatar 罗超

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

parents a237457b b3665fe3
...@@ -21,9 +21,9 @@ module.exports = function( /* ctx */ ) { ...@@ -21,9 +21,9 @@ module.exports = function( /* ctx */ ) {
// --> boot files are part of "main.js" // --> boot files are part of "main.js"
// https://quasar.dev/quasar-cli/cli-documentation/boot-files // https://quasar.dev/quasar-cli/cli-documentation/boot-files
boot: [ boot: [
'i18n', 'i18n',
'axios', 'axios',
"utils"
], ],
ssr: { ssr: {
pwa: true, pwa: true,
......
import Vue from 'vue' import Vue from 'vue'
import axios from 'axios' import axios from 'axios'
import md5 from 'js-md5'
Vue.prototype.$axios = axios Vue.prototype.$axios = axios
export default ({
app
}) => {
// Set i18n instance on app
app.axios = axios
}
export {
axios
}
import Vue from 'vue'
import axios from 'axios'
import md5 from 'js-md5'
//域名管理对象
Vue.prototype.domainManager = function () {
let domainUrl = '';
domainUrl = "http://192.168.0.110";
let locationName = window.location.hostname;
if (locationName.indexOf('testerp.oytour') !== -1) {
domainUrl = "http://testapi.oytour.com";
} else if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
}
var obj = {
//主地址
DomainUrl: domainUrl,
//常用提交数据URL
PostUrl: domainUrl + "/api/common/post",
};
return obj;
}
//HTTP提交数据
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") {
msg = {}
}
var timestamp = (new Date()).valueOf();
var apiurl = this.domainManager().PostUrl;
var token = "";
var key = "";
var tempLanguage = 0;
if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey;
}
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
var postData = {
msg: msg,
cmd: cmd,
timestamp: timestamp,
token: token,
sign: md5Str,
languageId: tempLanguage
}
this.$axios.post(apiurl, postData, {
headers: {
'Content-Type': 'application/json',
'Referer-Viitto': this.$route.path
}
})
.then(res => {
successCall(res);
}, faildCall)
}
//获取缓存
Vue.prototype.getLocalStorage = function () {
var localStorageData = window.localStorage["b2bUser"];
if (localStorageData !== undefined && localStorageData != 'undefined') {
return JSON.parse(localStorageData);
} else {
return null;
}
}
//向外跳转
Vue.prototype.OpenNewUrl = function (URL){
if (URL != '') {
if (URL.indexOf("https") != -1) {
var str = 'http://' + URL.substring(8);
window.open(str, '_blank');
} else if (URL.indexOf("http") != -1) {
var str = 'http://' + URL.substring(7);
window.open(str, '_blank');
} else {
window.open("http://" + URL, '_blank');
}
}
}
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<q-header <q-header
reveal reveal
elevated elevated
:style="{background:'transparent',color:'#FFF'}" :style="{background:baseData.nav.bg,color:'#FFF'}"
height-hint="98" height-hint="98"
> >
<q-toolbar style="height:60px;" class="q-pr-lg q-pl-lg"> <q-toolbar style="height:60px;" class="q-pr-lg q-pl-lg">
......
This diff is collapsed.
<style>
.banner-style8 .Mymobile-only{
display: none;
}
@media only screen and (max-width: 820px){
.banner-style8 .Mydesktop-only {
display: none;
}
.banner-style8 .Mymobile-only{
display: block;
}
}
.banner-style8 .MysearchDiv{
position: absolute;
width:100%;
top:60%;
}
</style>
<template> <template>
<div class="banner-style8"> <div class="banner-style8">
<q-carousel <q-carousel
...@@ -24,7 +42,7 @@ ...@@ -24,7 +42,7 @@
<div class="title">搜尋輪播淡出 - 大</div> <div class="title">搜尋輪播淡出 - 大</div>
<div class="sub-title">將您的夢變成一段真實的體驗,我們掌握今年冬季最受追捧的度假勝地,完成夢想就找我們</div> <div class="sub-title">將您的夢變成一段真實的體驗,我們掌握今年冬季最受追捧的度假勝地,完成夢想就找我們</div>
</div> </div>
<div class="desktop-only" style="width: 760px;"> <div class="Mydesktop-only" style="width: 760px;margin:auto;">
<div class="row"> <div class="row">
<div class="col-5" style="width:calc(41.6667% - 22px)"> <div class="col-5" style="width:calc(41.6667% - 22px)">
<q-input <q-input
...@@ -228,7 +246,10 @@ ...@@ -228,7 +246,10 @@
</q-scroll-area> </q-scroll-area>
</div> </div>
</div> </div>
<div class="mobile-only" style="width:100vw;">
</div>
<div class="MysearchDiv">
<div class="Mymobile-only" style="width:100%;">
<q-input <q-input
filled filled
v-model="searchKey" v-model="searchKey"
...@@ -242,6 +263,7 @@ ...@@ -242,6 +263,7 @@
</template> </template>
</q-input> </q-input>
</div> </div>
</div> </div>
<popup v-model="showPopup" mode="top" :safeAreaInsetBottom="true" border-radius="5"> <popup v-model="showPopup" mode="top" :safeAreaInsetBottom="true" border-radius="5">
<div class="chosen-box"> <div class="chosen-box">
......
<template> <template>
<q-layout view="hHh lpr fFf"> <q-layout view="hHh lpr fFf">
<hor-big-one v-if="headType==1" :base-data="baseinfo" ref="webhead"></hor-big-one> <hor-big-one v-if="headType==1" :base-data="baseinfo" ref="webhead"></hor-big-one>
<hor-big-two v-if="headType==2" :base-data="baseinfo" ref="webhead" ></hor-big-two> <hor-big-two v-if="headType==2" :base-data="baseinfo" ref="webhead"></hor-big-two>
<q-page-container> <q-page-container>
<router-view /> <router-view />
</q-page-container> </q-page-container>
<q-footer elevated class="bg-grey-8 text-white" style="position: unset;"> <q-footer elevated class="bg-grey-8 text-white" style="position: unset;">
<q-toolbar> <horBtm :dataList="dataList"></horBtm>
<q-toolbar-title>
<q-avatar>
<img src="https://cdn.quasar.dev/logo/svg/quasar-logo.svg" />
</q-avatar>Title
</q-toolbar-title>
</q-toolbar>
</q-footer> </q-footer>
</q-layout> </q-layout>
</template> </template>
<script> <script>
import horBigOne from "../components/navs/hor-big-one"; import horBigOne from "../components/navs/hor-big-one";
import horBigTwo from "../components/navs/hor-big-tow"; import horBigTwo from "../components/navs/hor-big-tow";
export default { import horBtm from "../components/navs/hor-btm";
components: { export default {
horBigOne, components: {
horBigTwo horBigOne,
}, horBigTwo,
data() { horBtm
return { },
leftDrawerOpen: false, data() {
baseinfo: { return {
logo: leftDrawerOpen: false,
"https://de0s2vtm6rzpn.cloudfront.net/white_label/575/logo_1583290210_rsz.png", baseinfo: {
name: "玩家旅遊", logo: "",
nav: { name: "",
bg: "rgba(255,255,255,.95)", nav: {
color: "#222", bg: "",
navs: [ color: "#222",
{ navs: []
title: "極上•深之旅", },
url: "http://17658.byethost18.com/", desc: "這是一家非常牛逼的旅遊網站"
icon: ""
},
{
title: "519住宿趣",
url: "http://winterfavor.byethost7.com/",
icon: ""
},
{
title: "玩家旅遊論壇",
url: "https://www.facebook.com/papago17658/",
icon: ""
},
{
title: "全球租車",
url: "https://yvonne.tripsaas.com/",
icon: ""
},
{
title: "歐洲團體行程",
url:
"https://yvonne.tripsaas.com/search/search_result?keyword=%E5%85%A8%E5%8D%80%20%E6%AD%90&type=area&from=2019-07-10&to=2020-01-06",
icon: ""
},
{
title: "茸茸毛寵物用品商城",
url: "https://petsiloveyou.123web.tw/",
icon: ""
}
]
}, },
desc: "這是一家非常牛逼的旅遊網站" headType: 0,
dataList:{}
};
},
created() {
this.$root.$on('change-head-style', param => {
this.changeHeadHandler(param);
this.getData();
})
},
methods: {
changeHeadHandler(t) {
this.headType = t;
}, },
headType:0 getData() {
}; this.apipost(
}, "ws_get_GetHomePage", {
created() { RB_Group_Id: 2
this.$root.$on('change-head-style', param=>{ },
this.changeHeadHandler(param) res => {
}) console.log(res);
}, if (res.data.resultCode == 1) {
methods: { this.dataList=res.data.data;
changeHeadHandler(t) { if(this.dataList){
this.headType = t; this.baseinfo.logo=this.dataList.Config.Logo;
} this.baseinfo.name=this.dataList.Config.Name;
}, this.baseinfo.nav.navs=this.dataList.HeaderList;
}; this.baseinfo.nav.bg=this.dataList.Config.BgColor;
}
} else {
}
},
err => {}
);
},
},
};
</script> </script>
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