Showing
1 changed file
with
5 additions
and
4 deletions
@@ -38,6 +38,7 @@ class ReturnsModel | @@ -38,6 +38,7 @@ class ReturnsModel | ||
38 | $param = array( | 38 | $param = array( |
39 | 'id' => $value['id'] | 39 | 'id' => $value['id'] |
40 | ); | 40 | ); |
41 | + $list[$key]['returnId'] = $value['id']; | ||
41 | $list[$key]['orderNum'] = $value['order_code']; | 42 | $list[$key]['orderNum'] = $value['order_code']; |
42 | $list[$key]['orderTime'] = str_replace('-', '/', $value['order_create_time']); | 43 | $list[$key]['orderTime'] = str_replace('-', '/', $value['order_create_time']); |
43 | $list[$key]['returnTime'] = $value['create_time']; | 44 | $list[$key]['returnTime'] = $value['create_time']; |
@@ -45,13 +46,13 @@ class ReturnsModel | @@ -45,13 +46,13 @@ class ReturnsModel | ||
45 | $list[$key]['isChange'] = false; | 46 | $list[$key]['isChange'] = false; |
46 | $uri = '/home/returns/refundDetail'; | 47 | $uri = '/home/returns/refundDetail'; |
47 | if ($value['canCancel'] === 'Y') { | 48 | if ($value['canCancel'] === 'Y') { |
48 | - $list[$key]['canCancelUrl'] = Helpers::url('/home/returns/cancelRefund', $param); | 49 | + $list[$key]['canCancelUrl'] = Helpers::url('/home/returns/cancelRefund'); |
49 | } | 50 | } |
50 | } elseif ($value['refund_type'] == 2) { // tar note 160624 终止换货 | 51 | } elseif ($value['refund_type'] == 2) { // tar note 160624 终止换货 |
51 | $list[$key]['isChange'] = true; | 52 | $list[$key]['isChange'] = true; |
52 | $uri = '/home/returns/exchangeDetail'; | 53 | $uri = '/home/returns/exchangeDetail'; |
53 | if ($value['canCancel'] === 'Y') { | 54 | if ($value['canCancel'] === 'Y') { |
54 | - $list[$key]['canCancelUrl'] = Helpers::url('/home/returns/cancelChange', $param); | 55 | + $list[$key]['canCancelUrl'] = Helpers::url('/home/returns/cancelChange'); |
55 | } | 56 | } |
56 | } | 57 | } |
57 | $list[$key]['returnStatus'] = $value['status_name']; | 58 | $list[$key]['returnStatus'] = $value['status_name']; |
@@ -111,7 +112,7 @@ class ReturnsModel | @@ -111,7 +112,7 @@ class ReturnsModel | ||
111 | $detail['expressList'] = self::getExpressCompany(); | 112 | $detail['expressList'] = self::getExpressCompany(); |
112 | 113 | ||
113 | if ($res['canCancel'] === 'Y') { | 114 | if ($res['canCancel'] === 'Y') { |
114 | - $detail['canCancelUrl'] = Helpers::url('/home/returns/cancelChange', array('id' => $id)); | 115 | + $detail['canCancelUrl'] = Helpers::url('/home/returns/cancelChange'); |
115 | } | 116 | } |
116 | } else { | 117 | } else { |
117 | return false; | 118 | return false; |
@@ -165,7 +166,7 @@ class ReturnsModel | @@ -165,7 +166,7 @@ class ReturnsModel | ||
165 | $detail['expressList'] = self::getExpressCompany(); | 166 | $detail['expressList'] = self::getExpressCompany(); |
166 | 167 | ||
167 | if ($res['canCancel'] === 'Y') { | 168 | if ($res['canCancel'] === 'Y') { |
168 | - $detail['canCancelUrl'] = Helpers::url('/home/returns/cancelRefund', array('id' => $id)); | 169 | + $detail['canCancelUrl'] = Helpers::url('/home/returns/cancelRefund'); |
169 | } | 170 | } |
170 | } else { | 171 | } else { |
171 | return false; | 172 | return false; |
-
Please register or login to post a comment