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

teamwork/.hbuilderx/launch.json

@@ -16,7 +16,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]

teamwork/manifest.json

@@ -22,7 +22,8 @@
         /* 模块配置 */
         "modules" : {
             "Geolocation" : {},
-            "Maps" : {}
+            "Maps" : {},
+            "Camera" : {}
         },
         /* 应用发布信息 */
         "distribute" : {

teamwork/pages.json

@@ -48,6 +48,23 @@
 		"style": {
 			"navigationStyle": "custom"
 		}
+	}, {
+		"path": "pages/my/finish",
+		"style": {
+			"navigationStyle": "custom",
+			"app-plus": {
+				"subNVues": [{
+					"id": "popup1", // 唯一标识  
+					"path": "pages/my/subNVue/finish", // 页面路径  
+					/*"type": "popup",  这里不需要*/
+					"style": {
+						"position": "absolute",
+						"margin": "0 auto",
+						"background": "transparent"
+					}
+				}]
+			}
+		}
 	}, {
 		"path": "pages/sport/main",
 		"style": {
@@ -85,28 +102,11 @@
 				}]
 			}
 		}
-	}, {
-		"path": "pages/my/finish",
-		"style": {
-			"navigationStyle": "custom",
-			"app-plus": {
-				"subNVues": [{
-					"id": "popup1", // 唯一标识  
-					"path": "pages/my/subNVue/finish", // 页面路径  
-					/*"type": "popup",  这里不需要*/
-					"style": {
-						"position": "absolute",
-						"margin": "0 auto",
-						"background": "transparent"
-					}
-				}]
-			}
-		}
 	}, {
 		"path": "pages/discover/main",
 		"style": {
 			"navigationStyle": "custom",
-			"enablePullDownRefresh":true
+			"enablePullDownRefresh": true
 		}
 	}, {
 		"path": "pages/discover/discover-detail",
@@ -133,11 +133,21 @@
 		"style": {
 			"navigationStyle": "custom"
 		}
+	}, {
+		"path": "pages/team/add-team-activity",
+		"style": {
+			"navigationStyle": "custom"
+		}
+	}, {
+		"path": "pages/team/add-team",
+		"style": {
+			"navigationStyle": "custom"
+		}
 	}, {
 		"path": "pages/post/post",
 		"style": {
 			"navigationStyle": "custom",
-			"enablePullDownRefresh":true
+			"enablePullDownRefresh": true
 		}
 	}, {
 		"path": "pages/post/add-post",

teamwork/pages/sport/start.vue

@@ -138,6 +138,7 @@
 				that.duration++
 				uni.getLocation({
 					type: 'gcj02',
+					enableHighAccuracy: true,
 					success: function(res) {
 						that1.latitude = res.latitude
 						that1.longitude = res.longitude

teamwork/pages/team/main.vue

@@ -128,10 +128,10 @@
 					})
 					.then(res => {
 						console.log(res),
-							this.name = res.result.data.username,
+							this.name = res.result.data.teamname,
 							this.activityList = res.result.data.activityList,
 							this.join = res.result.join,
-							this.icon = res.result.data.icon
+							this.icon = res.result.data.teamicon
 						console.log(this.join)
 					})
 			},