1 participants
-
Status changed to merged
-
mentioned in commit 9867e19a0c2007647ed8ff4dc586e8551553d89a
Showing
2 changed files
pages/cart/cart2/cart2.js
| @@ -1087,7 +1087,7 @@ Page({ | @@ -1087,7 +1087,7 @@ Page({ | ||
| 1087 | var fw_price = 0, fp_price=0; | 1087 | var fw_price = 0, fp_price=0; |
| 1088 | item=item.config; | 1088 | item=item.config; |
| 1089 | //------按重量---------- | 1089 | //------按重量---------- |
| 1090 | - if (goods_weight>0) { | 1090 | + if (goods_weight>=0) { |
| 1091 | fw_price =parseFloat(item['money']); | 1091 | fw_price =parseFloat(item['money']); |
| 1092 | if (goods_weight > item['first_weight']){ | 1092 | if (goods_weight > item['first_weight']){ |
| 1093 | var fw = goods_weight - item['first_weight']; | 1093 | var fw = goods_weight - item['first_weight']; |
pages/goods/categoryList/categoryList.js
| @@ -466,7 +466,7 @@ Page({ | @@ -466,7 +466,7 @@ Page({ | ||
| 466 | if (indexs==220){ this.get_brand();} | 466 | if (indexs==220){ this.get_brand();} |
| 467 | if (arr!="undefined" && arr!=undefined){ | 467 | if (arr!="undefined" && arr!=undefined){ |
| 468 | if (arr.length==0){ | 468 | if (arr.length==0){ |
| 469 | - this.setData({ select_classify_on: indexs, index: indexs, classify_name: name, | 469 | + this.setData({ select_classify_on: indexs, index: indexs, classify_name: name,cat_id:cid, |
| 470 | goodslist: null,is_level_three: 0 }); | 470 | goodslist: null,is_level_three: 0 }); |
| 471 | return false; | 471 | return false; |
| 472 | } | 472 | } |