return or exchange flag

周少峰
Commit 908efc42c47cf2de3b774b2c4ea9871a9fabc30f 1 parent 5bdfd6d4
Showing 2 changed files with 2 additions and 2 deletions
template/www.yohobuy.com/actions/home/returns/returns-detail.phtml
yohobuy/www.yohobuy.com/application/modules/Home/controllers/Returns.php
--- a/template/www.yohobuy.com/actions/home/returns/returns-detail.phtml
View file @908efc4
+++ b/template/www.yohobuy.com/actions/home/returns/returns-detail.phtml
View file @908efc4
@@ -23,7 +23,7 @@
                     </div>
                     {{#if canCancelUrl}}
                     <div class="cancel-return">
-                        如果您不想退货了,您可以 <a href="javascript:;" data-id="{{returnId}}" class="cancel-trigger" data-url="{{canCancelUrl}}">取消申请</a>
+                        如果您不想{{#if ../returnDetail}}退货{{^}}换货{{/if}}了,您可以 <a href="javascript:;" data-id="{{returnId}}" class="cancel-trigger" data-url="{{canCancelUrl}}">取消申请</a>
                     </div>
                     {{/if}}
                     <div class="detail-container">
--- a/yohobuy/www.yohobuy.com/application/modules/Home/controllers/Returns.php
View file @908efc4
+++ b/yohobuy/www.yohobuy.com/application/modules/Home/controllers/Returns.php
View file @908efc4
@@ -206,7 +206,7 @@ class ReturnsController extends WebAction
         $channel = Helpers::getChannelNameByCookie();
         $this->setWebNavHeader($channel);
-        $this->_view->display('returns-detail', array('meReturnsPage' => true, 'returns' => $data));
+        $this->_view->display('returns-detail', array('meReturnsPage' => true, 'returns' => $data, 'returnDetail' => true));
     }