diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js index 58d358d..3c312d6 100644 --- a/pages/info/roadInfo/index.js +++ b/pages/info/roadInfo/index.js @@ -211,9 +211,9 @@ Page({ // 组合产品获取购买的sku getComposeSku () { + let skuId = this.data.info.sku[this.data.skuIndex].id commonApi.user_post("product/get_sku_compose_list", { - // sku_id: "190720" - sku_id: "190740" + sku_id: skuId }).then(res => { if (res&&Array.isArray(res.data)&&res.data.length>0) { res.data.forEach(v => { @@ -221,6 +221,9 @@ Page({ v.num = this.data.producNum; v.sku.compose_sku_id = v.compose_sku_id }); + app.globalData.list = [] + app.globalData.postProduct = [] + app.globalData.product = null util.orderByShoppingCart(res.data,app) } }) diff --git a/project.private.config.json b/project.private.config.json index 92c79b1..6ee0549 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -5,11 +5,18 @@ }, "condition": { "miniprogram": { - "list": [ + "list": [ + { + "name": "pages/info/roadInfo/index", + "pathName": "pages/info/roadInfo/index", + "query": "id=457643", + "scene": null, + "launchMode": "default" + } ] } }, "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85", "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "libVersion": "development" + "libVersion": "3.9.3" } \ No newline at end of file diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js index aea92d8..6d4ea30 100644 --- a/subPackages/gwcOrder/index.js +++ b/subPackages/gwcOrder/index.js @@ -321,8 +321,9 @@ Page({ commonApi._post("product/get_sku_detail_id", { sku_id: sku_id }).then(res => { - this.data.product.sku = res.data - app.globalData.product.sku = res.data + let skuInfo = {...this.data.product.sku, ...res.data, is_compose: this.data.product.sku.is_compose || 0} + this.data.product.sku = skuInfo + app.globalData.product.sku = skuInfo this.setData({ singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price, product: this.data.product diff --git a/utils/https.js b/utils/https.js index c120ad9..ac1e739 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/"