积分相关更新

pagesOrder/confirm_order/index.vue

@@ -1,11 +1,5 @@
 <template>
 	<view class="container">
-		<!-- 占位符导航栏 -->
-		<!-- <navseat class="navbar" :opacity='opacitys' :backColor="'#E8AD7B'" :title='toplist.name' :titleshow='true'></navseat> -->
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- <view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;position: fixed;top: 0;width: 100%;z-index: 9'}"></view> -->
-		<!-- <view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;'}"></view> -->
-		<!-- #endif -->
 		<!-- 头部内容 -->
 		<view class="head">
 			<view class="head_bg"></view>
@@ -113,22 +107,12 @@
 		</view>
 		
 		<!-- 充值免单 -->
-		<view class="rechargeFree">
-			<view class="rechargeFree_bg" @click="rechargeFreeChecked = !rechargeFreeChecked">
-				<view class="left">
-					<view class="icon">优惠</view>
-					<view class="text">充值消费2倍（￥50），本单立享免单！</view>
-				</view>
-				<u-checkbox-group iconPlacement="right">
-				    <u-checkbox v-model="rechargeFreeChecked" :checked="rechargeFreeChecked" activeColor="#E8AD7B" shape="circle" icon-size="36" size="36">
-					</u-checkbox>
-				</u-checkbox-group>
-			</view>
-		</view>
-			
+		<!-- <rechargeFree ref="rechargeFree" :shopUserInfo="amountVIP" @changeFree="changeFree"></rechargeFree> -->
+		<!-- 充值活动 -->
+		<!-- <topUpActivity ref="topUpActivity" :shopUserInfo="amountVIP" ></topUpActivity> -->
+		<!-- 支付方式 -->
 		<paymentMethod ref="paymentMethod" :amountVIP="amountVIP" v-if="storeInfo.registerType == 'munchies'" @groupChange="groupChange"></paymentMethod>
 		
-		
 		<view class="bottom">
 			<view class="bottom_left">
 				<text style="margin-bottom: 5rpx;">实付金额</text>
@@ -165,10 +149,11 @@
 </template>
 
 <script>
-	import navseat from '@/components/navseat.vue'
 	import webSocketUtils from '@/common/js/websocket.js'
 	import payPasswordtwo from '@/components/payPasswordtwo.vue'
 	import paymentMethod from '../components/paymentMethod.vue'
+	import rechargeFree from '../components/rechargeFree.vue'
+	import topUpActivity from '../components/topUpActivity.vue'
 	// import cwxKeyboard from '@/components/cwx-keyboard/cwx-keyboard.vue'
 	
 	
@@ -176,7 +161,8 @@
 		components: {
 			payPasswordtwo,
 			paymentMethod,
-			navseat
+			rechargeFree,
+			topUpActivity,
 		},
 		data() {
 			return {
@@ -279,6 +265,14 @@
 			})
 		},
 		methods: {
+			changeFree ( val ) {
+				console.log(val)
+				if ( val ) {
+					this.listinfo.payAmount = this.listinfo.payAmount*2
+				} else {
+					this.listinfo.payAmount = this.listinfo.payAmount/2
+				}
+			},
 			
 			/**
 			 * 获取桌台码
@@ -752,7 +746,7 @@
 
 <style lang="scss">
 	.container{
-		padding-bottom: 246rpx;	
+		// padding-bottom: 246rpx;	
 	}
 	.head{
 		width: 100%;
@@ -1204,40 +1198,6 @@
 		}
 	}
 	
-	// 充值免单
-	.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;
-				}
-				.text{
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #333333;
-				}
-			}
-		}
-	}