diff --git a/components/b-rx-commodity-item/b-rx-commodity-item.vue b/components/b-rx-commodity-item/b-rx-commodity-item.vue index e5edc74..04ea596 100644 --- a/components/b-rx-commodity-item/b-rx-commodity-item.vue +++ b/components/b-rx-commodity-item/b-rx-commodity-item.vue @@ -16,7 +16,11 @@ x - {{item['num']?item['num']:item['amount']}} + + + {{item['num']?item['num']:item['amount']}} + + @@ -42,6 +46,7 @@ ¥{{item['adj_pay'] * (item['num']?item['num']:item['amount'])}} + (+{{item['add_price']}}) diff --git a/components/b-rx-sku-popup/b-rx-sku-popup.vue b/components/b-rx-sku-popup/b-rx-sku-popup.vue index 7c35839..c162235 100644 --- a/components/b-rx-sku-popup/b-rx-sku-popup.vue +++ b/components/b-rx-sku-popup/b-rx-sku-popup.vue @@ -1,6 +1,6 @@ + @@ -194,10 +195,17 @@ diff --git a/pages/restaurant/home/shop_home/components/shop-cart/shop-cart.vue b/pages/restaurant/home/shop_home/components/shop-cart/shop-cart.vue index 5691ba6..2f8b95c 100644 --- a/pages/restaurant/home/shop_home/components/shop-cart/shop-cart.vue +++ b/pages/restaurant/home/shop_home/components/shop-cart/shop-cart.vue @@ -208,8 +208,8 @@ - {{(item['pay_price'] * item['num'])}} - + {{(item.pay_price * item.num)}} + {{(item.adj_pay * item.num)}} diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue index b112bf8..f894f6b 100644 --- a/pages/restaurant/order/orders-settlement/settlement.vue +++ b/pages/restaurant/order/orders-settlement/settlement.vue @@ -22,7 +22,8 @@ ¥ - {{item['adj_pay'] * item['num']}} + {{__amount(item['bt_price'] * item['num'])}} + {{__amount(item['adj_pay'] * item['num'])}} ×{{item['num']}} @@ -282,6 +283,7 @@ getCart() { let products = []; + this.shoptotalnum = 0; // 因为进入时暂时获取不到deepClone方法所以使用反转化 let newobj = JSON.parse(JSON.stringify(this['GetCartList2'])); for (let i = 0; i < newobj['length']; i++) { @@ -654,7 +656,11 @@ font-family: PingFang-SC-Medium; text-align: center; white-space: nowrap; - line-height: 22rpx; + line-height: 22rpx; + .del { + text-decoration: line-through; + padding-left: 20rpx; + } } .text_7 { @@ -963,7 +969,7 @@ border-color: var(--Checkboxborder) !important; padding: 5rpx; position: relative; - + &::after { content: ''; position: absolute; @@ -971,7 +977,7 @@ height: 12rpx; border-radius: 50%; border: 3rpx solid #ffffff; - background-color: var(--Checkboxborder); + background-color: #FFBC0D; left: 50%; top: 50%; transform: translate(-50%, -50%);