diff --git a/app.js b/app.js index 8f07bc1..2d5ffd9 100644 --- a/app.js +++ b/app.js @@ -38,7 +38,7 @@ App({ // 获取前端配置文件 commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest115? true : false; + data.isTest = data.isTest118? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index dbf5f65..20bf1cd 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -4,7 +4,7 @@ - @@ -62,7 +62,7 @@ - @@ -94,9 +94,9 @@ - + {{item.title}} - + {{item.price/100}} @@ -123,7 +123,7 @@ - @@ -141,7 +141,7 @@ - @@ -310,7 +310,7 @@ - @@ -336,7 +336,7 @@ - @@ -350,7 +350,7 @@ - diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 81c5d68..20c4489 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -63,7 +63,7 @@ right: 0; display: flex; justify-content: space-between; - padding: 187rpx 20rpx 30rpx; + padding: 0rpx 20rpx 30rpx; box-sizing: border-box; background: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(0, 0, 0, 0.2)) } @@ -186,7 +186,6 @@ } .season-hot .season-item{ width: 266rpx; - height: 332rpx; margin-right: 14rpx; flex-shrink: 0; font-weight: bold; @@ -196,6 +195,11 @@ background: white; border-radius: 20rpx; } + .season-hot .season-content{ + display: flex; + flex-direction: column; + justify-content: space-between; + } .season-hot .season-item image{ width: 100%; diff --git a/pages/list/six/index.wxml b/pages/list/six/index.wxml index 0eac753..a33d90b 100644 --- a/pages/list/six/index.wxml +++ b/pages/list/six/index.wxml @@ -39,10 +39,10 @@ 公共服务 - + 景区舒适度 - + 停车场 diff --git a/pages/map/index.wxml b/pages/map/index.wxml index d871342..ccfb077 100644 --- a/pages/map/index.wxml +++ b/pages/map/index.wxml @@ -322,6 +322,7 @@ 电子社保卡 + 景区舒适度 diff --git a/project.private.config.json b/project.private.config.json index 89dc0d2..765bd8e 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -6,6 +6,13 @@ "condition": { "miniprogram": { "list": [ + { + "name": "pages/login/index", + "pathName": "pages/login/index", + "query": "", + "launchMode": "default", + "scene": null + }, { "name": "subPackages/index/index", "pathName": "subPackages/indexGQ/index",