Skip to content

F
FlashMan
Commit f36cc072 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

11

parent 2cd34fe6
Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 61 deletions
Common.wxss
View file @ f36cc072
...@@ -126,10 +126,23 @@ image{ ...@@ -126,10 +126,23 @@ image{
height: 100%; height: 100%;
} }
.commonF .cztm1 .cztmList1{ .commonF .cztm1 .cztmList1{
width:450rpx; width:413rpx;
height:280rpx; height:262rpx;
border-radius:12rpx; border-radius:12rpx;
} }
.commonF .cztm>view .rbzc{
position: absolute;
top: 0;
left: 0;
width:110rpx;
background:rgba(255,0,0,1);
border-radius:12rpx 0 12rpx 0;
text-align: center;
color: #fff;
font-size: 20rpx;
padding: 5rpx 15rpx;
}
.commonF .cztm>view{ .commonF .cztm>view{
display: inline-block; display: inline-block;
position: relative; position: relative;
...@@ -137,16 +150,18 @@ image{ ...@@ -137,16 +150,18 @@ image{
.commonF .cztm image{ .commonF .cztm image{
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 12rpx;
} }
.commonF .cztm .cztmList{ .commonF .cztm .cztmList{
width:210rpx; width:196rpx;
height:280rpx; height:262rpx;
border-radius:12rpx; border-radius:12rpx;
margin-left: 30rpx; margin-left: 27rpx;
} }
.commonF .cztm .cztmList image{ .commonF .cztm .cztmList image{
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius:12rpx;
} }
.commonF .cztm .boxshadow{ .commonF .cztm .boxshadow{
position: absolute; position: absolute;
......
component/Search/search.wxml
View file @ f36cc072
<view class="{{CitySite?'newsite back':'newsite'}}" catchtouchmove="{{CitySite}}"> <view class="{{CitySite?'newsite back':'newsite openclass'}}" catchtouchmove="{{CitySite}}">
<view style="background:#fff;padding:10rpx 30rpx"> <view class="{{!CitySite?'openclass':''}}" 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>
......
component/Search/search.wxss
View file @ f36cc072
/* component/Search/search.wxss */ /* component/Search/search.wxss */
.openclass{
background: transparent!important;
}
.cityView { .cityView {
background: #f2f2f2; background: #f2f2f2;
border-radius: 30rpx; border-radius: 30rpx;
......
component/calendar/calendar.js
View file @ f36cc072
...@@ -41,7 +41,6 @@ Component({ ...@@ -41,7 +41,6 @@ Component({
selectDate(e){ selectDate(e){
let item = e.currentTarget.dataset.item; let item = e.currentTarget.dataset.item;
let index = e.currentTarget.dataset.index; let index = e.currentTarget.dataset.index;
// console.log(item);
if (item.price == 0 || item.price == "" || !item.color){ if (item.price == 0 || item.price == "" || !item.color){
return; return;
} }
...@@ -66,8 +65,6 @@ Component({ ...@@ -66,8 +65,6 @@ Component({
}, },
getYearMonthDay() { getYearMonthDay() {
let that = this; let that = this;
// console.log("currentDay", this.data.currentDay)
// console.log("priceData", this.data.priceData)
let currentYear = that.data.currentDay.substring(0, 4); //当前年份 let currentYear = that.data.currentDay.substring(0, 4); //当前年份
let currentMonth = that.data.currentDay.substring(5, 7); //当前月份 let currentMonth = that.data.currentDay.substring(5, 7); //当前月份
that.setData({ that.setData({
...@@ -175,7 +172,6 @@ Component({ ...@@ -175,7 +172,6 @@ Component({
that.setData({ that.setData({
daysData: Arr daysData: Arr
}) })
// console.log("daysData",that.data.daysData)
}, },
isleapYears(year) { isleapYears(year) {
if (((year % 4) == 0) && ((year % 100) != 0) || ((year % 400) == 0)) { if (((year % 4) == 0) && ((year % 100) != 0) || ((year % 400) == 0)) {
......
component/chooseCity/chooseCity.js
View file @ f36cc072
...@@ -67,7 +67,6 @@ Component({ ...@@ -67,7 +67,6 @@ Component({
}, },
getCity(proInfo) { getCity(proInfo) {
console.log("proInfo", proInfo)
let that = this; let that = this;
app.$api('dict_post_Destination_GetChildList', { Id: proInfo.ID }).then(res => { app.$api('dict_post_Destination_GetChildList', { Id: proInfo.ID }).then(res => {
this.setData({ this.setData({
......
pages/Home/home.js
View file @ f36cc072
...@@ -6,7 +6,7 @@ Page({ ...@@ -6,7 +6,7 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
background: ["http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626103242285.png","http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190704061255480.jpg"], background: ["http://imgfile.oytour.com/Upload/DMC/Slide/20191009112009797.jpg"],
homeTravelSpecialSale:[], homeTravelSpecialSale:[],
specialAirTicketItem:[], specialAirTicketItem:[],
isLogin:0, isLogin:0,
...@@ -22,6 +22,11 @@ Page({ ...@@ -22,6 +22,11 @@ Page({
scenList:[], scenList:[],
localList:[], localList:[],
}, },
goWebView(){
wx.navigateTo({
url:'/pages/webview/webview'
})
},
draw: function () { draw: function () {
// this.data.contactNumber // this.data.contactNumber
let userinfo = wx.getStorageSync('admin') let userinfo = wx.getStorageSync('admin')
...@@ -75,7 +80,6 @@ Page({ ...@@ -75,7 +80,6 @@ Page({
this.getLocal() this.getLocal()
}, },
ChangeSite(val){ ChangeSite(val){
console.log(val.detail);
this.setData({ this.setData({
site: val.detail site: val.detail
}) })
......
pages/Home/home.json
View file @ f36cc072
{ {
"navigationBarTitleText": "首页", "navigationBarTitleText": "印象之旅",
"usingComponents": { "usingComponents": {
"search": "/component/Search/search" "search": "/component/Search/search"
} },
"navigationStyle": "custom"
} }
\ No newline at end of file
pages/Home/home.wxml
View file @ f36cc072
<!--pages/Home/home.wxml--> <!--pages/Home/home.wxml-->
<view class="Home commonF"> <view class="Home commonF">
<view id="searchView"> <view class="headerView">
<search id="CityComp" bind:ChangeSite="ChangeSite"></search> <image class="headerbg" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191108110833785.png"></image>
</view> <view class="hdjxView">
<view class="tab1"> <image class="headimg" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191108110853895.png"></image>
<swiper autoplay="{{true}}" duration="{{duration}}"> </view>
<block wx:for="{{background}}" wx:key="index"> <view id="searchView">
<swiper-item> <search id="CityComp" bind:ChangeSite="ChangeSite"></search>
<image src="{{item}}"></image> </view>
</swiper-item> <view class="tab1">
</block> <swiper autoplay="{{true}}" duration="{{duration}}">
</swiper> <block wx:for="{{background}}" wx:key="index">
<swiper-item>
<image src="{{item}}"></image>
</swiper-item>
</block>
</swiper>
</view>
</view> </view>
<view class="tablist"> <view class="tablist">
<view> <view>
<navigator hover-class="Home_hover" url="/pages/GroupTour/GroupTour"> <navigator hover-class="Home_hover" url="/pages/GroupTour/GroupTour">
...@@ -49,46 +56,56 @@ ...@@ -49,46 +56,56 @@
</view> </view>
</view> </view>
<view class="tab2" bindtap="draw"> <!-- <view class="tab2" bindtap="draw">
<navigator hover-class="Home_hover"> <navigator hover-class="Home_hover">
<image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190625044635970.png"></image> <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190625044635970.png"></image>
</navigator> </navigator>
</view> </view> -->
<!-- 超值特卖 -->
<view class="CommonMargin commonF"> <view class="CztmView">
<!-- 超值特卖 --> <view bindtap="goWebView" class="imageView">
<view> <image class="bannerImg" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191108013851924.png"></image>
<image class="small" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191108013907065.png"></image>
</view>
<view class="ContentView">
<view> <view>
<text style="font-size:30rpx;color:#000000">超值特卖</text> <image style="width:165rpx;height:26rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-11/20191108015629462.png"></image>
<text bindtap="goMore" data-url="/pages/GroupTour/GroupList/GroupList" style="font-size:24rpx;color:#888888;float:right;margin-top:15rpx">查看更多</text> <text bindtap="goMore" data-url="/pages/GroupTour/GroupList/GroupList" style="font-size:24rpx;color:#888888;float:right;margin-top:15rpx">查看更多</text>
</view> </view>
<view class="cztm cztm1"> <view class="cztm cztm1">
<view bindtap="goGroup" data-teamType="{{0}}" data-item="{{item}}" class="cztmList1" wx:for="{{homeTravelSpecialSale}}" wx:key="{{index}}" wx:if="{{index==0}}"> <view bindtap="goGroup" data-teamType="{{0}}" data-item="{{item}}" class="cztmList1" wx:for="{{homeTravelSpecialSale}}" wx:key="index" wx:if="{{index==0}}">
<image src="{{item.imgCover[0].url}}"></image> <image src="{{item.imgCover[0].url}}"></image>
<view class="boxshadow"> <view class="rbzc">日本专场</view>
<view class="text1" style="font-size:30rpx;padding-top:29rpx">{{item.title}}</view> <view class="boxshadow">
<view style="font-size:22rpx">{{item.dayNum}}日{{item.nightNum}}晚</view> <view class="text1" style="font-size:30rpx;padding-top:29rpx">{{item.title}}</view>
</view> <view style="font-size:22rpx">{{item.dayNum}}日{{item.nightNum}}晚</view>
</view>
<view bindtap="goGroup" data-teamType="{{0}}" data-item="{{item}}" class="cztmList" wx:for="{{homeTravelSpecialSale}}" wx:key="{{index}}" wx:if="{{index==1}}">
<image src="{{item.imgCover[0].url}}"></image>
<view class="boxshadow">
<view class="text1" style="font-size:30rpx;padding-top:29rpx">{{item.title}}</view>
<view style="font-size:22rpx">{{item.dayNum}}日{{item.nightNum}}晚</view>
</view>
</view> </view>
</view>
<view bindtap="goGroup" data-teamType="{{0}}" data-item="{{item}}" class="cztmList" wx:for="{{homeTravelSpecialSale}}" wx:key="index" wx:if="{{index==1}}">
<image src="{{item.imgCover[0].url}}"></image>
<view class="rbzc">日本专场</view>
<view class="boxshadow">
<view class="text1" style="font-size:30rpx;padding-top:29rpx">{{item.title}}</view>
<view style="font-size:22rpx">{{item.dayNum}}日{{item.nightNum}}晚</view>
</view>
</view> </view>
<view class="cztm cztm2">
<view bindtap="goGroup" data-teamType="{{0}}" data-item="{{item}}" class="cztmList" wx:for="{{homeTravelSpecialSale}}" wx:key="{{index}}" wx:if="{{index>1 && index<5}}"> </view>
<image src="{{item.imgCover[0].url}}"></image> <view class="cztm cztm2">
<view class="boxshadow"> <view bindtap="goGroup" data-teamType="{{0}}" data-item="{{item}}" class="cztmList" wx:for="{{homeTravelSpecialSale}}" wx:key="index" wx:if="{{index>1 && index<5}}">
<view class="text1" style="font-size:30rpx;padding-top:29rpx">{{item.title}}</view> <image src="{{item.imgCover[0].url}}"></image>
<view style="font-size:22rpx">{{item.dayNum}}日{{item.nightNum}}晚</view> <view class="rbzc">日本专场</view>
</view> <view class="boxshadow">
<view class="text1" style="font-size:30rpx;padding-top:29rpx">{{item.title}}</view>
<view style="font-size:22rpx">{{item.dayNum}}日{{item.nightNum}}晚</view>
</view> </view>
</view> </view>
</view> </view>
</view>
</view>
<view class="CommonMargin commonF">
<!-- 特价机票 --> <!-- 特价机票 -->
<view> <view>
<view> <view>
...@@ -123,7 +140,7 @@ ...@@ -123,7 +140,7 @@
</view> </view>
</view> </view>
<!-- 猜你喜欢 --> <!-- 猜你喜欢 -->
<scroll-view scroll-y scroll-into-view="{{ScrollView}}" scroll-with-animation="true"> <scroll-view scroll-y scroll-into-view="{{ScrollView}}" scroll-with-animation="true">
......
pages/Home/home.wxss
View file @ f36cc072
/* pages/Home/home.wxss */ /* pages/Home/home.wxss */
.CztmView .ContentView{
background: #fff;
border-radius:12rpx;
padding: 30rpx;
box-sizing: border-box;
margin-top: 90rpx;
}
.CztmView{
margin-top: 130rpx;
padding: 30rpx 26rpx;
box-sizing: border-box;
position: relative;
background:linear-gradient(90deg,rgba(207,0,8,1),rgba(204,0,92,1));
}
.CztmView .imageView{
width: 748rpx;
height: 188rpx;
position: absolute;
left: 5rpx;
top: -86rpx;
}
.CztmView .bannerImg{
width: 100%;
height: 100%;
}
.CztmView .small{
width: 180rpx;
height: 180rpx;
position: absolute;
right: 20rpx;
}
.headerView{
position: relative;
width: 100%;
height: 452rpx;
margin-bottom: 140rpx;
}
.Home .headerbg{
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 452rpx;
}
.hdjxView{
width: 100%;
position: relative;
z-index: 2000;
padding-top: 40rpx;
}
.hdjxView image{
padding-left: 12rpx;
width: 262rpx;
height: 74rpx;
}
.loginOut { .loginOut {
position: absolute; position: absolute;
width: 100%; width: 100%;
...@@ -34,6 +89,7 @@ ...@@ -34,6 +89,7 @@
.Home { .Home {
background: #fff; background: #fff;
position: relative;
} }
.Home_hover { .Home_hover {
...@@ -41,13 +97,18 @@ ...@@ -41,13 +97,18 @@
} }
.Home .tab1 { .Home .tab1 {
height: 300rpx; width:690rpx;
margin: 36rpx 0; height:300rpx;
border-radius:8rpx;
margin: 36rpx auto;
} }
.Home .tab1 image { .Home .tab1 image {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius:8rpx;
} }
.Home .tablist { .Home .tablist {
......
pages/webview/webview.js 0 → 100644
View file @ f36cc072
// pages/webview/webview.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/webview/webview.json 0 → 100644
View file @ f36cc072
{
"usingComponents": {}
}
\ No newline at end of file
pages/webview/webview.wxml 0 → 100644
View file @ f36cc072
<web-view src="https://www.baidu.com/"></web-view>
\ No newline at end of file
pages/webview/webview.wxss 0 → 100644
View file @ f36cc072
/* pages/webview/webview.wxss */
\ No newline at end of file
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