“多功能报名bug修复

App.vue

@@ -12,6 +12,7 @@ export default {
 			var obj = localStorage.getItem('token')
 			// console.log(JSON.parse(obj))
 			this.$store.state.user.token = obj
+			this.$store.state.user.user.token = obj
 		}
   },
 	created () {

manifest.json

@@ -101,9 +101,9 @@
             "port" : 30022
         },
         "router" : {
-            "base" : "/compete"
+            "base" : "/compete-province"
         },
-        "domain" : "https://test.tall.wiki",
+        "domain" : "https://www.tall.wiki",
         "async" : {
             //页面js异步加载配置
             "loading" : "AsyncLoading", //页面js加载时使用的组件（需注册为全局组件）
@@ -111,6 +111,11 @@
             "delay" : 500, //展示 loading 加载组件的延时时间（页面 js 若在 delay 时间内加载完成，则不会显示 loading 组件）
             "timeout" : 1000 //页面js加载超时时间（超时后展示 error 对应的组件）
         },
-        "title" : "2020年山西省学生跳绳比赛报名系统"
+        "title" : "2020年山西省学生跳绳比赛报名系统",
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : false
+            }
+        }
     }
 }

pages.json

@@ -98,7 +98,11 @@
 		}
         ,{
             "path" : "pages/Project/PatternMatch",
-            "style" : {}
+            "style" : {
+				"navigationBarTitleText": "花样赛项目",
+				"navigationBarTextStyle": "black",
+				"navigationBarBackgroundColor": "#f8f8f8"
+			}
         }
         ,{
             "path" : "pages/Login/Retrieve",

pages/Athletes/AthAdd.vue

@@ -38,7 +38,7 @@
 							</view>
 							<text class='cuIcon-cameraadd'></text>
 							<image class="img-box" :src="idCardBack"></image>
-							<icon v-show="idCardBack !== ''" type="icon" class="cuIcon-roundclosefill close-icon" @click="delimg(1)"></icon>
+							<icon v-show="idCardBack !== null" type="icon" class="cuIcon-roundclosefill close-icon" @click="delimg(1)"></icon>
 						</view>
 					</view>
 				</view>
@@ -193,17 +193,17 @@ import { group } from 'api/group'
 					content: 'insuranceRecord'
 				}],
 				idCardFront: '', //身份证正面照片 或户口本照片 （文件类型）
-				idCardFrontId: '1326409300276547584', //身份证正面照片 或户口本照片 （文件类型）
-				idCardBack: '', //身份证反面照片（文件类型）
-				idCardBackId: '1326409300276547584', //身份证反面照片（文件类型）
+				idCardFrontId: '', //身份证正面照片 或户口本照片 （文件类型）
+				idCardBack: null, //身份证反面照片（文件类型）
+				idCardBackId: '', //身份证反面照片（文件类型）
 				idPhone: '', //一寸证件照（文件类型）
-				idPhoneId: '1326409300276547584', //一寸证件照（文件类型）
+				idPhoneId: '', //一寸证件照（文件类型）
 				studentRecord: '', //学籍证明（文件类型）
-				studentRecordId: '1326409300276547584', //学籍证明（文件类型）
+				studentRecordId: '', //学籍证明（文件类型）
 				healthRecord: '', //体检证明（文件类型）
-				healthRecordId: '1326409300276547584', //体检证明（文件类型）
+				healthRecordId: '', //体检证明（文件类型）
 				insuranceRecord: '', //保险证明（文件类型）
-				insuranceRecordId: '1326409300276547584', //保险证明（文件类型）
+				insuranceRecordId: '', //保险证明（文件类型）
 				che: 0,
 				isId: 0,
 				playerId: 0,
@@ -232,7 +232,7 @@ import { group } from 'api/group'
 						content: '确定要删除这张图片么？',
 						success: (res) => {
 							if (res.confirm) {
-								that.idCardBack = ''
+								that.idCardBack = null
 								that.idCardBackId = ''
 							}
 						},
