Signed-off-by: 不吃茄子的阿宝 <528046418@qq.com>

packageA/pages/disaster/index.vue

@@ -7,7 +7,7 @@
 			<uni-card padding="0" margin="5px 0">
 				<uni-search-bar @confirm="search" v-model="keywords" @clear="search"></uni-search-bar>
 			</uni-card>
-			<view class="addbt" @click="handle('create')">
+			<view class="addbt" @click="handle({type:'create'})">
 				<view class="word"><uni-icons type="plusempty" size="30" color="#fff"></uni-icons></view>
 			</view>
 		</view>	

packageA/pages/duty/index.vue

@@ -74,11 +74,11 @@
 				return Array.from({ length: 101 }, (_, i) => {return {value:year+i - 20,text:`${year+i - 20}年`}})			
 			},
 			startDate(){
-				let day=getDateByWeek(this.week-1)
+				let day=getDateByWeek(this.week-1,this.year)
 				return 	parseTime(day,'{y}-{m}-{d}')		
 			},
 			endDate(){
-				let day=new Date(getDateByWeek(this.week-1))
+				let day=new Date(getDateByWeek(this.week-1,this.year))
 				let endDate=day.setDate(day.getDate()+6)
 				return parseTime(endDate,'{y}-{m}-{d}')			
 			}
@@ -145,88 +145,97 @@
 	padding: 20rpx;
 	box-sizing: border-box;
 	border-radius: 4px;
