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 f355ae3..51785a4 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
@@ -425,7 +425,25 @@
-
+
+
+
+
+
+
+ 下单后不支持退款
+
+
+
+
+ 取消
+
+
+ 我已确定
+
+
+
+
@@ -451,7 +469,9 @@
// 购物车弹框显示变量
shoppingshow: false,
// 购物车弹框距离购物车定位距离
- popupBootm:'0rpx'
+ popupBootm:'0rpx',
+
+ tipShow: false,
}
},
computed: {
@@ -676,71 +696,107 @@
* */
reducecommodity(item) {
this.REDUCE_CART(item)
+ },
+
+ createOrder() {
+ if (this['Shoplength'] <= 0) return;
+ this['$parent']['loading'] = true;
+ let self = this;
+ // console.log(self['MealList']['sku'],'MealList').;
+ // return.
+ self.SETREPLACE(self['MealList']);
+ if( this['BrandInfor']['brand_id'] == 1 || this['BrandInfor']['brand_id'] == 5){
+ uni.navigateTo({
+ url: `/pages/restaurant/order/orders-settlement/settlement`
+ });
+ }else if(this['BrandInfor']['brand_id'] == 13 || this['BrandInfor']['brand_id'] == 10 || this['BrandInfor']['brand_id'] == 2){
+ uni.navigateTo({
+ url: `/pages/restaurant/order/orders-settlement/orders-settlement`
+ });
+ }
+ return;
+ switch (this['BrandInfor']['brand_id']) {
+ case 1:
+ uni.navigateTo({
+ url: `/pages/restaurant/order/orders-settlement/orders-settlement`,
+ success: () => {
+ this['$parent']['loading'] = false;
+ }
+ });
+ break;
+ case 5:
+ uni.navigateTo({
+ url: `/pages/restaurant/order/orders-settlement/orders-settlement`,
+ success: () => {
+ this['$parent']['loading'] = false;
+ }
+ });
+ break;
+ case 13:
+ uni.navigateTo({
+ url: `/pages/restaurant/order/orders-settlement/rx-orders-settlement`,
+ success: () => {
+ this['$parent']['loading'] = false;
+ }
+ });
+ break;
+ case 10:
+ uni.navigateTo({
+ url: `/pages/restaurant/order/orders-settlement/xbk_orders_settlement`,
+ success: () => {
+ this['$parent']['loading'] = false;
+ }
+ });
+ break;
+ }
},
/**
* @创建订单页面
* */
- create() {
- if (this['Shoplength'] <= 0) return;
- this['$parent']['loading'] = true;
- let self = this;
- // console.log(self['MealList']['sku'],'MealList').;
- // return.
- self.SETREPLACE(self['MealList']);
- if( this['BrandInfor']['brand_id'] == 1 || this['BrandInfor']['brand_id'] == 5){
- uni.navigateTo({
- url: `/pages/restaurant/order/orders-settlement/settlement`
- });
- }else if(this['BrandInfor']['brand_id'] == 13 || this['BrandInfor']['brand_id'] == 10 || this['BrandInfor']['brand_id'] == 2){
- uni.navigateTo({
- url: `/pages/restaurant/order/orders-settlement/orders-settlement`
- });
- }
- return;
- switch (this['BrandInfor']['brand_id']) {
- case 1:
- uni.navigateTo({
- url: `/pages/restaurant/order/orders-settlement/orders-settlement`,
- success: () => {
- this['$parent']['loading'] = false;
- }
- });
- break;
- case 5:
- uni.navigateTo({
- url: `/pages/restaurant/order/orders-settlement/orders-settlement`,
- success: () => {
- this['$parent']['loading'] = false;
- }
- });
- break;
- case 13:
- uni.navigateTo({
- url: `/pages/restaurant/order/orders-settlement/rx-orders-settlement`,
- success: () => {
- this['$parent']['loading'] = false;
- }
- });
- break;
- case 10:
- uni.navigateTo({
- url: `/pages/restaurant/order/orders-settlement/xbk_orders_settlement`,
- success: () => {
- this['$parent']['loading'] = false;
- }
- });
- break;
- }
- },
+ create() {
+ if (this['Shoplength'] <= 0) return;
+ this.tipShow = true;
+ },
+
+ SureBtn() {
+ this.createOrder();
+ }
}
}
-
diff --git a/pages/restaurant/home/shop_home/shop_home.vue b/pages/restaurant/home/shop_home/shop_home.vue
index 228a207..daffd0c 100644
--- a/pages/restaurant/home/shop_home/shop_home.vue
+++ b/pages/restaurant/home/shop_home/shop_home.vue
@@ -139,7 +139,8 @@
// 是否闭店
close: false,
// 等待获取完店铺详情之后显示头部
- HeadShow: false
+ HeadShow: false,
+
}
},
@@ -491,40 +492,6 @@
\ No newline at end of file
diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue
index 8c5a0e9..022c66a 100644
--- a/pages/restaurant/order/orders-settlement/orders-settlement.vue
+++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue
@@ -75,7 +75,7 @@
¥{{ YingPrice }}
-
+
+
抵用券:
- (¥{{ computedTotal.coin_balance? computedTotal.coin_balance:'0.00' }} )
+ (¥{{ Number(computedTotal.coin_balance) + Number(computedTotal.broker_balance)? Number(computedTotal.coin_balance) + Number(computedTotal.broker_balance) : '0.00' }} )
+
+ 温馨提示
+ 1、下单后不支持退款;
+ 2、 如遇点餐失败,1小时内自动退款;
+
@@ -114,8 +119,6 @@
积分:
{{computedTotal.integral}}
-
-
@@ -166,25 +169,21 @@
抵用券抵扣
- -
- {{ZeroData.used_coin}}
+ -
+ {{Number(ZeroData.used_coin) + Number(ZeroData.used_broker)}}
-
+
-
- 实付
-
-
- 获得:{{ZeroData.integral}} 积分
-
+ 实付
+ 获得:{{ZeroData.integral}} 积分
¥{{realPayment}}
@@ -195,12 +194,8 @@
-
- 取消
-
-
- 确定
-
+ 取消
+ 确定
@@ -288,7 +283,7 @@
hasAssigned: false, // 标志变量
YingPrice: 0 ,// 应付
realPayment: 0, // 实际付款
- ZeroData: {}
+ ZeroData: {},
};
},
onLoad() {
@@ -380,6 +375,7 @@
// 是否使用券
isCoin() {
this.use_coin = !this.use_coin;
+ this.use_broker = !this.use_broker;
this.getCart();
},
diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue
index 8819f4d..5e553ed 100644
--- a/pages/restaurant/order/orders-settlement/settlement.vue
+++ b/pages/restaurant/order/orders-settlement/settlement.vue
@@ -99,7 +99,7 @@
¥{{ YingPrice }}
-
+
+
抵用券
- (¥{{ computedTotal.coin_balance }} )
+ (¥{{ Number(computedTotal.coin_balance) + Number(computedTotal.broker_balance)? Number(computedTotal.coin_balance) + Number(computedTotal.broker_balance) : '0.00' }} )
- *温馨提示:如遇点餐失败,1小时内自动退款
+
+ 温馨提示
+ 1、下单后不支持退款;
+ 2、 如遇点餐失败,1小时内自动退款;
+
+
@@ -182,17 +187,17 @@
抵用券抵扣
- -
- {{ZeroData.used_coin}}
+ -
+ {{Number(ZeroData.used_coin) + Number(ZeroData.used_broker)}}
-
+
@@ -382,6 +387,7 @@
// 是否使用券
isCoin() {
this.use_coin = !this.use_coin;
+ this.use_broker = !this.use_broker;
this.getCart()
},
diff --git a/unpackage/.DS_Store b/unpackage/.DS_Store
index c88a062..d0a2dfd 100644
Binary files a/unpackage/.DS_Store and b/unpackage/.DS_Store differ
diff --git a/unpackage/dist/.DS_Store b/unpackage/dist/.DS_Store
index 3684444..9ef469b 100644
Binary files a/unpackage/dist/.DS_Store and b/unpackage/dist/.DS_Store differ
diff --git a/unpackage/dist/build/.DS_Store b/unpackage/dist/build/.DS_Store
index d959afa..658e1a9 100644
Binary files a/unpackage/dist/build/.DS_Store and b/unpackage/dist/build/.DS_Store differ
diff --git a/unpackage/dist/build/web.zip b/unpackage/dist/build/web.zip
new file mode 100644
index 0000000..7a0bb16
Binary files /dev/null and b/unpackage/dist/build/web.zip differ
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index 901b402..1f80bb4 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('')