开屏页，活动日历五一，景点下单调整

pages/component/newCalendar/index.wxml

@@ -57,6 +57,7 @@
         <image wx:if="{{currentViewType==='week'}}" src="https://static.ticket.sz-trip.com/uploads/20240327/8b5f8a284de3831392560c367f8c59ca.png" mode=""/>
         <image wx:else src="https://static.ticket.sz-trip.com/uploads/20240327/d23c7a3d743e4fb9623c534adf10760b.png" mode=""/>
     </view>
+    <image wx:if="{{currentViewType==='month'}}" style="width: 180rpx;height: 157.33rpx;position: absolute;right: 0;bottom: 0;" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-bottom.png" mode=""/>
 </view> 
 
  

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;

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

pages/index/index.wxml

@@ -631,7 +631,7 @@
   <image bindtap="closeAdv" style="width: 100rpx; height: 100rpx;transform: translate(200rpx,6rpx);" src="https://static.ticket.sz-trip.com/uploads/20220810/f4bb1a4f0b5eb394e6ca6e4f03aaa1e0.png"></image>
 </view>
 <!-- 广告弹窗结束 -->
-<view class="fullavd" wx:if="{{showFullAdv}}">
+<view class="fullavd" wx:if="{{showFullAdv}}"  style="opacity: {{opacity}}">
   <view class="time" bindtap="closeFullAdv" wx:if="{{showTime}}">{{time}}s跳过</view>
     <!-- <view class="Qtop" style="height:{{viewHeight}}"> -->
     <view class="Qtop" style="min-height:100vh">

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%;

pages/list/activitynew/index.wxml

@@ -1,7 +1,9 @@
 <!--pages/activity/index.wxml-->
 <title-header title="活动日历"></title-header>
+<!-- <image src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-top.png" mode=""/> -->
 <new-calendar wx:if="{{type!=4}}" bind:selectDate="selectDate"></new-calendar>
 <view class="top-fixed-box">
+  <image class="bg-pic" src="https://static.ticket.sz-trip.com/jundaosuzhou/images/calendar-center.png" mode="widthFix"/>
   <view class="acitivity-search-box">
     <picker mode="selector" value="{{area}}" range="{{areas}}" range-key="area_name" bindchange="changeArea" wx:if="{{type!=4}}">
       <view class="picker">

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;
+  /* height: 57rpx; */
-  line-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;
 }

pages/map/index.wxml

@@ -12,7 +12,7 @@
 </picker>
 <view class="menus" wx:if="{{showMore=='close'}}">
   <!-- <view class="open" bindtap="changeShow"></view> -->
-  <image bindtap="changeShow" class="img-icon" src="https://static.ticket.sz-trip.com/uploads/20240129/e06f57483a5dfb145a30ab13226d2e93.png" mode=""/>
+  <image bindtap="changeShow" class="img-icon-new" src="https://static.ticket.sz-trip.com/uploads/20240426/dcc098205e0fbf21f0056ebe6046d10f.png" mode=""/>
   <view class="menu-list">
     <view class="menus-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
       <image class="menus-item-img" src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20240123/f188907357875241284e3b108f44588f.png':'https://static.ticket.sz-trip.com/uploads/20240123/ef1d97cfef1494aafe9913dcd98ea677.png'}}" mode="aspectFill"/>
@@ -45,46 +45,46 @@
       <image class="menu-item-img" src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20240123/021858cdaa954dab5eb8180303f33143.png':'https://static.ticket.sz-trip.com/uploads/20240123/c6c46566f32eeb8b9663a6be2ef0ae08.png'}}" mode="aspectFill"/>
       <text class="text">场馆</text>
     </view>
+    <view class="menus-item{{type==9?' active':''}}" bindtap="changeType" data-title="停车场" data-type="9">
+      <image class="menu-item-img" src="{{type==9?'https://static.ticket.sz-trip.com/uploads/20240123/45fc9c09cbbe5d4059c147f8374f21ac.png':'https://static.ticket.sz-trip.com/uploads/20240123/8d115105bc4eab2e2e87b36657f8c908.png'}}" mode="aspectFill"/>
+      <text class="text">停车场</text>
+    </view>
+    <view class="menus-item{{type==11?' active':''}}" bindtap="changeType" data-title="游客中心" data-type="11">
+      <image class="menu-item-img" src="{{type==11?'https://static.ticket.sz-trip.com/uploads/20240123/2f90c0a3be0afbab22ab9c07c6a0eb4c.png':'https://static.ticket.sz-trip.com/uploads/20240123/434433c37b40681d6b6d7e99fe8736f3.png'}}" mode="aspectFill"/>
+      <text class="text">游客中心</text>
+    </view>
     <view class="menus-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
       <image class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
       <text class="text">酒店</text>
     </view>