@@ -272,7 +272,7 @@ import { group } from 'api/group'
 										url: '//www.tall.wiki/gateway/mt/file/upload/photo',
 										filePath: tempFilePaths,
 										header:{
-											"Authorization" : "Bearer " + that.$store.state.user.user.token
+											"Authorization" : "Bearer " + that.$store.state.user.token
 										},
 										name: 'file',
 										success: (res) => {
@@ -428,11 +428,19 @@ import { group } from 'api/group'
 						// console.log(that.$store.state.project.num)
 					}catch(e){
 						//TODO handle the exception
-						uni.showToast({
-							title: e,
-							icon: 'none',
-							duration: 1500
-						})
+						if (e === 'error') {
+							uni.showToast({
+								title: '提交失败',
+								icon: 'none',
+								duration: 1500
+							})
+						} else {
+							uni.showToast({
+								title: e,
+								icon: 'none',
+								duration: 1500
+							})
+						}
 					}
 				}
 			},
@@ -463,17 +471,16 @@ import { group } from 'api/group'
 						duration: 1500
 					})
 				}  else if (that.idCardFrontId === '') {
-					uni.showToast({
-						title: '请上传身份证正面照',
-						icon: 'none',
-						duration: 1500
-					})
-				} else if (that.idCardBackId === '') {
-					uni.showToast({
-						title: '请上传身份证反面照',
-						icon: 'none',
-						duration: 1500
-					})
+					if (that.idCardBackId === '') {
+						uni.showToast({
+							title: '请上传身份证正面照',
+							icon: 'none',
+							duration: 1500
+						})
+					} else {
+						that.idCardFrontId = that.idCardBackId
+						that.idCardBackId = ''
+					}
 				} else if (that.idPhoneId === '') {
 					uni.showToast({
 						title: '请上传一寸证件照',
@@ -529,6 +536,19 @@ import { group } from 'api/group'
 						// console.log(that.$store.state.project.num)
 					}catch(e){
 						//TODO handle the exception
+						if (e === 'error') {
+							uni.showToast({
+								title: '提交失败',
+								icon: 'none',
+								duration: 1500
+							})
+						} else {
+							uni.showToast({
+								title: e,
+								icon: 'none',
+								duration: 1500
+							})
+						}
 					}
 				}
 			}

pages/Basics/Basics.vue

@@ -26,7 +26,7 @@ import { savecompany } from 'api/savecompany'
 	export default {
 		async onLoad (options) {
 			const that = this
-			console.log(options)
+			// console.log(options)
 			that.projectId = options.id - 0
 			that.companyId = options.companyId - 0
 			try{
@@ -148,11 +148,19 @@ import { savecompany } from 'api/savecompany'
 						that.$store.state.project.num++
 					}catch(e){
 						//TODO handle the exception
-						uni.showToast({
-							title: e,
-							icon: 'none',
-							duration: 1500
-						})
+						if (e === 'error') {
+							uni.showToast({
+								title: '提交失败',
+								icon: 'none',
+								duration: 1500
+							})
+						} else {
+							uni.showToast({
+								title: e,
+								icon: 'none',
+								duration: 1500
+							})
+						}
 					}
 				}
 			},

pages/Choice/Choice.vue

