解决冲突

pages/me/Reward-details/index.vue

@@ -400,7 +400,7 @@
 		// left: 60rpx;
 		margin-left: 50rpx;
 		margin-top: -14rpx;
-		font-size: 24rpx;
+		font-size: 30rpx;
 		font-weight: bold;
 		color: #000;
 	}
@@ -416,7 +416,7 @@
 	.content-two {
 		display: flex;
 		justify-content: space-between;
-		font-size: 24rpx;
+		font-size: 26rpx;
 		color: #6A6A6A;
 		margin-top: 25rpx;
 		margin-left: 30rpx;

pages/me/setting/setting.vue

@@ -75,8 +75,7 @@
 		},
 		created() {
 			this.getMyinfo();
-			plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
-				
+			plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {			
 				 //版本号
 				this.edition_s = wgtinfo.version
 			})
@@ -254,7 +253,6 @@
 					})
 					.then((res) => {
 						this.userInfo = res.data.data;
-						
 					})
 					.catch((err) => {