Skip to content

朱继来 / 后台订单管理

Go to a project
Commit b5168473 by 朱继来
Options

Merge branch 'zjl_add_order_20210624' into development

parents 66d09fbe 5c7dd2ef
Inline Side-by-side
Showing with 7 additions and 3 deletions
public/js/add_order.js
...@@ -416,8 +416,10 @@ ...@@ -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>'; 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>'; html += '<td>$<span class="goods-min-price-us">'+data.tiered[i]['price_us']+'</span></td>';
} else {
html += '<td></td>';
} }
} else { } else {
if (data.ac_type && data.ac_type != 5) { if (data.ac_type && data.ac_type != 5) {
...@@ -426,9 +428,11 @@ ...@@ -426,9 +428,11 @@
html += '<td><span>'+data.tiered[i]['purchases']+'</span></td><td>￥<span>'+data.tiered[i]['price_cn']+'</span></td>'; 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>'; html += '<td>$<span>'+data.tiered[i]['price_us']+'</span></td>';
} } else {
html += '<td></td>';
}
} }
html += '</tr>'; html += '</tr>';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment