Merged
Merge Request #324 · created by 后端研发-苏明海


Test


From test into qa

Merged by 后端研发-苏明海

1 participants


pages/cart/cart2/cart2.js
... ... @@ -1087,7 +1087,7 @@ Page({
1087 1087 var fw_price = 0, fp_price=0;
1088 1088 item=item.config;
1089 1089 //------按重量----------
1090   - if (goods_weight>0) {
  1090 + if (goods_weight>=0) {
1091 1091 fw_price =parseFloat(item['money']);
1092 1092 if (goods_weight > item['first_weight']){
1093 1093 var fw = goods_weight - item['first_weight'];
... ...
pages/goods/categoryList/categoryList.js
... ... @@ -466,7 +466,7 @@ Page({
466 466 if (indexs==220){ this.get_brand();}
467 467 if (arr!="undefined" && arr!=undefined){
468 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 470 goodslist: null,is_level_three: 0 });
471 471 return false;
472 472 }
... ...