Merge branch 'feature/supportShipment' into release/6.0.1

@@ -49,9 +49,9 @@
             </h3>
             <ul class="dispatch-mode">
                 {{#each dispatchMode}}
-                <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">
+                <li class="{{#if isSelected}}chosed{{/if}}{{#if is_support_message}} no-support{{/if}}" data-id="{{id}}">
                     <span>{{name}}：运费¥{{cost}} {{#if is_support_message}}({{is_support_message}}){{/if}}</span>
-                    <i class="right iconfont {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}{{#if is_support_message}} no-support{{/if}}"  data-id="{{id}}"></i>
+                    <i class="right iconfont {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}"  data-id="{{id}}"></i>
                 </li>
                 {{/each}}
             </ul>

@@ -49,9 +49,9 @@
             </h3>
             <ul class="dispatch-mode">
                 {{#each dispatchMode}}
-                <li {{#if isSelected}}class="chosed"{{/if}} data-id="{{id}}">
+                <li class="{{#if isSelected}}chosed{{/if}}{{#if is_support_message}} no-support{{/if}}" data-id="{{id}}">
                     <span>{{name}}：运费¥{{cost}} {{#if is_support_message}}({{is_support_message}}){{/if}}</span>
-                    <i class="right iconfont {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}{{#if is_support_message}} no-support{{/if}}"  data-id="{{id}}"></i>
+                    <i class="right iconfont {{#if isSelected}}icon-cb-radio{{else}}icon-radio{{/if}}" data-id="{{id}}"></i>
                 </li>
                 {{/each}}
             </ul>

@@ -343,7 +343,7 @@ if (!orderInfo('address_id')) {
 }
 
 $('.delivery-id').on('touchend', 'li', function(event) {
-    if ($(this).find('i').hasClass('no-support')) {
+    if ($(this).hasClass('no-support')) {
         return false;
     }
 
@@ -452,7 +452,7 @@ $subBlock.on('touchstart', 'li', function() {
         return true;
     }
 
-    if ($(this).find('i').hasClass('no-support')) {
+    if ($(this).hasClass('no-support')) {
         return false;
     }
 

@@ -324,7 +324,7 @@ if (!orderInfo('addressId')) {
 }
 
 $('.delivery-id').on('touchend', 'li', function(event) {
-    if ($(this).find('i').hasClass('no-support')) {
+    if ($(this).hasClass('no-support')) {
         return false;
     }
 
@@ -435,7 +435,7 @@ $subBlock.on('touchstart', 'li', function() {
         return true;
     }
 
-    if ($(this).find('i').hasClass('no-support')) {
+    if ($(this).hasClass('no-support')) {
         return false;
     }
 

@@ -218,6 +218,10 @@
                     padding: 20px 30px 20px 40px;
                     font-size: 25px;
                 }
+
+                .no-support {
+                    color: #b0b0b0;
+                }
             }
         }
     }