Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

pages/videoCircle/gDvideo.vue

@@ -501,13 +501,13 @@
 		height: 100%;
 	}
 	.pinglun span{
-		color: #ccc;
+		color: #333;
-		font-size: 13px;
+		font-size: 14px;
 		margin-left: 5px;
 	}
 	.pinglun image{
-		width: 17px;
+		width: 40rpx;
-		height: 17px;
+		height: 40rpx;
 	}
 	.pinglun{
 		display: flex;
@@ -523,6 +523,7 @@
 	.scroll-right-title{
 		font-size: 16px;
 		color: #000;
+		word-break: break-all;
 	}
 	.data-list{
 		width: 200px;
@@ -532,12 +533,11 @@
 	}
 	.scroll-right{
 		width: 77%;
-		display: flex;
+		display: flex!important; 
-		flex-direction: column;
+		flex-direction: column !important; 
-		
 	}
 	.scroll-left-mon{
-		color: #ccc;
+		color: #999;
 		font-size: 12px;
 		margin-top: 5px;
 		margin-left: 5px;
@@ -589,12 +589,13 @@
 		color: #fff;
 	}
 	/deep/.uni-scroll-view-content{
-		width: 100%;
+		width: 96%;
+		margin: 0 auto;
 		height: 100%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		/* padding-top: 20px; */
+		 padding-top: 50px;
 	}
 	.guanbi{
 		width: 30px;