wxd / MShopWeApp

Commit 9ab5d4db9b2e40ba990863b2ca3a8d925b24a382

Authored by 后端研发-苏明海
2 parents cb225886 3f92d272

Merge branch 'dev' into 'test' 

Dev

See merge request !1045
Inline Side-by-side
Showing 4 changed files with 7 additions and 4 deletions
pages/cart/cart2_inte/cart2_inte.js
  View file @9ab5d4d
@@ -453,8 +453,9 @@ Page({ @@ -453,8 +453,9 @@ Page({
453 let item = gd_arr_list[i]; 453 let item = gd_arr_list[i];
454 454
455 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1) ) { 455 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1) ) {
456 - if (goods_weight < 0) goods_weight = 0; 456 +
457 if (item['exp_sum_type'] == 2) { 457 if (item['exp_sum_type'] == 2) {
  458 + if (goods_weight < 0) goods_weight = 0;
458 goods_weight += item['weight'] * item['buynum']; 459 goods_weight += item['weight'] * item['buynum'];
459 cut_good_weight += item['weight'] * item['buynum']; 460 cut_good_weight += item['weight'] * item['buynum'];
460 } 461 }
pages/cart/cart2_pt/cart2_pt.js
  View file @9ab5d4d
@@ -439,8 +439,9 @@ Page({ @@ -439,8 +439,9 @@ Page({
439 let item = gd_arr_list[i]; 439 let item = gd_arr_list[i];
440 440
441 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) { 441 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
442 - if (goods_weight < 0) goods_weight = 0; 442 +
443 if (item['exp_sum_type'] == 2) { 443 if (item['exp_sum_type'] == 2) {
  444 + if (goods_weight < 0) goods_weight = 0;
444 cut_good_weight += item['weight'] * item['buynum']; 445 cut_good_weight += item['weight'] * item['buynum'];
445 goods_weight += item['weight'] * item['buynum']; 446 goods_weight += item['weight'] * item['buynum'];
446 } 447 }
pages/cart/cart_wk/cart_wk.js
  View file @9ab5d4d
@@ -518,8 +518,9 @@ Page({ @@ -518,8 +518,9 @@ Page({
518 let item = gd_arr_list[i]; 518 let item = gd_arr_list[i];
519 519
520 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) { 520 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
521 - if (goods_weight < 0) goods_weight = 0; 521 +
522 if (item['exp_sum_type'] == 2) { 522 if (item['exp_sum_type'] == 2) {
  523 + if (goods_weight < 0) goods_weight = 0;
523 goods_weight += item['weight'] * item['buynum']; 524 goods_weight += item['weight'] * item['buynum'];
524 cut_good_weight += item['weight'] * item['buynum']; 525 cut_good_weight += item['weight'] * item['buynum'];
525 } 526 }
pages/user/express/express.js
  View file @9ab5d4d
@@ -26,7 +26,7 @@ Page({ @@ -26,7 +26,7 @@ Page({
26 requestExpress: function() { 26 requestExpress: function() {
27 var s = this; 27 var s = this;
28 wx.request({ 28 wx.request({
29 - url: this.data.url + "/api/weshop/order/wuliu/" + this.data.delivery.shipping_code + "/" + this.data.delivery.invoice_no, success: function(e) { 29 + url: this.data.url + "/api/weshop/order/wuliu/" + this.data.delivery.shipping_code + "/" + this.data.delivery.invoice_no + "/" + this.data.delivery.mobile, success: function(e) {
30 30
31 var re_arr = e.data.data.Traces.reverse(); 31 var re_arr = e.data.data.Traces.reverse();
32 s.setData({ 32 s.setData({