积分抵扣、霸王餐、优惠券分享新增

pagesOrder/components/paymentMethod.vue

@@ -18,7 +18,7 @@
 										</view>
 									</view>
 								</view>
-								<u-radio activeColor="#E8AD7B" icon-size="36" size="36" :name="item.type">
+								<u-radio activeColor="#E8AD7B" :disabled="freeCheck&&index==0" icon-size="36" size="36" :name="item.type">
 								</u-radio>
 							</view>
 							
@@ -58,10 +58,29 @@
 			amountVIP:{
 				type: Object
 			},
+			freeCheck: {
+				type: Boolean
+			}
+		},
+		watch: {
+		
+			freeCheck(newVal,oldVal) {
+				if ( newVal ) {
+					// #ifdef MP-WEIXIN
+					this.radiovalue = 2
+					// #endif
+					// #ifdef MP-ALIPAY
+					this.radiovalue = 3
+					// #endif
+					let name = this.paymentMethodName[this.radiovalue-1].name;
+					this.$emit("groupChange",{type:this.radiovalue ,name: name })
+				}
+			}
 		},
 		mounted() {
-		console.log(this.amountVIP)
+			console.log(this.amountVIP)
 			// this.getAount();
+			
 		},
 		methods: {
 			/**
@@ -70,6 +89,9 @@
 			 */
 			groupChange(type) {
 				console.log(type)
+				if ( this.freeCheck && type == 1 ) {
+					return;
+				}
 				this.radiovalue = type;
 				let name = this.paymentMethodName[type-1].name;
 				this.$emit("groupChange",{type:type ,name: name })
@@ -92,7 +114,6 @@
 	.paymentMethod{
 		box-sizing: border-box;
 		margin-top: 30rpx;
-		padding: 0 20rpx 220rpx 20rpx;
 		border-radius: 18rpx;
 		.paymentMethod_content{
 			background-color: #fff;

pagesOrder/components/rechargeFree.vue

@@ -4,10 +4,10 @@
 		<view class="rechargeFree_bg" @click="changeFree">
 			<view class="left">
 				<view class="icon">优惠</view>
-				<view class="text">充值消费2倍（￥50），本单立享免单！</view>
+				<view class="text">充值消费{{freeDingConfig.rechargeTimes}}倍（￥{{freeDingConfig.rechargeThreshold}}），本单立享免单！</view>
 			</view>
 			<u-checkbox-group iconPlacement="right" >
-			    <u-checkbox v-model="rechargeFreeChecked" :checked="rechargeFreeChecked" @change="changeFree" activeColor="#E8AD7B" shape="circle" icon-size="36" size="36">
+			    <u-checkbox :disabled="freeDisabled" v-model="rechargeFreeChecked" :checked="rechargeFreeChecked" @change="changeFree" activeColor="#E8AD7B" shape="circle" icon-size="36" size="36">
 				</u-checkbox>
 			</u-checkbox-group>
 		</view>
@@ -19,14 +19,34 @@
 		data() {
 			return {
 				rechargeFreeChecked: false,
+				disabled: false,
 			}
 		},
 		props:{
 			shopUserInfo:{
 				type: Object
 			},
+			freeDingConfig:{
+				type: Object
+			},
+			payAmount: {
+				type: Number
+			},
+			freeDisabled: {
+				type: Boolean
+			}
+		},
+		watch: {
+			freeDisabled (newVal) {
+				if ( this.payAmount < this.freeDingConfig.rechargeThreshold ) {
+					this.freeDisabled = true
+				}
+			}
 		},
 		mounted() {
+			if ( this.payAmount < this.freeDingConfig.rechargeThreshold ) {
+				this.freeDisabled = true
+			}
 		},
 		methods: {
 			
@@ -34,7 +54,12 @@
 			 * 监听是否免单
 			 */
 			changeFree ( e ) {
+				if ( this.freeDisabled ) {
+					return;
+				}
+				
 				this.rechargeFreeChecked = !this.rechargeFreeChecked;
+				
 				this.$emit("changeFree",this.rechargeFreeChecked)
 			}
 		}

pagesOrder/components/topUpActivity.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 充值活动 -->
-	<view class="topUp">
+	<view class="topUp" v-if="list.length > 0">
 		<view class="topUpActivity">
 			<view class="topUpActivity_title">充值更划算</view>
 			<view class="content">