@@ -73,10 +73,10 @@
 			tabSelect(e) {
 				this.TabCur = e.currentTarget.dataset.id - 0;
 				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
-				console.log(this.TabCur,this.cha,this.cha1)
+				// console.log(this.TabCur,this.cha,this.cha1)
 			},
 			async del(num) {
-				console.log(num)
+				// console.log(num)
 				const that = this
 				uni.showModal({
 					title: '提示',

pages/Coach/Coach.vue

@@ -43,7 +43,7 @@
 		async onLoad(option) {
 			const that = this
 			if(option.id) {
-				console.log(option)
+				// console.log(option)
 				try{
 					const params = {
 						param: {
@@ -51,7 +51,7 @@
 						}
 					}
 					const data = await coachInfo(params)
-					console.log(data)
+					// console.log(data)
 					that.list[0].content = data.name
 					that.che = data.gender
 					that.list[2].content = data.phone
@@ -107,7 +107,7 @@
 			radioChange(e) {
 				const that = this
 				that.che = e.detail.value - 0
-				console.log(that.che)
+				// console.log(that.che)
 			},
 			jump(type) {
 				const that = this
@@ -129,13 +129,13 @@
 									url: '//www.tall.wiki/gateway/mt/file/upload/photo',
 									filePath: tempFilePaths,
 									header:{
-										"Authorization" : "Bearer " + that.$store.state.user.user.token
+										"Authorization" : "Bearer " + that.$store.state.user.token
 									},
 									name: 'file',
 									success: (res) => {
 											// console.log(JSON.stringify());
 											const jsondata = JSON.parse(res.data)
-											console.log(jsondata)
+											// console.log(jsondata)
 											that[`${type}Url`] = jsondata.data.visitUrl
 											that[`${type}`] = jsondata.data.id
 									}
@@ -227,11 +227,19 @@
 						},1000)
 					}catch(e){
 						//TODO handle the exception
-						uni.showToast({
-							title: e,
-							icon: 'none',
-							duration: 1500
-						})
+						if (e === 'error') {
+							uni.showToast({
+								title: '提交失败',
+								icon: 'none',
+								duration: 1500
+							})
+						} else {
+							uni.showToast({
+								title: e,
+								icon: 'none',
+								duration: 1500
+							})
+						}
 					}
 				}
 			},
@@ -294,11 +302,19 @@
 						},1000)
 					}catch(e){
 						//TODO handle the exception
-						uni.showToast({
-							title: e,
-							icon: 'none',
-							duration: 1500
-						})
+						if (e === 'error') {
+							uni.showToast({
+								title: '提交失败',
+								icon: 'none',
+								duration: 1500
+							})
+						} else {
+							uni.showToast({
+								title: e,
+								icon: 'none',
+								duration: 1500
+							})
+						}
 					}
 				}
 			}

pages/First/First.vue

@@ -80,7 +80,7 @@ import { overview } from 'api/overview'
 					const data = await competeTime(params)
 					that.projectId = data.id
 					that.$store.state.project.data = data
-					console.log(that.$store.state.project.data)
+					// console.log(that.$store.state.project.data)
 					if (data.id) {
 						const params = {
 							param : {
@@ -91,17 +91,26 @@ import { overview } from 'api/overview'
 						if (datalist.companyId) {
 							that.companyId = datalist.companyId
 						}
-						console.log(datalist.companyId)
+						// console.log(datalist.companyId)
 						that.datalist = datalist
 						that.$store.state.project.companyId = datalist.companyId
-						console.log(that.$store.state.project.companyId)
+						// console.log(that.$store.state.project.companyId)
 					}
 				}catch(e){
 					//TODO handle the exception
-					uni.showToast({
-						title: e,
-						icon: 'none'
-					})
+					if (e === 'error') {
+						uni.showToast({
+							title: '提交失败',
+							icon: 'none',
+							duration: 1500
+						})
+					} else {
+						uni.showToast({
+							title: e,
+							icon: 'none',
+							duration: 1500
+						})
+					}
 				}
 			},
 			jump (num) {

pages/Leader/Leader.vue

@@ -22,7 +22,7 @@ import { coachInfo } from 'api/coachInfo'
 		async onLoad(option) {
 			const that = this
 			if(option.id) {
-				console.log(option)
+				// console.log(option)
 				try{
 					const params = {
 						param: {
@@ -30,7 +30,7 @@ import { coachInfo } from 'api/coachInfo'
 						}
 					}
 					const data = await coachInfo(params)
-					console.log(data)
+					// console.log(data)
 					that.list[0].content = data.name
 					that.che = data.gender
 					that.list[2].content = data.phone
@@ -71,7 +71,7 @@ import { coachInfo } from 'api/coachInfo'
 			radioChange(e) {
 				const that = this
 				that.che = e.detail.value - 0
-				console.log(that.che)
+				// console.log(that.che)
 			},
 			async submit() {
 				const that = this
@@ -123,11 +123,19 @@ import { coachInfo } from 'api/coachInfo'
 						},1000)
 					}catch(e){
 						//TODO handle the exception
-						uni.showToast({
-							title: e,
-							icon: 'none',
-							duration: 1500
-						})
+						if (e === 'error') {
+							uni.showToast({
+								title: '提交失败',
+								icon: 'none',
+								duration: 1500
+							})
+						} else {
+							uni.showToast({
+								title: e,
+								icon: 'none',
+								duration: 1500
+							})
+						}
 					}
 				}
 				// console.log('提交事件')
@@ -183,11 +191,19 @@ import { coachInfo } from 'api/coachInfo'
 						},1000)
 					}catch(e){
 						//TODO handle the exception
-						uni.showToast({
-							title: e,
-							icon: 'none',
-							duration: 1500
-						})
+						if (e === 'error') {
+							uni.showToast({
+								title: '提交失败',
+								icon: 'none',
+								duration: 1500
+							})
+						} else {
+							uni.showToast({
+								title: e,
+								icon: 'none',
+								duration: 1500
+							})
+						}
 					}
 				}
 			}

