diff --git a/.DS_Store b/.DS_Store index a2cf1a5..8d81ab6 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/node_modules/.DS_Store b/node_modules/.DS_Store index bb96a36..7321a00 100644 Binary files a/node_modules/.DS_Store and b/node_modules/.DS_Store differ 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 6e5095e..a65b455 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 @@ -352,7 +352,7 @@ {{__amount(totalPrice)}} - + {{Shoplength > 0?'结算':'未选择商品'}} diff --git a/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue b/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue index 2e6b312..0173a42 100644 --- a/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue +++ b/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue @@ -21,13 +21,13 @@ - + 补贴后价格:¥ {{item['bt_price']}} - + 预估积分: {{item['integral']}} @@ -71,13 +71,13 @@ {{item['product_price']}} - + 补贴后价格:¥ {{item['bt_price']}} - + 预估积分: {{item['integral']}} @@ -107,13 +107,13 @@ {{item['product_price']}} - + 补贴后价格:¥ {{item['bt_price']}} - + 预估积分: {{item['integral']}} diff --git a/pages/restaurant/home/shop_home/shop_home.vue b/pages/restaurant/home/shop_home/shop_home.vue index 5dfc63e..487d63d 100644 --- a/pages/restaurant/home/shop_home/shop_home.vue +++ b/pages/restaurant/home/shop_home/shop_home.vue @@ -107,7 +107,7 @@ return { // 肯德基 // 顶部通知 - topNotice: '当前3人正在下单,获取取餐码等待时间为1-2分钟,景区和交通枢纽不支持线上点餐', + topNotice: '当前3人正在下单,获取取餐码等待时间为1-2分钟,景区和交通枢纽不支持线上点餐~', show: false, suspend: config['suspend'], diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue index ccfea69..61e82b6 100644 --- a/pages/restaurant/order/orders-settlement/orders-settlement.vue +++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue @@ -85,7 +85,7 @@ --> - + 抵用券: @@ -116,7 +116,7 @@ 实际付款: ¥{{realPayment}} - + 积分: {{computedTotal.integral}} @@ -167,7 +167,7 @@