Commit a8d2d1816a173893125dfc382d24ad228e9e0d93

Authored by abson
1 parent dfc5414c

预售重量

packageC/pages/presell/cart/cart2.js
... ... @@ -682,7 +682,9 @@ Page({
682 682 if (goods_weight < 0) goods_weight = 0;
683 683 //累积商品重量 每种商品的重量 * 数量
684 684 goods_weight += good['weight'] * good['buynum'];
685   - out_of_weight = (weight_free * 1000 ) - goods_weight;
  685 + if( weight_free > 0){
  686 + out_of_weight = (weight_free * 1000 ) - goods_weight;
  687 + }
686 688 break;
687 689 case 3:
688 690 if (goods_piece < 0) goods_piece = 0;
... ...
pages/goods/goodsInfo/goodsInfo.js
... ... @@ -2243,7 +2243,7 @@ Page({
2243 2243 ) {
2244 2244 url += "&room_id=" + getApp().globalData.room_id + "&room_user_share=1";
2245 2245 }
2246   -
  2246 + console.log(url,500);
2247 2247 var ob = {
2248 2248 title: price + "元 " + title,
2249 2249 path: url,
... ... @@ -2268,7 +2268,6 @@ Page({
2268 2268  
2269 2269 ob.title = text + " " + name;
2270 2270 }
2271   -
2272 2271 //-- 页面不能刷新 --
2273 2272 this.data.show_prew_img=1;
2274 2273 return ob;
... ... @@ -4164,7 +4163,7 @@ Page({
4164 4163 var item = this.data.teamgroup[ind];
4165 4164 var id = item.id;
4166 4165 var th = this;
4167   -
  4166 + var goods_id=this.data.data.goods_id;
4168 4167 getApp().request.get("/api/weshop/order/page", {
4169 4168 data: {
4170 4169 pt_prom_id: item.team_id,
... ... @@ -4207,14 +4206,14 @@ Page({
4207 4206  
4208 4207 } else {
4209 4208 wx.navigateTo({
4210   - url: "/pages/team/team_show/team_show?tg_id=" + id,
  4209 + url: `/pages/team/team_show/team_show?tg_id=${id}&goods_id=${goods_id}`,
4211 4210 });
4212 4211 }
4213 4212 }
4214 4213 //--跳转到参团--
4215 4214 else {
4216 4215 wx.navigateTo({
4217   - url: "/pages/team/team_show/team_show?tg_id=" + id,
  4216 + url: `/pages/team/team_show/team_show?tg_id=${id}&goods_id=${goods_id}`,
4218 4217 });
4219 4218 }
4220 4219 }
... ...