diff --git a/pages/advertisementAdd/advertisementAdd.vue b/pages/advertisementAdd/advertisementAdd.vue
index 64b5a45..b0d752d 100644
--- a/pages/advertisementAdd/advertisementAdd.vue
+++ b/pages/advertisementAdd/advertisementAdd.vue
@@ -8,7 +8,7 @@
 				<u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
 					<view class="add-list">
 						<u-form-item label="投放时段" prop="name" borderBottom>
-							<u-input v-model="model1.name" ></u-input>
+							<u-input v-model="model1.name" type="select" @click="toChangeTime"></u-input>
 						</u-form-item>
 					</view>
 					<view class="add-list">
@@ -187,6 +187,11 @@
 					url: '/pages/record/record'
 				})
 			},
+			toChangeTime(val) {
+				uni.navigateTo({
+					url: `/pages/advertisementTime/advertisementTime?val=${val}`
+				})
+			},
 			// 上一步
 			toBefor() {
 				this.active = +this.active - 1;
diff --git a/pages/advertisementDetail/advertisementDetail.vue b/pages/advertisementDetail/advertisementDetail.vue
index e61be6e..5900783 100644
--- a/pages/advertisementDetail/advertisementDetail.vue
+++ b/pages/advertisementDetail/advertisementDetail.vue
@@ -71,8 +71,8 @@
 			<text>客服</text>
 		</view>
 		<view class="footer-btn">
-			<u-button type="primary">意向申请</u-button>
-			<u-button type="success" style="margin-left: unset;" @click="leaseAdd">租赁申请</u-button>
+			<u-button type="primary" @click="leaseAdd('/pages/intentionApply/intentionApply')">意向申请</u-button>
+			<u-button type="success" style="margin-left: unset;" @click="leaseAdd('/pages/advertisementAdd/advertisementAdd')">租赁申请</u-button>
 			<!-- <u-button type="success" style="margin-left: unset;" @click="leaseAdd">广告申请</u-button> -->
 		</view>
 		<view class="footer-service">
@@ -106,11 +106,11 @@ export default {
 	console.log(this.tableData);
   },
   methods: {
-		leaseAdd(){
-			uni.navigateTo({
-				url: '/pages/advertisementAdd/advertisementAdd',
-			})
-		}
+	  leaseAdd(url){
+	  	uni.navigateTo({
+	  		url
+	  	})
+	  }
   }
 };
 </script>
diff --git a/pages/advertisementTime/advertisementTime.scss b/pages/advertisementTime/advertisementTime.scss
index 215a9a7..d7fadc7 100644
--- a/pages/advertisementTime/advertisementTime.scss
+++ b/pages/advertisementTime/advertisementTime.scss
@@ -3,20 +3,47 @@
 	left: 0;
 	top: 0;
 	width: 100%;
-	height: 100%;
+	overflow-y: scroll;
+	height: calc(100% - 120rpx);
+	background-color: #f6f6f6;
 }
