Merge branch 'release/5.4.1' into gray

@@ -11060,9 +11060,8 @@ function getAddress(d, callback) {
         data: {
             id: d.id * 1
         }
-    }).then(function(d) {
-
-        structureOption($obj, d.data, selectId);
+    }).then(function(resData) {
+        structureOption($obj, resData.data, selectId, d.id);
 
         if (typeof callback === 'function') {
             callback();
@@ -11072,18 +11071,13 @@ function getAddress(d, callback) {
 }
 
 // 构建select下拉选项
-function structureOption($obj, data, selectId) {
+function structureOption($obj, data, selectId, countryId) {
     var i,
         optionHtml = '',
         defaultOption,
         isStar = '';
-    var countyId;
 
     for (i = 0; i < data.length; i++) {
-        if (!countyId) {
-            countyId = data[i].id;
-        }
-
         if (data[i].is_support_express === 'Y') {
             isStar = '*';
         } else {
@@ -11108,10 +11102,8 @@ function structureOption($obj, data, selectId) {
     } else if ($obj.attr('name') === 'street') {
         defaultOption = '<option value="0">请选择乡镇／街道</option>';
 
-        if (countyId) {
-            countyId += '';
-            countyId = countyId.substr(0, 6);
-            defaultOption += '<option value="' + countyId + '">全部</option>';
+        if (countryId) {
+            defaultOption += '<option value="' + countryId + '">全部</option>';
         }
     }
 
@@ -16371,7 +16363,7 @@ var Order = {
                                 } else if (expressId === '2') {
                                     $('.express-list.sf').removeClass('hide');
                                 }
-                                
+
                             } else {
                                 new dialog.Alert(data.message).show();
                             }
@@ -16402,7 +16394,7 @@ var Order = {
                         $('.play-juan').removeClass('is-select');
 
                     } else {
-                        
+
                         e.$loading.show();
 
                         options = {
@@ -16893,7 +16885,7 @@ function rejustReceiptInfo() {
 
     if ($('#input-mobile').val() !== invoiceMobileStar) {
         $('#input-mobile').val(invoiceMobileStar);
-    };        
+    };
 }
 
 $receiptInfoSaveBtn.click(function(){
@@ -16955,6 +16947,9 @@ $('#input-mobile').bind('input propertychange', function() {
     }
 });
 
+// 获取用户是否新客（品众统计）写cookie
+$.ajax({type: 'GET', url: '/home/newuser'});
+
 // 订单确认页默认埋点
 window.addPoint('YB_SC_ORDER_ENSURE');
 
@@ -17792,6 +17787,7 @@ $('.to-play input.submit').click(function() {
             isContinueBuy: isContinueBuy
         }
     }).then(function(d) {
+        var newUser;
 
         $loading.hide();
         if (d.code === 200) {
@@ -17846,6 +17842,18 @@ $('.to-play input.submit').click(function() {
                         'items': pinyouItems
                     }).track('MC.2z.Rg-AQqSqQi2GykX12LUxI0');
                 }
+                // 品众
+                if (_fxcmd) {
+                    newUser = window.cookie('__NEW_USER') || 0;
+
+                    _fxcmd.push(['trackOrder', {
+                        oid: d.data.order_code,
+                        otp: d.data.order_amount,
+                        u_info: window.getUid(),
+                        u_type: newUser
+                    }, []]);
+                    window.setCookie('__NEW_USER', 0);
+                }
                 window.location.href = d.data.payUrl;
             }
         } else {