Merge branch 'release/5.5' of http://git.yoho.cn/fe/yohobuy-node into release/5.5

@@ -12,6 +12,10 @@
         <meta content="email=no" name="format-detection" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
         <meta name="renderer" content="webkit" />
+        {{#dnsPrefetch.hosts}}
+            <link rel="dns-prefetch" href="{{this}}">
+        {{/dnsPrefetch.hosts}}
+
         {{#if devEnv}}
             <link rel="stylesheet" href="//{{devHost}}:5002/css/base.css">
             <link rel="stylesheet" href="//{{devHost}}:5002/css/{{#if cssModule}}{{cssModule}}.css{{^}}{{module}}.css{{/if}}">
@@ -61,9 +65,9 @@
             <script src="//{{devHost}}:5002/libs.js"></script>
             <script src="//{{devHost}}:5002/{{module}}.{{page}}.js"></script>
         {{^}}
-            <input name="assetsPrefix" type="text" type="hidden" value="//cdn.yoho.cn/yohobuy-node/assets">
-            <script src="//cdn.yoho.cn/yohobuy-node/{{version}}/libs.js"></script>
-            <script src="//cdn.yoho.cn/yohobuy-node/{{version}}/{{module}}.{{page}}.js"></script>
+            <input name="assetsPrefix" type="text" type="hidden" value="//{{#isEqual cdn 'qcloud'}}qcdn.yoho.cn{{^}}cdn.yoho.cn{{/isEqual}}/yohobuy-node/assets">
+            <script src="//{{#isEqual cdn 'qcloud'}}qcdn.yoho.cn{{^}}cdn.yoho.cn{{/isEqual}}/yohobuy-node/{{version}}/libs.js"></script>
+            <script src="//{{#isEqual cdn 'qcloud'}}qcdn.yoho.cn{{^}}cdn.yoho.cn{{/isEqual}}/yohobuy-node/{{version}}/{{module}}.{{page}}.js"></script>
             {{> analysis}}
         {{/if}}
     </body>

@@ -23,6 +23,8 @@ var $addressManage, $province, $city,
 var isProvinceChecked = false;
 var refundDialogTpl = require('hbs/home/orders/refund-dialog.hbs');
 
+var yas = require('../../common/data-yas');
+
 function cancelFactory(id) {
     var options = {
         mask: false,
@@ -648,10 +650,13 @@ $('.me-orders, .order-detail').on('click', '.cancel-order', function() {
     active = deleteOrder(id, this);
     active.show();
 }).on('click', '.edit-order', function() {
+    var orderId = $(this).closest('.order, .order-detail').data('id');
+
     $(this).addClass('edit-order-active');
-    active = editOrder($(this).closest('.order, .order-detail').data('id'));
+    active = editOrder(orderId);
     active.show();
     newAddress(0);
+    traceChangeAddress(orderId); // eslint-diable-line
 }).on('click', '.rebuy', function() {
     var id = $(this).closest('.order, .order-detail').data('id');
 
@@ -681,5 +686,20 @@ $('.check-logistics').click(function() {
 });
 
 $('.refund-apply').on('click', function() {
-    showRefundDialog($(this).closest('.order, .order-detail').data('id'));
+    var orderId = $(this).closest('.order, .order-detail').data('id');
+
+    showRefundDialog(orderId);
+    traceRefund(orderId); // eslint-disable-line
 });
+
+function traceRefund(orderId) {
+    yas.givePoint('YB_ORDER_REFUND_C', {
+        ORD_NUM: orderId
+    });
+}
+
+function traceChangeAddress(orderId) {
+    yas.givePoint('YB_ORDER_MODIFY_ADDRESS_C', {
+        ORD_NUM: orderId
+    });
+}

@@ -1605,7 +1605,7 @@ $(function() {
                     TAB_ID: index
                 };
 
-                yas.givePoint('YB_GDS_PACKAGE_DT_GOODS_C', option);
+                yas.givePoint('YB_GDS_PACKAGE_GOODS_C', option);
             });
         }
     });
@@ -1683,7 +1683,7 @@ $('.package-box').on('click', '#buy-detail', function() {
             TAB_ID: index
         };
 
-        yas.givePoint('YB_GDS_PACKAGE_DT_GOODS_C', option);
+        yas.givePoint('YB_GDS_PACKAGE_GOODS_C', option);
     });
 
     // 选择颜色