pages/Login/Login.vue

@@ -102,14 +102,14 @@ import { login } from 'api/login'
 						}
 						const data = await login(params)
 						localStorage.setItem("token", data.token);
-						console.log(data)
+						// console.log(data)
 						that.cacheData(data)
 						uni.navigateTo({
 							url:`../First/First`
 						})
 					} catch(e){
 						//TODO handle the exception
-						console.log(e)
+						// console.log(e)
 						uni.showToast({
 							title:e,
 							icon: "none",

pages/Login/Register.vue

@@ -484,7 +484,7 @@ import { phone } from 'api/phone'
 							source: 1
 						}
 						const data = await register(params)
-						console.log(data)
+						// console.log(data)
 						if (!data || !data.token) {
 							uni.showToast({
 								title: '注册失败',
@@ -505,11 +505,19 @@ import { phone } from 'api/phone'
 						}
 					}catch(e){
 						//TODO handle the exception
-						uni.showToast({
-							title: e,
-							icon: 'none',
-							duration: 1500
-						})
+						if (e === 'error') {
+							uni.showToast({
+								title: '提交失败',
+								icon: 'none',
+								duration: 1500
+							})
+						} else {
+							uni.showToast({
+								title: e,
+								icon: 'none',
+								duration: 1500
+							})
+						}
 						that.safe = 0
 					}
 				}
@@ -553,7 +561,7 @@ import { phone } from 'api/phone'
 						}
 					}
 					const data = await getcode(params)
-					console.log(data)
+					// console.log(data)
 					if (data.expiredInSeconds) {
 						that.imgbox = false
 						uni.showToast({
@@ -578,11 +586,19 @@ import { phone } from 'api/phone'
 					}
 				}catch(e){
 					//TODO handle the exception
-					uni.showToast({
-						title: e,
-						icon: 'none',
-						duration: 1500
-					})
+					if (e === 'error') {
+						uni.showToast({
+							title: '提交失败',
+							icon: 'none',
+							duration: 1500
+						})
+					} else {
+						uni.showToast({
+							title: e,
+							icon: 'none',
+							duration: 1500
+						})
+					}
 				}
 			}
 		},

pages/Login/Retrieve.vue

@@ -78,7 +78,7 @@ import { getcode } from 'api/getcode'
 					
 				}
 				const data = await getbase(params)
-				console.log(data)
+				// console.log(data)
 				that.imgsrc = data.imageBase64
 				that.codeId = data.verificationCodeId
 				that.imgbox = true
@@ -93,7 +93,7 @@ import { getcode } from 'api/getcode'
 						code: that.code
 					}
 					const data = await password(params)
-					console.log(data)
+					// console.log(data)
 					if (!data || !data.token) {
 						uni.showToast({
 							title: '修改成功',
@@ -103,11 +103,19 @@ import { getcode } from 'api/getcode'
 					}
 				}catch(e){
 					//TODO handle the exception
-					uni.showToast({
-						title: e,
-						icon: 'none',
-						duration: 1500
-					})
+					if (e === 'error') {
+						uni.showToast({
+							title: '提交失败',
+							icon: 'none',
+							duration: 1500
+						})
+					} else {
+						uni.showToast({
+							title: e,
+							icon: 'none',
+							duration: 1500
+						})
+					}
 				}
 			},
 			async submit() {
@@ -121,7 +129,7 @@ import { getcode } from 'api/getcode'
 						}
 					}
 					const data = await getcode(params)
