Merge branch 'lisijia' into test_dev

LiangZhiYUMao/pages/part-time-matchmaker/index.vue

@@ -102,7 +102,7 @@
 					<input class="form-input" v-model="formData.experience" placeholder="请输入您的婚姻介绍经验" />
 				</view>
 
-				<view class="form-group">
+				<!-- <view class="form-group">
 					<text class="form-label">可服务时间：</text>
 					<picker mode="multiSelector" :range="timeSlotData" :value="timeSlotIndex" @change="onTimeSlotChange">
 						<view class="form-input picker-input">
@@ -110,7 +110,7 @@
 							<text class="picker-arrow">></text>
 						</view>
 					</picker>
-				</view>
+				</view> -->
 
 				<view class="form-group">
 					<text class="form-label">个人简介：</text>
@@ -547,13 +547,13 @@
 					return
 				}
 				
-				if (!this.formData.startTime || !this.formData.endTime) {
-					uni.showToast({
-						title: '请选择可服务时间',
-						icon: 'none'
-					})
-					return
-				}
+				// if (!this.formData.startTime || !this.formData.endTime) {
+				// 	uni.showToast({
+				// 		title: '请选择可服务时间',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
 				
 				if (!this.formData.introduction) {
 					uni.showToast({

service/homePage/src/main/java/com/zhentao/controller/MatchmakerApplyController.java

@@ -83,9 +83,9 @@ public class MatchmakerApplyController {
                 return Result.error("婚姻介绍经验不能为空");
             }
             
-            if (matchmakerApply.getServerTime() == null || matchmakerApply.getServerTime().trim().isEmpty()) {
-                return Result.error("可服务时间不能为空");
-            }
+//            if (matchmakerApply.getServerTime() == null || matchmakerApply.getServerTime().trim().isEmpty()) {
+//                return Result.error("可服务时间不能为空");
+//            }
             
             if (matchmakerApply.getIntroduction() == null || matchmakerApply.getIntroduction().trim().isEmpty()) {
                 return Result.error("个人简介不能为空");