diff --git a/app.js b/app.js index 2d8e4ba..215d2b7 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.isTest149? true : false; + data.isTest = data.isTest150? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/index/index.js b/pages/index/index.js index 78aeb41..49f6d81 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -339,9 +339,9 @@ Page({ isTest: app.globalData.configJson.isTest, otherPlat: app.globalData.configJson.otherPlats, // 正式数据 - // indexSeason: app.globalData.configJson.indexSeason, + indexSeason: app.globalData.configJson.indexSeason, // 开发数据 - indexSeason: imageSource.testImgs.indexSeason + // indexSeason: imageSource.testImgs.indexSeason }) this.getFourProduct() console.log(this.data) diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js index 23d01e0..d7103c2 100644 --- a/pages/info/sceneProductInfo/index.js +++ b/pages/info/sceneProductInfo/index.js @@ -121,6 +121,7 @@ Page({ res.data.product.map(product => { product.sku.map(sku => { sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2); + sku.display_tags_str = sku.display_tags.join(' | ') }) }) this.setData({ @@ -157,6 +158,7 @@ Page({ res.data.product.map(product => { product.sku.map(sku => { sku.display_tags = (sku.display_tags ? sku.display_tags.split(",") : []).splice(0, 2); + sku.display_tags_str = sku.display_tags.join(' | ') }) }) this.setData({ diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml index 2c2022f..1d0768a 100644 --- a/pages/info/sceneProductInfo/index.wxml +++ b/pages/info/sceneProductInfo/index.wxml @@ -37,7 +37,7 @@ - + 补贴价 ¥{{ info.allowance.mini_price / 100 }}起 @@ -52,7 +52,9 @@ - {{item}} + + {{sku.display_tags_str}} + 预订须知>> diff --git a/pages/info/sceneProductInfo/index.wxss b/pages/info/sceneProductInfo/index.wxss index 44d3b80..9db679b 100644 --- a/pages/info/sceneProductInfo/index.wxss +++ b/pages/info/sceneProductInfo/index.wxss @@ -950,7 +950,6 @@ page { flex: 1; width: 1rpx; max-height: 1100rpx; - padding-bottom: 20rpx; } .box-gb-20241216{