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

alpha/admin/uniCloud-aliyun/cloudfunctions/fe-login-checkToken/index.js

+'use strict';
+exports.main = async (event, context) => {
+	const db = uniCloud.database()
+	const collection = db.collection('mustgo-token')
+	let res = await collection.where({
+		cid: event.cid,
+		token:event.token
+	}).get()
+	
+	
+	if (res.affectedDocs == 1) {
+		let nowtime = Date.now()
+		if(nowtime <= res.data[0]["expire"]) {
+			return {
+				code: 200,
+				message: "登录成功",
+				data: {
+					uid:res.data[0]["uid"]
+				}
+			}
+		}
+	}
+	return {
+		code: 500,
+		message: "登录失败",
+		data: {}
+	}
+};
\ No newline at end of file

alpha/admin/uniCloud-aliyun/cloudfunctions/fe-login-checkToken/package.json

+{
+  "name": "fe-login-checkToken",
+  "dependencies": {},
+  "extensions": {
+    "uni-cloud-jql": {}
+  }
+}
\ No newline at end of file

alpha/admin/uniCloud-aliyun/cloudfunctions/fe-login/index.js

@@ -11,7 +11,7 @@ exports.main = async (event, context) => {
 	}).get()
 	console.log(res.data[0])
 	
-	if (res.data[0]["password"] == event.password)
+	if (res.data[0]["password"] == event.password) {
 		return {
 			code: 200,
 			message: "登录成功",
@@ -28,6 +28,7 @@ exports.main = async (event, context) => {
 				total_walking_distance: res.data[0]["total_walking_distance"]
 			}
 		}
+	}
 	
 	//返回数据给客户端
 	return {

alpha/admin/uniCloud-aliyun/cloudfunctions/fe-sport-object/index.obj.js

@@ -130,9 +130,16 @@ module.exports = {
 		let cur = res.data[0][fieldName];
 		cur += event.distance
 		
-		res = await collection.doc(event.userId).update({
-			total_walking_distance: cur,
-		})
+		if (event.type == "跑步") {
+			res = await collection.doc(event.userId).update({
+				total_running_distance: cur
+			})
+		} else {
+			res = await collection.doc(event.userId).update({
+				total_walking_distance: cur
+			})
+		}
+
 		
 		if (res.updated > 0)
 			return {

alpha/admin/uniCloud-aliyun/cloudfunctions/fe-team-activityDetail/index.js

@@ -25,6 +25,7 @@ exports.main = async (event, context) => {
 		}).get()
 
 		var time =  getSystemTime()
+		
 
 		if (time > res.data[0]["start_date"]) {
 			return {
@@ -115,8 +116,12 @@ function getSystemTime() {
 	var year = time.getFullYear();
 	// 获取月份(0-11,0代表1月)
 	var month = time.getMonth() + 1;
+	if(month<10)
+		month = "0"+month
 	// 获取日期(1-31)
 	var date = time.getDate();
+	if(date<10)
+		date = "0"+date
 	// 获取小时
 	var h = time.getHours() + 8;
 	h = h < 10 ? '0' + h : h;

alpha/admin/uniCloud-aliyun/cloudfunctions/fe-team-leaveTeam/index.js

@@ -40,12 +40,16 @@ exports.main = async (event, context) => {
 		if (tmp.affectedDocs == 1) {
 			const collection1 = db.collection('mustgo-team')
 			const res1 = await collection1.doc(teamid).remove()
+			
+			const tmp2 = await activitycollection.where({
+				team_id:teamid
+			}).remove()
 		}
 
 		const res = await collection.doc(event.userId).update({
 			team_id: ""
 		})
-		if (res.updated === 1) {
+		if (res.updated === 1  && res1.affectedDocs != 1) {
 
 			const activity = db.collection('mustgo-team-activity')
 			let res2 = await activity.where({
@@ -64,6 +68,12 @@ exports.main = async (event, context) => {
 				}).remove()
 			}
 
+			return {
+				"code": 200,
+				"message": "退出小队成功",
+				"data": {}
+			}
+		} else {
 			return {
 				"code": 200,
 				"message": "退出小队成功",

alpha/admin/uniCloud-aliyun/cloudfunctions/uni-cloud-push/index.js

@@ -3,34 +3,41 @@
 exports.main = async (event, context) => {
 	const db = uniCloud.database()
 	const regsTable = db.collection('mustgo-registration')
-	const res = await regsTable.where(
+	const res = await regsTable.where({
 		owner_id: event.uid,
 		notified: false
-	).get()
+	}).get()
 
 	let arr = new Array
 	let list = new Array
 	arr = res.data
+
 	for (var i = 0; i < arr.length; i++) {
 		const teamActivityTable = db.collection('mustgo-team-activity')
-		const title = await teamActivityTable.where(
+		const activity = await teamActivityTable.where({
 			_id: arr[i]["team_activity_id"]
-		).get()
-		list.push(title.data.title)
+		}).get()
+		list.push(activity.data[0].title)
 	}
-	
+
 	const uniPush = uniCloud.getPushManager({
 		appId: "__UNI__AAFC50C"
 	});
-	for (var i = 0; i < list.length; i ++) {
-		await uniPush.sendMessage({
-			"push_clientid": event.push_clientid,
+	let result = new Array
+	for (var i = 0; i < list.length; i++) {
+		let tmp = await uniPush.sendMessage({
+			"push_clientid": event.cid,
 			"title": "小队活动即将开始",
-			"content": "您报名的" + list[i] + "小队活动即将开始，快来看看吧~", 
+			"content": "您报名的小队活动" + list[i] + "即将开始，快来看看吧~",
 			"payload": event.payload,
 			"force_notification": true,
 			"request_id": event.request_id,
 			"badge": event.badge
 		});
+		await regsTable.doc(arr[i].owner_id).update({
+			notified: true
+		})
+		result.push(tmp)
 	}
+	return result
 };
\ No newline at end of file

alpha/admin/uniCloud-aliyun/cloudfunctions/uni-cloud-push/uni-cloud-push.param.json

+// 本文件中的json内容将在云函数【运行】时作为参数传给云函数。
+// 配置教程参考：https://uniapp.dcloud.net.cn/uniCloud/rundebug.html#runparam
+{
+	"uid": "645c972809e298919852519f",
+	"cid": "e1ad5019d8aec999f1ef4df59e809b7b"
+}
\ No newline at end of file