diff --git a/src/subpackage/order/pages/retail/detail/detail.vue b/src/subpackage/order/pages/retail/detail/detail.vue index 19f3f1c..72cc115 100644 --- a/src/subpackage/order/pages/retail/detail/detail.vue +++ b/src/subpackage/order/pages/retail/detail/detail.vue @@ -40,7 +40,7 @@ {{ e.erp_retail_goods ? (e.erp_retail_goods.goods_name || '-') : (e.name || '-') }} - ¥{{ e.erp_retail_goods ? (e.erp_retail_goods.erp_goods ? e.erp_retail_goods.erp_goods.erp_goods_price : 0) : 0 }} + ¥{{ e.erp_retail_goods ? e.erp_retail_goods.assistant_price || 0 : 0 }} sku:{{ e.erp_retail_goods ? (e.erp_retail_goods.erp_goods ? e.erp_retail_goods.erp_goods.erp_goods_sku : '-') : '-' }} diff --git a/src/subpackage/retail/components/hover_cart_list/hover_cart_list.vue b/src/subpackage/retail/components/hover_cart_list/hover_cart_list.vue index 28cf9ef..2cca86f 100644 --- a/src/subpackage/retail/components/hover_cart_list/hover_cart_list.vue +++ b/src/subpackage/retail/components/hover_cart_list/hover_cart_list.vue @@ -20,7 +20,7 @@ - {{ item.erp_goods.erp_goods_price }} + {{ item.assistant_price }} diff --git a/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue b/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue index 25ab2bb..5103681 100644 --- a/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue +++ b/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue @@ -23,7 +23,7 @@ - {{ item.erp_goods.erp_goods_price }} + {{ item.assistant_price }} diff --git a/src/subpackage/retail/pages/confirm_order/confirm_order.vue b/src/subpackage/retail/pages/confirm_order/confirm_order.vue index 8f22372..c94d62a 100644 --- a/src/subpackage/retail/pages/confirm_order/confirm_order.vue +++ b/src/subpackage/retail/pages/confirm_order/confirm_order.vue @@ -120,7 +120,7 @@ id: this.cartListFinal[i].id, // name: this.cartListFinal[i].erp_goods.erp_goods_name, name: this.cartListFinal[i].goods_name, - price: this.cartListFinal[i].erp_goods.erp_goods_price, + price: this.cartListFinal[i].assistant_price, nums: this.cartListFinal[i].count, unit: this.cartListFinal[i].erp_goods.erp_goods_unit, }); diff --git a/src/subpackage/retail/pages/index/index.vue b/src/subpackage/retail/pages/index/index.vue index 5831aef..568e24e 100644 --- a/src/subpackage/retail/pages/index/index.vue +++ b/src/subpackage/retail/pages/index/index.vue @@ -46,7 +46,7 @@ - {{ item.erp_goods.erp_goods_price }} + {{ item.assistant_price }} @@ -225,11 +225,6 @@ export default { url: `/subpackage/retail/pages/search/search?data=${encodeURIComponent(JSON.stringify(data))}` }); }, - // 购物车输入确认 - cartInputConfirm(value, i) { - this.cartList[i].erp_goods_price = value; - this.calcTotalPriceAndCount(); // 计算购物车总价跟总量 - }, // 清空购物车 clearCart() { this.cartList = []; @@ -359,7 +354,7 @@ export default { let count = 0; for (let i = 0; i < this.cartList.length; ++i) { - price = parseFloat(price) + parseFloat(this.cartList[i].count * this.cartList[i].erp_goods.erp_goods_price); + price = parseFloat(price) + parseFloat(this.cartList[i].count * this.cartList[i].assistant_price); count += this.cartList[i].count; } this.totalPrice = price.toFixed(2);