Merge branch 'master' of http://118.195.146.34:3000/ygtx/ygoa_miniapp

pages/message/index.vue

@@ -345,14 +345,15 @@ function setAllMsgRead() {
 
 ::v-deep .uni-badge {
 	height: 1.5rem !important;
+	min-width: calc(1.5rem + 0.5 * (1rem - 16px)) !important;
 	line-height: 1.375rem !important;
 	font-size: 1.125rem !important;
 }
 
 .read_button {
 	position: absolute;
-	top: 12px;
-	right: 38px;
+	top: calc(12px + 0.5 * (1rem - 16px));
+	right: calc(50px + 0.5 * (1rem - 16px));
 	height: 28px;
 	line-height: 28px;
 	font-size: 14px;

pages/mine/index.vue

@@ -31,7 +31,7 @@
 					</view>
 
 				</view>
-				<uni-icons @click="lookMsg()" type="forward" size="16" style="margin-right: 30rpx;"></uni-icons>
+				<uni-icons @click="lookMsg()" type="forward" size="16" margin-left="10px"></uni-icons>
 			</view>
 		</uni-card>
 
@@ -147,7 +147,7 @@
 	.user-info {
 		display: flex;
 		align-items: center;
-		padding: 1rem 4rem;
+		padding: 1rem 3rem;
 		border-bottom: 1rpx solid #666;
 		color: #777;
 	}