wxd / MShopWeApp

Commit 73589d2eb540473a29e8b13576641f5c8bb5421f

Authored by 后端研发-苏明海
2 parents 71844ecc f47ebfef

Merge branch 'test' into 'qa' 

Test

See merge request !128
Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
pages/goods/goodsInfo/goodsInfo.js
  View file @73589d2
... ... @@ -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;
... ...