diff --git a/app.json b/app.json index a23c41d..0f44cc5 100644 --- a/app.json +++ b/app.json @@ -249,8 +249,8 @@ "style": "v2", "sitemapLocation": "sitemap.json", "tabBar": { - "color": "#999999", - "selectedColor": "#22A3CD", + "color": "#000000", + "selectedColor": "#000000", "borderStyle": "white", "list": [ { diff --git a/images/ai.png b/images/ai.png index 8ed8e01..3f74b7e 100644 Binary files a/images/ai.png and b/images/ai.png differ diff --git a/images/ai_seld.png b/images/ai_seld.png index 6e00ec9..da28b49 100644 Binary files a/images/ai_seld.png and b/images/ai_seld.png differ diff --git a/images/aindex_seld.png b/images/aindex_seld.png deleted file mode 100644 index 7e422ec..0000000 Binary files a/images/aindex_seld.png and /dev/null differ diff --git a/images/amap_seld.png b/images/amap_seld.png deleted file mode 100644 index d4af3f5..0000000 Binary files a/images/amap_seld.png and /dev/null differ diff --git a/images/auser_seld.png b/images/auser_seld.png deleted file mode 100644 index 2cd9a43..0000000 Binary files a/images/auser_seld.png and /dev/null differ diff --git a/images/index.png b/images/index.png index 3ad0a3b..d8cb4f8 100644 Binary files a/images/index.png and b/images/index.png differ diff --git a/images/index_seld.png b/images/index_seld.png index 97f97e0..0d194b0 100644 Binary files a/images/index_seld.png and b/images/index_seld.png differ diff --git a/images/map.png b/images/map.png index b8f45d8..417c935 100755 Binary files a/images/map.png and b/images/map.png differ diff --git a/images/map_seld.png b/images/map_seld.png index 60b9cb5..25e6d9b 100644 Binary files a/images/map_seld.png and b/images/map_seld.png differ diff --git a/images/user.png b/images/user.png index 73eb192..a84c2ac 100755 Binary files a/images/user.png and b/images/user.png differ diff --git a/images/user_seld.png b/images/user_seld.png index 8996d2a..578fb91 100644 Binary files a/images/user_seld.png and b/images/user_seld.png differ diff --git a/pages/index/index.js b/pages/index/index.js index 1505b1e..0129399 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -403,7 +403,10 @@ Page({ repurchaseList: [], canGetrepurchase: true, - urltopage: {}, + urltopage: {}, + + cityIndex: 0, + scrollItem: "scrollItem-0", // ---------------2025-5-26改版没用到的------------------ fourProduct: [], @@ -520,7 +523,7 @@ Page({ }) } else { // 小程序是3 - commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => { + commonApi._post("adv/get_home_ui", {type_id: 15}).then(res => { let obj = {}; (res.data.content||[]).forEach(item => { obj[item.id] = item.image @@ -1010,7 +1013,22 @@ Page({ this.setData({ videoPlay: true }) - }, + }, + + changeSimpleVal (e) { + let keyname = e.currentTarget.dataset.keyname; + let val = e.currentTarget.dataset.val; + let param = {} + param[keyname] = val + if (keyname == "cityIndex") { + let scrollIndex = val-2 + if (scrollIndex<0) { scrollIndex = 0 } + param.scrollItem = "scrollItem-"+scrollIndex + } + + this.setData(param) + console.log(this.data) + }, onShow: function() { this.pagePoint({event: 'home_view'}, 1) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 488c1da..55f7ff3 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -11,7 +11,7 @@ src="https://static.ticket.sz-trip.com/uploads/20250714/1f3ac6a7144c6e6849edad89289061cc.png" mode="aspectFill"> - + 搜索您想要的 @@ -104,7 +104,7 @@ - + {{item.title}} {{tag}} @@ -187,10 +187,10 @@ - + - + @@ -208,7 +208,7 @@ - + @@ -229,17 +229,31 @@ - - + + - - + + + + + + + + + {{item.menu_name}} + + + - + @@ -251,10 +265,10 @@ - + - + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 76e79dc..57acb14 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -99,6 +99,7 @@ flex-wrap: wrap; border-radius: 20rpx; background: #FFEEAD; + padding-top: 13rpx; } .top-icon-item { margin-bottom: 37rpx; @@ -117,8 +118,8 @@ margin-right: 0; } .top-icon-item image { - width: 93.33rpx; - height: 93.33rpx; + width: 66.33rpx; + height: 66.33rpx; display: block; transition: all 0.2s; /* margin: 0 auto; */ @@ -163,7 +164,7 @@ .sale-road-boxes { display: flex; justify-content: space-between; - margin-top: 40rpx; + margin-top: 48rpx; position: relative; align-items: flex-end; } @@ -423,9 +424,8 @@ flex-wrap: wrap; } .new-pic { - width: 340rpx; - height: 146.67rpx; - margin-bottom: 20rpx; + width: 157.33rpx; + height: 226.67rpx; } .title-more { @@ -805,23 +805,92 @@ width: 697rpx; /* background: linear-gradient(-90deg, #FF9B6A, #D02E25); */ border-radius: 20rpx; - display: flex; - justify-content: space-between; - align-items: center; - overflow: scroll; - margin: 32rpx 0 53.33rpx; + margin: -40rpx 0 53.33rpx; z-index: 1; position: relative; } -.six-box-new image { - width: 333.33rpx; - height: 200rpx !important; - /* background: #FFE7C0; */ - border-radius: 20rpx; - flex-shrink: 0; - margin-right: 13.33rpx; +.six-box-new .big-image-box { + width: 100%; + height: 346rpx; + position: relative; + +} +.six-box-new .big-image-box image{ + width: 100%; + height: 100%; + border-radius: 20rpx 20rpx 0 0; +} +.six-box-new .big-image-box .text-container{ + width: 100%; + height: 100%; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + font-weight: 500; + font-size: 24rpx; + color: #FFFFFF; + display: flex; + flex-direction: column; + justify-content: flex-end; + padding: 16rpx; + box-sizing: border-box; +} +.six-box-new .small-image-box{ + width: 100%; + padding: 10rpx 16rpx; + overflow-x: auto; + background: white; + display: flex; + flex-wrap: nowrap; + border-radius: 0 0 20rpx 20rpx; + box-sizing: border-box; + height: 120rpx; +} +.six-box-new .small-image-box .small-image-item{ + width: 120rpx; + height: 100rpx; + background: #FF8623; + border-radius: 13rpx; + flex-shrink: 0; + margin-right: 27rpx; + position: relative; + box-sizing: border-box; + overflow: hidden; +} +.six-box-new .small-image-box .small-image-item.active{ + border: 2px solid #000; +} +.six-box-new .small-image-box .small-image-item:last-of-type{ + margin-right: 0rpx; } +.six-box-new .small-image-box image{ + width: 100%; + height: 100%; + border-radius: 13rpx; +} +.six-box-new .small-image-box .small-image-item .text-box{ + width: 100%; + height: 40rpx; + position: absolute; + bottom: 0; + left: 0; + right: 0; + background: #FFC543; + font-weight: 500; + font-size: 23rpx; + color: #000000; + text-align: center; + line-height: 40rpx; + border-radius: 0 0 13rpx 13rpx; +} +.six-box-new .small-image-box .small-image-item.active .text-box{ + background: #FF8623; + color: #FFFFFF; +} + /* 春节金刚区字体颜色样式更换 */ .top-icon-text { color: #111111; diff --git a/utils/https.js b/utils/https.js index b0f9a8b..d55ab84 100644 --- a/utils/https.js +++ b/utils/https.js @@ -1,8 +1,8 @@ var app = getApp(); import util from "../utils/util" // import userApi from "../utils/https/user.js"; -const baseUrl = "https://test.api.cloud.sz-trip.com/api/"; -// let baseUrl = "https://api.cloud.sz-trip.com/api/"; +// const baseUrl = "https://test.api.cloud.sz-trip.com/api/"; +let baseUrl = "https://api.cloud.sz-trip.com/api/"; const env = wx.getAccountInfoSync().miniProgram.envVersion if (env == 'develop1') { baseUrl = "https://test.api.cloud.sz-trip.com/api/"