-					console.log(data)
+					// console.log(data)
 					if (data.expiredInSeconds) {
 						that.imgbox = false
 						uni.showToast({

pages/Project/MatchDetail/MatchDetail.vue

@@ -36,7 +36,8 @@ import { join } from 'api/join'
 				objdata: {},
 				submit: 2,
 				changeList: [],
-				originalList: []
+				originalList: [],
+				joinNum:0
 			}
 		}, 
 		methods: {
@@ -57,12 +58,21 @@ import { join } from 'api/join'
 					} else {
 						that.submit = 2
 					}
+					for (var i=0; i<data.length; i++) {
+						for (var j=0; j<data[i].playerList.length; i++) {
+							if (data[i].playerList[j].joinProject - 0 === 1) {
+								that.joinNum ++
+							}
+						}
+					}
+
 				}catch(e){
 					//TODO handle the exception
 				}
 			},
 			change (a,b) {
 				const that = this
+				that.joinNum = 0
 				// console.log(that.list[a].playerList[b])		// 本次点击的队员
 				var obj = {}
 				if (that.originalList.length === 0) {
@@ -121,6 +131,13 @@ import { join } from 'api/join'
 					}
 				}
 				
+				for (var i=0; i<that.list.length; i++) {
+					for (var j=0; j<that.list[i].playerList.length; i++) {
+						if (that.list[i].playerList[j].joinProject - 0 === 1) {
+							that.joinNum ++
+						}
+					}
+				}
 				console.log(that.changeList)
 			},
 			changeSub() {
@@ -139,11 +156,19 @@ import { join } from 'api/join'
 						}
 					}
 					const data = await join(params)
-					uni.showToast({
-						title: '报名成功',
-						icon: 'success',
-						duration: 1500
-					})
+					if (that.joinNum - 0 === 0) {
+						uni.showToast({
+							title: '取消成功',
+							icon: 'success',
+							duration: 1500
+						})
+					} else {
+						uni.showToast({
+							title: '报名成功',
+							icon: 'success',
+							duration: 1500
+						})
+					}
 					that.changeList = []
 					that.originalList = []
 					that.query()
@@ -152,11 +177,19 @@ import { join } from 'api/join'
 				}catch(e){
 					//TODO handle the exception
 					that.submit = 1
-					uni.showToast({
-						title: e,
-						icon: 'none',
-						duration: 1500
-					})
+					if (e === 'error') {
+						uni.showToast({
+							title: '提交失败',
+							icon: 'none',
+							duration: 1500
+						})
+					} else {
+						uni.showToast({
+							title: e,
+							icon: 'none',
+							duration: 1500
+						})
+					}
 				}
 			}
 		}

pages/Project/MatchDetail/TeamDetail.vue

@@ -18,7 +18,7 @@
 		<view v-show="!list2[0]" class="img-B">
 			<img src="static/item.png" class="img-box" />
 			<view>
-				暂无运动员信息
+				暂无报名信息
 			</view>
 		</view>
 	</view>
@@ -38,10 +38,13 @@
 			const that = this
 			that.obj = JSON.parse(option.obj)
 			that.showms = that.obj.joinRule
-			if (option.groupRemark - 0) {
+			if (option.groupRemark) {
+				// console.log('1')
 				that.value = option.groupRemark - 0 - 1
 				that.value1 = option.gender - 0
+				that.query()
 			} else {
+				// console.log('2')
 				that.query()
 			}
 			// console.log(that.obj,option)
@@ -166,11 +169,19 @@
 							// console.log(that.$store.state)
 						}catch(e){
 							//TODO handle the exception
-							uni.showToast({
-								title: e,
-								icon: 'none',
-								duration: 1500
-							})
+							if (e === 'error') {
+								uni.showToast({
+									title: '提交失败',
+									icon: 'none',
+									duration: 1500
+								})
+							} else {
+								uni.showToast({
+									title: e,
+									icon: 'none',
+									duration: 1500
+								})
+							}
 						}
 					}
 				// }
