Merge branch 'dev' into 'test'

预售重量 See merge request !942

Merge branch 'dev' into 'test'
预售重量 See merge request !942
后端研发-苏明海
2 parents b6c8f4ba a8d2d181
Showing 2 changed files with 7 additions and 6 deletions
packageC/pages/presell/cart/cart2.js
pages/goods/goodsInfo/goodsInfo.js
@@ -682,7 +682,9 @@ Page({
                             if (goods_weight < 0) goods_weight = 0;
                             //累积商品重量 每种商品的重量 * 数量
                             goods_weight += good['weight'] * good['buynum'];
-                            out_of_weight = (weight_free * 1000 ) - goods_weight;
+                            if( weight_free > 0){
+                                out_of_weight = (weight_free * 1000 ) - goods_weight;
+                            }
                             break;
                         case 3:
                             if (goods_piece < 0) goods_piece = 0;
@@ -2243,7 +2243,7 @@ Page({
     ) {
       url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1";
     }
-
+    console.log(url,500);
     var ob = {
       title: price + "元  " + title,
       path: url,
@@ -2268,7 +2268,6 @@ Page({
       ob.title = text + " " + name;
     }
-
     //-- 页面不能刷新 --
     this.data.show_prew_img=1;
     return ob;
@@ -4164,7 +4163,7 @@ Page({
     var item = this.data.teamgroup[ind];
     var id = item.id;
     var th = this;
-
+    var goods_id=this.data.data.goods_id;
     getApp().request.get("/api/weshop/order/page", {
       data: {
         pt_prom_id: item.team_id,
@@ -4207,14 +4206,14 @@ Page({
           } else {
             wx.navigateTo({
-              url: "/pages/team/team_show/team_show?tg_id=" + id,
+              url: `/pages/team/team_show/team_show?tg_id=${id}&goods_id=${goods_id}`,
             });
           }
         }
         //--跳转到参团--
         else {
           wx.navigateTo({
-            url: "/pages/team/team_show/team_show?tg_id=" + id,
+            url: `/pages/team/team_show/team_show?tg_id=${id}&goods_id=${goods_id}`,
           });
         }
       }