Merge branch 'zjl_add_order_20210624' into development

public/js/add_order.js

@@ -416,8 +416,10 @@
                                                 html += '<td><span class="goods-min-num">'+data.tiered[i]['purchases']+'</span></td><td>￥<span class="goods-min-price">'+data.tiered[i]['price_cn']+'</span></td>';
                                             }
 
-                                            if (joint_goods_type.indexOf(data.goods_type) != -1) {
+                                            if (joint_goods_type.indexOf(data.goods_type) != -1 && data.tiered[i]['price_us']) {
                                                 html += '<td>$<span class="goods-min-price-us">'+data.tiered[i]['price_us']+'</span></td>';
+                                            } else {
+                                                html += '<td></td>';
                                             }
                                         } else {
                                             if (data.ac_type && data.ac_type != 5) {
@@ -426,9 +428,11 @@
                                                 html += '<td><span>'+data.tiered[i]['purchases']+'</span></td><td>￥<span>'+data.tiered[i]['price_cn']+'</span></td>';
                                             }
                                             
-                                            if (joint_goods_type.indexOf(data.goods_type) != -1) {
+                                            if (joint_goods_type.indexOf(data.goods_type) != -1 && data.tiered[i]['price_us']) {
                                                 html += '<td>$<span>'+data.tiered[i]['price_us']+'</span></td>';
-                                            }     
+                                            } else {
+                                                html += '<td></td>';
+                                            }    
                                         } 
 
                                         html += '</tr>';