merge

@@ -140,7 +140,7 @@ router.get('/orders/refund', ordersController.refund);
 // 申请退款原因
 // 申请退款原因
 router.get('/orders/refundreason', ordersController.refundReason);
 router.get('/orders/refundreason', ordersController.refundReason);
 
 
-/********************************* 我的订单结束 *****************************************/
+/** ******************************* 我的订单结束 *****************************************/
 
 
 
 
 // router.get('/coupons', CouponsController.index);
 // router.get('/coupons', CouponsController.index);

@@ -275,7 +275,7 @@ function getAddress(d, callback) {
         $obj = $city;
         $obj = $city;
     } else if (d.type === 'getCounty') {
     } else if (d.type === 'getCounty') {
 
 
-        //url = 'getCounty';
+        // url = 'getCounty';
         $obj = $county;
         $obj = $county;
     } else if (d.type === 'getStreet') {
     } else if (d.type === 'getStreet') {
         $obj = $street;
         $obj = $street;
@@ -528,7 +528,7 @@ function newAddress(id) {
                     }, function() {
                     }, function() {
                         var countyId = $county.val();
                         var countyId = $county.val();
 
 
-                        //如果获取的县有默认选中项则获取乡镇／街道
+                        // 如果获取的县有默认选中项则获取乡镇／街道
                         if (countyId !== '0') {
                         if (countyId !== '0') {
                             getAddress({
                             getAddress({
                                 id: countyId,
                                 id: countyId,