Commit 4fe35650 authored by huangyuanyuan's avatar huangyuanyuan

update

parent caed59fc
{ {
"pages": [ "pages": [
"pages/SearchPage/SearchPage",
"pages/GroupTour/GroupTour", "pages/GroupTour/GroupTour",
"pages/SearchPage/SearchPage",
"pages/GroupTour/FillOrder/FillOrder", "pages/GroupTour/FillOrder/FillOrder",
"pages/GroupTour/ChDateNum/ChDateNum", "pages/GroupTour/ChDateNum/ChDateNum",
"pages/GroupTour/GroupDetails/GroupDetails", "pages/GroupTour/GroupDetails/GroupDetails",
"pages/product/product", "pages/product/product",
"pages/freeTravel/freeList/freeList", "pages/freeTravel/freeList/freeList",
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
font-size:26rpx; font-size:26rpx;
} }
.newsite{ .newsite{
position: fixed; position: absolute;
margin-bottom:30rpx; margin-bottom:30rpx;
z-index: 2000; z-index: 2000;
background:rgba(17,17,17,0.5); background:rgba(17,17,17,0.5);
......
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
align-items: center; align-items: center;
font-size: 30rpx; font-size: 30rpx;
} }
.dayView{
min-height: 300rpx;
}
.dayView .black{ .dayView .black{
color:#333333; color:#333333;
} }
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<text class="f20">总价:¥</text> <text class="f20">总价:¥</text>
<text class="f46 cee">{{payInfo.PreferPrice}}</text> <text class="f46 cee">{{payInfo.PreferPrice}}</text>
<text class="f20 c88">/人起</text> <text class="f20 c88">/人起</text>
<text bindtap='OpenGoodsView' style="padding-left:10rpx" class="f22 c55">明细</text> <!-- <text bindtap='OpenGoodsView' style="padding-left:10rpx" class="f22 c55">明细</text> -->
<image bindtap='OpenGoodsView' style="width:18rpx;height:8rpx" src="/images/group/mx1.png"></image> <image bindtap='OpenGoodsView' style="width:18rpx;height:8rpx" src="/images/group/mx1.png"></image>
</view> </view>
......
...@@ -66,11 +66,14 @@ ...@@ -66,11 +66,14 @@
</view> --> </view> -->
<view style="position: relative;margin-top:30rpx"> <view style="position: relative;margin-top:30rpx">
<scroll-view scroll-x class="scroll-header"> <scroll-view scroll-x class="scroll-header">
<view wx:for="{{priceList}}" wx:key="index" class="ScrollActive scroll-view-item"> <view wx:if="{{priceList.length>0}}" wx:for="{{priceList}}" wx:key="index" class="ScrollActive scroll-view-item">
<view>{{item.date}}</view> <view>{{item.date}}</view>
<view>¥{{isLogin!==1?item.b2CPrice:item.b2BPrice}}</view> <view>¥{{isLogin!==1?item.b2CPrice:item.b2BPrice}}</view>
</view> </view>
<view wx:if="{{priceList.length==0}}" wx:key="index" class="ScrollActive scroll-view-item">
<view>暂无</view>
<view style="color:#111111">班期</view>
</view>
</scroll-view> </scroll-view>
<view bindtap="StartYd" class="MorebDate"> <view bindtap="StartYd" class="MorebDate">
<view>更多</view> <view>更多</view>
......
...@@ -236,6 +236,14 @@ Page({ ...@@ -236,6 +236,14 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
console.log("options", options)
let that=this;
if (options.lineId){
that.data.listmsg.lineId=options.lineId;
}
that.setData({
listmsg:that.data.listmsg,
})
this.GetStartInfo(); this.GetStartInfo();
let City = this.selectComponent("#CityComp"); let City = this.selectComponent("#CityComp");
City.getCityList(); City.getCityList();
......
<view class='GroupList commonF' catchtouchmove="{{StopResh}}"> <view class='GroupList commonF' catchtouchmove="{{StopResh}}">
<search id="CityComp" bind:ChangeSite="ChangeSite"></search> <view id="searchView">
<search id="CityComp" bind:ChangeSite="ChangeSite"></search>
</view>
<view class="ListView"> <view class="ListView">
<view class="PxView"> <view class="PxView">
<!-- <view class="jView"> <!-- <view class="jView">
......
<!--pages/Home/home.wxml--> <!--pages/Home/home.wxml-->
<view class="Home commonF"> <view class="Home commonF">
<search id="CityComp" bind:ChangeSite="ChangeSite"></search> <view id="searchView">
<search id="CityComp" bind:ChangeSite="ChangeSite"></search>
</view>
<view class="tab1"> <view class="tab1">
<image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626103242285.png"></image> <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626103242285.png"></image>
</view> </view>
......
...@@ -16,6 +16,16 @@ Page({ ...@@ -16,6 +16,16 @@ Page({
*/ */
onLoad: function (options) { onLoad: function (options) {
},
CloseSelect(e){
console.log(e);
let self = e.target.dataset.self;
console.log(self)
if(self=="self"){
this.setData({
typeHidden: false,
})
}
}, },
typeViewShow(){ typeViewShow(){
this.setData({ this.setData({
......
<!-- 点击输入框 --> <!-- 点击输入框 -->
<view class="Inputfocus"> <view class="Inputfocus" bindtap="CloseSelect" data-self="self">
<view class="head3" style="width:600rpx"> <view class="head3" style="width:600rpx">
<view bindtap="typeViewShow" class="typeView">{{chineseValue}} <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 bindinput="inputValue" value="{{value}}" style="width:520rpx;display:inline-block" placeholder="搜索目的地/交通/景点/酒店" /> <input bindinput="inputValue" data-self="self" value="{{value}}" style="width:520rpx;display:inline-block" placeholder="搜索目的地/交通/景点/酒店" />
<view class="TypeList" hidden="{{!typeHidden}}"> <view class="TypeList" hidden="{{!typeHidden}}">
<view bindtap="goUrl" data-type="gentuan" data-value="跟团游">跟团游</view> <view bindtap="goUrl" data-type="gentuan" data-value="跟团游">跟团游</view>
</view> </view>
......
<view class="commonF Ticket"> <view class="commonF Ticket">
<search></search> <view id="searchView">
<search id="CityComp" bind:ChangeSite="ChangeSite"></search>
</view>
<view style="width:100%;height:300rpx;margin-top:36rpx;position: relative;z-index:0"> <view style="width:100%;height:300rpx;margin-top:36rpx;position: relative;z-index:0">
<image style="position: relative;z-index:0" src='http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626103539899.png'></image> <image style="position: relative;z-index:0" src='http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626103539899.png'></image>
</view> </view>
......
<view class='GroupList commonF' catchtouchmove="{{StopResh}}"> <view class='GroupList commonF' catchtouchmove="{{StopResh}}">
<search id="CityComp" bind:ChangeSite="ChangeSite"></search> <view id="searchView">
<search id="CityComp" bind:ChangeSite="ChangeSite"></search>
</view>
<view class="ListView"> <view class="ListView">
<view class="PxView"> <view class="PxView">
<view class="jView" data-type="{{0}}" bindtap='changeOrderType'> <view class="jView" data-type="{{0}}" bindtap='changeOrderType'>
......
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