From 186ccd6abbf59a8cd02fd18f3abc86a509d9ae49 Mon Sep 17 00:00:00 2001 From: shaojing <2901156235@qq.com> Date: Sun, 28 Apr 2024 09:20:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=B1=8F=E9=A1=B5=EF=BC=8C=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E6=97=A5=E5=8E=86=E4=BA=94=E4=B8=80=EF=BC=8C=E6=99=AF?= =?UTF-8?q?=E7=82=B9=E4=B8=8B=E5=8D=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/component/newCalendar/index.wxml | 1 + pages/component/newCalendar/index.wxss | 11 +++++- pages/index/index.js | 11 +++++- pages/index/index.wxml | 2 +- pages/index/index.wxss | 3 ++ pages/list/activitynew/index.wxml | 2 ++ pages/list/activitynew/index.wxss | 23 ++++++++++--- pages/map/index.wxml | 46 +++++++++++++------------- pages/map/index.wxss | 9 ++++- pages/order/scene/index.js | 10 ++++-- 10 files changed, 83 insertions(+), 35 deletions(-) diff --git a/pages/component/newCalendar/index.wxml b/pages/component/newCalendar/index.wxml index 4ee36f8..8dd1fc8 100644 --- a/pages/component/newCalendar/index.wxml +++ b/pages/component/newCalendar/index.wxml @@ -57,6 +57,7 @@ + \ No newline at end of file diff --git a/pages/component/newCalendar/index.wxss b/pages/component/newCalendar/index.wxss index 4c61809..b7b528f 100644 --- a/pages/component/newCalendar/index.wxss +++ b/pages/component/newCalendar/index.wxss @@ -1,13 +1,20 @@ /* components/xx-calendar/xx-calendar.wxss */ /* 头部样式start */ .title-wrap{ - background-color: #F2F2F2; + /* background-color: #F2F2F2; */ /* padding-top: 20rpx; */ /* border-bottom: 1px solid #D4DBDC; */ /* padding-bottom: 10rpx; */ /* width: 697rpx; */ + /* margin: 0 auto; + padding: 37rpx 22rpx 40rpx; */ + background-color: #FFD6B2; margin: 0 auto; padding: 37rpx 22rpx 40rpx; + background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-top.png"); + background-size: 100% 100%; + width: 90%; + height: 65.67rpx } .change-date{ display: flex; @@ -48,6 +55,8 @@ display: flex; flex-wrap: wrap; border-radius: 20rpx; + margin-top: -28rpx; + position: relative; } .mouth-date{ display: flex; diff --git a/pages/index/index.js b/pages/index/index.js index 03a741e..4c6b95a 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -39,6 +39,7 @@ Page({ alertSwipeList: [], //弹窗广告 showAdv: false, //弹窗开关 showFullAdv: true, //全屏广告开关 + opacity: 1, time: 3, //全屏广告剩余时间 showTime:false, xpth:{}, // 元旦新增 新品特惠和sqjNew @@ -74,8 +75,16 @@ Page({ this.setData({ time: this.data.time - 1 }) - if (this.data.time == 0) { + if (this.data.time === 0) { + var opacityTimer = setInterval(() => { + this.setData({ + opacity: this.data.opacity - 0.3 + }) + }, 100) + } + if (this.data.time == -1) { clearInterval(timer) + clearInterval(opacityTimer) wx.showTabBar() //倒计时结束清除定时器显示导航栏 this.setData({ showFullAdv: false diff --git a/pages/index/index.wxml b/pages/index/index.wxml index d96ad95..88ac756 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -631,7 +631,7 @@ - + {{time}}s跳过 diff --git a/pages/index/index.wxss b/pages/index/index.wxss index e8175c6..aa2e27b 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -782,6 +782,9 @@ page { height: 100%; z-index: 1001; background-color: #fff; + opacity: 1; + transition: all 1s; + } .fullsp{ width: 100%; diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml index a32bb9e..d826ce0 100644 --- a/pages/list/activitynew/index.wxml +++ b/pages/list/activitynew/index.wxml @@ -1,7 +1,9 @@ + + diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss index 1a91b9b..c5f9f59 100644 --- a/pages/list/activitynew/index.wxss +++ b/pages/list/activitynew/index.wxss @@ -1,7 +1,8 @@ /* pages/activity/index.wxss */ page { - background: #F2F2F2; + /* background: #F2F2F2; */ + background: #FFD6B2; } .types { /* justify-content: space-between; */ @@ -123,8 +124,9 @@ background: rgba(11, 137, 142, .1); background: #FFF; width: 697rpx; margin: 0 auto; - border-radius: 20rpx; + border-radius: 20rpx 20rpx 0 0; margin-top: 20rpx; + position: relative; } .activity-list { width: 697rpx; @@ -352,16 +354,27 @@ flex-shrink: 0; } .types-item-active { padding: 0 25rpx; - height: 57rpx; - line-height: 57rpx; + /* height: 57rpx; */ + height: 68rpx; + line-height: 58rpx; display: inline-block; - background: #0B898E; + /* background: #0B898E; */ color: #FFFFFF; border-radius: 27rpx; margin-right: 13rpx; flex-shrink: 0; + background-image: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-bg.png"); + background-size: 100% 100%; + margin-top: -5rpx; + text-align: center; } /* 不显示滚动条 */ .types-box::-webkit-scrollbar { display: none; +} +.bg-pic { + width: 266.67rpx; + height: 106.67rpx; + position: absolute; + right: 0; } \ No newline at end of file diff --git a/pages/map/index.wxml b/pages/map/index.wxml index 849530a..29cc225 100644 --- a/pages/map/index.wxml +++ b/pages/map/index.wxml @@ -12,7 +12,7 @@ - + @@ -45,46 +45,46 @@ 场馆 + + + 停车场 + + + + 游客中心 + 酒店 - - - 公共自行车 + + + 行李寄存 + + + + 特产 美食 - - - 文保单位 + + + 公共自行车 运河十景 + + + 文保单位 + 江南小书场 - - - 停车场 - - - - 行李寄存 - - - - 游客中心 - - - - 特产 - 红色地图 diff --git a/pages/map/index.wxss b/pages/map/index.wxss index 2ede90a..6af56b0 100644 --- a/pages/map/index.wxss +++ b/pages/map/index.wxss @@ -492,7 +492,7 @@ left: 26.67rpx; bottom: 26.67rpx; width: 697rpx; - height: 200rpx; + height: 213.33rpx; background: rgba(255,255,255,0.8); box-shadow: 0rpx 1rpx 16rpx 0rpx rgba(153,153,153,0.35); border-radius: 20rpx; @@ -630,4 +630,11 @@ .img-icon { width: 686.67rpx; height: 40rpx; +} + +.img-icon-new { + width: 105.33rpx; + height: 17.33rpx; + margin: 17rpx auto 32rpx; + display: block; } \ No newline at end of file diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index 366ba51..5066c8f 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -53,6 +53,7 @@ Page({ is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard }) console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard); + console.log('---期票类型----',app.globalData.product.sku.ticket_type); if (!app.globalData.product) { util.back(); @@ -71,7 +72,8 @@ Page({ product: app.globalData.product, singlePrice: this.data.gp_id ? app.globalData.product.sku.event_price : app.globalData.product.sku.price }) - this.showAllPrice() + this.getNewCoupon() + // this.showAllPrice() // console.log('********',this.data.product); if (!this.data.kjId && !this.data.gp_id && this.data.product.isGroup != 1 && this.data.type!='museum') { this.couponCom = this.selectAllComponents("#coupon")[0]; @@ -86,9 +88,10 @@ Page({ // console.log('detail',app.globalData.product); // console.log('singlePrice',this.data.singlePrice); // console.log('productNum',this.data.productNum); - if (app.globalData.product.price) { + console.log('couponInfo',app.globalData.couponInfo); + if (this.data.ticket_type != 1) { this.setData({ - singlePrice:app.globalData.product.price + singlePrice:app.globalData.product.product.price }) let price = this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0) if (price >0) { @@ -545,6 +548,7 @@ Page({ this.setData({ coupon:e.detail }) + this.showAllPrice() }, /**