Commit 77fb70dc authored by huangyuanyuan's avatar huangyuanyuan

update

parent 5307dc3e
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
color:#000000; color:#000000;
background: #fff; background: #fff;
} }
#searchView{
height: 70rpx;
width: 100%;
}
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 0; width: 0;
height: 0; height: 0;
......
{ {
"pages": [ "pages": [
"pages/GroupTour/GroupTour",
"pages/SearchPage/SearchPage", "pages/SearchPage/SearchPage",
"pages/GroupTour/GroupTour",
"pages/GroupTour/FillOrder/FillOrder", "pages/GroupTour/FillOrder/FillOrder",
"pages/GroupTour/ChDateNum/ChDateNum", "pages/GroupTour/ChDateNum/ChDateNum",
"pages/GroupTour/GroupDetails/GroupDetails", "pages/GroupTour/GroupDetails/GroupDetails",
......
...@@ -29,6 +29,11 @@ Component({ ...@@ -29,6 +29,11 @@ Component({
* 组件的方法列表 * 组件的方法列表
*/ */
methods: { methods: {
InputFous(){
wx.navigateTo({
url: '/pages/SearchPage/SearchPage',
})
},
getCityList() { getCityList() {
app.$api('b2b_get_site', {}).then(res => { app.$api('b2b_get_site', {}).then(res => {
this.setData({ this.setData({
......
<view class="newsite" catchtouchmove="{{CitySite}}"> <view class="{{CitySite?'newsite back':'newsite'}}" catchtouchmove="{{CitySite}}">
<view style="background:#fff;padding:10rpx 30rpx">
<view class='cityView' hidden="{{InputFous}}"> <view class='cityView' hidden="{{InputFous}}">
<view bindtap='ChangeSite' class="head1" style="width:150rpx"> <view bindtap='ChangeSite' class="head1" style="width:150rpx">
<image src="../../images/home/location.png"></image> <image src="../../images/home/location.png"></image>
...@@ -7,10 +7,12 @@ ...@@ -7,10 +7,12 @@
<view style="color:#CCCCCC">|</view> <view style="color:#CCCCCC">|</view>
<view class="head3" style="width:500rpx"> <view class="head3" style="width:500rpx">
<image src="../../images/home/search.png"></image> <image src="../../images/home/search.png"></image>
<input style="width:100%" placeholder="搜索目的地/交通/景点/酒店"/> <input bindtap="InputFous" style="width:100%" placeholder="搜索目的地/交通/景点/酒店"/>
</view> </view>
<!-- bindtap="ListenInput" --> <!-- bindtap="ListenInput" -->
</view> </view>
</view>
<view bindtap="CloseCity" data-target="self" class="cityChange" hidden="{{!CitySite}}"> <view bindtap="CloseCity" data-target="self" class="cityChange" hidden="{{!CitySite}}">
<view class="CityView"> <view class="CityView">
<view catchtap='SetCity' data-msg="{{item}}" class="CityItem" wx:for="{{cityList}}" wx:key="index">{{item.siteName}}</view> <view catchtap='SetCity' data-msg="{{item}}" class="CityItem" wx:for="{{cityList}}" wx:key="index">{{item.siteName}}</view>
......
/* component/Search/search.wxss */ /* component/Search/search.wxss */
.cityView { .cityView {
width: 94%;
background: #f2f2f2; background: #f2f2f2;
border-radius: 30rpx; border-radius: 30rpx;
padding: 0 10rpx;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
align-items: center; align-items: center;
margin: 0 auto; margin: 0 auto;
height: 60rpx; height: 60rpx;
line-height: 60rpx; line-height: 60rpx;
padding: 0 10rpx;
} }
.cityView .head1 { .cityView .head1 {
...@@ -45,13 +43,10 @@ ...@@ -45,13 +43,10 @@
.cityChange{ .cityChange{
position: absolute;
background:rgba(17,17,17,0.5);
position: fixed;
top: 75rpx;
width: 100%; width: 100%;
z-index: 100; z-index: 100;
height:calc( 100% - 75rpx); height: 100%;
} }
.CityView{ .CityView{
background: #fff; background: #fff;
...@@ -59,7 +54,7 @@ ...@@ -59,7 +54,7 @@
} }
.Site{ .Site{
height: 100%; height: 100%;
background:rgba(17,17,17,0.5);
position: fixed; position: fixed;
top: 0; top: 0;
width: 100%; width: 100%;
...@@ -71,6 +66,13 @@ ...@@ -71,6 +66,13 @@
font-size:26rpx; font-size:26rpx;
} }
.newsite{ .newsite{
position: relative; position: fixed;
padding-top:15rpx; margin-bottom:30rpx;
z-index: 2000;
background:rgba(17,17,17,0.5);
width: 100%;
}
.back{
height: 100%;
} }
\ No newline at end of file
...@@ -57,6 +57,7 @@ Page({ ...@@ -57,6 +57,7 @@ Page({
url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.idDes) + "&tcid=" + item.tcid, url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.idDes) + "&tcid=" + item.tcid,
}) })
}, },
GodetailList(e){ GodetailList(e){
let item = e.currentTarget.dataset.item; let item = e.currentTarget.dataset.item;
......
<view class="group commonF"> <view class="group commonF">
<search id="CityComp" bind:ChangeSite="ChangeSite"></search> <view id="searchView">
<search id="CityComp" bind:ChangeSite="ChangeSite"></search>
</view>
<!-- <view class="page-section page-section-spacing"> <!-- <view class="page-section page-section-spacing">
<swiper class="swiper" indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" vertical="{{vertical}}" indicator-color="rgba(242,242,242,1);" indicator-active-color="rgba(238,68,84,1)" interval="{{interval}}" duration="{{duration}}"> <swiper class="swiper" indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" circular="{{circular}}" vertical="{{vertical}}" indicator-color="rgba(242,242,242,1);" indicator-active-color="rgba(238,68,84,1)" interval="{{interval}}" duration="{{duration}}">
<block wx:for="{{background}}" wx:key="*this"> <block wx:for="{{background}}" wx:key="*this">
......
...@@ -5,7 +5,10 @@ Page({ ...@@ -5,7 +5,10 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
searchKey:"",
chineseValue:'跟团游',
typeHidden:false,
type:'gentuan',
}, },
/** /**
...@@ -14,7 +17,44 @@ Page({ ...@@ -14,7 +17,44 @@ Page({
onLoad: function (options) { onLoad: function (options) {
}, },
typeViewShow(){
this.setData({
typeHidden: true,
})
},
searchInput(data){
let value = this.data.searchKey;
if (value==""){
wx.showToast({
title: "请输入搜索内容",
icon: 'none',
duration: 1000
})
return;
}
console.log(value)
if (this.data.type == "gentuan") {
wx.navigateTo({
url: '/pages/GroupTour/GroupList/GroupList?searchKey=' + this.data.searchKey,
})
}
},
inputValue(e){
let value = e.detail.value;
this.setData({
searchKey: value
})
},
goUrl(e){
let data=e.target.dataset.type;
let chineseValue = e.target.dataset.value;
this.setData({
chineseValue: chineseValue,
typeHidden:false,
type: data,
})
},
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
......
<!-- 点击输入框 --> <!-- 点击输入框 -->
<view class="Inputfocus"> <view class="Inputfocus">
<view class="head3" style="width:600rpx"> <view class="head3" style="width:600rpx">
<view class="typeView">跟团游 <view bindtap="typeViewShow" class="typeView">{{chineseValue}}
<image src="/images/group/mx2.png"></image> <image src="/images/group/mx2.png"></image>
</view> </view>
<!-- <view style="width:26rpx;height:26rpx;"><image src="../../images/home/search.png"></image></view> --> <!-- <view style="width:26rpx;height:26rpx;"><image src="../../images/home/search.png"></image></view> -->
<input style="width:520rpx;display:inline-block" placeholder="搜索目的地/交通/景点/酒店" /> <input bindinput="inputValue" value="{{value}}" style="width:520rpx;display:inline-block" placeholder="搜索目的地/交通/景点/酒店" />
<view class="TypeList"> <view class="TypeList" hidden="{{!typeHidden}}">
<view>跟团游</view> <view bindtap="goUrl" data-type="gentuan" data-value="跟团游">跟团游</view>
<view>自由行</view>
<view>签证</view>
<view>当地游</view>
</view> </view>
</view> </view>
<text class='Seach'>搜索</text> <text bindtap="searchInput" class='Seach'>搜索</text>
<view> <!-- <view>
<view class="hotTitle">热门推荐</view> <view class="hotTitle">热门推荐</view>
<view> <view>
<view class="HotItem"> <view class="HotItem">
...@@ -34,5 +31,5 @@ ...@@ -34,5 +31,5 @@
<text>签证</text> <text>签证</text>
</view> </view>
</view> </view>
</view> </view> -->
</view> </view>
\ No newline at end of file
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
z-index: 100; z-index: 100;
transition: all linear 0.5s; transition: all linear 0.5s;
padding:15rpx 30rpx; padding:15rpx 30rpx;
} }
.TypeList>view{ .TypeList>view{
padding: 10rpx 0; padding: 10rpx 0;
......
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