Skip to content

M
million
Commit def2614d authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 3cee4656
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 530 deletions
quasar.conf.js
View file @ def2614d
...@@ -149,6 +149,7 @@ module.exports = function( /* ctx */ ) { ...@@ -149,6 +149,7 @@ module.exports = function( /* ctx */ ) {
'QCheckbox', 'QCheckbox',
'QPagination', 'QPagination',
'QRadio', 'QRadio',
'QCardSection'
], ],
directives: [ directives: [
......
src/components/label_other/diy-form.vue
View file @ def2614d
<style>
.mydiy-form .q-mb-lg{
margin-top:11px;
margin-bottom:0;
}
</style>
<template> <template>
<div class="mydiy-form q-mt-lg"> <div class="mydiy-form q-mt-lg">
<div class="form1 section-block"> <div class="form1 diy-form-block">
<h2 class="block-title q-mb-lg">專人服務</h2> <h2 class="block-title q-mb-lg">專人服務</h2>
<q-form class="q-gutter-md" ref="myform"> <q-form class="q-gutter-md" ref="myform">
<div class="row q-gutter-xl q-mb-lg q-pl-md" v-if="!$q.screen.xs"> <div class="row q-gutter-xl q-mb-lg q-pl-md" v-if="!$q.screen.xs">
<q-input filled v-model="params.Name" label="如何稱呼您" class="col" lazy-rules <q-input filled v-model="params.Name" label="如何稱呼您" class="col" lazy-rules
:rules="[ val => val && val.length > 0 || '請填寫您的稱呼']" /> :rules="[ val => val && val.length > 0 || '請填寫您的稱呼']" />
...@@ -31,7 +25,8 @@ ...@@ -31,7 +25,8 @@
<q-input filled v-model="params.Remarks" label="備註" class="col" type="textarea" /> <q-input filled v-model="params.Remarks" label="備註" class="col" type="textarea" />
</div> </div>
<div class="row q-mb-lg"> <div class="row q-mb-lg">
<q-btn type="submit" unelevated color="primary" style="margin-top:5px;" size="lg" label="送出" class="col" @click="onSubmit" /> <q-btn type="submit" unelevated color="primary" style="margin-top:10px;" size="lg" label="送出" class="col"
@click="onSubmit" />
</div> </div>
</q-form> </q-form>
</div> </div>
...@@ -43,6 +38,7 @@ ...@@ -43,6 +38,7 @@
props: ["TCID"], props: ["TCID"],
data() { data() {
return { return {
showLoading: false,
params: { params: {
Name: "", Name: "",
Mobile: "", Mobile: "",
...@@ -63,9 +59,38 @@ ...@@ -63,9 +59,38 @@
var jObj = JSON.parse(window.localStorage.getItem('groupinfo')); var jObj = JSON.parse(window.localStorage.getItem('groupinfo'));
this.params.RB_Group_Id = jObj.GroupId; this.params.RB_Group_Id = jObj.GroupId;
this.params.TCID = this.TCID; this.params.TCID = this.TCID;
if (this.params.Name == '') {
this.$q.notify({
type: 'negative',
message: '請填寫您的稱呼',
position: 'top',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
})
return;
}
if (this.params.Mobile == '') {
this.$q.notify({
type: 'negative',
message: '請填寫您的聯絡電話哦',
position: 'top',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
})
return;
}
if (this.params.EMail == '') {
this.$q.notify({
type: 'negative',
message: '請填寫您的聯絡E-Mail',
position: 'top',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
})
return;
}
this.$q.loading.show();
this.apipost( this.apipost(
"ws_post_SetService", this.params, "ws_post_SetService", this.params,
res => { res => {
this.$q.loading.hide();
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.params.Name = ''; this.params.Name = '';
this.params.Mobile = ''; this.params.Mobile = '';
...@@ -75,9 +100,12 @@ ...@@ -75,9 +100,12 @@
color: "green-4", color: "green-4",
textColor: "white", textColor: "white",
icon: "cloud_done", icon: "cloud_done",
message: "提交成功" message: "提交成功",
position:'center',
timeout: 1000, // 以毫秒为单位; 0意味着没有超时
}); });
this.$refs.myform.resetValidation(); this.$refs.myform.resetValidation();
this.$emit('closeDialog')
} }
}, },
err => {} err => {}
...@@ -107,13 +135,36 @@ ...@@ -107,13 +135,36 @@
</script> </script>
<style> <style>
.mydiy-form {
margin-top: 0 !important;
}
.mydiy-form .q-mb-lg {
margin-bottom: 0;
}
.mydiy-form .q-gutter-md{
margin-top:0!important;
}
.form1 .block-title { .form1 .block-title {
font-size: 24px; font-size: 24px;
font-weight: 600; font-weight: 600;
padding: 0; padding: 0;
margin: 0; margin: 0;
margin-bottom: 30px; margin-bottom: 20px;
line-height: unset; line-height: unset;
} }
.diy-form-block {
width: 100%;
margin: 0 auto;
max-width: 1200px;
}
.mydiy-form .q-field--with-bottom {
padding-bottom: 14px;
}
.mydiy-form .q-textarea.q-field--labeled .q-field__control-container{
padding-top:15px!important;
}
</style> </style>
src/components/navs/hor-big-one.vue
View file @ def2614d
...@@ -2,12 +2,11 @@ ...@@ -2,12 +2,11 @@
.q-ml-lg .block { .q-ml-lg .block {
margin-right: 12px; margin-right: 12px;
} }
</style> </style>
<template> <template>
<q-header reveal elevated :style="{background:baseData.nav.bg,color:baseData.nav.color}" height-hint="98" to="/index"> <q-header reveal elevated :style="{background:baseData.nav.bg,color:baseData.nav.color}" height-hint="98" to="/index">
<q-toolbar style="height:60px;" class="q-pr-lg q-pl-lg"> <q-toolbar style="height:60px;" class="q-pr-lg q-pl-lg zk_toolbar">
<img :src="baseData.logo" style="height:45px; cursor:pointer;" class="q-mr-lg" @click="CommonJump('/index',{})" /> <img :src="baseData.logo" style="height:45px; cursor:pointer;margin-right:100px;" class="q-mr-lg" @click="CommonJump('/index',{})" />
<q-tabs align="center" style="margin:0 auto;" shrink v-if="!$q.screen.xs"> <q-tabs align="center" style="margin:0 auto;" shrink v-if="!$q.screen.xs">
<template v-for="(x, i) in baseData.nav.navs"> <template v-for="(x, i) in baseData.nav.navs">
<q-btn :key="i" stretch flat :label="x.title" type="a" :href="x.url" target="_blank" :no-wrap="true" size="16px" <q-btn :key="i" stretch flat :label="x.title" type="a" :href="x.url" target="_blank" :no-wrap="true" size="16px"
......
src/components/search_s/search_s1.vue
View file @ def2614d
...@@ -82,79 +82,6 @@ ...@@ -82,79 +82,6 @@
</q-scroll-area> </q-scroll-area>
</div> </div>
</div> </div>
<div v-show="showCompPannel" id="sp" transition-show="fade" elevated transition-hide="scale"
class="showspbox row">
<q-scroll-area :thumb-style="thumbStyle" :bar-style="barStyle" style="height: 100%;width:100%">
<q-list class="area-box">
<q-item clickable v-ripple @click="chosenAreaHandler('日本')">
<q-item-section>
<q-item-label class="h4">日本</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('佐佐木美術館')">
<q-item-section>
<q-item-label class="h4">佐佐木美術館</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('名古屋樂高樂園')">
<q-item-section>
<q-item-label class="h4">名古屋樂高樂園</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('鶴據村')">
<q-item-section>
<q-item-label class="h4">鶴據村</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('長盤公園')">
<q-item-section>
<q-item-label class="h4">長盤公園</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('日本磁懸浮列車')">
<q-item-section>
<q-item-label class="h4">日本磁懸浮列車</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">日本平展望台</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">火影忍者村</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">海賊俱樂部</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-未知海域</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-scroll-area>
</div>
</div> </div>
<div class="mobile-only"> <div class="mobile-only">
<q-input filled id="search_key" v-model="searchKey" class="bg-grey-1" :label="$t('search')" readonly="readonly" <q-input filled id="search_key" v-model="searchKey" class="bg-grey-1" :label="$t('search')" readonly="readonly"
...@@ -245,7 +172,6 @@ ...@@ -245,7 +172,6 @@
searchDate: "", searchDate: "",
searchEndDate: "", searchEndDate: "",
showSplitPannel: false, showSplitPannel: false,
showCompPannel: false,
thumbStyle: { thumbStyle: {
right: "4px", right: "4px",
borderRadius: "5px", borderRadius: "5px",
...@@ -291,8 +217,6 @@ ...@@ -291,8 +217,6 @@
clickHandler(e) { clickHandler(e) {
if (!document.querySelector("#sb").contains(e.target)) { if (!document.querySelector("#sb").contains(e.target)) {
this.showSplitPannel = false; this.showSplitPannel = false;
} else if (!document.querySelector("#sp").contains(e.target)) {
this.showCompPannel = false;
} }
}, },
clickSlideHandler(url) { clickSlideHandler(url) {
...@@ -316,16 +240,13 @@ ...@@ -316,16 +240,13 @@
searchChangeHandler() { searchChangeHandler() {
if (this.searchKey == "") { if (this.searchKey == "") {
this.showSplitPannel = true; this.showSplitPannel = true;
this.showCompPannel = false;
} else { } else {
this.showSplitPannel = false; this.showSplitPannel = false;
this.showCompPannel = true;
} }
}, },
chosenAreaHandler(name) { chosenAreaHandler(name) {
this.searchKey = name; this.searchKey = name;
this.showSplitPannel = false; this.showSplitPannel = false;
this.showCompPannel = false;
}, },
goSearchHandler() { goSearchHandler() {
if (this.searchKey == "") { if (this.searchKey == "") {
......
src/components/search_s/search_s2.vue
View file @ def2614d
...@@ -82,79 +82,6 @@ ...@@ -82,79 +82,6 @@
</q-scroll-area> </q-scroll-area>
</div> </div>
</div> </div>
<div v-show="showCompPannel" id="sp" transition-show="fade" elevated transition-hide="scale"
class="showspbox row">
<q-scroll-area :thumb-style="thumbStyle" :bar-style="barStyle" style="height: 100%;width:100%">
<q-list class="area-box">
<q-item clickable v-ripple @click="chosenAreaHandler('日本')">
<q-item-section>
<q-item-label class="h4">日本</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('佐佐木美術館')">
<q-item-section>
<q-item-label class="h4">佐佐木美術館</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('名古屋樂高樂園')">
<q-item-section>
<q-item-label class="h4">名古屋樂高樂園</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('鶴據村')">
<q-item-section>
<q-item-label class="h4">鶴據村</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('長盤公園')">
<q-item-section>
<q-item-label class="h4">長盤公園</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('日本磁懸浮列車')">
<q-item-section>
<q-item-label class="h4">日本磁懸浮列車</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">日本平展望台</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">火影忍者村</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">海賊俱樂部</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-未知海域</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-scroll-area>
</div>
</div> </div>
<div class="mobile-only"> <div class="mobile-only">
<q-input filled id="search_key" v-model="searchKey" class="bg-grey-1" :label="$t('search')" readonly="readonly" <q-input filled id="search_key" v-model="searchKey" class="bg-grey-1" :label="$t('search')" readonly="readonly"
...@@ -246,7 +173,6 @@ ...@@ -246,7 +173,6 @@
searchDate: "", searchDate: "",
searchEndDate: "", searchEndDate: "",
showSplitPannel: false, showSplitPannel: false,
showCompPannel: false,
thumbStyle: { thumbStyle: {
right: "4px", right: "4px",
borderRadius: "5px", borderRadius: "5px",
...@@ -288,8 +214,6 @@ ...@@ -288,8 +214,6 @@
clickHandler(e) { clickHandler(e) {
if (!document.querySelector("#sb").contains(e.target)) { if (!document.querySelector("#sb").contains(e.target)) {
this.showSplitPannel = false; this.showSplitPannel = false;
} else if (!document.querySelector("#sp").contains(e.target)) {
this.showCompPannel = false;
} }
}, },
clickSlideHandler(url) { clickSlideHandler(url) {
...@@ -313,16 +237,13 @@ ...@@ -313,16 +237,13 @@
searchChangeHandler() { searchChangeHandler() {
if (this.searchKey == "") { if (this.searchKey == "") {
this.showSplitPannel = true; this.showSplitPannel = true;
this.showCompPannel = false;
} else { } else {
this.showSplitPannel = false; this.showSplitPannel = false;
this.showCompPannel = true;
} }
}, },
chosenAreaHandler(name) { chosenAreaHandler(name) {
this.searchKey = name; this.searchKey = name;
this.showSplitPannel = false; this.showSplitPannel = false;
this.showCompPannel = false;
}, },
goSearchHandler() { goSearchHandler() {
if (this.searchKey == "") { if (this.searchKey == "") {
......
src/components/search_s/search_s3.vue
View file @ def2614d
...@@ -82,79 +82,6 @@ ...@@ -82,79 +82,6 @@
</q-scroll-area> </q-scroll-area>
</div> </div>
</div> </div>
<div v-show="showCompPannel" id="sp" transition-show="fade" elevated transition-hide="scale"
class="showspbox row">
<q-scroll-area :thumb-style="thumbStyle" :bar-style="barStyle" style="height: 100%;width:100%">
<q-list class="area-box">
<q-item clickable v-ripple @click="chosenAreaHandler('日本')">
<q-item-section>
<q-item-label class="h4">日本</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('佐佐木美術館')">
<q-item-section>
<q-item-label class="h4">佐佐木美術館</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('名古屋樂高樂園')">
<q-item-section>
<q-item-label class="h4">名古屋樂高樂園</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('鶴據村')">
<q-item-section>
<q-item-label class="h4">鶴據村</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('長盤公園')">
<q-item-section>
<q-item-label class="h4">長盤公園</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('日本磁懸浮列車')">
<q-item-section>
<q-item-label class="h4">日本磁懸浮列車</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">日本平展望台</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">火影忍者村</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">海賊俱樂部</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-未知海域</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-scroll-area>
</div>
</div> </div>
<div class="mobile-only"> <div class="mobile-only">
<q-input filled id="search_key" v-model="searchKey" class="bg-grey-1" :label="$t('search')" readonly="readonly" <q-input filled id="search_key" v-model="searchKey" class="bg-grey-1" :label="$t('search')" readonly="readonly"
...@@ -245,7 +172,6 @@ ...@@ -245,7 +172,6 @@
searchDate: "", searchDate: "",
searchEndDate: "", searchEndDate: "",
showSplitPannel: false, showSplitPannel: false,
showCompPannel: false,
thumbStyle: { thumbStyle: {
right: "4px", right: "4px",
borderRadius: "5px", borderRadius: "5px",
...@@ -289,8 +215,6 @@ ...@@ -289,8 +215,6 @@
clickHandler(e) { clickHandler(e) {
if (!document.querySelector("#sb").contains(e.target)) { if (!document.querySelector("#sb").contains(e.target)) {
this.showSplitPannel = false; this.showSplitPannel = false;
} else if (!document.querySelector("#sp").contains(e.target)) {
this.showCompPannel = false;
} }
}, },
clickSlideHandler(url) { clickSlideHandler(url) {
...@@ -314,16 +238,13 @@ ...@@ -314,16 +238,13 @@
searchChangeHandler() { searchChangeHandler() {
if (this.searchKey == "") { if (this.searchKey == "") {
this.showSplitPannel = true; this.showSplitPannel = true;
this.showCompPannel = false;
} else { } else {
this.showSplitPannel = false; this.showSplitPannel = false;
this.showCompPannel = true;
} }
}, },
chosenAreaHandler(name) { chosenAreaHandler(name) {
this.searchKey = name; this.searchKey = name;
this.showSplitPannel = false; this.showSplitPannel = false;
this.showCompPannel = false;
}, },
goSearchHandler() { goSearchHandler() {
if (this.searchKey == "") { if (this.searchKey == "") {
......
src/components/search_sf/search_sf1.vue
View file @ def2614d
...@@ -85,79 +85,6 @@ ...@@ -85,79 +85,6 @@
</q-scroll-area> </q-scroll-area>
</div> </div>
</div> </div>
<div v-show="showCompPannel" id="sp" transition-show="fade" elevated transition-hide="scale"
class="showspbox row">
<q-scroll-area :thumb-style="thumbStyle" :bar-style="barStyle" style="height: 100%;width:100%">
<q-list class="area-box">
<q-item clickable v-ripple @click="chosenAreaHandler('日本')">
<q-item-section>
<q-item-label class="h4">日本</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('佐佐木美術館')">
<q-item-section>
<q-item-label class="h4">佐佐木美術館</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('名古屋樂高樂園')">
<q-item-section>
<q-item-label class="h4">名古屋樂高樂園</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('鶴據村')">
<q-item-section>
<q-item-label class="h4">鶴據村</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('長盤公園')">
<q-item-section>
<q-item-label class="h4">長盤公園</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('日本磁懸浮列車')">
<q-item-section>
<q-item-label class="h4">日本磁懸浮列車</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">日本平展望台</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">火影忍者村</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">海賊俱樂部</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-未知海域</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-scroll-area>
</div>
</div> </div>
<div style="width:100vw;" v-if="$q.screen.xs"> <div style="width:100vw;" v-if="$q.screen.xs">
<q-input filled v-model="searchKey" class="bg-grey-1 q-ml-md q-mr-md" :label="$t('search')" readonly="readonly" <q-input filled v-model="searchKey" class="bg-grey-1 q-ml-md q-mr-md" :label="$t('search')" readonly="readonly"
...@@ -248,7 +175,6 @@ ...@@ -248,7 +175,6 @@
searchDate: "", searchDate: "",
searchEndDate: "", searchEndDate: "",
showSplitPannel: false, showSplitPannel: false,
showCompPannel: false,
thumbStyle: { thumbStyle: {
right: "4px", right: "4px",
borderRadius: "5px", borderRadius: "5px",
...@@ -324,8 +250,6 @@ ...@@ -324,8 +250,6 @@
try { try {
if (!document.querySelector("#sb").contains(e.target)) { if (!document.querySelector("#sb").contains(e.target)) {
this.showSplitPannel = false; this.showSplitPannel = false;
} else if (!document.querySelector("#sp").contains(e.target)) {
this.showCompPannel = false;
} }
} catch (error) { } catch (error) {
} }
...@@ -351,16 +275,13 @@ ...@@ -351,16 +275,13 @@
searchChangeHandler() { searchChangeHandler() {
if (this.searchKey == "") { if (this.searchKey == "") {
this.showSplitPannel = true; this.showSplitPannel = true;
this.showCompPannel = false;
} else { } else {
this.showSplitPannel = false; this.showSplitPannel = false;
this.showCompPannel = true;
} }
}, },
chosenAreaHandler(name) { chosenAreaHandler(name) {
this.searchKey = name; this.searchKey = name;
this.showSplitPannel = false; this.showSplitPannel = false;
this.showCompPannel = false;
}, },
//跳转到搜索页面 //跳转到搜索页面
goSearchHandler() { goSearchHandler() {
......
src/components/search_sf/search_sf2.vue
View file @ def2614d
...@@ -85,79 +85,6 @@ ...@@ -85,79 +85,6 @@
</q-scroll-area> </q-scroll-area>
</div> </div>
</div> </div>
<div v-show="showCompPannel" id="sp" transition-show="fade" elevated transition-hide="scale"
class="showspbox row">
<q-scroll-area :thumb-style="thumbStyle" :bar-style="barStyle" style="height: 100%;width:100%">
<q-list class="area-box">
<q-item clickable v-ripple @click="chosenAreaHandler('日本')">
<q-item-section>
<q-item-label class="h4">日本</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('佐佐木美術館')">
<q-item-section>
<q-item-label class="h4">佐佐木美術館</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('名古屋樂高樂園')">
<q-item-section>
<q-item-label class="h4">名古屋樂高樂園</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('鶴據村')">
<q-item-section>
<q-item-label class="h4">鶴據村</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('長盤公園')">
<q-item-section>
<q-item-label class="h4">長盤公園</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('日本磁懸浮列車')">
<q-item-section>
<q-item-label class="h4">日本磁懸浮列車</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">日本平展望台</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">火影忍者村</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">海賊俱樂部</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-未知海域</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-scroll-area>
</div>
</div> </div>
<div style="width:100vw;" v-if="$q.screen.xs"> <div style="width:100vw;" v-if="$q.screen.xs">
<q-input filled v-model="searchKey" class="bg-grey-1 q-ml-md q-mr-md" :label="$t('search')" readonly="readonly" <q-input filled v-model="searchKey" class="bg-grey-1 q-ml-md q-mr-md" :label="$t('search')" readonly="readonly"
...@@ -248,7 +175,6 @@ ...@@ -248,7 +175,6 @@
searchDate: "", searchDate: "",
searchEndDate: "", searchEndDate: "",
showSplitPannel: false, showSplitPannel: false,
showCompPannel: false,
thumbStyle: { thumbStyle: {
right: "4px", right: "4px",
borderRadius: "5px", borderRadius: "5px",
...@@ -326,8 +252,6 @@ ...@@ -326,8 +252,6 @@
try { try {
if (!document.querySelector("#sb").contains(e.target)) { if (!document.querySelector("#sb").contains(e.target)) {
this.showSplitPannel = false; this.showSplitPannel = false;
} else if (!document.querySelector("#sp").contains(e.target)) {
this.showCompPannel = false;
} }
} catch (error) { } catch (error) {
} }
...@@ -353,16 +277,13 @@ ...@@ -353,16 +277,13 @@
searchChangeHandler() { searchChangeHandler() {
if (this.searchKey == "") { if (this.searchKey == "") {
this.showSplitPannel = true; this.showSplitPannel = true;
this.showCompPannel = false;
} else { } else {
this.showSplitPannel = false; this.showSplitPannel = false;
this.showCompPannel = true;
} }
}, },
chosenAreaHandler(name) { chosenAreaHandler(name) {
this.searchKey = name; this.searchKey = name;
this.showSplitPannel = false; this.showSplitPannel = false;
this.showCompPannel = false;
}, },
//跳转到搜索页面 //跳转到搜索页面
goSearchHandler() { goSearchHandler() {
......
src/components/search_sf/search_sf3.vue
View file @ def2614d
...@@ -85,79 +85,6 @@ ...@@ -85,79 +85,6 @@
</q-scroll-area> </q-scroll-area>
</div> </div>
</div> </div>
<div v-show="showCompPannel" id="sp" transition-show="fade" elevated transition-hide="scale"
class="showspbox row">
<q-scroll-area :thumb-style="thumbStyle" :bar-style="barStyle" style="height: 100%;width:100%">
<q-list class="area-box">
<q-item clickable v-ripple @click="chosenAreaHandler('日本')">
<q-item-section>
<q-item-label class="h4">日本</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('佐佐木美術館')">
<q-item-section>
<q-item-label class="h4">佐佐木美術館</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('名古屋樂高樂園')">
<q-item-section>
<q-item-label class="h4">名古屋樂高樂園</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('鶴據村')">
<q-item-section>
<q-item-label class="h4">鶴據村</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('長盤公園')">
<q-item-section>
<q-item-label class="h4">長盤公園</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler('日本磁懸浮列車')">
<q-item-section>
<q-item-label class="h4">日本磁懸浮列車</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">日本平展望台</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">火影忍者村</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-東京</q-item-label>
</q-item-section>
</q-item>
<q-item clickable v-ripple @click="chosenAreaHandler">
<q-item-section>
<q-item-label class="h4">海賊俱樂部</q-item-label>
</q-item-section>
<q-item-section>
<q-item-label class="h6">日本-未知海域</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-scroll-area>
</div>
</div> </div>
<div style="width:100vw;" v-if="$q.screen.xs"> <div style="width:100vw;" v-if="$q.screen.xs">
<q-input filled v-model="searchKey" class="bg-grey-1 q-ml-md q-mr-md" :label="$t('search')" readonly="readonly" <q-input filled v-model="searchKey" class="bg-grey-1 q-ml-md q-mr-md" :label="$t('search')" readonly="readonly"
...@@ -248,7 +175,6 @@ ...@@ -248,7 +175,6 @@
searchDate: "", searchDate: "",
searchEndDate: "", searchEndDate: "",
showSplitPannel: false, showSplitPannel: false,
showCompPannel: false,
thumbStyle: { thumbStyle: {
right: "4px", right: "4px",
borderRadius: "5px", borderRadius: "5px",
...@@ -329,8 +255,6 @@ ...@@ -329,8 +255,6 @@
try { try {
if (!document.querySelector("#sb").contains(e.target)) { if (!document.querySelector("#sb").contains(e.target)) {
this.showSplitPannel = false; this.showSplitPannel = false;
} else if (!document.querySelector("#sp").contains(e.target)) {
this.showCompPannel = false;
} }
} catch (error) { } catch (error) {
} }
...@@ -356,16 +280,13 @@ ...@@ -356,16 +280,13 @@
searchChangeHandler() { searchChangeHandler() {
if (this.searchKey == "") { if (this.searchKey == "") {
this.showSplitPannel = true; this.showSplitPannel = true;
this.showCompPannel = false;
} else { } else {
this.showSplitPannel = false; this.showSplitPannel = false;
this.showCompPannel = true;
} }
}, },
chosenAreaHandler(name) { chosenAreaHandler(name) {
this.searchKey = name; this.searchKey = name;
this.showSplitPannel = false; this.showSplitPannel = false;
this.showCompPannel = false;
}, },
////跳转到搜索页面 ////跳转到搜索页面
goSearchHandler() { goSearchHandler() {
......
src/components/trip/style3.vue
View file @ def2614d
...@@ -2368,14 +2368,15 @@ ...@@ -2368,14 +2368,15 @@
.daily-detail { .daily-detail {
width: 100%; width: 100%;
display: inline-block; display: inline-block;
margin-top: 50px; margin-top: 30px;
padding-top: 50px; padding-top: 30px;
border-top: 2px solid #9a9a9a; border-top: 2px solid #9a9a9a;
} }
.daily-detail:first-child{
margin-top:20px;
}
.detail-bg-block { .detail-bg-block {
position: relative; position: relative;
margin-top: 20px;
height: 255px; height: 255px;
overflow: hidden; overflow: hidden;
} }
......
src/components/trip/tripList.vue
View file @ def2614d
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<q-td key="tcid" :props="props"> <q-td key="tcid" :props="props">
<q-btn type="a" :label="props.row.seat>0||props.row.isSubstitution?'報名GO!':'無法預訂'" <q-btn type="a" :label="props.row.seat>0||props.row.isSubstitution?'報名GO!':'無法預訂'"
:color="props.row.seat>0||props.row.isSubstitution?'indigo':'grey'" rounded unelevated :color="props.row.seat>0||props.row.isSubstitution?'indigo':'grey'" rounded unelevated
:disable="props.row.seat==0&&props.row.isSubstitution" /> :disable="props.row.seat==0&&props.row.isSubstitution" @click="goSignUp(props.row.seat)" />
</q-td> </q-td>
</q-tr> </q-tr>
</template> </template>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<q-item-label class="text-grey">報名</q-item-label> <q-item-label class="text-grey">報名</q-item-label>
<q-btn type="a" :label="props.row.seat>0||props.row.isSubstitution?'報名GO!':'無法預訂'" <q-btn type="a" :label="props.row.seat>0||props.row.isSubstitution?'報名GO!':'無法預訂'"
:color="props.row.seat>0||props.row.isSubstitution?'indigo':'grey'" rounded unelevated :color="props.row.seat>0||props.row.isSubstitution?'indigo':'grey'" rounded unelevated
:disable="props.row.seat==0&&props.row.isSubstitution" /> :disable="props.row.seat==0&&props.row.isSubstitution" @click="goSignUp(props.row.seat)" />
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>
...@@ -213,6 +213,12 @@ ...@@ -213,6 +213,12 @@
methods: { methods: {
formatLabel(firstRowIndex, endRowIndex, totalRowsNumber) { formatLabel(firstRowIndex, endRowIndex, totalRowsNumber) {
return ""; return "";
},
//报名
goSignUp(seat){
if(seat>0){
this.$emit('showDialog');
}
} }
}, },
mounted() { mounted() {
......
src/pages/Search.vue
View file @ def2614d
...@@ -581,7 +581,7 @@ ...@@ -581,7 +581,7 @@
position: relative; position: relative;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
width: 100%; /* width: 100%; */
height: 44px; height: 44px;
margin: 0 auto; margin: 0 auto;
max-width: 1160px; max-width: 1160px;
...@@ -1281,7 +1281,7 @@ ...@@ -1281,7 +1281,7 @@
//数据改变 //数据改变
changeData() { changeData() {
this.qMsg.pageIndex = 1; this.qMsg.pageIndex = 1;
this.goSearchHandler(); // this.goSearchHandler();
}, },
//分页方法 //分页方法
getPage() { getPage() {
......
src/pages/details.vue
View file @ def2614d
...@@ -105,9 +105,9 @@ ...@@ -105,9 +105,9 @@
<template> <template>
<q-page ref="orderview"> <q-page ref="orderview">
<!-- loading --> <!-- loading -->
<div class="detail_loadingDiv" v-if="isLoading"> <!-- <div class="detail_loadingDiv" v-if="isLoading">
<q-spinner color="primary" size="3em" :thickness="10" /> <q-spinner color="primary" size="3em" :thickness="10" />
</div> </div> -->
<template v-if="isShow"> <template v-if="isShow">
<!-- 顶部大图 --> <!-- 顶部大图 -->
<headStyle1 :dataList="dataList" v-if="TripConfig.TripConfig.IsShowBgImg==1"></headStyle1> <headStyle1 :dataList="dataList" v-if="TripConfig.TripConfig.IsShowBgImg==1"></headStyle1>
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<!-- 行程資訊 --> <!-- 行程資訊 -->
<!-- TripListStyle 1月历 2列表 --> <!-- TripListStyle 1月历 2列表 -->
<tripList v-if="item.Id=='TripList'&&TripConfig.TripConfig.TripListStyle==2" :key="index+100" <tripList v-if="item.Id=='TripList'&&TripConfig.TripConfig.TripListStyle==2" :key="index+100"
:plugData="dataList.priceList"></tripList> :plugData="dataList.priceList" @showDialog="showDialog"></tripList>
<tripcalendar v-if="item.Id=='TripList'&&TripConfig.TripConfig.TripListStyle==1" :key="index+200" <tripcalendar v-if="item.Id=='TripList'&&TripConfig.TripConfig.TripListStyle==1" :key="index+200"
:dateData="dataList.priceList" :priceInfo="dataList.currentPriceInfo" @showDialog="showDialog"></tripcalendar> :dateData="dataList.priceList" :priceInfo="dataList.currentPriceInfo" @showDialog="showDialog"></tripcalendar>
<!-- 每日行程 --> <!-- 每日行程 -->
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
</div> </div>
<q-separator /> <q-separator />
<div style="max-height: 600px;padding:20px 30px 30px 30px" class="scroll"> <div style="max-height: 600px;padding:20px 30px 30px 30px" class="scroll">
<diyForm :TCID="msg.tcid"></diyForm> <diyForm :TCID="msg.tcid" @closeDialog="closeDialog"></diyForm>
</div> </div>
<q-separator /> <q-separator />
</q-card> </q-card>
...@@ -232,10 +232,14 @@ ...@@ -232,10 +232,14 @@
showDialog(){ showDialog(){
this.isShowDialog=true; this.isShowDialog=true;
}, },
//关闭弹窗
closeDialog(){
this.isShowDialog=false;
},
getData() { getData() {
this.isLoading = true; this.$q.loading.show();
this.apipost('b2b_get_GetB2BTravelInfoV1', this.msg, r => { this.apipost('b2b_get_GetB2BTravelInfoV1', this.msg, r => {
this.isLoading = false; this.$q.loading.hide();
if (r.data.resultCode == 1) { if (r.data.resultCode == 1) {
this.dataList = r.data.data; this.dataList = r.data.data;
if (this.dataList.dayList && this.dataList.dayList.length > 0) { if (this.dataList.dayList && this.dataList.dayList.length > 0) {
......
src/pages/login.vue
View file @ def2614d
...@@ -139,6 +139,13 @@ ...@@ -139,6 +139,13 @@
}) })
return; return;
} }
this.$q.notify({
type: 'negative',
message: '提交中',
position: 'top',
color:'secondary',
timeout: 500, // 以毫秒为单位; 0意味着没有超时
})
this.apipost( this.apipost(
"b2b_post_Login", this.loginMsg, "b2b_post_Login", this.loginMsg,
res => { res => {
...@@ -151,6 +158,7 @@ ...@@ -151,6 +158,7 @@
type: 'negative', type: 'negative',
message: res.data.message, message: res.data.message,
position: 'top', position: 'top',
color:'secondary',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时 timeout: 2000, // 以毫秒为单位; 0意味着没有超时
}) })
} }
......
src/pages/usercenter/register.vue
View file @ def2614d
...@@ -28,28 +28,35 @@ ...@@ -28,28 +28,35 @@
.regist_Box .q-field__control { .regist_Box .q-field__control {
height: 46px; height: 46px;
} }
.regisTiptext{
.regisTiptext {
font-size: 16px; font-size: 16px;
margin-bottom: 15px; margin-bottom: 15px;
color: #999; color: #999;
text-align: center; text-align: center;
} }
.regisTiptext a{
color:#00afff; .regisTiptext a {
color: #00afff;
cursor: pointer; cursor: pointer;
} }
.regist_Box .q-field__control{
min-height:46px!important; .regist_Box .q-field__control {
min-height: 46px !important;
} }
.regist_Box .q-field__native{
min-height:46px; .regist_Box .q-field__native {
min-height: 46px;
} }
.regist_Box .q-field__marginal{
height:46px; .regist_Box .q-field__marginal {
height: 46px;
} }
.regisStar{
color:red; .regisStar {
color: red;
} }
</style> </style>
<template> <template>
<q-page> <q-page>
...@@ -145,59 +152,74 @@ ...@@ -145,59 +152,74 @@
}, },
methods: { methods: {
doRegister() { doRegister() {
if(this.registerMsg.Name==''){ if (this.registerMsg.Name == '') {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
message:'请输入姓名', message: '请输入姓名',
position:'top', position: 'top',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时 timeout: 2000, // 以毫秒为单位; 0意味着没有超时
}) })
return; return;
} }
if(this.registerMsg.Account==''){ if (this.registerMsg.Account == '') {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
message:'请输入账号', message: '请输入账号',
position:'top', position: 'top',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时 timeout: 2000, // 以毫秒为单位; 0意味着没有超时
}) })
return; return;
} }
if(this.registerMsg.Password==''){ if (this.registerMsg.Password == '') {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
message:'请输入密码', message: '请输入密码',
position:'top', position: 'top',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时 timeout: 2000, // 以毫秒为单位; 0意味着没有超时
}) })
return; return;
} }
if(this.registerMsg.SurePwd==''){ if (this.registerMsg.SurePwd == '') {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
message:'请输入确认密码', message: '请输入确认密码',
position:'top', position: 'top',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时 timeout: 2000, // 以毫秒为单位; 0意味着没有超时
}) })
return; return;
} }
if(this.registerMsg.SurePwd!=this.registerMsg.Password){ if (this.registerMsg.SurePwd != this.registerMsg.Password) {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
message:'两次输入密码不一致', message: '两次输入密码不一致',
position:'top', position: 'top',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时 timeout: 2000, // 以毫秒为单位; 0意味着没有超时
}) })
return; return;
} }
this.$q.notify({
type: 'negative',
message: '提交中',
position: 'top',
color: 'secondary',
timeout: 500, // 以毫秒为单位; 0意味着没有超时
})
this.apipost( this.apipost(
"b2b_post_SetCustomerAccountService", this.registerMsg, "b2b_post_SetCustomerAccountService", this.registerMsg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var jsonData = JSON.stringify(res.data.data); var jsonData = JSON.stringify(res.data.data);
window.localStorage.setItem("b2bUser", jsonData); window.localStorage.setItem("b2bUser", jsonData);
this.CommonJump('/index', {}) this.$q.notify({
type: 'negative',
message: res.data.message,
position: 'top',
color: 'secondary',
timeout: 2000, // 以毫秒为单位; 0意味着没有超时
})
setTimeout(() => {
this.CommonJump('/login', {})
}, 2000)
} }
}, },
err => {} err => {}
......
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