Merge branch 'feature/order' of git.dev.yoho.cn:web/yohobuy into feature/order

@@ -165,10 +165,6 @@ function submitOrder() {
     var invoiceText = $invoice.find('[name="invoice-title"]').val() || orderInfo('invoiceText'),
     var invoiceText = $invoice.find('[name="invoice-title"]').val() || orderInfo('invoiceText'),
         msg = $('#msg').find('input').val() || orderInfo('msg');
         msg = $('#msg').find('input').val() || orderInfo('msg');
 
 
-    if (orderInfo('deliveryId') === 2 && !$addressWrap.data('support')) {
-        tip.show('当前地址不支持顺丰快递');
-        return;
-    }
     if (isSubmiting) {
     if (isSubmiting) {
         return false;
         return false;
     }
     }

@@ -14,7 +14,7 @@
     {{^}}
     {{^}}
         <div class="address block address-wrap not-address">
         <div class="address block address-wrap not-address">
             <i class="iconfont">&#xe637;</i>
             <i class="iconfont">&#xe637;</i>
-            <a class="choose" href="/cart/index/selectAddress">请选择收获地址<span class="iconfont">&#xe614;</span></a>
+            <a class="choose" href="/cart/index/selectAddress">请选择收货地址<span class="iconfont">&#xe614;</span></a>
         </div>
         </div>
     {{/if}}
     {{/if}}
     <section class="dispatch block">
     <section class="dispatch block">
@@ -27,10 +27,12 @@
             </h3>
             </h3>
             <ul>
             <ul>
                 {{#each paymentWay}}
                 {{#each paymentWay}}
-                <li {{#if isSelected}}class="chosed"{{/if}}>
+                    {{#if isSupport}}
+                    <li {{#if recommend}}class="chosed"{{/if}}>
                         <span>{{name}}</span>
                         <span>{{name}}</span>
                         <i class="right iconfont {{#if recommend}}icon-cb-radio{{else}}icon-radio{{/if}}"  data-id="{{paymentType}}"></i>
                         <i class="right iconfont {{#if recommend}}icon-cb-radio{{else}}icon-radio{{/if}}"  data-id="{{paymentType}}"></i>
                     </li>
                     </li>
+                    {{/if}}
                 {{/each}}
                 {{/each}}
             </ul>
             </ul>
         </div>
         </div>