From 5d37b65d076ffb8397f4a7b2528f4a1b6731234c Mon Sep 17 00:00:00 2001
From: unknown <binbin0314@126.com>
Date: Fri, 30 Apr 2021 12:05:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/competeTimeList.js             |  5 ++
 manifest.json                      |  6 +-
 pages.json                         | 10 ++-
 pages/Athletes/AthAdd.vue          |  3 +-
 pages/Coach/Coach.vue              |  3 +-
 pages/First/Choose.vue             | 97 ++++++++++++++++++++++++++++++
 pages/First/First.vue              | 23 ++++---
 pages/Login/Login.vue              |  4 +-
 store/modules/project/mutations.js | 13 +++-
 store/modules/project/state.js     |  1 +
 10 files changed, 146 insertions(+), 19 deletions(-)
 create mode 100644 api/competeTimeList.js
 create mode 100644 pages/First/Choose.vue

diff --git a/api/competeTimeList.js b/api/competeTimeList.js
new file mode 100644
index 0000000..8bb56fd
--- /dev/null
+++ b/api/competeTimeList.js
@@ -0,0 +1,5 @@
+const proxyUrl = '/mt';
+import { http } from 'plugins/request/index';
+
+// 查看比赛列表
+export const competeTimeList = params => http.post(`${proxyUrl}/compete/competeTimeList`, params);
diff --git a/manifest.json b/manifest.json
index 2277717..8bc15c2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -101,9 +101,9 @@
             "port" : 30022
         },
         "router" : {
-            "base" : "/compete-province"
+            "base" : ""
         },
-        "domain" : "https://www.tall.wiki",
+        "domain" : "https://test.tall.wiki",
         "async" : {
             //页面js异步加载配置
             "loading" : "AsyncLoading", //页面js加载时使用的组件（需注册为全局组件）
@@ -111,7 +111,7 @@
             "delay" : 500, //展示 loading 加载组件的延时时间（页面 js 若在 delay 时间内加载完成，则不会显示 loading 组件）
             "timeout" : 1000 //页面js加载超时时间（超时后展示 error 对应的组件）
         },
-        "title" : "2020年山西省学生跳绳比赛报名系统",
+        "title" : "2021年山西省学生跳绳比赛报名系统",
         "optimization" : {
             "treeShaking" : {
                 "enable" : false
diff --git a/pages.json b/pages.json
index 3fb95dc..8fcaa48 100644
--- a/pages.json
+++ b/pages.json
@@ -116,10 +116,18 @@
             "path" : "pages/Project/MatchDetail/TeamDetail",
             "style" : {}
         }
+        ,{
+            "path" : "pages/First/Choose",
+						"style" : {
+							"navigationBarTitleText": "选择比赛类型",
+							"navigationBarTextStyle": "#0a97c6",
+							"navigationBarBackgroundColor": "#6D99F2"
+						}
+        }
     ],
   "globalStyle": {
     "navigationBarTextStyle": "white",
-    "navigationBarTitleText": "2020年山西省学生跳绳比赛报名系统",
+    "navigationBarTitleText": "2021年山西省学生跳绳比赛报名系统",
     "navigationBarBackgroundColor": "#6D99F2",
     "backgroundColor": "#0a97c6"
   },
