feat: 新增点餐提醒
This commit is contained in:
parent
51e8db87a5
commit
cbfc8a7905
|
|
@ -426,6 +426,24 @@
|
|||
</view>
|
||||
</u-popup>
|
||||
</template>
|
||||
|
||||
|
||||
<!-- 下单提示 -->
|
||||
<u-modal :show="tipShow" title="温馨提示" closeOnClickOverlay @close="tipShow = false" @confirm="tipShow = false" @cancel="tipShow = false">
|
||||
<template v-slot:default>
|
||||
<view>下单后不支持退款</view>
|
||||
</template>
|
||||
<template v-slot:confirmButton>
|
||||
<view class="confirmButton">
|
||||
<view class="btn replace" @tap="tipShow = false" :style="{border:`1rpx solid ${Brand()['ThemeColor']}`}">
|
||||
取消
|
||||
</view>
|
||||
<view class="btn confirm" @tap="SureBtn()" :style="Brand()['customStyle']['BtnStyle'][0]">
|
||||
我已确定
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
</u-modal>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -451,7 +469,9 @@
|
|||
// 购物车弹框显示变量
|
||||
shoppingshow: false,
|
||||
// 购物车弹框距离购物车定位距离
|
||||
popupBootm:'0rpx'
|
||||
popupBootm:'0rpx',
|
||||
|
||||
tipShow: false,
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
|
|
@ -678,10 +698,7 @@
|
|||
this.REDUCE_CART(item)
|
||||
},
|
||||
|
||||
/**
|
||||
* @创建订单页面
|
||||
* */
|
||||
create() {
|
||||
createOrder() {
|
||||
if (this['Shoplength'] <= 0) return;
|
||||
this['$parent']['loading'] = true;
|
||||
let self = this;
|
||||
|
|
@ -733,14 +750,53 @@
|
|||
break;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* @创建订单页面
|
||||
* */
|
||||
create() {
|
||||
if (this['Shoplength'] <= 0) return;
|
||||
this.tipShow = true;
|
||||
},
|
||||
|
||||
SureBtn() {
|
||||
this.createOrder();
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
<style lang="scss" scoped>
|
||||
@import "./kdj.scss";
|
||||
@import "./mdl.scss";
|
||||
@import "./xbk.scss";
|
||||
@import "./rx.scss";
|
||||
@import "./nx.scss";
|
||||
|
||||
.confirmButton {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
.replace {
|
||||
border: 1rpx solid #000;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
.confirm {
|
||||
background: #00AF66;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.btn {
|
||||
width: 230rpx;
|
||||
height: 86rpx;
|
||||
font-size: 30rpx;
|
||||
line-height: 86rpx;
|
||||
text-align: center;
|
||||
border-radius: 43rpx;
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -139,7 +139,8 @@
|
|||
// 是否闭店
|
||||
close: false,
|
||||
// 等待获取完店铺详情之后显示头部
|
||||
HeadShow: false
|
||||
HeadShow: false,
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -491,40 +492,6 @@
|
|||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
// 弹框按钮颜色
|
||||
.confirmButtonslot {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
text-align: center;
|
||||
font-size: $FONTSIZE28;
|
||||
|
||||
.Cancel {
|
||||
width: 240rpx;
|
||||
height: 80rpx;
|
||||
background-color: #E2E2E2;
|
||||
color: #000;
|
||||
line-height: 80rpx;
|
||||
}
|
||||
|
||||
.Cancels {
|
||||
width: 432rpx;
|
||||
height: 80rpx;
|
||||
background-color: $THEMECOLOR2;
|
||||
color: #ffffff;
|
||||
line-height: 80rpx;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.confirm {
|
||||
width: 240rpx;
|
||||
height: 80rpx;
|
||||
background-color: $THEMECOLOR2;
|
||||
color: #ffffff;
|
||||
line-height: 80rpx;
|
||||
}
|
||||
}
|
||||
|
||||
/deep/ .u-slide-down-enter-active {
|
||||
bottom: 100rpx !important;
|
||||
}
|
||||
|
|
@ -662,4 +629,31 @@
|
|||
width: 120rpx;
|
||||
height: 120rpx;
|
||||
}
|
||||
|
||||
.confirmButton {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
.replace {
|
||||
border: 1rpx solid #000;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
.confirm {
|
||||
background: #00AF66;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.btn {
|
||||
width: 230rpx;
|
||||
height: 86rpx;
|
||||
font-size: 30rpx;
|
||||
line-height: 86rpx;
|
||||
text-align: center;
|
||||
border-radius: 43rpx;
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
<text lines="1" class="amount">￥{{ YingPrice }}</text>
|
||||
</view>
|
||||
<!-- 新增计算抵扣逻辑 -->
|
||||
<view class="Commodity Commodity-Item" style="margin-bottom: 0rpx; padding-bottom: 0rpx; padding-top: 0rpx" @click="isBroker()">
|
||||
<!-- <view class="Commodity Commodity-Item" style="margin-bottom: 0rpx; padding-bottom: 0rpx; padding-top: 0rpx" @click="isBroker()">
|
||||
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
|
||||
<view>
|
||||
<text lines="1" class="quantity">余额：</text>
|
||||
|
|
@ -83,16 +83,21 @@
|
|||
</view>
|
||||
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_broker? true : false}"></view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="Commodity Commodity-Item" @click="isCoin()">
|
||||
</view> -->
|
||||
<view class="Commodity Commodity-Item" style="padding-top: 0rpx;" @click="isCoin()">
|
||||
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
|
||||
<view>
|
||||
<text lines="1" class="quantity">抵用券：</text>
|
||||
<text lines="1" class="amount">(￥{{ computedTotal.coin_balance? computedTotal.coin_balance:'0.00' }} )</text>
|
||||
<text lines="1" class="amount">(￥{{ Number(computedTotal.coin_balance) + Number(computedTotal.broker_balance)? Number(computedTotal.coin_balance) + Number(computedTotal.broker_balance) : '0.00' }} )</text>
|
||||
</view>
|
||||
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_coin? true : false}"></view>
|
||||
</view>
|
||||
</view>
|
||||
<view style="background-color: #fff; padding: 20rpx 40rpx; color: darkred; line-height: 50rpx">
|
||||
<view>温馨提示</view>
|
||||
<view>1、下单后不支持退款；</view>
|
||||
<view>2、 如遇点餐失败，1小时内自动退款；</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 占位元素 -->
|
||||
|
|
@ -114,8 +119,6 @@
|
|||
<text lines="1" class="text_24">积分：</text>
|
||||
<text lines="1" class="text_25" :style="{color:Brand()['ThemeColor']}">{{computedTotal.integral}}</text>
|
||||
</view>
|
||||
|
||||
|
||||
<!-- <view lines="1" class="text_26 itemamount">消费卡抵扣：￥{{_amount(calculationamount['Actualamounts'])}}</view> -->
|
||||
<!-- <view lines="1" class="text_27 itemamount">获得佣金：￥{{_commission(commission)}}</view> -->
|
||||
</view>
|
||||
|
|
@ -166,25 +169,21 @@
|
|||
<view class="item flex">
|
||||
<text>抵用券抵扣</text>
|
||||
<text class="blod">
|
||||
<text v-if="ZeroData.used_coin">-</text>
|
||||
<text>{{ZeroData.used_coin}}</text>
|
||||
<text>-</text>
|
||||
<text>{{Number(ZeroData.used_coin) + Number(ZeroData.used_broker)}}</text>
|
||||
</text>
|
||||
</view>
|
||||
<view class="item flex">
|
||||
<!-- <view class="item flex">
|
||||
<text>余额抵扣</text>
|
||||
<text class="blod">
|
||||
<text v-if="ZeroData.used_broker">-</text>
|
||||
<text>{{ZeroData.used_broker}}</text>
|
||||
</text>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="know">
|
||||
<view class="left">
|
||||
<view class="blod">
|
||||
实付
|
||||
</view>
|
||||
<view class="point" v-if="ZeroData.integral > 0">
|
||||
获得：{{ZeroData.integral}} 积分
|
||||
</view>
|
||||
<view class="blod">实付</view>
|
||||
<view class="point" v-if="ZeroData.integral > 0">获得：{{ZeroData.integral}} 积分</view>
|
||||
</view>
|
||||
<view class="right blod">
|
||||
￥{{realPayment}}
|
||||
|
|
@ -195,12 +194,8 @@
|
|||
</template>
|
||||
<template v-slot:confirmButton>
|
||||
<view class="confirmButton">
|
||||
<view class="btn replace" @tap="zeroshow = false" :style="{border:`1rpx solid ${Brand()['ThemeColor']}`}">
|
||||
取消
|
||||
</view>
|
||||
<view class="btn confirm" @tap="surePay" :style="Brand()['customStyle']['BtnStyle'][0]">
|
||||
确定
|
||||
</view>
|
||||
<view class="btn replace" @tap="zeroshow = false" :style="{border:`1rpx solid ${Brand()['ThemeColor']}`}">取消</view>
|
||||
<view class="btn confirm" @tap="surePay" :style="Brand()['customStyle']['BtnStyle'][0]">确定</view>
|
||||
</view>
|
||||
</template>
|
||||
</u-modal>
|
||||
|
|
@ -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();
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@
|
|||
<text lines="1" class="amount">￥{{ YingPrice }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="Commodity Commodity-Item" style="margin-bottom: 0rpx; padding-bottom: 0rpx; padding-top: 0rpx" @click="isBroker()">
|
||||
<!-- <view class="Commodity Commodity-Item" style="margin-bottom: 0rpx; padding-bottom: 0rpx; padding-top: 0rpx" @click="isBroker()">
|
||||
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
|
||||
<view>
|
||||
<text lines="1" class="quantity">余额：</text>
|
||||
|
|
@ -107,18 +107,23 @@
|
|||
</view>
|
||||
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_broker? true : false}"></view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="Commodity Commodity-Item" @click="isCoin()">
|
||||
</view> -->
|
||||
<view class="Commodity Commodity-Item" style="padding-top: 0rpx;" @click="isCoin()">
|
||||
<view class="discount" style="width: 100%; display: flex; justify-content: space-between">
|
||||
<view>
|
||||
<text lines="1" class="quantity">抵用券</text>
|
||||
<text lines="1" class="amount">(￥{{ computedTotal.coin_balance }} )</text>
|
||||
<text lines="1" class="amount">(￥{{ Number(computedTotal.coin_balance) + Number(computedTotal.broker_balance)? Number(computedTotal.coin_balance) + Number(computedTotal.broker_balance) : '0.00' }} )</text>
|
||||
</view>
|
||||
<view class="Checkbox" :style="{'--aftercolor':Brand()['ThemeColor']}" :class="{'active-Checkbox': use_coin? true : false}"></view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view lines="1" class="text_23">*温馨提示：如遇点餐失败，1小时内自动退款</view>
|
||||
<view lines="1" class="text_23" style="background-color: #fff; padding: 20rpx 40rpx; color: darkred; line-height: 50rpx">
|
||||
<view>温馨提示</view>
|
||||
<view>1、下单后不支持退款；</view>
|
||||
<view>2、 如遇点餐失败，1小时内自动退款；</view>
|
||||
</view>
|
||||
<!-- <view lines="1" class="text_23">*温馨提示：如遇点餐失败，1小时内自动退款</view> -->
|
||||
|
||||
<!-- 占位元素 -->
|
||||
<view style="height: 158rpx;width: 100%;"></view>
|
||||
|
|
@ -182,17 +187,17 @@
|
|||
<view class="item flex">
|
||||
<text>抵用券抵扣</text>
|
||||
<text class="blod">
|
||||
<text v-if="ZeroData.used_coin">-</text>
|
||||
<text>{{ZeroData.used_coin}}</text>
|
||||
<text>-</text>
|
||||
<text>{{Number(ZeroData.used_coin) + Number(ZeroData.used_broker)}}</text>
|
||||
</text>
|
||||
</view>
|
||||
<view class="item flex">
|
||||
<!-- <view class="item flex">
|
||||
<text>余额抵扣</text>
|
||||
<text class="blod">
|
||||
<text v-if="ZeroData.used_broker">-</text>
|
||||
<text>{{ZeroData.used_broker}}</text>
|
||||
</text>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="know">
|
||||
<view class="left">
|
||||
<view class="blod">
|
||||
|
|
@ -382,6 +387,7 @@
|
|||
// 是否使用券
|
||||
isCoin() {
|
||||
this.use_coin = !this.use_coin;
|
||||
this.use_broker = !this.use_broker;
|
||||
this.getCart()
|
||||
},
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,2 +1,2 @@
|
|||
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>在线点餐</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
|
||||
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src="https://h5.dhcc.wang/api/apilink-native.min.js?v=20200701"></script><link rel=stylesheet href=/privilege/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/privilege/static/js/chunk-vendors.48d1c479.js></script><script src=/privilege/static/js/index.9b39331d.js></script></body></html>
|
||||
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src="https://h5.dhcc.wang/api/apilink-native.min.js?v=20200701"></script><link rel=stylesheet href=/privilege/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/privilege/static/js/chunk-vendors.48d1c479.js></script><script src=/privilege/static/js/index.a19d0ad9.js></script></body></html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
unpackage/dist/build/web/static/js/pages-diy-addposition-addposition.ae8cf609.js
vendored
Normal file
1
unpackage/dist/build/web/static/js/pages-diy-addposition-addposition.ae8cf609.js
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
unpackage/dist/build/web/static/js/pages-diy-orders-ersonal_order-ersonal_order.64dde5d7.js
vendored
Normal file
1
unpackage/dist/build/web/static/js/pages-diy-orders-ersonal_order-ersonal_order.64dde5d7.js
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
unpackage/dist/build/web/static/js/pages-diy-orders-team_order-team_order.35be3a7e.js
vendored
Normal file
1
unpackage/dist/build/web/static/js/pages-diy-orders-team_order-team_order.35be3a7e.js
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
unpackage/dist/build/web/static/js/pages-film-filmIndex~pages-film-filmSearch.8c2a925e.js
vendored
Normal file
1
unpackage/dist/build/web/static/js/pages-film-filmIndex~pages-film-filmSearch.8c2a925e.js
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
unpackage/dist/build/web/static/js/pages-film-filmPlay~pages-film-filmYSearch.b66a3feb.js
vendored
Normal file
1
unpackage/dist/build/web/static/js/pages-film-filmPlay~pages-film-filmYSearch.b66a3feb.js
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
unpackage/dist/build/web/static/js/pages-pages-recharge-balance_details-index.6c449cd1.js
vendored
Normal file
1
unpackage/dist/build/web/static/js/pages-pages-recharge-balance_details-index.6c449cd1.js
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
unpackage/dist/build/web/static/js/pages-restaurant-home-shop_home-shop_home.1df37d59.js
vendored
Normal file
1
unpackage/dist/build/web/static/js/pages-restaurant-home-shop_home-shop_home.1df37d59.js
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
unpackage/dist/build/web/static/js/pages-restaurant-index-index_dyp.780aae0b.js
vendored
Normal file
1
unpackage/dist/build/web/static/js/pages-restaurant-index-index_dyp.780aae0b.js
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue