From 209924202faea8b425494492c230756f1fabd506 Mon Sep 17 00:00:00 2001
From: unknown <binbin0314@126.com>
Date: Thu, 6 May 2021 17:17:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9=E6=AF=94?=
 =?UTF-8?q?=E8=B5=9B=E7=B1=BB=E5=9E=8B=E8=BF=87=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Athletes/AthAdd.vue   | 6 ++++--
 pages/Athletes/Athletes.vue | 4 +++-
 pages/Basics/Basics.vue     | 7 +------
 pages/Choice/Choice.vue     | 3 ++-
 pages/First/Choose.vue      | 6 +++---
 pages/First/First.vue       | 2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pages/Athletes/AthAdd.vue b/pages/Athletes/AthAdd.vue
index ff76225..de5c5a0 100644
--- a/pages/Athletes/AthAdd.vue
+++ b/pages/Athletes/AthAdd.vue
@@ -90,6 +90,7 @@ import { upload } from 'api/upload'
 import { saveplayer } from 'api/saveplayer'
 import { playerInfo } from 'api/playerInfo'
 import { group } from 'api/group'
+import { mapState } from 'vuex'
 // import { photoBase64 } from 'api/photoBase64'
 	export default {
 		async onLoad(option) {
@@ -212,6 +213,7 @@ import { group } from 'api/group'
 				showview: 0
 			}
 		},
+		computed:mapState('project',['companyId']),
 		methods: {
 			delimg(index) {
 				const that = this
@@ -403,7 +405,7 @@ import { group } from 'api/group'
 					try{
 						const params = {
 							param: {
-								competeId: that.$store.state.project.companyId,
+								competeId: that.companyId,
 								groupRemark: that.groupRemark,//组别id
 								playerName: that.list[0].content,//选手姓名
 								gender: that.che,//性别
@@ -511,7 +513,7 @@ import { group } from 'api/group'
 						const params = {
 							param: {
 								playerId: that.playerId,
-								competeId: that.$store.state.project.companyId,
+								competeId: that.companyId,
 								groupRemark: that.groupRemark,//组别id
 								playerName: that.list[0].content,//选手姓名
 								gender: that.che,//性别
diff --git a/pages/Athletes/Athletes.vue b/pages/Athletes/Athletes.vue
index 40f9cdf..e94a2cb 100644
--- a/pages/Athletes/Athletes.vue
+++ b/pages/Athletes/Athletes.vue
@@ -26,6 +26,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 import { groupplayer } from 'api/groupplayer'
 import { delplayer } from 'api/delplayer'
 	export default {
@@ -38,13 +39,14 @@ import { delplayer } from 'api/delplayer'
 				cha: 2
 			}
 		},
+		computed:mapState('project',['companyId']),
 		methods: {
 			async add() {
 				const that = this
 				try{
 					const params = {
 						param: {
-							companyId: that.$store.state.project.companyId
+							companyId: that.companyId
 						}
 					}
 					const data = await groupplayer(params)
diff --git a/pages/Basics/Basics.vue b/pages/Basics/Basics.vue
index 81e507a..a2e1739 100644
--- a/pages/Basics/Basics.vue
+++ b/pages/Basics/Basics.vue
@@ -72,12 +72,12 @@ import { savecompany } from 'api/savecompany'
 				}],
 				projectId: 0,
 				che: false,
-				companyId: '',
 				sub: true,
 				chan: false
 				// imgList: []
 			}
 		},
+		computed:mapState('project',['companyId']),
 		methods: {
 			radioChange() {
 				const that = this
@@ -121,11 +121,6 @@ import { savecompany } from 'api/savecompany'
 					})
 				}else {
 					try{
-						if (that.$store.state.project.companyId - 0 === 0) {
-							that.companyId = ''
-						} else {
-							that.companyId = that.$store.state.project.companyId
-						}
 						const params = {
 							param: {
 								companyId: that.companyId,
diff --git a/pages/Choice/Choice.vue b/pages/Choice/Choice.vue
index dc5515a..70eda3c 100644
--- a/pages/Choice/Choice.vue
+++ b/pages/Choice/Choice.vue
@@ -69,6 +69,7 @@
 				cha1: 2
 			}
 		},
+		computed: mapState('project',['companyId']),
 		methods: {
 			tabSelect(e) {
 				this.TabCur = e.currentTarget.dataset.id - 0;
@@ -137,7 +138,7 @@
 				try{
 					const params = {
 						param: {
-							companyId: that.$store.state.project.companyId
+							companyId: that.companyId
 						}
 					}
 					const data = await querycoach(params)
diff --git a/pages/First/Choose.vue b/pages/First/Choose.vue
index 848b761..a3a15ee 100644
--- a/pages/First/Choose.vue
+++ b/pages/First/Choose.vue
@@ -5,13 +5,13 @@
 			<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 style="color:#39B54A" v-else-if="item.competeStatus === 1">
 					正在报名中
 				</text>
 				<text style="color:#F0AD4E" v-else>未开始</text>
 			</view>
 			<view class="item-time">
-				<text :style="{color:item.competeStatus === 2?'#39B54A':'#C0C0C0'}" >
+				<text :style="{color:item.competeStatus === 1?'#39B54A':'#C0C0C0'}" >
 					({{$moment(+item.startTime).format('MM-DD HH:mm:ss')}} - {{$moment(+item.endTime).format('MM-DD HH:mm:ss')}})
 				</text>
 			</view>
@@ -39,7 +39,7 @@
 			},
 			jump(item) {
 				console.log(item.competeStatus)
-				if(item.competeStatus === 2) {
+				if(item.competeStatus === 1) {
 					this.setCompanyId(item.id)
 					this.setType(item.type)
 					uni.navigateTo({
diff --git a/pages/First/First.vue b/pages/First/First.vue
index a5fb627..cc83ad6 100644
--- a/pages/First/First.vue
+++ b/pages/First/First.vue
@@ -75,7 +75,7 @@ import { overview } from 'api/overview'
 				that.query()
 			}
 		},
-		computed: mapState('home',['type']),
+		computed: mapState('project',['type']),
 		methods: {
 			async query () {
 				const that = this