Merge branch 'bjxz-rain' into bjxz-dev

pages/messageCenter/messageCenter.vue

@@ -192,6 +192,9 @@
 </script>
 
 <style lang="scss" scoped>
+	.centerContent {
+		padding-bottom: 110rpx;
+	}
 	.flex2 {
 		display: flex;
 		align-items: center;

pages/projectEnd/emergencyDisposal/detail.vue

@@ -242,7 +242,7 @@
 			this.id = options.id;
 			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight
 			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
-			console.log(options);
+			// console.log(options);
 
 		},
 		onShow() {

pages/standardScheduleNews/addFrom.vue

@@ -349,7 +349,7 @@
 		.b-bottom {
 			border-top: 2rpx solid #f0f0f0;
 			display: flex;
-			height: 200rpx;
+			// height: 200rpx;
 			line-height: 80rpx;
 
 			.inputFrom {
@@ -473,7 +473,8 @@
 	.imgBox_wrap {
 		display: flex;
 		flex-wrap: wrap;
-		margin-top: 10px;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
 		width: 75%;
 	}
 

pages/standardScheduleNews/detail.vue

@@ -10,7 +10,7 @@
 				任务内容
 			</view>
 			<view class="type">
-				<view class="textColor">分部分项工程名称：<span class="textStyle">{{itemFrom.taskName}}</span></view>
+				<view class="textColor"><text class="textFlex">分部分项工程名称：</text> <span class="textStyle">{{itemFrom.taskName}}</span></view>
 			</view>
 			<view class="type">
 				<view class="textColor">区域：<span class="textStyle">{{itemFrom.qualityRegionName}}</span></view>
@@ -220,6 +220,13 @@
 </script>
 
 <style lang="less">
+	.textColor {
+		display: flex;
+		justify-content: space-between;
+		.textFlex{
+			width: 55%;
+		}
+	}
 	.content {
 		width: 100%;
 		box-sizing: border-box;

pages/standardScheduleNews/index.vue

@@ -245,12 +245,12 @@ export default {
 
 
 .item {
-  box-shadow: 0 4px 24px 0px rgba(212, 220, 236, 0.69);
+  box-shadow: 0 8rpx 48rpx 0px rgba(212, 220, 236, 0.69);
   border-radius: 8px;
-  height: 175px;
+  // height: 175px;
   width: 92%;
-  margin: 15px 10px;
-  padding: 10px 0px 0px 10px;
+  margin: 30rpx 30rpx;
+  padding: 20rpx 0px 20rpx 20rpx;
   // position: relative;
 
 }