确认订单修改
This commit is contained in:
GaoHao
@@ -83,13 +83,20 @@
|
|||||||
<view>{{(shopTableInfo.seatNum*storeInfo.tableFee).toFixed(2)}}</view>
|
<view>{{(shopTableInfo.seatNum*storeInfo.tableFee).toFixed(2)}}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- <view class="favorable" v-for="(item,index) in favorable" :key="index">
|
<view class="favorable" v-for="(item,index) in favorable" :key="index">
|
||||||
<view class="favorable_left">
|
<view class="favorable_left">
|
||||||
<image class="icon" :src="item.url" mode="aspectFill"/>
|
<image class="icon" :src="item.url" mode="aspectFill"/>
|
||||||
<text class="name"> {{ item.name }} </text>
|
<text class="name"> {{ item.name }} </text>
|
||||||
</view>
|
</view>
|
||||||
<view class="favorable_right"><text class="favorable_right_text">暂无可用优惠券</text> <u-icon name="arrow-right" color="#575B66" size="28"></u-icon></view>
|
<view class="favorable_right" v-if="item.type == 'points'" @click="isPointsChecked = !isPointsChecked">
|
||||||
</view> -->
|
<text class="favorable_right_text" style="color: #666;margin-right: 16rpx;">使用29积分抵扣￥29.00</text>
|
||||||
|
<u-checkbox-group iconPlacement="right">
|
||||||
|
<u-checkbox v-model="isPointsChecked" :checked="isPointsChecked" activeColor="#E8AD7B" shape="circle" icon-size="36" size="36">
|
||||||
|
</u-checkbox>
|
||||||
|
</u-checkbox-group>
|
||||||
|
</view>
|
||||||
|
<view class="favorable_right" v-else ><text class="favorable_right_text">暂无可用优惠券</text> <u-icon name="arrow-right" color="#575B66" size="28"></u-icon></view>
|
||||||
|
</view>
|
||||||
<view class="totalPrice">
|
<view class="totalPrice">
|
||||||
<text style="margin-bottom: 5rpx;">小计￥</text>
|
<text style="margin-bottom: 5rpx;">小计￥</text>
|
||||||
<text class="totalPriceNum"> {{listinfo.payAmount}} </text>
|
<text class="totalPriceNum"> {{listinfo.payAmount}} </text>
|
||||||
@@ -105,35 +112,20 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 支付方式 -->
|
<!-- 充值免单 -->
|
||||||
<!-- <view class="paymentMethod" v-if="storeInfo.registerType == 'munchies'">
|
<view class="rechargeFree">
|
||||||
<view class="paymentMethod_content">
|
<view class="rechargeFree_bg" @click="rechargeFreeChecked = !rechargeFreeChecked">
|
||||||
<view class="paymentMethod_title">支付方式</view>
|
<view class="left">
|
||||||
<u-radio-group v-model="radiovalue" iconPlacement="right" @change="groupChange" :size="28"
|
<view class="icon">优惠</view>
|
||||||
placement="column">
|
<view class="text">充值消费2倍（￥50），本单立享免单！</view>
|
||||||
<block v-for="(item,index) in paymentMethodList" :key="index">
|
</view>
|
||||||
<view class="method_list" @click="groupChange(index+1)">
|
<u-checkbox-group iconPlacement="right">
|
||||||
<view class="method_list_top">
|
<u-checkbox v-model="rechargeFreeChecked" :checked="rechargeFreeChecked" activeColor="#E8AD7B" shape="circle" icon-size="36" size="36">
|
||||||
<view class="method_list_top_left">
|
</u-checkbox>
|
||||||
<image class="icon" :src="item.url" mode="aspectFill"/>
|
</u-checkbox-group>
|
||||||
<view class="method_list_top_cen">
|
|
||||||
<view class="name"> {{ item.name }} </view>
|
|
||||||
<view class="method_list_bom" v-if="item.type == 1">
|
|
||||||
<text class="balance">会员卡余额 ￥{{amountVIP?amountVIP.amount:0}}</text>
|
|
||||||
<text class="topUpNow" @click="goRecharge">去充值</text>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<u-radio activeColor="#E8AD7B" icon-size="36" size="36" :name="index+1">
|
|
||||||
</u-radio>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
</view>
|
|
||||||
</block>
|
|
||||||
</u-radio-group>
|
|
||||||
</view>
|
</view>
|
||||||
</view> -->
|
</view>
|
||||||
|
|
||||||
<paymentMethod ref="paymentMethod" :amountVIP="amountVIP" v-if="storeInfo.registerType == 'munchies'" @groupChange="groupChange"></paymentMethod>
|
<paymentMethod ref="paymentMethod" :amountVIP="amountVIP" v-if="storeInfo.registerType == 'munchies'" @groupChange="groupChange"></paymentMethod>
|
||||||
|
|
||||||
|
|
||||||
@@ -200,9 +192,12 @@
|
|||||||
sendType: "table",
|
sendType: "table",
|
||||||
eatModel: [],
|
eatModel: [],
|
||||||
favorable: [
|
favorable: [
|
||||||
{ name: "优惠券", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png"},
|
// { name: "优惠券", type: "coupon", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png"},
|
||||||
{ name: "团购优惠", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/groupOffer.png"},
|
// { name: "团购优惠", type: "group", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/groupOffer.png"},
|
||||||
|
{ name: "积分抵扣", type: "points", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/points.png"},
|
||||||
],
|
],
|
||||||
|
isPointsChecked: false,
|
||||||
|
rechargeFreeChecked: false,
|
||||||
order: {
|
order: {
|
||||||
phone: "",
|
phone: "",
|
||||||
},
|
},
|
||||||
@@ -1010,7 +1005,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.content_box{
|
.content_box{
|
||||||
padding: 0 30rpx;
|
padding: 0 20rpx;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
margin-top: 10rpx;
|
margin-top: 10rpx;
|
||||||
position: relative;
|
position: relative;
|
||||||
@@ -1180,11 +1175,10 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 备注
|
||||||
.remark{
|
.remark{
|
||||||
padding: 0 30rpx;
|
padding: 0 20rpx;
|
||||||
box-sizing: border-box;
|
margin-top: 32rpx;
|
||||||
margin-top: 30rpx;
|
|
||||||
.remark_bg{
|
.remark_bg{
|
||||||
background-color: $uni-bg-color;
|
background-color: $uni-bg-color;
|
||||||
border-radius: 22rpx;
|
border-radius: 22rpx;
|
||||||
@@ -1209,69 +1203,45 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.paymentMethod{
|
|
||||||
padding: 0 30rpx;
|
// 充值免单
|
||||||
box-sizing: border-box;
|
.rechargeFree{
|
||||||
margin-top: 30rpx;
|
padding: 0 20rpx;
|
||||||
|
margin-top: 32rpx;
|
||||||
.paymentMethod_content{
|
.rechargeFree_bg{
|
||||||
background-color: $uni-bg-color;
|
display: flex;
|
||||||
border-radius: 22rpx;
|
justify-content: space-between;
|
||||||
padding:30rpx 0 0 0;
|
align-items: center;
|
||||||
box-sizing: border-box;
|
padding: 32rpx 24rpx;
|
||||||
.paymentMethod_title{
|
border-radius: 24rpx;
|
||||||
font-weight: 500;
|
background-color: #fff;
|
||||||
font-size: 32rpx;
|
.left{
|
||||||
color: #333333;
|
display: flex;
|
||||||
// margin-bottom: 30rpx;
|
align-items: center;
|
||||||
padding: 0 30rpx;
|
.icon{
|
||||||
box-sizing: border-box;
|
width: 68rpx;
|
||||||
}
|
height: 36rpx;
|
||||||
.method_list{
|
text-align: center;
|
||||||
padding: 40rpx 30rpx;
|
line-height: 36rpx;
|
||||||
box-sizing: border-box;
|
background: linear-gradient( 180deg, #FEDE81 0%, #FEB263 100%);
|
||||||
.method_list_top{
|
border-radius: 12rpx 0rpx 12rpx 0rpx;
|
||||||
display: flex;
|
font-weight: 500;
|
||||||
justify-content: space-between;
|
font-size: 20rpx;
|
||||||
.method_list_top_left{
|
color: #FFFFFF;
|
||||||
display: flex;
|
margin-right: 12rpx;
|
||||||
align-items: center;
|
|
||||||
.icon{
|
|
||||||
width: 54.67rpx!important;
|
|
||||||
height: 48rpx!important;
|
|
||||||
margin-right: 22rpx;
|
|
||||||
}
|
|
||||||
.name{
|
|
||||||
font-size: 32rpx;
|
|
||||||
font-weight: 500;
|
|
||||||
color: #333;
|
|
||||||
}
|
|
||||||
.method_list_top_cen{
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
.method_list_bom{
|
.text{
|
||||||
display: flex;
|
font-weight: 500;
|
||||||
align-items: center;
|
font-size: 28rpx;
|
||||||
.balance{
|
color: #333333;
|
||||||
margin-right: 20rpx;
|
|
||||||
font-size: 24rpx;
|
|
||||||
}
|
|
||||||
.topUpNow{
|
|
||||||
color: #FF803D;
|
|
||||||
font-size: 28rpx;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.method_list:nth-child(odd){
|
|
||||||
border-bottom: 2rpx solid #ccc;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.bottom{
|
.bottom{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background: #FFFFFF;
|
background: #FFFFFF;
|
||||||
|
|||||||
@@ -18,8 +18,8 @@
|
|||||||
<text>会员享低价</text>
|
<text>会员享低价</text>
|
||||||
<text>长按保存，微信内扫一扫加好友</text>
|
<text>长按保存，微信内扫一扫加好友</text>
|
||||||
</view>
|
</view>
|
||||||
|
<image style="height: 150rpx;width: 150rpx;" :src="listinfo.shopQrcode" @longpress="saveImage(listinfo.shopQrcode)" mode="aspectFill"></image>
|
||||||
<u-image width="152" height="152" radius="16" :src="listinfo.shopQrcode" ></u-image>
|
<!-- <u-image width="152" height="152" radius="16" :src="listinfo.shopQrcode" ></u-image> -->
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<orderInfoAfter ref="orderInfoAfter" :listinfo="listinfo" v-if="listinfo.useType == 'dine-in-after'"></orderInfoAfter>
|
<orderInfoAfter ref="orderInfoAfter" :listinfo="listinfo" v-if="listinfo.useType == 'dine-in-after'"></orderInfoAfter>
|
||||||
@@ -106,7 +106,17 @@
|
|||||||
console.log(e)
|
console.log(e)
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
saveImage (url) {
|
||||||
|
my.saveImage({
|
||||||
|
url: url,
|
||||||
|
success: () => {
|
||||||
|
uni.showToast({
|
||||||
|
title: "保存成功",
|
||||||
|
icon: 'none'
|
||||||
|
})
|
||||||
|
},
|
||||||
|
});
|
||||||
|
},
|
||||||
/**
|
/**
|
||||||
* 获取会员信息
|
* 获取会员信息
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user