Merge pull request 'zmr' (#235) from zmr into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/235

pageA/pactList/pactList.vue

@@ -73,11 +73,11 @@ export default {
 		width: 90%;
 		margin: 0 auto;
 		padding: 16upx 0;
-		font-size: 26upx;
+		font-size: 30upx;
 		color: #333;
 	}
 	.rict_type {
 		text-indent: 1rem;
-		line-height: 1.2;
+		line-height: 1.4;
 	}
 </style>

pageB/photo/index.vue

@@ -335,6 +335,7 @@
 					color: #333;
 					font-size: 28rpx;
 					.title {
+						line-height: 40rpx;
 					}
 					.name {
 						width: 500rpx;
@@ -345,6 +346,8 @@
 						display: -webkit-box;
 						-webkit-box-orient: vertical;
 						-webkit-line-clamp: 2;
+						margin:8rpx 0;
+						line-height:36rpx;
 					}
 					.price {
 						color: #FF3131;

pageD/activity/activity.vue

@@ -56,6 +56,7 @@
 	}
 	#actives{
 			height: 100%;
+			background: #ECECEC;
             .time {
                 padding: 30rpx 0;
                 color: #666;
@@ -97,6 +98,7 @@
                 justify-content: center;
 				width: 100%;
 				height: 140rpx;
+				line-height: 36rpx;
                 padding: 20rpx;
 				background: rgba(241,241,241,1);
                 & > text {

pageD/notice/notice.vue

@@ -13,21 +13,20 @@
 				list: [],
 			};
 		},
-		onLoad(){
+		onLoad() {
 			this.informationList();
 		},
 		methods: {
-			titletext(){
+			titletext() {},
-			},
+			informationList() {
-			informationList(){
+				this.$u.api.informationList({}).then((res) => {
-				this.$u.api.informationList({}).then((res)=>{
 					if (res.errCode == 0) {
 						this.list = res.data;
 					}
 				})
 			}
 		},
-		components:{
+		components: {
 			notice,
 		}
 	};
@@ -37,6 +36,7 @@
 	page {
 		background-color: #ECECEC;
 	}
+
 	.sousuo {
 		height: 113rpx;
 		border: 1px #f00 solid;