diff --git a/pagesOrder/confirm_order/index.vue b/pagesOrder/confirm_order/index.vue
index c903705..e4ae74d 100644
--- a/pagesOrder/confirm_order/index.vue
+++ b/pagesOrder/confirm_order/index.vue
@@ -83,13 +83,20 @@
{{(shopTableInfo.seatNum*storeInfo.tableFee).toFixed(2)}}
-
+
+ 使用29积分抵扣￥29.00
+
+
+
+
+
+ 暂无可用优惠券
+
小计￥
{{listinfo.payAmount}}
@@ -105,35 +112,20 @@
-
-
+
+
+
+ 优惠
+ 充值消费2倍（￥50），本单立享免单！
+
+
+
+
+
- -->
-
+
+
@@ -200,9 +192,12 @@
sendType: "table",
eatModel: [],
favorable: [
- { name: "优惠券", 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: "coupon", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.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: {
phone: "",
},
@@ -1010,7 +1005,7 @@
}
.content_box{
- padding: 0 30rpx;
+ padding: 0 20rpx;
box-sizing: border-box;
margin-top: 10rpx;
position: relative;
@@ -1180,11 +1175,10 @@
}
}
-
+ // 备注
.remark{
- padding: 0 30rpx;
- box-sizing: border-box;
- margin-top: 30rpx;
+ padding: 0 20rpx;
+ margin-top: 32rpx;
.remark_bg{
background-color: $uni-bg-color;
border-radius: 22rpx;
@@ -1209,69 +1203,45 @@
}
}
- .paymentMethod{
- padding: 0 30rpx;
- box-sizing: border-box;
- margin-top: 30rpx;
-
- .paymentMethod_content{
- background-color: $uni-bg-color;
- border-radius: 22rpx;
- padding:30rpx 0 0 0;
- box-sizing: border-box;
- .paymentMethod_title{
- font-weight: 500;
- font-size: 32rpx;
- color: #333333;
- // margin-bottom: 30rpx;
- padding: 0 30rpx;
- box-sizing: border-box;
- }
- .method_list{
- padding: 40rpx 30rpx;
- box-sizing: border-box;
- .method_list_top{
- display: flex;
- justify-content: space-between;
- .method_list_top_left{
- display: flex;
- 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;
- }
- }
-
+
+ // 充值免单
+ .rechargeFree{
+ padding: 0 20rpx;
+ margin-top: 32rpx;
+ .rechargeFree_bg{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 32rpx 24rpx;
+ border-radius: 24rpx;
+ background-color: #fff;
+ .left{
+ display: flex;
+ align-items: center;
+ .icon{
+ width: 68rpx;
+ height: 36rpx;
+ text-align: center;
+ line-height: 36rpx;
+ background: linear-gradient( 180deg, #FEDE81 0%, #FEB263 100%);
+ border-radius: 12rpx 0rpx 12rpx 0rpx;
+ font-weight: 500;
+ font-size: 20rpx;
+ color: #FFFFFF;
+ margin-right: 12rpx;
}
- .method_list_bom{
- display: flex;
- align-items: center;
- .balance{
- margin-right: 20rpx;
- font-size: 24rpx;
- }
- .topUpNow{
- color: #FF803D;
- font-size: 28rpx;
- }
+ .text{
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #333333;
}
}
- .method_list:nth-child(odd){
- border-bottom: 2rpx solid #ccc;
- }
}
}
+
+
+
.bottom{
width: 100%;
background: #FFFFFF;
diff --git a/pagesOrder/order_detail/index.vue b/pagesOrder/order_detail/index.vue
index 76d0b6a..79e837c 100644
--- a/pagesOrder/order_detail/index.vue
+++ b/pagesOrder/order_detail/index.vue
@@ -18,8 +18,8 @@
会员享低价
长按保存，微信内扫一扫加好友
-
-
+
+
@@ -106,7 +106,17 @@
console.log(e)
},
methods: {
-
+ saveImage (url) {
+ my.saveImage({
+ url: url,
+ success: () => {
+ uni.showToast({
+ title: "保存成功",
+ icon: 'none'
+ })
+ },
+ });
+ },
/**
* 获取会员信息
*/