From 12ba59384802c276638489d1f6ac0f2c4fcdf111 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 22 Apr 2025 11:56:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E5=81=87=E6=97=A5=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                 |  2 +-
 pages/component/newCalendar/index.js   |  3 ++-
 pages/component/newCalendar/index.wxml |  5 ++++-
 pages/component/newCalendar/index.wxss | 19 +++++++++++++++++--
 pages/list/activitynew/index.wxss      | 18 ++++++++++++++++--
 5 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index 26b4e39..3752d15 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest183? true : false;
+      data.isTest = data.isTest184? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/component/newCalendar/index.js b/pages/component/newCalendar/index.js
index 0e5322e..b64552c 100644
--- a/pages/component/newCalendar/index.js
+++ b/pages/component/newCalendar/index.js
@@ -257,7 +257,8 @@ Component({
                 return {
                     ...item,
                     color:'#DE4126',
-                    background:'#FFECDB'
+                    background:'#FFECDB',
+                    borderBottom: "0.02px solid #E99C3C"
                   }
               }else if (item.name == '春节') {
                 return {
diff --git a/pages/component/newCalendar/index.wxml b/pages/component/newCalendar/index.wxml
index 6e81ebf..02d248a 100644
--- a/pages/component/newCalendar/index.wxml
+++ b/pages/component/newCalendar/index.wxml
@@ -19,6 +19,8 @@
 </view>
 <!-- 日期 -->
 <view class="date-wrap">
+    <image wx:if="{{currentViewType === 'month'}}" class="bottom-image" src="https://static.ticket.sz-trip.com/uploads/20250421/a0b731399b5c348ae4dc5199c9034ab5.png"></image>
+
     <view class="week">
         <text wx:for="{{weeksArr}}" wx:key="*this">{{item}}</text>
     </view>
@@ -32,7 +34,8 @@
     <view class="mouth-date current-mouth  " wx:for="{{currentViewType === 'month' ? nowMonthDays : weekDay}}" wx:key="*this" bindtap="selectDate"
      data-item="{{item}}" data-type="nowMonthDays" data-index="{{index}}"
     > 
-       <view class="day-box {{item.isNowMonthDay?'active':''}} {{item.isHoliday ? 'holiday' : ''}}{{item.isHoliday&&item.isNowMonthDay ? 'active' : ''}}" style="background: {{ item.isHoliday.background }};color: {{ item.isHoliday.color }}">
+       <view class="day-box {{item.isNowMonthDay?'active':''}} {{item.isHoliday ? 'holiday' : ''}}{{item.isHoliday&&item.isNowMonthDay ? 'active' : ''}}" 
+       style="background: {{ item.isHoliday.background }};color: {{ item.isHoliday.color }};border-bottom: {{item.isHoliday.borderBottom||'none'}};">
         <text class="day-text">
         <!-- <text class="day-text {{item.isHoliday?'color':''}} "> -->
           <text>{{item.date}}</text> 
diff --git a/pages/component/newCalendar/index.wxss b/pages/component/newCalendar/index.wxss
index 6e957c1..65cdd95 100644
--- a/pages/component/newCalendar/index.wxss
+++ b/pages/component/newCalendar/index.wxss
@@ -1,4 +1,7 @@
 /* components/xx-calendar/xx-calendar.wxss */
+page{
+    background: #F0B643;
+}
 /* 头部样式start */
 .title-wrap{
     /* background-color: #F2F2F2; */
@@ -16,7 +19,10 @@
     /* background-image: url("https://static.ticket.sz-trip.com/uploads/20240605/82a51ad6c58274c78f99fef4af3c9739.png"); */
     background-size: 100% 100%;
     width: 100%;
-    height: 65.67rpx
+    /* height: 65.67rpx; */
+    height: 256.67rpx;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/58fee5695a0b676a14e8157b809ba1d6.png");
+    box-sizing: border-box;
 }
 .change-date{
     display: flex;
@@ -58,7 +64,7 @@
     display: flex;
     flex-wrap: wrap;
     border-radius: 20rpx;
-    margin-top: -28rpx;
+    margin-top: -144rpx;
     position: relative;
 }
 .mouth-date{
@@ -191,3 +197,12 @@
   width: 20rpx;
   height: 20rpx;
 }
+
+
+.bottom-image{
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 290.13rpx;
+    height: 146rpx;
+}
\ No newline at end of file
diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss
index 155d0d1..1b79993 100644
--- a/pages/list/activitynew/index.wxss
+++ b/pages/list/activitynew/index.wxss
@@ -128,6 +128,8 @@ background: rgba(11, 137, 142, .1);
   border-radius: 20rpx 20rpx 0 0;
   margin-top: 20rpx;
   position: relative;
+  background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/63b9ec7a1192790eed3e5dcf915212c0.png");
+  background-size: 100% 100%;
 }
 .activity-list {
   width: 697rpx;
@@ -325,6 +327,7 @@ background: rgba(11, 137, 142, .1);
   color: #0B898E;
   /* 节假日花样 */
   /* color: #DE4126; */
+  color: #DE4126;
 }
 .new-top-search-box {
   display: flex;
@@ -350,9 +353,10 @@ flex-shrink: 0;
     position: relative;
     z-index: 9;
     align-items: center;
+    
 }
 .types-item {
-    border: 1px solid #999999;
+    /* border: 1px solid #999999; */
     border-radius: 27rpx;
     height: 53rpx;
     padding: 0 25rpx;
@@ -360,6 +364,7 @@ flex-shrink: 0;
     line-height: 53rpx;
     margin-right: 13rpx;
     flex-shrink: 0;
+    border: 1px solid #FFC987;
 }
 .types-item-active {
   /* padding: 0 79rpx; */
@@ -369,7 +374,7 @@ flex-shrink: 0;
   /* height: 91.33rpx; */
   line-height: 57rpx;
   display: inline-block;
-  background: #0B898E;
+  /* background: #0B898E; */
   color: #FFFFFF;
   border-radius: 27rpx;
   margin-right: 13rpx;
@@ -379,6 +384,15 @@ flex-shrink: 0;
   background-size: 100% 100%;
   /* margin-top: -15rpx; */
     text-align: center;
+    min-width: 177.33rpx;
+    box-sizing: border-box;
+    color: #DA4939;
+    text-shadow: 
+                -1px -1px 0 white,  
+                1px -1px 0 white,
+                -1px 1px 0 white,
+                1px 1px 0 white;
+    background-image: url("https://static.ticket.sz-trip.com/uploads/20250421/48ce52adb4044d6b91bbce05047695a5.png");
 }
 /* 不显示滚动条 */
 .types-box::-webkit-scrollbar {