|
@@ -440,9 +440,9 @@
|
|
|
|
|
|
<!-- 医械通单独处理商品价格 -->
|
|
|
<div class="money-group" v-if="item.product_type === '医械通'">
|
|
|
- <div>商品总价:<span>@#item.vipInfo.area === '-'?'-':('¥'+ getProdMoney(item) | FormatNum)#@</span></div>
|
|
|
+ <div>商品总价:<span>¥ @#getProdMoney(item) | FormatNum#@</span></div>
|
|
|
<div v-if="item.order_status != -2 && item.order_status != -3">
|
|
|
- 优惠金额:<span>@#item.vipInfo.area === '-'?'-':('¥'+ getProdMoney(item) | FormatNum)#@</span>
|
|
|
+ 优惠金额:<span>¥ @#getProdMoney(item) | FormatNum#@</span>
|
|
|
</div>
|
|
|
<div>实付金额:<span class="ss">¥@#item.pay_money | FormatNum#@</span></div>
|
|
|
</div>
|
|
@@ -459,9 +459,9 @@
|
|
|
默认: 显示 商品总价、优惠金额(有则显示,没有则不显示)、实付金额
|
|
|
已取消(状态-2): 只显示商品总价
|
|
|
-->
|
|
|
- <div>商品总价:<span>¥@#getProdMoney(item) | FormatNum#@</span></div>
|
|
|
+ <div>商品总价:<span>¥ @#getProdMoney(item) | FormatNum#@</span></div>
|
|
|
<div v-if="item.discount_price && item.order_status != -2 && item.order_status != -3">
|
|
|
- 优惠金额:<span>-¥@#item.discount_price | FormatNum#@</span></div>
|
|
|
+ 优惠金额:<span>-¥ @#item.discount_price | FormatNum#@</span></div>
|
|
|
|
|
|
<div v-if="item.pay_money && item.order_status != -2 && item.order_status != -3">实付金额:<span
|
|
|
class="ss">¥@#item.pay_money | FormatNum#@</span></div>
|
|
@@ -723,6 +723,7 @@
|
|
|
$('.pagination-box').html(window.clonePageTemplate)
|
|
|
}
|
|
|
|
|
|
+ // vue2.0逻辑
|
|
|
var orderListForVue = new Vue({
|
|
|
el: '#drder',
|
|
|
delimiters: ['@#', '#@'],
|
|
@@ -1029,6 +1030,10 @@
|
|
|
industry: '全行业',
|
|
|
cycle: '-'
|
|
|
}
|
|
|
+ // 判断 大会员时候 区域为 -
|
|
|
+ if (v.filter.area === '-') {
|
|
|
+ vipInfo.area = '-'
|
|
|
+ }
|
|
|
if (!$.isEmptyObject(vipOriginalInfo)) {
|
|
|
if (vipOriginalInfo.areacount !== -1) {
|
|
|
var newcitys = vipOriginalInfo.newcitys
|
|
@@ -1178,7 +1183,8 @@
|
|
|
var order_money = item.order_money ? item.order_money : 0
|
|
|
var discount_price = item.discount_price ? item.discount_price : 0
|
|
|
var prodMoney100 = (order_money * 100) + (discount_price * 100)
|
|
|
- return prodMoney100 / 100
|
|
|
+ // 兼容 医械通 的 -
|
|
|
+ return item.vipInfo.area == '-'?'-': prodMoney100 / 100
|
|
|
},
|
|
|
goPay: function (item) {
|
|
|
var href = ''
|