Commit f47ebfefd0639ff804ecfd28458ab53e04a570d7
Merge branch 'dev' into 'test'
商品详情页,规格修改 See merge request !127
Showing
1 changed file
with
4 additions
and
4 deletions
pages/goods/goodsInfo/goodsInfo.js
| ... | ... | @@ -541,8 +541,8 @@ Page({ |
| 541 | 541 | var gg = "", |
| 542 | 542 | item = t.data.data; |
| 543 | 543 | |
| 544 | - if(item.goods_spec=="null") item.goods_spec=""; | |
| 545 | - if(item.goods_color=="null") item.goods_color=""; | |
| 544 | + if(item.goods_spec=="null" || item.goods_spec==null ) item.goods_spec=""; | |
| 545 | + if(item.goods_color=="null" || item.goods_color==null) item.goods_color=""; | |
| 546 | 546 | |
| 547 | 547 | if (item.goods_spec != "" && item.goods_color != "") { |
| 548 | 548 | gg = item.goods_spec + "/" + item.goods_color; |
| ... | ... | @@ -1173,8 +1173,8 @@ Page({ |
| 1173 | 1173 | var item = arrdata[i], |
| 1174 | 1174 | gg = ""; |
| 1175 | 1175 | |
| 1176 | - if(item.goods_spec=="null") item.goods_spec=""; | |
| 1177 | - if(item.goods_color=="null") item.goods_color=""; | |
| 1176 | + if(item.goods_spec=="null" || item.goods_spec==null) item.goods_spec=""; | |
| 1177 | + if(item.goods_color=="null" || item.goods_color==null) item.goods_color=""; | |
| 1178 | 1178 | |
| 1179 | 1179 | if (item.goods_spec != "" && item.goods_color != "") { |
| 1180 | 1180 | gg = item.goods_spec + "/" + item.goods_color; | ... | ... |