From f4be6b0bb740f79d6f34f6509759da7802a8953b Mon Sep 17 00:00:00 2001
From: yyt <1721861653@qq.com>
Date: Sun, 7 May 2023 17:41:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=8F=8A=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 teamwork/pages/sport/finish.vue          |   9 ++---
 teamwork/pages/sport/main.vue            |  42 +++++++++++------------
 teamwork/pages/sport/ranking.vue         |  16 ++++++---
 teamwork/pages/sport/ready.vue           |  21 ++----------
 teamwork/pages/sport/start.vue           |   2 +-
 teamwork/pages/sport/subNVue/finish.nvue |  15 ++++++--
 teamwork/static/sport/marker1.png        | Bin 0 -> 5808 bytes
 teamwork/static/sport/marker2.png        | Bin 0 -> 5785 bytes
 8 files changed, 52 insertions(+), 53 deletions(-)
 create mode 100644 teamwork/static/sport/marker1.png
 create mode 100644 teamwork/static/sport/marker2.png

diff --git a/teamwork/pages/sport/finish.vue b/teamwork/pages/sport/finish.vue
index 00301ab..113dbb4 100644
--- a/teamwork/pages/sport/finish.vue
+++ b/teamwork/pages/sport/finish.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<map id="myMap" style="width: 100%; height: 780px;" :latitude="latitude" :longitude="longitude"
-			:markers="markers" :polyline="polyline" show-location="true" scale="16">
+			:markers="markers" :polyline="polyline" show-location="true" scale="20">
 			<cover-image class="returnBack" src="/static/login/returnBack.png" @click="goBack()"></cover-image>
 		</map>
 	</view>
@@ -11,7 +11,7 @@
 	export default {
 		onReady() {
 			//传从运动界面传数据过来
-			var data = uni.getStorageSync('info')
+			var data = uni.getStorageSync('data-to-finish')
 			var res = JSON.parse(data)
 			this.id = res.id;
 			this.polyline = res.polyline;
@@ -37,18 +37,19 @@
 				icon: '/static/sport/icon.jpg',
 				longitude: 121.44820869,
 				latitude: 37.48330837,
+				scale: 16,
 				polyline: [],
 				markers: [{
 						id: 0,
 						longitude: 121.44577861,
 						latitude: 37.48205260,
-						iconPath: '/static/sport/location.png'
+						iconPath: '/static/sport/marker1.png'
 					},
 					{
 						id: 1,
 						longitude: 121.44820869,
 						latitude: 37.48330837,
-						iconPath: '/static/sport/location.png'
+						iconPath: '/static/sport/marker2.png'
 					}
 				]
 			}
diff --git a/teamwork/pages/sport/main.vue b/teamwork/pages/sport/main.vue
index 13baebe..72c1a0b 100644
--- a/teamwork/pages/sport/main.vue
+++ b/teamwork/pages/sport/main.vue
@@ -1,16 +1,16 @@
 <template>
 	<view class="content">
 		<view class="type-select">
-			<uni-data-select custom-class="type" v-model="type" :localdata="range" :clear="false"
+			<uni-data-select custom-class="type" v-model="info.type" :localdata="range" :clear="false"
 				@change="change"></uni-data-select>
 		</view>
 		<view class="accumulate">
 			<view class="block1">
 				<ul>
-					<li>累计{{type}}</li>
+					<li>累计{{info.type}}</li>
 				</ul>
 				<view class="dis">
-					<view class="distance">{{distance.toFixed(2)}}</view>
+					<view class="distance">{{info.distance.toFixed(2)}}</view>
 					<view class="km">公里</view>
 				</view>
 			</view>
@@ -18,7 +18,7 @@
 				<ul>
 					<li>本校累计排名</li>
 				</ul>
-				<view class="rank">{{rank}}</view>
+				<view class="rank">{{info.rank}}</view>
 			</view>
 		</view>
 		<image class="start-button" src="/static/sport/start1.png" @click="start"></image>
@@ -31,7 +31,11 @@
 		data() {
 			return {
 				userId: '644a643a0c801ca878983559',
-				type: '跑步',
+				info: {
+					type: '跑步',
+					distance: 0,
+					rank: 1
+				},
 				range: [{
 						value: '跑步',
 						text: '跑步'
@@ -40,39 +44,33 @@
 						value: '健走',
 						text: '健走'
 					}
-				],
-				distance: 0,
-				rank: 1
+				]
 			};
 		},
 		methods: {
-			change(e) {
+			change() {
 				uniCloud.callFunction({
 						name: 'fe-sport-index',
 						data: {
 							userId: this.userId,
-							type: this.type
+							type: this.info.type
 						}
 					})
 					.then(res => {
 						console.log(res)
-						this.distance = res.result.data.totalRunningDistance
-						this.rank = res.result.data.totalRunningRank
+						this.info.distance = res.result.data.totalRunningDistance
+						this.info.rank = res.result.data.totalRunningRank
 					});
 			},
 			click() {
-				if (this.type === '跑步') {
-					uni.navigateTo({
-						url: './ranking?type=跑步'
-					})
-				} else {
-					uni.navigateTo({
-						url: './ranking?type=健走'
-					})
-				}
+				let item = JSON.stringify(this.info)
+				uni.setStorageSync('data-to-ranking', item)
+				uni.navigateTo({
+					url: './ranking'
+				})
 			},
 			start() {
-				if (this.type === '跑步') {
+				if (this.info.type === '跑步') {
 					uni.navigateTo({
 						url: './ready?type=跑步'
 					})
diff --git a/teamwork/pages/sport/ranking.vue b/teamwork/pages/sport/ranking.vue
index 2a35341..79c6034 100644
--- a/teamwork/pages/sport/ranking.vue
+++ b/teamwork/pages/sport/ranking.vue
@@ -10,7 +10,7 @@
 			<image class="icon" :src="item.icon"></image>
 			<view class="info">
 				<view class="username">{{item.username}}</view>
-				<view class="distance">{{item.distance}}km</view>
+				<view class="distance">{{item.distance.toFixed(2)}}km</view>
 			</view>
 		</view>
 		<view class="my">
@@ -18,7 +18,7 @@
 			<image class="icon" :src="icon"></image>
 			<view class="info">
 				<view class="username">{{username}}</view>
-				<view class="distance">{{distance}}km</view>
+				<view class="distance">{{distance.toFixed(2)}}km</view>
 			</view>
 		</view>
 	</view>
@@ -30,9 +30,10 @@
 			return {
 				userId: '644a643a0c801ca878983559',
 				rank: 1,
+				distance: 99.99,
+				type: '',
 				icon: '/static/sport/icon.jpg',
 				username: "不会取名字",
-				distance: 99.99,
 				userList: []
 			}
 		},
@@ -45,9 +46,14 @@
 				});
 			}
 		},
