diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 73e58cb..f2952b0 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -358,7 +358,7 @@ Page({ return false; } - th.setData({has_def:1}) + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) var ee=JSON.parse(JSON.stringify(e)); //--定时器推迟一下-- diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index 9a22c10..a6ef4e5 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -92,7 +92,7 @@ Page({ return false; } - th.setData({has_def:1}) + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) var appd=getApp().globalData; var w_time = setInterval(function() { diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index 2205f89..bdff1a9 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -259,7 +259,7 @@ Page({ th.data.fir_def_store = {}; //赋值空对象 return false; } - th.setData({has_def:1}) + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) var ee = JSON.parse(JSON.stringify(e)); var appd = getApp().globalData; diff --git a/packageB/pages/zuhegou/preindex/index.js b/packageB/pages/zuhegou/preindex/index.js index 1c773d1..280ecb7 100644 --- a/packageB/pages/zuhegou/preindex/index.js +++ b/packageB/pages/zuhegou/preindex/index.js @@ -260,7 +260,7 @@ Page({ return false; } - th.setData({has_def:1}) + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) var ee = JSON.parse(JSON.stringify(e)); var appd = getApp().globalData; diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 9055067..bfc7ab7 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -475,7 +475,7 @@ Page({ return false; } - th.setData({has_def:1}) + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) var ee = JSON.parse(JSON.stringify(e)); //--定时器推迟一下-- setTimeout(function () { diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index a9b679a..285b3b3 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -679,7 +679,7 @@ Page({ th.data.fir_def_store = {}; //赋值空对象 return false; } - th.setData({has_def:1}) + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) var ee = JSON.parse(JSON.stringify(e)); diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.js b/packageC/pages/presell/pregoodsInfo/goodsInfo.js index 40c8888..99d6490 100644 --- a/packageC/pages/presell/pregoodsInfo/goodsInfo.js +++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.js @@ -676,7 +676,7 @@ Page({ return false; } - th.setData({has_def:1}) + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) var ee = JSON.parse(JSON.stringify(e)); diff --git a/pages/giftpack/public/buy_com.js b/pages/giftpack/public/buy_com.js index 06bc375..064d8a5 100644 --- a/pages/giftpack/public/buy_com.js +++ b/pages/giftpack/public/buy_com.js @@ -45,7 +45,7 @@ module.exports = { return false; } - th.setData({has_def:1}) + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) var ee = JSON.parse(JSON.stringify(e)); //--定时器推迟一下-- diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss index 027b2d2..ca2dc4b 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxss +++ b/pages/goods/goodsInfo/goodsInfo.wxss @@ -725,6 +725,11 @@ view.cart-btn-lg { color: #333; } + +.spec-name+view{ + flex-wrap: wrap; +} + .quhuo { font-size: 30rpx; color: #000 diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 761a97f..97babf8 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -613,7 +613,7 @@ Page({ return false; } - th.setData({has_def:1}) + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) //--定时器推迟一下-- setTimeout(function () { if(!th.data.goods) return false;