Merge remote-tracking branch 'origin/master'

pages.json

@@ -15,15 +15,15 @@
 				"navigationBarTitleText": "新增供销社信息"
 			}
 		},
-		{
-			"path": "pages/highServer/cooperative/cooperative",
-			"style": {
-				"usingComponents": {},
-				"navigationBarBackgroundColor": "#07c160",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "供销社"
-			}
-		},
+		// {
+		// 	"path": "pages/highServer/cooperative/cooperative",
+		// 	"style": {
+		// 		"usingComponents": {},
+		// 		"navigationBarBackgroundColor": "#07c160",
+		// 		"navigationBarTextStyle": "white",
+		// 		"navigationBarTitleText": "供销社"
+		// 	}
+		// },
 		{
 			"path": "pages/specialService/loveAtVillage/loveAtVillage",
 			"style": {

pages/handleAffairs/dept/dept.vue

@@ -99,6 +99,9 @@
 		justify-content: center;
 		height: 100vh;
 	} */
+	html,body{
+		background-color: #fff;
+	}
 	.not-highlight{
 		color:#000;
 	}
@@ -107,11 +110,27 @@
 	}
 	.btnContain{
 		position: relative;
-		width: 100%;
+		width: 92%;
 		display: flex;
 		height: 20%;
 		background-color: #fff;
 		justify-content: space-between;
+		margin:2% auto auto auto;
+		padding: 1%;
+		box-shadow: 0px 0px 6px 0px gray;
+	}
+	.uni-grid{
+		flex-wrap:wrap
+	}
+	.uni-grid uni-grid-item{
+		width: 28%;
+		margin-top: 3%;
+		margin-left: 4%;
+		background-color: #fff;
+		box-shadow: 0px 0px 2px 0px gray;
+	}
+	.uni-grid .uni-grid-item{
+		width: 100% !important;
 	}
 	.btnContain::after{
 		content: '';

pages/handleAffairs/index.vue

@@ -255,7 +255,7 @@ import { listDept,collectlist } from '@/api/handleAffairs/matter.js';
 		width: 45%;
 		color: #27C874;
 		height: 100%;
-		line-height: 200%;
+		line-height: 250%;
 		text-indent: 9%;
 		background-color: #F1F1F1;
 		border: none !important;

pages/handleAffairs/topic/topic.vue

@@ -93,20 +93,38 @@
 		justify-content: center;
 		height: 100vh;
 	} */
+	html,body{
+		background-color: #fff;
+	}
 	.not-highlight{
 		color:#000;
 	}
 	.highlight{
 		color:#FF673D;
 	}
-
+	.uni-grid{
+		flex-wrap:wrap
+	}
+	.uni-grid uni-grid-item{
+		width: 28%;
+		margin-top: 3%;
+		margin-left: 4%;
+		background-color: #fff;
+		box-shadow: 0px 0px 2px 0px gray;
+	}
+	.uni-grid .uni-grid-item{
+		width: 100% !important;
+	}
 	.btnContain{
 		position: relative;
-		width: 100%;
+		width: 92%;
 		display: flex;
 		height: 20%;
 		background-color: #fff;
 		justify-content: space-between;
+		margin:2% auto auto auto;
+		padding: 1%;
+		box-shadow: 0px 0px 6px 0px gray;
 	}
 	.btnContain::after{
 		content: '';

pages/service/service.vue

@@ -94,7 +94,7 @@
 	}
 	.titleLeftSecond::after{
 		content:'';
-		left: -121px;
+		left: -109px;
 		width: 12vw;
 		background: url('../../static/images/more/specialService.png') 0 0 no-repeat;
 		background-size: 93% 93%;