Merge branch 'frontend' of https://gitcode.net/qq_50679803/great-teamwork into frontend

teamwork/manifest.json

@@ -60,14 +60,14 @@
                 "geolocation" : {
                     "amap" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "d8ed7a0b95d0c729908f38b495767549",
-                        "appkey_android" : "d8ed7a0b95d0c729908f38b495767549"
+                        "appkey_ios" : "921f50bdf0f2d9511ac8c0824f04e6c2",
+                        "appkey_android" : "921f50bdf0f2d9511ac8c0824f04e6c2"
                     }
                 },
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "d8ed7a0b95d0c729908f38b495767549",
-                        "appkey_android" : "d8ed7a0b95d0c729908f38b495767549"
+                        "appkey_ios" : "921f50bdf0f2d9511ac8c0824f04e6c2",
+                        "appkey_android" : "921f50bdf0f2d9511ac8c0824f04e6c2"
                     }
                 },
                 "ad" : {}

teamwork/pages/my/my-running-record.vue

@@ -212,23 +212,18 @@
 	}
 
 	.content1 {
-
 		height: 50%;
-
 	}
 
 	.distance {
-
-
 		width: 70%;
 		font-weight: bold;
-		font-size: 65rpx;
-		margin-top: 15rpx;
+		font-size: 55rpx;
+		margin-top: 35rpx;
 		float: left;
 	}
 
 	.type-icon {
-
 		float: right;
 		margin-top: 50rpx;
 		margin-right: 70rpx;

teamwork/pages/my/my-walking-record.vue

@@ -202,12 +202,10 @@
 	}
 
 	.distance {
-
-
 		width: 70%;
 		font-weight: bold;
-		font-size: 65rpx;
-		margin-top: 15rpx;
+		font-size: 55rpx;
+		margin-top: 35rpx;
 		float: left;
 	}
 

teamwork/pages/sport/finish.vue

@@ -28,7 +28,7 @@
 				duration: res.duration,
 				pace: res.duration / res.distance
 			});
-			const subNVue = uni.getSubNVueById('popup1'); // 通过 id 获取 nvue 子窗体 
+			const subNVue = uni.getSubNVueById('popup'); // 通过 id 获取 nvue 子窗体 
 			subNVue.show('slide-in-top', 250); // 打开 nvue 子窗体
 		},
 		data() {