-}
-.tip{
-	font-size: 28rpx;
-	color: #666;
-	.week{
-		padding: 0 10rpx;
-		display: inline-block;
-	}
-	.time{
-		padding-left: 10rpx;
-		font-size: 26rpx;
+	.tip{
+		font-size: 28rpx;
+		color: #666;
+		.week{
+			padding: 0 10rpx;
+			display: inline-block;
+		}
+		.time{
+			padding-left: 10rpx;
+			font-size: 26rpx;
+		}
 	}
-}
-.selectbox{
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding: 20rpx;
-	.item-select{
-		width: 300rpx;
-		&.year{
-			width: 200rpx;
+	.selectbox{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 20rpx;
+		.item-select{
+			width: 300rpx;
+			&.year{
+				width: 200rpx;
+			}
 		}
 	}
-}
-.addbt{
-	width: 80rpx;
-	height: 80rpx;
-	border-radius: 50%;
-	background-color: #409eff;
-	color: #fff;
-	line-height: 80rpx;
-	text-align: center;
-	box-shadow:0 2px 10rpx rgba(64,158,255,0.30);
-	position: fixed;
-	right: 10rpx;
-	top: 50%;
-	z-index: 99;
-	font-size: 60rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-.slot-button{
-	width: 260rpx;
-	height: 80%;
-	display: flex;
-	flex-direction: row;
-	justify-content: center;
-	align-items: center;
-	color: #fff;
-	margin-top: 7%;
-	.bt{
-		width: 50%;
-		height: 100%;
-		font-size: 30rpx;
-		box-sizing: border-box;
+	.addbt{
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+		color: #fff;
+		background-color: rgba(64,158,255,0.6);			
+		box-shadow:0 0 10rpx rgba(0,0,0,0.6);
+		position: fixed;
+		right: 10rpx;
+		bottom: 20%;
+		z-index: 99;
+		text-align: center;
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		&.edit{
-		    background-color:#007aff;
+		.word{
+			width: 80rpx;
+			height: 80rpx;
+			border-radius: 50%;
+			margin: 5rpx auto;
+			font-size: 28rpx;
+			letter-spacing: 2px;
+			display: flex;
+			justify-content: center;
+			align-items: center;
 		}
-		&.del{
-			background-color:#F56C6C;
+	}
+	.slot-button{
+		width: 260rpx;
+		height: 80%;
+		display: flex;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		color: #fff;
+		margin-top: 7%;
+		.bt{
+			width: 50%;
+			height: 100%;
+			font-size: 30rpx;
+			box-sizing: border-box;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			&.edit{
+			    background-color:#007aff;
+			}
+			&.del{
+				background-color:#F56C6C;
+			}
 		}
 	}
-}
-.rtbox{
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	.rt{
-		text-align: right;
+	.rtbox{
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.rt{
+			text-align: right;
+		}
 	}
-}
-.delbt{
-	padding: 20rpx;
-	image{
-		display: block;
-		width: 30rpx;
-		height: 30rpx;
+	.delbt{
+		padding: 20rpx;
+		image{
+			display: block;
+			width: 30rpx;
+			height: 30rpx;
+		}
 	}
 }
 </style>

unpackage/dist/dev/mp-weixin/packageA/pages/duty/index.wxss

@@ -33,49 +33,58 @@
   box-sizing: border-box;
   border-radius: 4px;
 }
-.tip.data-v-145d70ba {
+.page-wrap .tip.data-v-145d70ba {
   font-size: 28rpx;
   color: #666;
 }
-.tip .week.data-v-145d70ba {
+.page-wrap .tip .week.data-v-145d70ba {
   padding: 0 10rpx;
   display: inline-block;
 }
-.tip .time.data-v-145d70ba {
+.page-wrap .tip .time.data-v-145d70ba {
   padding-left: 10rpx;
   font-size: 26rpx;
 }
-.selectbox.data-v-145d70ba {
+.page-wrap .selectbox.data-v-145d70ba {
   display: flex;
   justify-content: space-between;
   align-items: center;
   padding: 20rpx;
 }
-.selectbox .item-select.data-v-145d70ba {
+.page-wrap .selectbox .item-select.data-v-145d70ba {
   width: 300rpx;
 }
-.selectbox .item-select.year.data-v-145d70ba {
+.page-wrap .selectbox .item-select.year.data-v-145d70ba {
   width: 200rpx;
 }
-.addbt.data-v-145d70ba {
-  width: 80rpx;
-  height: 80rpx;
+.page-wrap .addbt.data-v-145d70ba {
+  width: 100rpx;
+  height: 100rpx;
   border-radius: 50%;
-  background-color: #409eff;
   color: #fff;
-  line-height: 80rpx;
-  text-align: center;
-  box-shadow: 0 2px 10rpx rgba(64, 158, 255, 0.3);
+  background-color: rgba(64, 158, 255, 0.6);
+  box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.6);
   position: fixed;
   right: 10rpx;
-  top: 50%;
+  bottom: 20%;
   z-index: 99;
-  font-size: 60rpx;
+  text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.page-wrap .addbt .word.data-v-145d70ba {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  margin: 5rpx auto;
+  font-size: 28rpx;
+  letter-spacing: 2px;
   display: flex;
   justify-content: center;
   align-items: center;
 }
-.slot-button.data-v-145d70ba {
+.page-wrap .slot-button.data-v-145d70ba {
   width: 260rpx;
   height: 80%;
   display: flex;
@@ -85,7 +94,7 @@
   color: #fff;
   margin-top: 7%;
 }
-.slot-button .bt.data-v-145d70ba {
+.page-wrap .slot-button .bt.data-v-145d70ba {
   width: 50%;
   height: 100%;
   font-size: 30rpx;
@@ -94,24 +103,24 @@
   justify-content: center;
   align-items: center;
 }
-.slot-button .bt.edit.data-v-145d70ba {
+.page-wrap .slot-button .bt.edit.data-v-145d70ba {
   background-color: #007aff;
 }
-.slot-button .bt.del.data-v-145d70ba {
+.page-wrap .slot-button .bt.del.data-v-145d70ba {
   background-color: #F56C6C;
 }
-.rtbox.data-v-145d70ba {
+.page-wrap .rtbox.data-v-145d70ba {
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
-.rtbox .rt.data-v-145d70ba {
+.page-wrap .rtbox .rt.data-v-145d70ba {
   text-align: right;
 }
-.delbt.data-v-145d70ba {
+.page-wrap .delbt.data-v-145d70ba {
   padding: 20rpx;
 }
-.delbt image.data-v-145d70ba {
+.page-wrap .delbt image.data-v-145d70ba {
   display: block;
   width: 30rpx;
   height: 30rpx;