Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp into master

# Conflicts:
#	pages/MallMange/userManage.vue

pages/MallMange/commentsManage.vue

@@ -226,6 +226,13 @@
 	.comment_Nei {
 		font-size: 24rpx;
 		color: #000000;
+		text-overflow: -o-ellipsis-lastline;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	    display: -webkit-box;
+	    -webkit-line-clamp: 3;
+	    line-clamp: 3;
+	    -webkit-box-orient: vertical;
 	}
 
 	.comment_Replay {