-    <view class="menus-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
+    <view class="menus-item{{type==10?' active':''}}" bindtap="changeType" data-title="行李寄存" data-type="10">
-      <image class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
+      <image class="menu-item-img" src="{{type==10?'https://static.ticket.sz-trip.com/uploads/20240123/4288a56bbb7d333e4c007baa68c5e02f.png':'https://static.ticket.sz-trip.com/uploads/20240123/fdd743af95af2679f2dd60229fe06bd0.png'}}" mode="aspectFill"/>
-      <text class="text">公共自行车</text>
+      <text class="text">行李寄存</text>
+    </view>
+    <view class="menus-item{{type==12?' active':''}}" bindtap="changeType" data-title="特产" data-type="12">
+      <image class="menu-item-img" src="{{type==12?'https://static.ticket.sz-trip.com/uploads/20240123/8d8bf4cd274617eddc67b7f7bfc600ad.png':'https://static.ticket.sz-trip.com/uploads/20240123/c3fe8b4e3c7b13ff8eeabad48f2784c1.png'}}" mode="aspectFill"/>
+      <text class="text">特产</text>
     </view>
     <view class="menus-item{{type==5?' active':''}}" bindtap="changeType" data-title="美食" data-type="5">
       <image class="menu-item-img" src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20240123/a1c54d7b95d69646d55a7cb66a5b7ba2.png':'https://static.ticket.sz-trip.com/uploads/20240123/491264b09539365d16c8f625a5c40258.png'}}" mode="aspectFill"/>
       <text class="text">美食</text>
     </view>
-    <view class="menus-item{{type==6?' active':''}}" bindtap="changeType" data-title="文保单位" data-type="6">
+    <view class="menus-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
-      <image class="menu-item-img" src="{{type==6?'https://static.ticket.sz-trip.com/uploads/20240123/7ff3f0b3305d326eeef98d2886533230.png':'https://static.ticket.sz-trip.com/uploads/20240123/8c35ff42eb2c0c41dfadaa21af3310d5.png'}}" mode="aspectFill"/>
+      <image class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
-      <text class="text">文保单位</text>
+      <text class="text">公共自行车</text>
     </view>
     <view class="menus-item{{type==7?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="7">
       <image class="menu-item-img" src="{{type==7?'https://static.ticket.sz-trip.com/uploads/20240123/c57bfbb67fe73593904e92188399ea10.png':'https://static.ticket.sz-trip.com/uploads/20240123/c99e25679e5c1d5a9e0587ddcb278948.png'}}" mode="aspectFill"/>
       <text class="text">运河十景</text>
     </view>
+    <view class="menus-item{{type==6?' active':''}}" bindtap="changeType" data-title="文保单位" data-type="6">
+      <image class="menu-item-img" src="{{type==6?'https://static.ticket.sz-trip.com/uploads/20240123/7ff3f0b3305d326eeef98d2886533230.png':'https://static.ticket.sz-trip.com/uploads/20240123/8c35ff42eb2c0c41dfadaa21af3310d5.png'}}" mode="aspectFill"/>
+      <text class="text">文保单位</text>
+    </view>
     <view class="menus-item{{type==8?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="8">
       <image class="menu-item-img" src="{{type==8?'https://static.ticket.sz-trip.com/uploads/20240123/a95f3135ee4c9550b7bb0e855e8eb13b.png':'https://static.ticket.sz-trip.com/uploads/20240123/7dc1051d06ad9a4703edc209b065e851.png'}}" mode="aspectFill"/>
       <text class="text">江南小书场</text>
     </view>
-    <view class="menus-item{{type==9?' active':''}}" bindtap="changeType" data-title="停车场" data-type="9">
-      <image class="menu-item-img" src="{{type==9?'https://static.ticket.sz-trip.com/uploads/20240123/45fc9c09cbbe5d4059c147f8374f21ac.png':'https://static.ticket.sz-trip.com/uploads/20240123/8d115105bc4eab2e2e87b36657f8c908.png'}}" mode="aspectFill"/>
-      <text class="text">停车场</text>
-    </view>
-    <view class="menus-item{{type==10?' active':''}}" bindtap="changeType" data-title="行李寄存" data-type="10">
-      <image class="menu-item-img" src="{{type==10?'https://static.ticket.sz-trip.com/uploads/20240123/4288a56bbb7d333e4c007baa68c5e02f.png':'https://static.ticket.sz-trip.com/uploads/20240123/fdd743af95af2679f2dd60229fe06bd0.png'}}" mode="aspectFill"/>
-      <text class="text">行李寄存</text>
-    </view>
-    <view class="menus-item{{type==11?' active':''}}" bindtap="changeType" data-title="游客中心" data-type="11">
-      <image class="menu-item-img" src="{{type==11?'https://static.ticket.sz-trip.com/uploads/20240123/2f90c0a3be0afbab22ab9c07c6a0eb4c.png':'https://static.ticket.sz-trip.com/uploads/20240123/434433c37b40681d6b6d7e99fe8736f3.png'}}" mode="aspectFill"/>
-      <text class="text">游客中心</text>
-    </view>
-    <view class="menus-item{{type==12?' active':''}}" bindtap="changeType" data-title="特产" data-type="12">
-      <image class="menu-item-img" src="{{type==12?'https://static.ticket.sz-trip.com/uploads/20240123/8d8bf4cd274617eddc67b7f7bfc600ad.png':'https://static.ticket.sz-trip.com/uploads/20240123/c3fe8b4e3c7b13ff8eeabad48f2784c1.png'}}" mode="aspectFill"/>
-      <text class="text">特产</text>
-    </view>
     <view class="menus-item{{type==13?' active':''}}" bindtap="changeType" data-title="红色地图" data-type="13">
       <image class="menu-item-img" src="{{type==13?'https://static.ticket.sz-trip.com/uploads/20240123/176d442b0df8b16329ac62ffd481815a.png':'https://static.ticket.sz-trip.com/uploads/20240123/789606012a481332c98a5bd7ccb07306.png'}}" mode="aspectFill"/>
       <text class="text">红色地图</text>

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;
 }

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()
   },
 
   /**