@@ -192,21 +203,37 @@
 			},
 			async query() {
 				const that = this
+				// console.log('xxx')
 				try{
-					const params = {
-						param: {
-							companyId: that.$store.state.project.companyId,
-							gender: that.value1,
-							groupRemark: that.value - 0 + 1,
-							projectId: that.obj.id
+					var params = {}
+					if (that.obj.joinRule) {
+						params = {
+							param: {
+								companyId: that.$store.state.project.companyId,
+								projectId: that.obj.id
+							}
+						}
+					} else {
+						params = {
+							param: {
+								companyId: that.$store.state.project.companyId,
+								gender: that.value1,
+								groupRemark: that.value - 0 + 1,
+								projectId: that.obj.id
+							}
 						}
 					}
-					that.list2 = []
 					const data = await rulePlayer(params)
+					that.list2 = []
 					if (that.obj.joinRule - 0 === 0 && that.value1 - 0 !== 2) {
 						that.list2 = data[0].playerList
-					} else {
-						console.log(data)
+					} else if (that.obj.joinRule - 0 === 0 && that.value1 - 0 === 2) {
+						// console.log(data)
+						for (var i=0;i<data.length;i++) {
+							that.list2 = that.list2.concat(data[i].playerList)
+						}
+						// console.log(that.list2)
+					} else if (that.obj.joinRule - 0 === 1) {
 						for (var i=0;i<data.length;i++) {
 							that.list2 = that.list2.concat(data[i].playerList)
 						}

pages/Project/MatchDetail/TeamMatch.vue

@@ -20,7 +20,7 @@
 		<view class="img-B" v-else>
 			<img src="static/item.png" class="img-box" />
 			<view>
-				暂无运动员信息
+				暂无报名信息
 			</view>
 		</view>
 
@@ -35,7 +35,7 @@
 		onLoad(option) {
 			const that = this
 			var OBJ = JSON.parse(option.obj)
-			console.log(option.TypeNum,OBJ)
+			// console.log(option.TypeNum,OBJ)
 			that.obj = OBJ
 			that.query()
 		},
@@ -53,7 +53,7 @@
 					content: '确定要删除整组么？',
 					success: async (res) => {
 						if (res.confirm) {
-							console.log(index)
+							// console.log(index)
 							const params = {
 								param: {
 									teamId: index
@@ -94,7 +94,7 @@
 				}
 				const data = await teamProject(params)
 				that.list = data
-				console.log(that.list)
+				// console.log(that.list)
 			}
 		},
 		watch:{

pages/Project/NumMatch.vue

@@ -20,7 +20,7 @@ import { secondproject } from 'api/secondproject'
 				}
 				const data = await secondproject(params)
 				that.list = data
-				console.log(data)
+				// console.log(data)
 			}catch(e){
 				//TODO handle the exception
 			}

pages/Project/PatternMatch.vue

@@ -20,7 +20,7 @@ import { secondproject } from 'api/secondproject'
 				}
 				const data = await secondproject(params)
 				that.list = data
-				console.log(data)
+				// console.log(data)
 			}catch(e){
 				//TODO handle the exception
 			}

pages/Project/Project.vue

@@ -25,7 +25,7 @@ import { firstproject } from 'api/firstproject'
 				}
 				const data = await firstproject(params)
 				that.list = data
-				console.log(data)
+				// console.log(data)
 			}catch(e){
 				//TODO handle the exception
 			}

pages/read/Privacy.vue

@@ -9,7 +9,7 @@
 		onLoad(option) {
 			const that = this
 			that.type = option.type
-			that.token = that.$store.state.user.user.token
+			that.token = that.$store.state.user.token
 			that.src = `http://test.tall.wiki/compete/index/index.html?type=` + option.type + `&token=` + that.token
 		},
 		data() {

store/modules/user/state.js

@@ -1,6 +1,8 @@
 const state = {
   token: '',
-  user: null,
+  user: {
+		token:''
+	},
 	fingerprint: 0
 };