diff --git a/app.js b/app.js index ae5e570..6573851 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.isTest128? true : false; + data.isTest = data.isTest129? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/pages/index/index.js b/pages/index/index.js index 6ce436f..4ac7827 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -410,6 +410,7 @@ Page({ hotIndex: 0, indexHot: [], weather: null, + showMore: false, // 页面图片 // imageSourceList:imageSource, @@ -462,6 +463,7 @@ Page({ }) this.getUrlToPage() + this.getShowMore() }, showImg (img) { @@ -518,7 +520,7 @@ Page({ }) } else { // 小程序是3 - commonApi._post("adv/get_home_ui", {type_id: 15}).then(res => { + commonApi._post("adv/get_home_ui", {type_id: 3}).then(res => { let obj = {}; (res.data.content||[]).forEach(item => { obj[item.id] = item.image @@ -588,6 +590,14 @@ Page({ }) }, + getShowMore () { + commonApi._post("multimedia/detail", {id: 2462}).then(res => { + this.setData({ + showMore: res.data.company_name ==1?true:false + }) + }) + }, + // --------------------banner 相关--------------------------- diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 6257faa..7cd195b 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -170,10 +170,10 @@ - + + 更多 > - + diff --git a/pages/map/index.wxml b/pages/map/index.wxml index 50707e7..1f467da 100644 --- a/pages/map/index.wxml +++ b/pages/map/index.wxml @@ -28,9 +28,13 @@ 酒店 - + + + + 运河十景 @@ -71,10 +75,10 @@ 美食 - + 运河十景 diff --git a/pages/map/index.wxss b/pages/map/index.wxss index 7c6d54b..9faef2f 100644 --- a/pages/map/index.wxss +++ b/pages/map/index.wxss @@ -583,7 +583,7 @@ display: flex; /* justify-content: space-around; */ flex-wrap: wrap; - width: calc(170rpx * 8); + width: calc(170rpx * 7); margin: 0 20rpx; }