diff --git a/app.js b/app.js index bf51395..38e723c 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.isTest102? true : false; + data.isTest = data.isTest103? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index fbb75cc..3cbd68f 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -93,7 +93,14 @@ Page({ } if (app.globalData.product && app.globalData.product.sku && app.globalData.product.sku.display_tags) { - app.globalData.product.sku.display_tags_str = app.globalData.product.sku.display_tags.split(",").splice(0, 2).join(" | "); + try { + if (Array.isArray(app.globalData.product.sku.display_tags)) { + app.globalData.product.sku.display_tags_str = app.globalData.product.sku.display_tags.splice(0, 2).join(" | "); + } else { + app.globalData.product.sku.display_tags_str = app.globalData.product.sku.display_tags.split(",").splice(0, 2).join(" | "); + } + } catch(e) {} + // app.globalData.product.sku.display_tags_str = app.globalData.product.sku.display_tags.split(",").splice(0, 2).join(" | "); } this.setData({ product: app.globalData.product,