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 @@
-
+
抵用券抵扣
-
@@ -181,7 +181,7 @@
{{ZeroData.used_broker}}
-->
-
+
实付
获得:{{ZeroData.integral}} 积分
diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue
index cc9dac2..e01c601 100644
--- a/pages/restaurant/order/orders-settlement/settlement.vue
+++ b/pages/restaurant/order/orders-settlement/settlement.vue
@@ -108,7 +108,7 @@
-->
-
+
抵用券
@@ -135,7 +135,7 @@
实际付款:
¥{{realPayment}}
-
+
积分:
¥{{computedTotal.integral}}
diff --git a/static/js/mixin/mixin.js b/static/js/mixin/mixin.js
index 4b18770..d059f9c 100644
--- a/static/js/mixin/mixin.js
+++ b/static/js/mixin/mixin.js
@@ -18,7 +18,12 @@ import {
} from '@/static/js/serviceurl.js';
// 公共mixins
export default {
-computed: {},
+ computed: {
+ isWx() {
+ const ua = navigator.userAgent.toLowerCase();
+ return ua.indexOf('miniprogram') > -1;
+ }
+ },
// 方法
methods: {
...mapMutations(['GetState']),
diff --git a/unpackage/dist/build/.DS_Store b/unpackage/dist/build/.DS_Store
index 82496ad..477e110 100644
Binary files a/unpackage/dist/build/.DS_Store and b/unpackage/dist/build/.DS_Store differ
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index 70c3618..4e411b6 100644
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@@ -1,2 +1,2 @@
在线点餐
\ No newline at end of file
+ document.write('')