Merge branch 'qa' into 'master'

Qa See merge request !325

Merge branch 'qa' into 'master'
Qa See merge request !325
后端研发-苏明海
2 parents 493fc7f8 9867e19a
Showing 2 changed files with 2 additions and 2 deletions
pages/cart/cart2/cart2.js
pages/goods/categoryList/categoryList.js
@@ -1087,7 +1087,7 @@ Page({
     var fw_price = 0, fp_price=0;
     item=item.config;
     //------按重量----------
-    if (goods_weight>0) {
+    if (goods_weight>=0) {
       fw_price =parseFloat(item['money']);
       if (goods_weight > item['first_weight']){
         var fw = goods_weight - item['first_weight'];
@@ -466,7 +466,7 @@ Page({
    if (indexs==220){ this.get_brand();}
    if (arr!="undefined" && arr!=undefined){
       if (arr.length==0){
-           this.setData({ select_classify_on: indexs, index: indexs, classify_name: name,
+           this.setData({ select_classify_on: indexs, index: indexs, classify_name: name,cat_id:cid,
                goodslist: null,is_level_three: 0 });
            return false;
       }