-.calendar {
-	margin-top: 20rpx;
+.calendar-box {
+	margin: 20rpx;
+	background-color: #fff;
+	border-radius: 14rpx;
+	overflow: hidden;
+	.wn-calendar {
+		.labels {
+			background-color: #fff;
+		}
+	}
+}
+.form-box {
+	padding: 0 20rpx;
+	.add-list{
+		padding: 0 4%;
+		background-color: #FFFFFF;
+		border-radius: 20rpx;
+		margin-top: 20rpx;
+		width: 100%;
+		}
+		.btns {
+			display: flex;
+			margin-top: 20rpx;
+			.u-btn {
+				padding: 0 60rpx;
+			}
+		}
 }
 /* 保存按钮 */
 .page-footer{
 	position: fixed;
 	left: 0;
 	bottom: 0;
-	display: flex;
 	width: 100%;
-	height: 100rpx;
+	height: 120rpx;
 	background-color: #FFFFFF;
+	padding: 20rpx 20rpx;
 	padding-bottom: constant(safe-area-inset-bottom);
 	padding-bottom: env(safe-area-inset-bottom);
 	.footer-buy{
@@ -30,7 +57,7 @@
 			align-items: center;
 			justify-content: center;
 			width: 100%;
-			height: 100rpx;
+			height: 70rpx;
 			background-color: #3f9b6a;
 			text{
 				font-size: 28rpx;
diff --git a/pages/advertisementTime/advertisementTime.vue b/pages/advertisementTime/advertisementTime.vue
index a385dad..156586e 100644
--- a/pages/advertisementTime/advertisementTime.vue
+++ b/pages/advertisementTime/advertisementTime.vue
@@ -1,173 +1,65 @@
 <template>
 	<view class="page">
-		<view class="calendar">
-		    <calendar ref="calendar" v-if="isShow" @cancel="cancel" :startDate="startDate" :height="height" :endDate="endDate" @selectDate="selectDate" :limit="limit" :bottom1="bottom1" :yimanArray="yimanArray" />
+		<view class="calendar-box">
+			<wn-calendar
+			   ref="calendar" 
+			   :data="[{date:'2024/10/25', text:'显示文本', type: 2}]" 
+			   :isBorder="false" 
+			   :isLess="false" 
+			   :colors="['#f3a73f', '#2979ff', '#8f939c', '#18bc37', '#e43d33']" 
+			   :isEn="false"
+			   format="/"
+			 ></wn-calendar>
 		</view>
-		<!-- 保存按钮 -->
+		<u-form class="form-box" labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
+			<view class="add-list">
+				<u-form-item label="开始时间" prop="val" borderBottom>
+					<u-input v-model="model1.val" ></u-input>
+				</u-form-item>
+			</view>
+			<view class="add-list">
+				<u-form-item label="结束时间" prop="val" borderBottom>
+					<u-input v-model="model1.val" ></u-input>
+				</u-form-item>
+			</view>
+			<view class="btns">
+				<u-button size="medium">1天</u-button>
+				<u-button size="medium">2天</u-button>
+				<u-button size="medium">3天</u-button>
+				<u-button size="medium">4天</u-button>
+			</view>
+		</u-form>
+		<view style="height: 120rpx;"></view>
 		<view class="page-footer">
-		  <view class="footer-buy" @click="advertisementAdd">
-		    <view class="cart-add">
-		      <text>下一步</text>
-		    </view>
-		  </view>
+			<u-button type="success">确定</u-button>
 		</view>
 	</view>
 </template>
 
 <script>
-    // import calendar from '@/components/fl-calendar1/fl-calendar1.vue'
-	  import calendar from '@/components/dc-calendar/dc-calendar.vue'
-    export default {
-        components: {
-            
-			calendar
-			
-        },
-		
-        data() {
-            return {
-                isShow:false,
-                startDate:'',     //开始日期2022-01-26
-                endDate:'',       //结束日期 2022-01-29
-                height:600,                 //日历容器高度
-                limit:12,                    //展示月份数量
-				bottom1:0,
-				yimanArray:[],
-				dicdes:{
-					price:1
-				},//传过来的订单数据
-				type:0,//1是进入订单 0是返回
-				
-            }
-        },
-        mounted() {
-
-        },
-		onUnload() {
-			uni.setStorageSync('满日期显示',0)
-			
-		},
-		onLoad(e) {
-			
-			uni.showLoading({
-			    title: '加载中'
-			});
-			
-			let sys = uni.getSystemInfoSync();
-			if (sys.statusBarHeight >=44) {
-				// this.height = sys.windowHeight - 34;
-				this.bottom1 = 34;
-			} else{
-				// this.height = sys.windowHeight;
-			}
-			
-			// console.log(sys);
-			
-			var  dicday = uni.getStorageSync('入离日期');
-			if(dicday){
-				this.startDate = dicday.startDate;
-				this.endDate = dicday.endDate;
-			}
-			this.newdate();
-			
-				this.type = 1;
-				// this.dicdes = JSON.parse(e.dic);
-				uni.setStorageSync('满日期显示',1)
-				// //取房间满房日期
-				this.gethttpurl(this.dicdes.id);
-				
-			
-		
-		},
-        methods: {
-			advertisementAdd() {
-				uni.navigateTo({
-					url: '/pages/advertisementAdd/advertisementAdd'
-				})
-			},
-			//取房间满房日期
-			gethttpurl(id){
-				
-				this.yimanArray =['2022-03-25','2022-04-10'];
-				this.isShow = true;
-				uni.hideLoading();
-			
-				
-			},
-			
-			
-            // 展示选择器
-            showCalendar() {
-                this.isShow = true
-            },
-            // 隐藏选择器
-            cancel(){
-                this.isShow=false
-            },
-            // 获取传参
-            selectDate(data) {
-                console.log('拿到传参', data)
-				uni.setStorageSync('入离日期',data);
-				
-				
-				
-            },
-			// 获取当日的 年-月-日
-			newdate() {
-				let date = new Date()
-				let year = date.getFullYear()
-				let month = date.getMonth() + 1
-				let week = date.getDay()
-				let day = date.getDate()
-				var days = new Date(year, month, 0).getDate(); //总共多少天
-				// console.log(days,day);
-				month = month < 10 ? '0' + month : month
-				day = day < 10 ? '0' + day : day
-				let today = `${year}-${month}-${day}`;
-				let todayend = `${year}-${month}-${day}`;
-				let today1 = `${month}月${day}日`;
-				let today1end = `${month}月${day}日`;
-				//加年
-				if (month == 12 && parseInt(day) == parseInt(days)) {
-			
-					let day01 = '01';
-					let month01 = '01';
-					let year01 = parseInt(year) + 1;
-					todayend = `${year01}-${month01}-${day01}`;
-					today1end = `${year01}年${month01}月${day01}日`;
-				} else if (parseInt(day) == parseInt(days)) {
-					//加月
-					let day01 = '01';
-					let month01 = parseInt(month) + 1;
-					month01 = month01 < 10 ? '0' + month01 : month01
-					todayend = `${year}-${month01}-${day01}`;
-					today1end = `${month01}月${day01}日`;
-			
-				} else {
-					//加天数
-					let day01 = parseInt(day) + 1;
-					day01 = day01 < 10 ? '0' + day01 : day01
-					todayend = `${year}-${month}-${day01}`;
-					today1end = `${month}月${day01}日`;
-				}
-				
-				let  dicday = {
-					startDate: today,
-					endDate: todayend,
-					startDate1: today1,
-					endDate1: today1end,
-					dayNum: '1'
-				}
-				
-				this.startDate = dicday.startDate;
-					this.endDate = dicday.endDate;
-				uni.setStorageSync('入离日期', dicday);
-				// console.log(this.dicday);
-			},
-        }
-    }
+	export default {
+	    data() {
+	        return {
+				model1: {
+					val: '',
+				},
+				rules: {},
+	        }
+	    },
+	    methods: {
+	        // 点击日数方法
+	        clickActive({year, month, date, index}){
+	            console.log(year, month, date, index)
+	        },
+	
+	        // 点击任务方法
+	        clickTask({row, index}){
+	            console.log(row, index)
+	        }
+	    }
+	}
 </script>
 
-<style scoped lang="scss">
+<style>
 	@import 'advertisementTime.scss';
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/createQuestionnaire/createQuestionnaire.scss b/pages/createQuestionnaire/createQuestionnaire.scss
index 948c9c1..c878793 100644
--- a/pages/createQuestionnaire/createQuestionnaire.scss
+++ b/pages/createQuestionnaire/createQuestionnaire.scss
@@ -1,76 +1,67 @@
 .page{
-	padding: 20rpx 30rpx;
-	background-color: #fff;
+	padding: 0 20rpx 20rpx;
+	background-color: #f6f6f6;
 	font-size: 24rpx;
 	font-weight: 500;
 	position: relative;
-	.titles{
-		display: flex;
-		justify-content: space-between;
-		margin-bottom: 30rpx;
-	}
-	.uni-textarea{
-		
-		padding: 20rpx 30rpx;
-		min-height: 50rpx;
-		font-size: 24rpx;
-		background-color: #EFEFEF;
-		/deep/ uni-textarea{
-			height: 180rpx;
-		}
-		/deep/.textarea{
-			width: 100%;
-			font-size: 24rpx;
-			
-		}
+	.form-box {
+		padding: 0 4%;
+		background-color: #FFFFFF;
+		border-radius: 20rpx;
+		margin-top: 20rpx;
+		width: 100%;
 	}
-	.listCont{
-		margin-top: 60rpx;
-		.listTitile{
-			margin-bottom: 20rpx;
-		}
-		.uni-input{
-			background-color: #E0E0E0;
-			margin-bottom: 20rpx;
-			height: 80rpx;
-			padding: 10rpx 20rpx;
-			font-size: 24rpx;
+	.select-item {
+		background-color: #FFFFFF;
+		border-radius: 20rpx;
+		margin-top: 20rpx;
+		width: 100%;
+		.top {
+			padding: 22rpx 4%;
+			.title {
+				font-size: 30rpx;
+				margin-bottom: 20rpx;
+			}
+			.radio-box {
+				font-size: 24rpx;
+				color: #7c7c7c;
+			}
 		}
-		.btnList{
+		.bottom {
+			padding: 20rpx 4%;
 			display: flex;
-			flex-wrap: wrap;
-			font-weight: 200;
-			background-color: #E0E0E0;
-			padding: 14rpx 14rpx;
-				justify-content: space-between;
-			/deep/ uni-button{
+			background-color: #EDFFF5;
+			border: #0FBB59  solid 1rpx;
+			border-radius: 0 0 20rpx 20rpx;
+			.u-btn {
 				width: 18%;
-						height:45rpx;
-						font-size: 24rpx;
-				border-radius:none;
-				line-height: 45rpx;
+			}
+			:first-child {
+				margin-left: 0;
+			}
+			:last-child {
+				margin-right: 0;
 			}
 		}
 	}
-	.page_foot{
+	.page-footer{
 		position: fixed;
+		left: 0;
 		bottom: 0;
-		left: 0;	
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
 		width: 100%;
-		z-index: 10;	
-		.foot_btnList{
-			display: flex;
-			flex-wrap: wrap;
-			font-weight: 200;
-			padding: 14rpx 30rpx;
-			justify-content: space-between;
-			/deep/ uni-button{
-				width: 21%;
-						height:70rpx;
-						font-size: 24rpx;
-				border-radius:none;
-				line-height: 70rpx;
-			}
+		height: 120rpx;
+		background-color: #FFFFFF;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+		.u-btn {
+			width: 30%;
+		}
+		.u-icon {
+			margin-right: 10rpx;
 		}
 	}
 }
\ No newline at end of file
diff --git a/pages/createQuestionnaire/createQuestionnaire.vue b/pages/createQuestionnaire/createQuestionnaire.vue
index 380eea2..e6d9a86 100644
--- a/pages/createQuestionnaire/createQuestionnaire.vue
+++ b/pages/createQuestionnaire/createQuestionnaire.vue
@@ -1,54 +1,36 @@
 <template>
 <view class="page">
-	  <view class="" style="margin-top: 20rpx;">
-	  	<view class="titles">
-	  		<view>问卷名称</view>
-			<view>这里有名称</view>
-	  	</view>
-		<view class="" style="margin-bottom: 20rpx;">
-			问卷说明
+	<u-form :model="form" ref="uForm" :label-width="120">
+		<view class="form-box">
+			<u-form-item label="问卷名称"><u-input v-model="form.name" /></u-form-item>
 		</view>
-		<view class="uni-textarea">
-				<textarea placeholder-style="color:#A2A2A2" placeholder="请输入" placeholder-class="textarea"/>
-					</view>
-		<view class="listCont">
-			<view class="listTitile">
-				1.这里有标题
-			</view>
-			<view class="">
-			<radio-group>
-				<view>	<label class="radio"><radio value="r1" checked="true" style="transform:scale(0.5)"/>这里有选项这里有选项</label></view>
-				<view><label class="radio"><radio value="r2" style="transform:scale(0.5)" />这里有选项这里有选项</label></view>
-			</radio-group>
-			
-			</view>
-			<view style="margin: 20rpx 0;">
-				<view class="btnList">
-					<button>编辑</button><button>复制</button><button>上移</button><button>下移</button><button>删除</button>
-				</view>
-			</view>
+		<view class="form-box">
+			<u-form-item label="问卷说明" label-position="top"><u-input v-model="form.name" type="textarea"/></u-form-item>
 		</view>
-		<view class="listCont">
-			<view  class="listTitile">
-				1.这里有标题
-			</view>
-			<view class="" style="padding:0 20rpx;">
-				<input class="uni-input"  placeholder="请输入" />
-			</view>
-			<view>
-				<view class="btnList">
-					<button>编辑</button><button>复制</button><button>上移</button><button>下移</button><button>删除</button>
+		<view class="select-item" v-for="i in 2" :key="2">
+			<view class="top">
+				<view class="title">
+					1.这里有标题这里有标题这里有标题
 				</view>
+				<u-radio-group class="radio-box">
+					<u-radio shape="circle">这里有选项这里有选项</u-radio>
+					<u-radio shape="circle">这里有选项这里有选项</u-radio>
+				</u-radio-group>
 			</view>
-		</view>
-		<view class="page_foot">
-			
-			<view class="foot_btnList">
-				<button>添加题目</button><button>设置</button><button>预览</button><button>提交</button>
+			<view class="bottom">
+				<u-button type="primary" size="mini">编辑</u-button>
+				<u-button type="success" size="mini">复制</u-button>
+				<u-button type="success" size="mini">上移</u-button>
+				<u-button type="success" size="mini">下移</u-button>
+				<u-button type="error" size="mini">删除</u-button>
 			</view>
 		</view>
-	  </view>
-	  
+	</u-form>
+		<view class="page-footer">
+			<u-button type="info"><u-icon name="setting"></u-icon>设置</u-button>
+			<u-button type="info"><u-icon name="eye"></u-icon>预览</u-button>
+			<u-button type="success"><u-icon name="checkmark-circle"></u-icon>提交</u-button>
+		</view>	  
 </view>
 </template>
 
@@ -56,6 +38,9 @@
 	export default {
 		data() {
 			return {
+				form: {
+					name: '',
+				},
 				value:0
 			};
 		},
diff --git a/pages/questionnaire/questionnaire.vue b/pages/questionnaire/questionnaire.vue
index 4749cc6..bd16aaa 100644
--- a/pages/questionnaire/questionnaire.vue
+++ b/pages/questionnaire/questionnaire.vue
@@ -31,7 +31,7 @@
 		</view>
 		<view style="height: 120rpx;"></view>
 		<view class="page-footer">
-			<u-button type="success" @click="toAdd">创建问卷</u-button>
+			<u-button type="success" @click="createWen">创建问卷</u-button>
 		</view>
 	</view>
 </template>
@@ -79,9 +79,6 @@
 				this.search();
 			},
 			search() {},
-			toAdd() {
-				
-			},
 			createWen(){
 				uni.navigateTo({
 					url: '/pages/createQuestionnaire/createQuestionnaire'