-		onLoad(option) {
+		onReady() {
+			var data = uni.getStorageSync('data-to-ranking')
+			var res = JSON.parse(data)
+			this.type = res.type
+			this.rank = res.rank
+			this.distance = res.distance
 			var url
-			if (option.type === '跑步') {
+			if (this.type === '跑步') {
 				url = 'fe-sport-run-rank'
 			} else {
 				url = 'fe-sport-walk-rank'
diff --git a/teamwork/pages/sport/ready.vue b/teamwork/pages/sport/ready.vue
index b5b4320..80433a7 100644
--- a/teamwork/pages/sport/ready.vue
+++ b/teamwork/pages/sport/ready.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<map id="myMap" style="width: 100%; height: 780px;" :latitude="latitude" :longitude="longitude"
-			:markers="markers" show-location="true" :scale="16">
+			:markers="markers" show-location="true" :scale="18">
 			<cover-image class="returnBack" src="/static/login/returnBack.png" @click="goBack()"></cover-image>
 			<cover-image class="start-button" src="/static/sport/start1.png" @click="start"></cover-image>
 		</map>
@@ -97,27 +97,10 @@
 							id: 1,
 							latitude: res.latitude,
 							longitude: res.longitude,
-							iconPath: '/static/sport/location.png'
+							iconPath: '/static/sport/marker1.png'
 						}]
 					}
 				});
-			},
-			toLocation: function(obj) {
-				// 改变地图中心位置
-				mapCtx.moveToLocation(obj)
-				// 移动标记点并添加动画效果
-				mapCtx.translateMarker({
-					markerId: 1,
-					autoRotate: true,
-					duration: 100,
-					destination: {
-						latitude: obj.latitude,
-						longitude: obj.longitude,
-					},
-					animationEnd() {
-						console.log('animation end')
-					}
-				})
 			}
 		}
 	}
diff --git a/teamwork/pages/sport/start.vue b/teamwork/pages/sport/start.vue
index 004174f..bee398a 100644
--- a/teamwork/pages/sport/start.vue
+++ b/teamwork/pages/sport/start.vue
@@ -99,7 +99,7 @@
 									icon: 'success'
 								})
 								let item = JSON.stringify(this.info)
-								uni.setStorageSync('info', item)
+								uni.setStorageSync('data-to-finish', item)
 								uni.reLaunch({
 									url: '/pages/sport/finish',
 									animationType: 'pop-in',
diff --git a/teamwork/pages/sport/subNVue/finish.nvue b/teamwork/pages/sport/subNVue/finish.nvue
index 051c3a6..420d3ce 100644
--- a/teamwork/pages/sport/subNVue/finish.nvue
+++ b/teamwork/pages/sport/subNVue/finish.nvue
@@ -89,13 +89,24 @@
 					uniCloud.callFunction({
 							name: 'fe-sport-feeling',
 							data: {
-								userId: this.id,
+								id: this.id,
 								type: this.type,
 								feeling: this.feeling
 							}
 						})
 						.then(res => {
-							console.log(res)
+							if (res.code === 200) {
+								uni.showToast({
+									title: '运动感受保存成功',
+									icon: 'success'
+								})
+							} else {
+								uni.showToast({
+									title: '运动感受保存失败',
+									icon: 'error'
+								})
+							}
+							this.choose = false
 						})
 				}
 			}
diff --git a/teamwork/static/sport/marker1.png b/teamwork/static/sport/marker1.png
new file mode 100644
index 0000000000000000000000000000000000000000..43290e959574b4a038da08c7fe412f73334d881d
GIT binary patch
literal 5808
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
JRI6x(_#cUE0H*)|

literal 0
HcmV?d00001

diff --git a/teamwork/static/sport/marker2.png b/teamwork/static/sport/marker2.png
new file mode 100644
index 0000000000000000000000000000000000000000..eaa59dfce3118489871489dbd51edfcdd6bee303
GIT binary patch
literal 5785
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

literal 0
HcmV?d00001

-- 
GitLab