免费配送

mallApp/src/pages/billing/affirmGhs.vue

@@ -57,18 +57,18 @@
 						</block>
 					</tui-list-cell>
 
-					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view v-if="form.sendType == 0">
-							<text style="color: #3385FF;width:100%;">
-							在本店配送范围的，免配送货上门（楼下）。首次下单，请联系客服确认是否在配送范围
-							</text>
-						</view>				
-						<view v-if="form.sendType == 1">
-							<text v-if="account == 4805" style="color: #3385FF;width:100%;">
-							需要送货上门，运费另付，下单后请联系客服
-							</text>
-						</view>
-					</tui-list-cell>
+				<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.sendType == 0 || form.sendType == 1">
+					<view v-if="form.sendType == 0">
+						<text style="color: #3385FF;width:100%;">
+						在本店配送范围的，免配送货上门（楼下）。首次下单，请联系客服确认是否在配送范围
+						</text>
+					</view>				
+					<view v-if="form.sendType == 1">
+						<text v-if="account == 4805" style="color: #3385FF;width:100%;">
+						需要送货上门，运费另付，下单后请联系客服
+						</text>
+					</view>
+				</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" v-if="form.sendType == 2 || form.sendType == 0">
 						<div class="tui-title">收花人姓名</div>
 						<input v-model="form.receiveUserName" placeholder-class="phcolor" placeholder-style="color:#ccc" @blur="onInputBlur" class="tui-input" name="receiveUserName" placeholder="请填写姓名" />
@@ -295,7 +295,9 @@ export default {
 				packCost:0,
 				sendCost:0,
 				showAddress:'',
-				openIntraCity:0 // 是否支持跑腿送： 0不支持 1支持  2暂不可用
+				openIntraCity:0, // 是否支持跑腿送： 0不支持 1支持  2暂不可用
+				receiveUserName:'',
+				receiveMobile:''
 			},
 			userInfo:{},
 			shopInfo:{},
@@ -675,6 +677,16 @@ export default {
 			console.log('selectDelivery -- isFreeDelivery: ',isFreeDelivery)
 		},
 		confirmForm(){
+			if(this.form.sendType == 0 || this.form.sendType == 2){
+				if(this.$util.isEmpty(this.form.receiveMobile)){
+					this.$msg('请填写收花人手机号')
+					return false
+				}
+				if(this.$util.isEmpty(this.form.receiveUserName)){
+					this.$msg('请填写收花人名称')
+					return false
+				}
+			}
 			this.$util.confirmModal({content:'确认提交？'},() => {
 				this.submitMyForm()
 			})
@@ -917,7 +929,7 @@ export default {
 		flex: 1;
 		padding: 20upx;
 		background-color: #f0f2f6;
-		margin-bottom:90upx;
+		margin-bottom:120upx;
 		.commodity-view {
 			display: flex;
 			flex-direction: column;