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

teamwork/App.vue

@@ -8,6 +8,12 @@
 		},
 		onHide: function() {
 			console.log('App Hide')
+		},
+		globalData: {
+			userId:'',
+			name:'',
+			type:'',
+			icon:'',
 		}
 	}
 </script>

teamwork/pages.json

@@ -83,7 +83,8 @@
 	}, {
 		"path": "pages/discover/main",
 		"style": {
-			"navigationStyle": "custom"
+			"navigationStyle": "custom",
+			"enablePullDownRefresh":true
 		}
 	}, {
 		"path": "pages/discover/discover-detail",

teamwork/pages/discover/main.vue

@@ -55,7 +55,7 @@
 				current: 0,
 				showButton: false, // 初始值为隐藏
 				id: '1' ,// 根据id控制显示和隐藏 后期改为判断用户身份
-				teacherId: '644a643a0c801ca878983559',
+				teacherId: '',
 				list: [{
 					name: '发现'
 				},{
@@ -70,6 +70,12 @@
 				title:'趣味篮球赛'
 			}
 		},
+		onPullDownRefresh(){
+					//刷新后的效果
+					console.log("1111");
+					this.onLoad1();
+					uni.stopPullDownRefresh();
+		},		
 		mounted() {
 		      // 根据id值进行判断
 		      if (this.id == 1) {
@@ -116,13 +122,28 @@
 				 this.activityList1=res.result.data.activityList,
 				console.log(this.activityList1);
 			});
+		},
+		onLoad1() {
+			let type =getApp().globalData.type;
+			if(type=="644a64c228064a7587cd79bf") this.id=2;
+			else this.id=1;
+			if(this.id==1) this.teacherId=getApp().globalData.userId;
+			this.getData();
+			this.getData1();
 		}
 		
 		
 	},
 		onLoad() {
+			let type =getApp().globalData.type;
+			if(type=="644a64c228064a7587cd79bf") this.id=2;
+			else this.id=1;
+			if(this.id==1) this.teacherId=getApp().globalData.userId;
 			this.getData();
 			this.getData1();
+		},
+		onShow() {
+			this.onLoad1();
 		}
 	}
 </script>
@@ -143,6 +164,7 @@
 	  height: 200px;
 	  margin-top: 2px;
 	  margin-bottom: 10px;
+	  border-radius: 15px;
 	}
 
 	.school-activity-title {

teamwork/pages/login/login.vue

@@ -82,6 +82,11 @@
 							})
 							.then(res => {
 								if(res.result.code===200){
+									getApp().globalData.userId=res.result.data.userId
+									getApp().globalData.name=res.result.data.name
+									getApp().globalData.type=res.result.data.type
+									getApp().globalData.icon=res.result.data.icon
+									console.log(res)
 									uni.showToast({
 										title: '登录成功',
 										icon: 'success'

teamwork/pages/login/register.vue

@@ -142,6 +142,7 @@
 								}
 							})
 							.then(res => {
+								console.log(res)
 								if (res.result.code === 200) {
 									uni.showToast({
 										title: '注册成功',
@@ -154,7 +155,7 @@
 									})
 								} else {
 									uni.showToast({
-										title: '注册失败',
+										title: '手机号已存在',
 										icon: 'error'
 									})
 								}

teamwork/pages/sport/main.vue

@@ -38,11 +38,11 @@
 				},
 				range: [{
 						value: '跑步',
-						text: '跑步'
+						text: '跑 步'
 					},
 					{
 						value: '健走',
-						text: '健走'
+						text: '健 走'
 					}
 				]
 			};
@@ -82,6 +82,7 @@
 			}
 		},
 		onLoad() {
+			this.userId=getApp().globalData.userId
 			uniCloud.callFunction({
 					name: 'fe-sport-index',
 					data: {

teamwork/pages/sport/ranking.vue

@@ -47,6 +47,8 @@
 			}
 		},
 		onReady() {
+			this.username = getApp().globalData.name
+			this.icon = getApp().globalData.icon
 			var data = uni.getStorageSync('data-to-ranking')
 			var res = JSON.parse(data)
 			this.type = res.type

teamwork/pages/sport/subNVue/finish.nvue

@@ -44,6 +44,8 @@
 <script>
 	export default {
 		onLoad() {
+			this.username=getApp().globalData.name
+			this.icon=getApp().globalData.icon
 			uni.$on('information', (res) => {
 				this.type = res.type
 				this.startTime = res.startTime

teamwork/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -347,6 +347,7 @@
 	}
 
 	.uni-select {
+		background-color: #f1992d;
 		font-size: 14px;
 		border: 1px solid $uni-border-3;
 		box-sizing: border-box;
@@ -494,7 +495,10 @@
 	.uni-select__input-text {
 		// width: 280px;
 		width: 100%;
-		color: $uni-main-color;
+		// color: $uni-main-color;
+		color: white;
+		font-size: 20px;
+		font-weight: 600;
 		white-space: nowrap;
 		text-overflow: ellipsis;
 		-o-text-overflow: ellipsis;