diff --git a/app.js b/app.js index 7338f14..00d0e3f 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.isTest118? true : false; + data.isTest = data.isTest119? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/component/newCalendar/index.wxss b/pages/component/newCalendar/index.wxss index afc1141..58585ab 100644 --- a/pages/component/newCalendar/index.wxss +++ b/pages/component/newCalendar/index.wxss @@ -11,17 +11,18 @@ /* 节假日花样 */ /* background-color: #FFD6B2; */ margin: 0 auto; - padding: 37rpx 22rpx 40rpx; + padding: 37rpx 0 40rpx; /* 节假日花样 */ background-image: url("https://static.ticket.sz-trip.com/uploads/20240605/82a51ad6c58274c78f99fef4af3c9739.png"); background-size: 100% 100%; - width: 90%; + width: 100%; height: 65.67rpx } .change-date{ display: flex; justify-content: space-between; align-items: center; + margin: 0 22rpx; } .change-date image{ width: 50rpx; diff --git a/pages/index/index.wxml b/pages/index/index.wxml index bd08211..4af909c 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -42,9 +42,9 @@ - - - + + + {{item.name}} @@ -55,11 +55,11 @@ - - + + - + {{item.title}} 去购票 > @@ -70,10 +70,11 @@ - + - + @@ -145,8 +146,8 @@ - - + + 安全服务 @@ -190,7 +191,7 @@ - + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 330a3d1..e25c5f0 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -105,6 +105,7 @@ page { } .content { /* margin: 0 25rpx; */ + margin-top: 20.67rpx; } .sale-road-boxes { display: flex; @@ -306,12 +307,15 @@ page { } */ /* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */ .pic-list { - width: 100%; + /* width: 100%; display: flex; margin-right: 26rpx; display: flex; justify-content: space-between; - flex-wrap: wrap; + flex-wrap: wrap; */ + display: flex; + justify-content: space-between; + margin: 0 28rpx; } .title-more { font-size: 24rpx; @@ -1030,9 +1034,9 @@ page { } /* 元旦修改新增样式 */ .new-pic { - width: 150rpx !important; - height: 218.67rpx !important; - margin-bottom: 26.67rpx; + width: 160rpx !important; + height: 255rpx !important; + /* margin-bottom: 26.67rpx; */ } .ggfw-list { @@ -1191,8 +1195,8 @@ page { } .hdrlItem { flex-shrink: 0; - padding: 26.67rpx 32rpx 26.67rpx 20rpx; - width: 593.33rpx; + padding: 26.67rpx 22rpx 26.67rpx 20rpx; + /* width: 593.33rpx; */ display: flex; background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png"); background-size: 100% 100%; @@ -1248,10 +1252,11 @@ page { background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png"); background-size: 100% 100%; flex-shrink: 0; + height: 206.67rpx; } .movieItem-img { - width: 230rpx; - height: 230rpx; + width: 213rpx; + height: 213rpx; border-radius: 18rpx; margin-right: 18rpx; flex-shrink: 0; @@ -1259,15 +1264,18 @@ page { .ysz-box { margin: 0 8rpx 15.33rpx; background-image: url("https://static.ticket.sz-trip.com/uploads/20240604/d59d35c02ced0da92a366971a63a2476.png"); - padding: 43.33rpx 59rpx 46.67rpx 58rpx; + /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */ background-size: 100% 100%; + width: 733.33rpx; + height: 320rpx; + padding-top: 33.33rpx; } .ysz-more { width: 333rpx; height: 53rpx; background: #FFFFFF; border-radius: 27rpx; - margin: 38rpx auto 0; + margin: 23rpx auto 0; text-align: center; line-height: 53rpx; font-weight: 500; @@ -1275,7 +1283,8 @@ page { color: #078565; } .ysz-box2 { - padding: 20rpx 35rpx; + /* padding: 20rpx 35rpx; */ + padding-top: 23.33rpx; } .tjbd-title { width: 286.67rpx; @@ -1424,4 +1433,13 @@ page { -webkit-box-orient: vertical; -webkit-line-clamp: 3; overflow: hidden; +} +.public-box { + width: 593.33rpx; + height: 266.67rpx; + background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png"); + background-size: 100% 100%; +} +.one::-webkit-scrollbar{ + display:none; } \ No newline at end of file diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml index 77950e4..75166f8 100644 --- a/pages/list/activitynew/index.wxml +++ b/pages/list/activitynew/index.wxml @@ -91,7 +91,7 @@ 影院 - + {{movieAreas[movieArea].area_title}} @@ -134,7 +134,7 @@ - + {{item.title}} diff --git a/pages/list/activitynew/index.wxss b/pages/list/activitynew/index.wxss index 45fe3b4..c8bd90f 100644 --- a/pages/list/activitynew/index.wxss +++ b/pages/list/activitynew/index.wxss @@ -132,8 +132,7 @@ background: rgba(11, 137, 142, .1); .activity-list { width: 697rpx; /* padding: 0 24rpx; */ - /* background: #0B898E; */ - background: #FFFFFF; + background: #0B898E; min-height:1300rpx; margin: 0 auto; } diff --git a/pages/list/scene/index.wxss b/pages/list/scene/index.wxss index 41ba0b2..d645bf1 100644 --- a/pages/list/scene/index.wxss +++ b/pages/list/scene/index.wxss @@ -141,6 +141,9 @@ overflow-x: scroll; flex-wrap: nowrap; } +.navBox::-webkit-scrollbar{ + display:none; +} .nav { display: flex; diff --git a/subPackages/indexs/index.wxml b/subPackages/indexs/index.wxml index bd08211..4af909c 100644 --- a/subPackages/indexs/index.wxml +++ b/subPackages/indexs/index.wxml @@ -42,9 +42,9 @@ - - - + + + {{item.name}} @@ -55,11 +55,11 @@ - - + + - + {{item.title}} 去购票 > @@ -70,10 +70,11 @@ - + - + @@ -145,8 +146,8 @@ - - + + 安全服务 @@ -190,7 +191,7 @@ - + diff --git a/subPackages/indexs/index.wxss b/subPackages/indexs/index.wxss index 330a3d1..e25c5f0 100644 --- a/subPackages/indexs/index.wxss +++ b/subPackages/indexs/index.wxss @@ -105,6 +105,7 @@ page { } .content { /* margin: 0 25rpx; */ + margin-top: 20.67rpx; } .sale-road-boxes { display: flex; @@ -306,12 +307,15 @@ page { } */ /* 元旦修改 以上两个样式为注释掉的 下面的.pic-list是新改的 */ .pic-list { - width: 100%; + /* width: 100%; display: flex; margin-right: 26rpx; display: flex; justify-content: space-between; - flex-wrap: wrap; + flex-wrap: wrap; */ + display: flex; + justify-content: space-between; + margin: 0 28rpx; } .title-more { font-size: 24rpx; @@ -1030,9 +1034,9 @@ page { } /* 元旦修改新增样式 */ .new-pic { - width: 150rpx !important; - height: 218.67rpx !important; - margin-bottom: 26.67rpx; + width: 160rpx !important; + height: 255rpx !important; + /* margin-bottom: 26.67rpx; */ } .ggfw-list { @@ -1191,8 +1195,8 @@ page { } .hdrlItem { flex-shrink: 0; - padding: 26.67rpx 32rpx 26.67rpx 20rpx; - width: 593.33rpx; + padding: 26.67rpx 22rpx 26.67rpx 20rpx; + /* width: 593.33rpx; */ display: flex; background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png"); background-size: 100% 100%; @@ -1248,10 +1252,11 @@ page { background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png"); background-size: 100% 100%; flex-shrink: 0; + height: 206.67rpx; } .movieItem-img { - width: 230rpx; - height: 230rpx; + width: 213rpx; + height: 213rpx; border-radius: 18rpx; margin-right: 18rpx; flex-shrink: 0; @@ -1259,15 +1264,18 @@ page { .ysz-box { margin: 0 8rpx 15.33rpx; background-image: url("https://static.ticket.sz-trip.com/uploads/20240604/d59d35c02ced0da92a366971a63a2476.png"); - padding: 43.33rpx 59rpx 46.67rpx 58rpx; + /* padding: 43.33rpx 59rpx 46.67rpx 58rpx; */ background-size: 100% 100%; + width: 733.33rpx; + height: 320rpx; + padding-top: 33.33rpx; } .ysz-more { width: 333rpx; height: 53rpx; background: #FFFFFF; border-radius: 27rpx; - margin: 38rpx auto 0; + margin: 23rpx auto 0; text-align: center; line-height: 53rpx; font-weight: 500; @@ -1275,7 +1283,8 @@ page { color: #078565; } .ysz-box2 { - padding: 20rpx 35rpx; + /* padding: 20rpx 35rpx; */ + padding-top: 23.33rpx; } .tjbd-title { width: 286.67rpx; @@ -1424,4 +1433,13 @@ page { -webkit-box-orient: vertical; -webkit-line-clamp: 3; overflow: hidden; +} +.public-box { + width: 593.33rpx; + height: 266.67rpx; + background: url("https://static.ticket.sz-trip.com/jundaosuzhou/images/holiday/calendarBg.png"); + background-size: 100% 100%; +} +.one::-webkit-scrollbar{ + display:none; } \ No newline at end of file