diff --git a/pages/Athletes/AthAdd.vue b/pages/Athletes/AthAdd.vue
index 4c629e9..ff76225 100644
--- a/pages/Athletes/AthAdd.vue
+++ b/pages/Athletes/AthAdd.vue
@@ -269,7 +269,8 @@ import { group } from 'api/group'
 								// that.urlTobase64(res.tempFilePaths[0],type);
 								
 								uni.uploadFile({
-										url: '//www.tall.wiki/gateway/mt/file/upload/photo',
+										url: '//test.tall.wiki/gateway/mt/file/upload/photo',
+										// url: '//www.tall.wiki/gateway/mt/file/upload/photo',
 										filePath: tempFilePaths,
 										header:{
 											"Authorization" : "Bearer " + that.$store.state.user.token
diff --git a/pages/Coach/Coach.vue b/pages/Coach/Coach.vue
index 612be35..58fd3d9 100644
--- a/pages/Coach/Coach.vue
+++ b/pages/Coach/Coach.vue
@@ -126,7 +126,8 @@
 							const tempFilePaths = res.tempFilePaths[0]
 							that[`${type}`] = tempFilePaths
 							uni.uploadFile({
-									url: '//www.tall.wiki/gateway/mt/file/upload/photo',
+									url: '//test.tall.wiki/gateway/mt/file/upload/photo',
+									// url: '//www.tall.wiki/gateway/mt/file/upload/photo',
 									filePath: tempFilePaths,
 									header:{
 										"Authorization" : "Bearer " + that.$store.state.user.token
diff --git a/pages/First/Choose.vue b/pages/First/Choose.vue
new file mode 100644
index 0000000..848b761
--- /dev/null
+++ b/pages/First/Choose.vue
@@ -0,0 +1,97 @@
+<template>
+	<view >
+		<view class="item-box" v-for="(item,index) in list" :key="index" @click="jump(item)">
+			<view class="item-num">{{ index + 1 }}</view>
+			<text class="item-content">{{ item.name }}</text>
+			<view  class="item-infor">
+				<text style="color:#C0C0C0" v-if="item.competeStatus === 0">已结束</text>
+				<text style="color:#39B54A" v-else-if="item.competeStatus === 2">
+					正在报名中
+				</text>
+				<text style="color:#F0AD4E" v-else>未开始</text>
+			</view>
+			<view class="item-time">
+				<text :style="{color:item.competeStatus === 2?'#39B54A':'#C0C0C0'}" >
+					({{$moment(+item.startTime).format('MM-DD HH:mm:ss')}} - {{$moment(+item.endTime).format('MM-DD HH:mm:ss')}})
+				</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mapMutations } from 'vuex';
+	import { competeTimeList } from 'api/competeTimeList'
+	export default {
+		data() {
+			return {
+				list: [],
+			}
+		},
+		created() {
+			this.getMatchList()
+		},
+		methods: {
+			...mapMutations('project',['setCompanyId','setType']),
+			async getMatchList() {
+				const res = await competeTimeList()
+				this.list = res
+			},
+			jump(item) {
+				console.log(item.competeStatus)
+				if(item.competeStatus === 2) {
+					this.setCompanyId(item.id)
+					this.setType(item.type)
+					uni.navigateTo({
+						url:`../First/First`
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+ .item-box {
+	 margin-top: 24px;
+	 height: 80px;
+	 line-height: 80px;
+	 font-size: 18px;
+	 width: 670rpx;
+	 margin-left: 40rpx;
+	 padding-left: 56rpx;
+	 position: relative;
+	 box-shadow: 0px 2px 5px $grey;
+	 border-radius: 10px;
+ }
+ .item-num {
+	 position: relative;
+	 width: 40px;
+	 height: 40px;
+	 border-radius: 50%;
+	 top: 20px;
+	 text-align: center;
+	 line-height: 40px;
+	 background-color: #709AFC;
+	 color: #fff;
+ }
+ .item-infor {
+ 	 position: absolute;
+ 	 left: 180rpx;
+ 	 font-size: 30rpx;
+ 	 color: $gray;
+ 	 top: 6px;
+ }
+ .item-content {
+ 	 position: absolute;
+ 	 left: 180rpx;
+ 	 top: -16px;
+ 	 font-size: 16px;
+ }
+ .item-time {
+	 font-size: 24rpx;
+	 position: absolute;
+	 left: 180rpx;
+	 top: 26px;
+ }
+</style>
diff --git a/pages/First/First.vue b/pages/First/First.vue
index b9f8326..a5fb627 100644
--- a/pages/First/First.vue
+++ b/pages/First/First.vue
@@ -27,6 +27,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
 import { competeTime } from 'api/competeTime'
 import { overview } from 'api/overview'
 	export default {
@@ -37,14 +38,14 @@ import { overview } from 'api/overview'
 			return {
 				list: [{
 					title:'基础信息',
-					complete: 1
+					complete: 0
 				}, {
 					title:'领队及教练信息',
-					leader: 2,
+					leader: 0,
 					coach: 0
 				}, {
 					title:'运动员注册',
-					athletes: 4
+					athletes: 0
 				}, {
 					title:'参赛项目',
 					project: 0
@@ -68,13 +69,20 @@ import { overview } from 'api/overview'
 				}]
 			}
 		},
+		watch: {
+			'$store.state.project.num'(val) {
+				const that = this
+				that.query()
+			}
+		},
+		computed: mapState('home',['type']),
 		methods: {
 			async query () {
 				const that = this
 				try{
 					const params = {
 						param: {
-							type: 0
+							type: this.type
 						}
 					}
 					const data = await competeTime(params)
@@ -156,12 +164,7 @@ import { overview } from 'api/overview'
 				}
 			}
 		},
-		watch: {
-			'$store.state.project.num'(val) {
-				const that = this
-				that.query()
-			}
-		}
+
 	}
 </script>
 <style lang="scss" scoped>
diff --git a/pages/Login/Login.vue b/pages/Login/Login.vue
index 2f60480..6fec701 100644
--- a/pages/Login/Login.vue
+++ b/pages/Login/Login.vue
@@ -38,7 +38,7 @@ import { login } from 'api/login'
 			const that = this
 			if (that.$store.state.user.token) {
 				uni.navigateTo({
-					url:`../First/First`
+					url:`../First/Choose`
 				})
 			}
 		},
@@ -105,7 +105,7 @@ import { login } from 'api/login'
 						// console.log(data)
 						that.cacheData(data)
 						uni.navigateTo({
-							url:`../First/First`
+							url:`../First/Choose`
 						})
 					} catch(e){
 						//TODO handle the exception
diff --git a/store/modules/project/mutations.js b/store/modules/project/mutations.js
index 290319e..1769d8c 100644
--- a/store/modules/project/mutations.js
+++ b/store/modules/project/mutations.js
@@ -1,5 +1,16 @@
 const mutations = {
-
+	/*
+		存取比赛的Id
+	*/
+	setCompanyId(state,data) {
+		state.companyId = data
+	},
+	/*
+		存取比赛的Type
+	*/
+	setType(state,data) {
+		state.type = data
+	}
 };
 
 export default mutations;
diff --git a/store/modules/project/state.js b/store/modules/project/state.js
index 3baa1a4..0059e51 100644
--- a/store/modules/project/state.js
+++ b/store/modules/project/state.js
@@ -1,6 +1,7 @@
 const state = {
   data: null,
 	companyId: 0,
+	type: 0,
 	num: 0,
 	Mat: 0
 };