diff --git a/App.vue b/App.vue index 44e8f6d9e96b0b64d4575d233d40e23ed3671774..729a4171bd15164fc15e95d567206ec7f0aad077 100644 --- a/App.vue +++ b/App.vue @@ -25,5 +25,11 @@ min-width: 1140px; overflow-x: hidden; } - + .clearfix::after{ + content: ''; + height: 0; + display: block; + clear: both; + overflow: hidden; + } diff --git a/components/hotel/content.vue b/components/hotel/content.vue new file mode 100644 index 0000000000000000000000000000000000000000..fba493a0ab1e3625252802eaa7870e1b67c5fa32 --- /dev/null +++ b/components/hotel/content.vue @@ -0,0 +1,289 @@ + + + + + diff --git a/components/index/body.vue b/components/index/body.vue index 4dd914211466f405e7ab226103f18f75c52b65ab..3e96b39a5639c819f245d0933590d009bd036310 100644 --- a/components/index/body.vue +++ b/components/index/body.vue @@ -16,11 +16,8 @@ - - - + - diff --git a/components/index/bottom.vue b/components/index/bottom.vue new file mode 100644 index 0000000000000000000000000000000000000000..4c23efc72cccc81c304befedddbeb19e16daccef --- /dev/null +++ b/components/index/bottom.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/components/index/header.vue b/components/index/header.vue index 2785dcf6d4fde6aeca41b9beee5f1d120f68c93c..d3ee73b24f8c02e249c67fb1cc707b0c83c04913 100644 --- a/components/index/header.vue +++ b/components/index/header.vue @@ -7,18 +7,18 @@ - - 首页 + + 首页 - - 目的地 + + 目的地 - - 旅游攻略 + + 旅游攻略 - - - + + + 去旅行 @@ -33,11 +33,11 @@ 签证 - - 机票火车 + + 机票火车 - - 订酒店 + + 订酒店 @@ -58,7 +58,7 @@ - APP + APP @@ -70,7 +70,7 @@ | - + @@ -87,9 +87,18 @@ return { list:[ {title:'首页'} - ] + ], + active:1 }; - } + }, + methods:{ + act(a){ + this.active=a + + console.log(a) + } + }, + } @@ -111,6 +120,9 @@ view{ line-height: 68px; } + .nav{ + font-size: 16px; + } .nav:hover{ color: $color; border-bottom: 3px solid $color; @@ -148,8 +160,11 @@ color: $color; border-bottom: 3px solid $color; z-index: 999; - height: 58px; + // height: 58px; } + .nav{ + font-size: 14px; + } .xl{ top: 53px; } @@ -191,6 +206,11 @@ // position: relative; float: left; color: #333; + + .active{ + background-color: $color; + color: #fff; + } .nav{ padding: 2px 16px; z-index: 4; diff --git a/components/index/index-header.vue b/components/index/index-header.vue deleted file mode 100644 index 5e3c02adfce64c9fdf957f568fbed3898c2a23d8..0000000000000000000000000000000000000000 --- a/components/index/index-header.vue +++ /dev/null @@ -1,124 +0,0 @@ - - - - - diff --git a/components/index/left-body.vue b/components/index/left-body.vue new file mode 100644 index 0000000000000000000000000000000000000000..47a2163990700607294d3142efcec5c1b4bb4219 --- /dev/null +++ b/components/index/left-body.vue @@ -0,0 +1,354 @@ + + + + + diff --git a/components/index/right-body.vue b/components/index/right-body.vue new file mode 100644 index 0000000000000000000000000000000000000000..315001b837822f243c0d94779cde3ed2584a7f52 --- /dev/null +++ b/components/index/right-body.vue @@ -0,0 +1,572 @@ + + + + + diff --git a/pages.json b/pages.json index 27e47e4e78e34bf34ff99a32c11ab89ff13732ff..3d8f382dd76072f370f21454b35dd75bd490568b 100644 --- a/pages.json +++ b/pages.json @@ -6,7 +6,25 @@ } } - ], + ,{ + "path" : "pages/reg/reg", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/hotel/hotel", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "q-trip", diff --git a/pages/hotel/hotel.vue b/pages/hotel/hotel.vue new file mode 100644 index 0000000000000000000000000000000000000000..3e151949b4901840f4bcaedce66dbc79acd35d65 --- /dev/null +++ b/pages/hotel/hotel.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index 88f5aef69bc529abac359f94ad68452fe3995c70..c77482e20761264d1e974b411912dd3d752b78e7 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -3,6 +3,7 @@ + @@ -10,6 +11,8 @@ import indexHeader from '@/components/index/header.vue' import indexBanner from '@/components/index/banner.vue' import indexBody from '@/components/index/body.vue' + import bottom from '@/components/index/bottom.vue' + export default { data() { return { @@ -28,7 +31,8 @@ components:{ indexHeader, indexBanner, - indexBody + indexBody, + bottom } } diff --git a/pages/reg/reg.vue b/pages/reg/reg.vue new file mode 100644 index 0000000000000000000000000000000000000000..7dd300975b5e85f066b9298b207e4076e11b4ee1 --- /dev/null +++ b/pages/reg/reg.vue @@ -0,0 +1,243 @@ + + + + + diff --git a/static/bottom/app.png b/static/bottom/app.png new file mode 100644 index 0000000000000000000000000000000000000000..a95c6d1c3d92568140326c9cde21e9682feb772f Binary files /dev/null and b/static/bottom/app.png differ diff --git a/static/bottom/dingyuehao.gif b/static/bottom/dingyuehao.gif new file mode 100644 index 0000000000000000000000000000000000000000..9933ef07d837b4e36855f01a615029df32fb4cb7 Binary files /dev/null and b/static/bottom/dingyuehao.gif differ diff --git a/static/bottom/fuwuhao.png b/static/bottom/fuwuhao.png new file mode 100644 index 0000000000000000000000000000000000000000..9eb02c377b309b0d7a31f5f246434314a59879ee Binary files /dev/null and b/static/bottom/fuwuhao.png differ diff --git a/static/header/header-sprites15.png b/static/header/header-sprites15.png deleted file mode 100644 index 95a0578f75007b9460a703cfc3e17badf6b2ee65..0000000000000000000000000000000000000000 Binary files a/static/header/header-sprites15.png and /dev/null differ diff --git a/static/header/mfwzx.png b/static/header/mfwzx.png deleted file mode 100644 index 0a176cc6871dc210b08f138a54f403cccb1dff2c..0000000000000000000000000000000000000000 Binary files a/static/header/mfwzx.png and /dev/null differ diff --git a/static/hotel/1.jpeg b/static/hotel/1.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..fdc6307e8409074a16f990924095ab23ffa2ff7f Binary files /dev/null and b/static/hotel/1.jpeg differ diff --git a/static/hotel/2.jpeg b/static/hotel/2.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..ae0d2ca14ae0c0250feb19a711ca5eba28104b8c Binary files /dev/null and b/static/hotel/2.jpeg differ diff --git a/static/hotel/3.jpeg b/static/hotel/3.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..aa09ec369a9ebcf04d03e57fdb4ea78ad27607b0 Binary files /dev/null and b/static/hotel/3.jpeg differ diff --git a/static/hotel/4.jpeg b/static/hotel/4.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..a5d99f5c6002d22be977e5dcb4535640107d625d Binary files /dev/null and b/static/hotel/4.jpeg differ diff --git a/static/hotel/5.jpeg b/static/hotel/5.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..3d192ee2a0114588d7c1f2428ab09283cc361d18 Binary files /dev/null and b/static/hotel/5.jpeg differ diff --git a/static/hotel/6.jpeg b/static/hotel/6.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..248173355f2a30dda68f3327b877dced3df665c0 Binary files /dev/null and b/static/hotel/6.jpeg differ diff --git a/static/hotel/hotel1.jpeg b/static/hotel/hotel1.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..863f26da8cf0eb5fba1161467aede92d6ee5ddf6 Binary files /dev/null and b/static/hotel/hotel1.jpeg differ diff --git a/static/hotel/hotel2.jpeg b/static/hotel/hotel2.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..67254e343c8e2a15ab6e3fc10537fc41bc62d955 Binary files /dev/null and b/static/hotel/hotel2.jpeg differ diff --git a/static/hotel/hotel3.jpeg b/static/hotel/hotel3.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..30817a549bd4f0990700588f67dcc6229ce125de Binary files /dev/null and b/static/hotel/hotel3.jpeg differ diff --git a/static/hotel/hotel4.jpeg b/static/hotel/hotel4.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..2cd955e55641dba84acf045c0d1303cb5c34300d Binary files /dev/null and b/static/hotel/hotel4.jpeg differ diff --git a/static/hotel/hotel5.jpeg b/static/hotel/hotel5.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..27fb9133575c839f440304644713c9af20840cdd Binary files /dev/null and b/static/hotel/hotel5.jpeg differ diff --git a/static/hotel/hotel6.jpeg b/static/hotel/hotel6.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..18f7c1dbbcc35cf203873e106362fa25a8c8cca4 Binary files /dev/null and b/static/hotel/hotel6.jpeg differ diff --git a/static/hotel/hotel7.jpeg b/static/hotel/hotel7.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..77029c10415d675d8bedaee9350abf9408c9e751 Binary files /dev/null and b/static/hotel/hotel7.jpeg differ diff --git a/static/hotel/hotel8.jpeg b/static/hotel/hotel8.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..7d35c2f3da4977c202c8c972235a3d8585dcc2f4 Binary files /dev/null and b/static/hotel/hotel8.jpeg differ diff --git a/static/index/body/index-sprites9.png b/static/index/body/index-sprites9.png new file mode 100644 index 0000000000000000000000000000000000000000..8da818e986b3827048e675eab0adf24ca0a6306a Binary files /dev/null and b/static/index/body/index-sprites9.png differ diff --git a/static/index/content/erweima.png b/static/index/content/erweima.png new file mode 100644 index 0000000000000000000000000000000000000000..a57839b7b1dfe9294dfa8ce7e65d8cfe5ba77d69 Binary files /dev/null and b/static/index/content/erweima.png differ diff --git a/static/index/content/img1.jpeg b/static/index/content/img1.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..88d7ab8a021d70fe3fbc4d7d0347a3c54507d66a Binary files /dev/null and b/static/index/content/img1.jpeg differ diff --git a/static/index/content/img10.png b/static/index/content/img10.png new file mode 100644 index 0000000000000000000000000000000000000000..808470798fd4b51e61aa8c76219650696c70058a Binary files /dev/null and b/static/index/content/img10.png differ diff --git a/static/index/content/img2.jpeg b/static/index/content/img2.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..972fb13ab4d3824c6c10fd097edca7ab46dc027e Binary files /dev/null and b/static/index/content/img2.jpeg differ diff --git a/static/index/content/img3.jpeg b/static/index/content/img3.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..e90b346d39b8e69e4343e6e130f9c1fb6a6e56b7 Binary files /dev/null and b/static/index/content/img3.jpeg differ diff --git a/static/index/content/img4.jpg b/static/index/content/img4.jpg new file mode 100644 index 0000000000000000000000000000000000000000..fc25a76241bf7267a12410e574711cb47487ba36 Binary files /dev/null and b/static/index/content/img4.jpg differ diff --git a/static/index/content/img5.jpg b/static/index/content/img5.jpg new file mode 100644 index 0000000000000000000000000000000000000000..89a9d33d975b78a35574e406f0f5585a9f0acd15 Binary files /dev/null and b/static/index/content/img5.jpg differ diff --git a/static/index/content/img6.jpg b/static/index/content/img6.jpg new file mode 100644 index 0000000000000000000000000000000000000000..af6f2a5b888a32713268c29cbfb06e0a7ceae289 Binary files /dev/null and b/static/index/content/img6.jpg differ diff --git a/static/index/content/img7.jpg b/static/index/content/img7.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f86ab6b3c1ca0b9c8251eabf2787508ab6a7842f Binary files /dev/null and b/static/index/content/img7.jpg differ diff --git a/static/index/content/img8.jpg b/static/index/content/img8.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6a56a3844183c00fba605e1ce44b0904f0420f4d Binary files /dev/null and b/static/index/content/img8.jpg differ diff --git a/static/index/content/img9.jpg b/static/index/content/img9.jpg new file mode 100644 index 0000000000000000000000000000000000000000..993587205f79ba32d6b294dbf5ccfc9ff6afd7bd Binary files /dev/null and b/static/index/content/img9.jpg differ diff --git a/static/index/content/user1.jpeg b/static/index/content/user1.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..a61f991a2d91df7916560722c548825bd8814065 Binary files /dev/null and b/static/index/content/user1.jpeg differ diff --git a/static/index/content/user10.jpeg b/static/index/content/user10.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..a4af1518a433b14524a93a86719abdc031f1b753 Binary files /dev/null and b/static/index/content/user10.jpeg differ diff --git a/static/index/content/user2.jpeg b/static/index/content/user2.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..1f866497fe7f9abd29d2645cd51065b40b5f2f5d Binary files /dev/null and b/static/index/content/user2.jpeg differ diff --git a/static/index/content/user3.jpeg b/static/index/content/user3.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..a5ddf6028f34f09fc9a78ea5a660cdd670d5fb55 Binary files /dev/null and b/static/index/content/user3.jpeg differ diff --git a/static/index/content/user4.jpeg b/static/index/content/user4.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..f1fd72007058179f014f87bf1b533b3f25ddfccf Binary files /dev/null and b/static/index/content/user4.jpeg differ diff --git a/static/index/content/user5.jpeg b/static/index/content/user5.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..004ab2f4d904a17d11d155e8fb15a22d1c8a7660 Binary files /dev/null and b/static/index/content/user5.jpeg differ diff --git a/static/index/content/user6.jpeg b/static/index/content/user6.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..4fff324d448e69ddcede4af8de2268fdfd821d58 Binary files /dev/null and b/static/index/content/user6.jpeg differ diff --git a/static/index/content/user7.jpeg b/static/index/content/user7.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..847106bb6f88e5697d259b7f77a836ce573048c9 Binary files /dev/null and b/static/index/content/user7.jpeg differ diff --git a/static/index/content/user8.jpeg b/static/index/content/user8.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..416f9008daf79f2ee3ac4a7357246ed82e9ca4d7 Binary files /dev/null and b/static/index/content/user8.jpeg differ diff --git a/static/index/content/user9.jpeg b/static/index/content/user9.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..1b2acc69f7e79b78b5bf303079e3c557267cbb33 Binary files /dev/null and b/static/index/content/user9.jpeg differ diff --git a/static/index/hostList/1.jpg b/static/index/hostList/1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..cb81866489dd2875855c8a4df81a7eeef94dad8d Binary files /dev/null and b/static/index/hostList/1.jpg differ diff --git a/static/index/hostList/2.jpg b/static/index/hostList/2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..66e67a90215215a8ab5cb0ca8a40e25f58dfedd5 Binary files /dev/null and b/static/index/hostList/2.jpg differ diff --git a/static/index/hostList/3.jpg b/static/index/hostList/3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..cbe844efb163de4ca25209fa6db80ddf2238d8a3 Binary files /dev/null and b/static/index/hostList/3.jpg differ diff --git a/static/index/hostList/4.jpg b/static/index/hostList/4.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6c7c6fbe13420e4cc5e2b5410bca5ceb043f92be Binary files /dev/null and b/static/index/hostList/4.jpg differ diff --git a/static/reg/1.jpg b/static/reg/1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..70f03449677c2e202ec16a08d09bafc7523a637c Binary files /dev/null and b/static/reg/1.jpg differ diff --git a/static/reg/2.jpg b/static/reg/2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..55860c5c980c5f435df9a1e25671296c327c560f Binary files /dev/null and b/static/reg/2.jpg differ diff --git a/static/reg/3.jpg b/static/reg/3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..26ebcc99c931a2a7b3daf0ace2daee191bbd4d04 Binary files /dev/null and b/static/reg/3.jpg differ diff --git a/static/reg/4.jpg b/static/reg/4.jpg new file mode 100644 index 0000000000000000000000000000000000000000..823d14089c5d2c9b3ed66f9972525af18e78896e Binary files /dev/null and b/static/reg/4.jpg differ diff --git a/static/reg/5.jpg b/static/reg/5.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e06fced32c9fb083811053e01ab9e31f2eac1f4c Binary files /dev/null and b/static/reg/5.jpg differ diff --git a/static/reg/6.jpg b/static/reg/6.jpg new file mode 100644 index 0000000000000000000000000000000000000000..14140b0f472a4304b372c4bf15e3e76896f979d2 Binary files /dev/null and b/static/reg/6.jpg differ diff --git a/static/reg/7.jpg b/static/reg/7.jpg new file mode 100644 index 0000000000000000000000000000000000000000..12600dfa2f4ce4bb1e87ceae52b0ca587c6553d1 Binary files /dev/null and b/static/reg/7.jpg differ diff --git a/static/reg/8.jpg b/static/reg/8.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6825482e8e7a10c25975b0d7263e732ece681535 Binary files /dev/null and b/static/reg/8.jpg differ diff --git a/static/reg/9.jpg b/static/reg/9.jpg new file mode 100644 index 0000000000000000000000000000000000000000..de7b6211817f254ba3e61a7e15a81248ae7dd816 Binary files /dev/null and b/static/reg/9.jpg differ diff --git a/static/reg/full_page_vignette.png b/static/reg/full_page_vignette.png new file mode 100644 index 0000000000000000000000000000000000000000..634b3747be5a69faa0026ef78016394c44e0f872 Binary files /dev/null and b/static/reg/full_page_vignette.png differ diff --git a/static/reg/ic_qq.png b/static/reg/ic_qq.png new file mode 100644 index 0000000000000000000000000000000000000000..9973f704ab9b98ab2fbb8d11b143da802b76364f Binary files /dev/null and b/static/reg/ic_qq.png differ diff --git a/static/reg/ic_qq_sel.png b/static/reg/ic_qq_sel.png new file mode 100644 index 0000000000000000000000000000000000000000..3afe98813ccc091e6cdf2a54aeeeac937b34ec57 Binary files /dev/null and b/static/reg/ic_qq_sel.png differ diff --git a/static/reg/ic_weibo.png b/static/reg/ic_weibo.png new file mode 100644 index 0000000000000000000000000000000000000000..16f9ff360df2fbb36e6dc180654161d082542ad3 Binary files /dev/null and b/static/reg/ic_weibo.png differ diff --git a/static/reg/ic_weibo_sel.png b/static/reg/ic_weibo_sel.png new file mode 100644 index 0000000000000000000000000000000000000000..4bc9b54dbf00019d9a91160ebc45f8f1205846fa Binary files /dev/null and b/static/reg/ic_weibo_sel.png differ diff --git a/static/reg/ic_weixin.png b/static/reg/ic_weixin.png new file mode 100644 index 0000000000000000000000000000000000000000..c90aef8c9150d9f8af55b01b45b991f32fc9cc61 Binary files /dev/null and b/static/reg/ic_weixin.png differ diff --git a/static/reg/ic_weixin_sel.png b/static/reg/ic_weixin_sel.png new file mode 100644 index 0000000000000000000000000000000000000000..284ebbb74350c47641bdd42bd46c8211bc03c65d Binary files /dev/null and b/static/reg/ic_weixin_sel.png differ diff --git a/static/reg/img_download.png b/static/reg/img_download.png new file mode 100644 index 0000000000000000000000000000000000000000..ee0530b64950c09591bd841e95b038db916831a3 Binary files /dev/null and b/static/reg/img_download.png differ