diff --git a/app.js b/app.js index 9ec3084..7326dea 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.isTest146? true : false; + data.isTest = data.isTest150? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml index c23f9b3..9f1fdd5 100644 --- a/pages/info/postProductInfo/index.wxml +++ b/pages/info/postProductInfo/index.wxml @@ -68,6 +68,8 @@ + + > diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss index 83d34dd..1f5ccf0 100644 --- a/pages/info/postProductInfo/index.wxss +++ b/pages/info/postProductInfo/index.wxss @@ -438,6 +438,7 @@ page { justify-content: space-between; text-align: center; padding-left: 0; + z-index: 77; } .fixed-bottom .iconfont { @@ -552,6 +553,8 @@ page { justify-content: space-between; height: 400rpx; align-content: flex-start; + overflow-y: auto; + overflow-x: hidden; } .sku-name-item { @@ -696,7 +699,7 @@ width: 250rpx; border-radius: 50%; right: 20rpx; bottom: 166rpx; - z-index: 15; + z-index: 88; } .cart-box image { diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js index c9d5806..5ad5dec 100644 --- a/pages/user/cartlist/list.js +++ b/pages/user/cartlist/list.js @@ -231,13 +231,16 @@ Page({ this.setData({flag:''}) - let use_type = product[0].sku.use_type - if (product.some(x=>x.sku.use_type!=use_type)) { - this.setData({ - flag: 'mix', - isCar: 'multiple' - }) + if (product.length>0) { + let use_type = product[0].sku.use_type + if (product.some(x=>x.sku.use_type!=use_type)) { + this.setData({ + flag: 'mix', + isCar: 'multiple' + }) + } } + if (product.length > 0 && product1.length > 0) { this.setData({ flag: 'mix', diff --git a/project.private.config.json b/project.private.config.json index 66b3e05..96a56ce 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -9,10 +9,17 @@ { "name": "pages/info/postProductInfo/index", "pathName": "pages/info/postProductInfo/index", - "query": "id=464888", + "query": "id=462080", "scene": null, "launchMode": "default" }, + { + "name": "pages/info/postProductInfo/index", + "pathName": "pages/info/postProductInfo/index", + "query": "id=464888", + "launchMode": "default", + "scene": null + }, { "name": "pages/order/orderList/index", "pathName": "pages/order/orderList/index",