'退换货列表页取消退换货链接添加'

@@ -35,26 +35,28 @@ class ReturnsModel
             //设置分页
             //设置分页
             $pager = self::setPager($returnsData['data']['page'], $returnsData['data']['total'], $returnsData['data']['total_page'], $limit);
             $pager = self::setPager($returnsData['data']['page'], $returnsData['data']['total'], $returnsData['data']['total_page'], $limit);
             foreach ($returnsData['data']['list'] as $key => $value) {
             foreach ($returnsData['data']['list'] as $key => $value) {
+                $param = array(
+                    'id' => $value['id']
+                );
                 $list[$key]['orderNum'] = $value['order_code'];
                 $list[$key]['orderNum'] = $value['order_code'];
                 $list[$key]['orderTime'] = str_replace('-', '/', $value['order_create_time']);
                 $list[$key]['orderTime'] = str_replace('-', '/', $value['order_create_time']);
                 $list[$key]['returnTime'] = $value['create_time'];
                 $list[$key]['returnTime'] = $value['create_time'];
-                if ($value['refund_type'] == 1) {
+                if ($value['refund_type'] == 1) { // tar note 160624 终止退货
                     $list[$key]['isChange'] = false;
                     $list[$key]['isChange'] = false;
                     $uri = '/home/returns/refundDetail';
                     $uri = '/home/returns/refundDetail';
-                } elseif ($value['refund_type'] == 2) {
+                    if ($value['canCancel'] === 'Y') {
+                        $list[$key]['canCancelUrl'] = Helpers::url('/home/returns/cancelRefund', $param);
+                        $cancelUri = '/home/returns/';
+                    }
+                } elseif ($value['refund_type'] == 2) { // tar note 160624 终止换货
                     $list[$key]['isChange'] = true;
                     $list[$key]['isChange'] = true;
                     $uri = '/home/returns/exchangeDetail';
                     $uri = '/home/returns/exchangeDetail';
+                    if ($value['canCancel'] === 'Y') {
+                        $list[$key]['canCancelUrl'] = Helpers::url('/home/returns/cancelChange', $param);
+                    }
                 }
                 }
                 $list[$key]['returnStatus'] = $value['status_name'];
                 $list[$key]['returnStatus'] = $value['status_name'];
-                $param = array(
-                    'id' => $value['id']
-                );
                 $list[$key]['moreHref'] = helpers::url($uri, $param);
                 $list[$key]['moreHref'] = helpers::url($uri, $param);
-
-                // tar note 添加是否可以取消退换货条件判断
-                foreach ($value['goods'] as $subKey => $subValue) {
-                    $value['goods'][$subKey]['canCancel'] = $value['canCancel'] === 'Y';
-                }
                 $list[$key]['goods'] = self::getGoodsData($value['goods']);
                 $list[$key]['goods'] = self::getGoodsData($value['goods']);
             }
             }
         } else {
         } else {
@@ -193,12 +195,8 @@ class ReturnsModel
             $result[$key]['name'] = $value['product_name'];
             $result[$key]['name'] = $value['product_name'];
             $result[$key]['color'] = $value['color_name'];
             $result[$key]['color'] = $value['color_name'];
             $result[$key]['size'] = $value['size_name'];
             $result[$key]['size'] = $value['size_name'];
-
-            // tar note 判断是否可以取消退换货申请 链接待处理
-            if ($value['canCancel']) {
-                $result[$key]['canCancelUrl'] = Helpers::url('/cancel');
-            }
         }
         }
+
         return $result;
         return $result;
     }
     }