wxd / MShopWeApp

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

Qa

From qa into master

Merged by 后端研发-苏明海

1 participants
Inline Side-by-side
Showing 4 changed files
pages/cart/cart2_inte/cart2_inte.js
  View file @b874bd1
... ... @@ -453,8 +453,9 @@ Page({
453 453 let item = gd_arr_list[i];
454 454  
455 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 457 if (item['exp_sum_type'] == 2) {
  458 + if (goods_weight < 0) goods_weight = 0;
458 459 goods_weight += item['weight'] * item['buynum'];
459 460 cut_good_weight += item['weight'] * item['buynum'];
460 461 }
... ...
pages/cart/cart2_pt/cart2_pt.js
  View file @b874bd1
... ... @@ -439,8 +439,9 @@ Page({
439 439 let item = gd_arr_list[i];
440 440  
441 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 443 if (item['exp_sum_type'] == 2) {
  444 + if (goods_weight < 0) goods_weight = 0;
444 445 cut_good_weight += item['weight'] * item['buynum'];
445 446 goods_weight += item['weight'] * item['buynum'];
446 447 }
... ...
pages/cart/cart_wk/cart_wk.js
  View file @b874bd1
... ... @@ -518,8 +518,9 @@ Page({
518 518 let item = gd_arr_list[i];
519 519  
520 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 522 if (item['exp_sum_type'] == 2) {
  523 + if (goods_weight < 0) goods_weight = 0;
523 524 goods_weight += item['weight'] * item['buynum'];
524 525 cut_good_weight += item['weight'] * item['buynum'];
525 526 }
... ...
pages/user/express/express.js
  View file @b874bd1
... ... @@ -26,7 +26,7 @@ Page({
26 26 requestExpress: function() {
27 27 var s = this;
28 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 31 var re_arr = e.data.data.Traces.reverse();
32 32 s.setData({
... ...