Explorar el Código

修改小程序

zs hace 7 meses
padre
commit
558542dd85
Se han modificado 52 ficheros con 430 adiciones y 142 borrados
  1. 6 2
      pages/home/index.vue
  2. 9 3
      pages/my/index.vue
  3. 5 0
      pagesHome/match/index.vue
  4. 5 1
      pagesHome/match/sign.vue
  5. 66 3
      pagesMy/activity/detail.vue
  6. 10 6
      pagesMy/activity/index.vue
  7. 17 0
      pagesMy/contact/index.vue
  8. 7 0
      pagesMy/match/add.vue
  9. 10 6
      pagesMy/match/index.vue
  10. 111 64
      pagesMy/match/score.vue
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/tabs/index.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/login/index.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/match/index.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/match/sign.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/register/index.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/about/index.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/basic.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/index.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/password.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/activity/add.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/activity/detail.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/activity/index.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/agree/index.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/contact/index.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  38. 1 1
      unpackage/dist/dev/mp-weixin/common/vendor.js
  39. 1 1
      unpackage/dist/dev/mp-weixin/pages/home/index.wxml
  40. 3 0
      unpackage/dist/dev/mp-weixin/pages/home/index.wxss
  41. 39 13
      unpackage/dist/dev/mp-weixin/pages/my/index.js
  42. 5 0
      unpackage/dist/dev/mp-weixin/pagesHome/match/index.js
  43. 1 1
      unpackage/dist/dev/mp-weixin/pagesHome/match/sign.wxml
  44. 3 0
      unpackage/dist/dev/mp-weixin/pagesHome/match/sign.wxss
  45. 55 11
      unpackage/dist/dev/mp-weixin/pagesMy/activity/detail.js
  46. 1 1
      unpackage/dist/dev/mp-weixin/pagesMy/activity/detail.wxml
  47. 19 0
      unpackage/dist/dev/mp-weixin/pagesMy/activity/detail.wxss
  48. 1 1
      unpackage/dist/dev/mp-weixin/pagesMy/activity/index.wxml
  49. 3 0
      unpackage/dist/dev/mp-weixin/pagesMy/activity/index.wxss
  50. 20 0
      unpackage/dist/dev/mp-weixin/pagesMy/contact/index.js
  51. 1 1
      unpackage/dist/dev/mp-weixin/pagesMy/contact/index.wxml
  52. 4 0
      unpackage/dist/dev/mp-weixin/pagesMy/contact/index.wxss

+ 6 - 2
pages/home/index.vue

@@ -27,7 +27,7 @@
 								<span>{{item.address||'在线活动'}}</span>
 							</view>
 							<view class="list_right"
-								:class="[item.match_status=='0'?'active_1':item.match_status=='1'?'active_2':'active_3']">
+								:class="[item.match_status=='0'?'active_1':item.match_status=='1'?'active_2':item.match_status=='2'?'active_3':'active_4']">
 								{{getDict(item.match_status,'status')}}
 							</view>
 						</view>
@@ -319,8 +319,12 @@
 					}
 
 					.active_3 {
-						background: linear-gradient(to right, #949698, #c6c9cc);
+						background: linear-gradient(to right, #FF5722, #FF9800);
+
+					}
 
+					.active_4 {
+						background: linear-gradient(to right, #949698, #c6c9cc);
 					}
 				}
 			}

+ 9 - 3
pages/my/index.vue

@@ -71,13 +71,19 @@
 					}
 				} catch (e) {}
 			},
-			searchOther() {
+			async searchOther() {
 				const that = this;
 				let config = that.$config;
 				let isShow = false
 				if (that.user.id) {
-					const hasCompetition = that.user.role.find((f) => f === 'Competition')
-					if (hasCompetition) isShow = true
+					const arr = await that.$api(`/competition`, 'GET', {
+						user: that.user.id,
+						status: '1'
+					})
+					if (arr.errcode == '0') {
+						const hasCompetition = that.user.role.find((f) => f === 'Competition')
+						if (hasCompetition) isShow = true
+					}
 				}
 				if (!isShow) config.menuList = config.menuList.filter((f) => f.title !== '我的赛事')
 				that.$set(that, `menuList`, config.menuList);

+ 5 - 0
pagesHome/match/index.vue

@@ -294,6 +294,11 @@
 							url: `/pagesHome/login/index`
 						})
 					}
+				} else if (that.info.match_status == '2') {
+					uni.showToast({
+						title: '活动进行中 暂不支持报名!',
+						icon: 'none'
+					})
 				} else {
 					uni.showToast({
 						title: '比赛已结束!',

+ 5 - 1
pagesHome/match/sign.vue

@@ -8,7 +8,7 @@
 					<span>{{getTime(info.start_time,info.end_time)||'暂无'}}</span>
 				</view>
 				<view class="one_right"
-					:class="[info.match_status=='0'?'active_1':info.match_status=='1'?'active_2':'active_3']">
+					:class="[info.match_status=='0'?'active_1':info.match_status=='1'?'active_2':info.match_status=='2'?'active_3':'active_4']">
 					<text class="t-icon t-icon-shizhong-copy"></text>
 					<span>{{getDict(info.match_status,'status')}}</span>
 				</view>
@@ -322,6 +322,10 @@
 				}
 
 				.active_3 {
+					background-color: #FF5722;
+				}
+
+				.active_4 {
 					background-color: #949698;
 				}
 			}

+ 66 - 3
pagesMy/activity/detail.vue

@@ -104,7 +104,7 @@
 						</view>
 					</view>
 				</view>
-				<view v-else>
+				<view v-if="tabs.active=='1'">
 					<view class="thr">
 						<view class="thr_cont">
 							<view class="thr_1">报名信息</view>
@@ -154,7 +154,24 @@
 							</view>
 						</view>
 						<view class="button">
-							<button class="danger" size="mini" type="warn" @tap.stop="toEdit(sign)">修改报名信息</button>
+							<button class="danger" size="mini" type="warn" @tap.stop="toEdit(sign)"
+								v-if="sign.status!=='1'">修改报名信息</button>
+						</view>
+					</view>
+				</view>
+				<view v-else>
+					<view class="list" v-for="(item, index) in score" :key="index">
+						<view class="value">
+							<view class="title">流程名称:</view>
+							<view class="label">{{item.matchPath_name||'暂无'}}</view>
+						</view>
+						<view class="value">
+							<view class="title">分数:</view>
+							<view class="label">{{item.score||'暂无'}}</view>
+						</view>
+						<view class="value">
+							<view class="title">时间:</view>
+							<view class="label">{{item.time||'暂无'}}</view>
 						</view>
 					</view>
 				</view>
@@ -186,7 +203,10 @@
 				user: {},
 				config: {},
 				info: {},
+				// 报名信息
 				sign: {},
+				// 分数信息
+				score: {},
 				// 字典表
 				statusList: [],
 				typeList: [],
@@ -246,7 +266,12 @@
 						that.$set(that, `sign`, res.data)
 						if (res.data.match) {
 							const arr = await that.$api(`/match/${res.data.match}`, 'GET', {})
-							if (res.errcode == '0') that.$set(that, `info`, arr.data)
+							if (res.errcode == '0') {
+								that.$set(that, `info`, arr.data)
+								if (arr.data.match_status == '2' || arr.data.match_status == '3') {
+									await that.searchPath()
+								}
+							}
 						}
 					} else {
 						uni.showToast({
@@ -255,6 +280,18 @@
 					}
 				}
 			},
+			async searchPath() {
+				const that = this;
+				that.$set(that.tabs, `menu`, [...that.tabs.menu, {
+					title: '分数信息',
+					active: '2'
+				}])
+				const arr = await that.$api(`/score/list`, 'GET', {
+					match: that.info.id,
+					sign: that.sign.id
+				})
+				if (arr.errcode == '0') that.$set(that, `score`, arr.data)
+			},
 			// 选择选项卡
 			tabsChange(e) {
 				const that = this;
@@ -381,6 +418,32 @@
 		}
 
 		.tabsList {
+			.list {
+				background-color: var(--mainColor);
+				border-bottom: 1px solid var(--f5Color);
+				margin: 2vw 2vw 0 2vw;
+				border-radius: 4px;
+				padding: 3vw;
+
+
+				.value {
+					display: flex;
+					align-items: center;
+
+					.title {
+						font-size: var(--font14Size);
+						font-weight: bold;
+					}
+
+					.label {
+						font-size: var(--font12Size);
+						color: var(--f85Color);
+					}
+				}
+
+
+			}
+
 			.thr {
 				background-color: var(--mainColor);
 

+ 10 - 6
pagesMy/activity/index.vue

@@ -28,7 +28,7 @@
 										<span>{{item.address||'在线活动'}}</span>
 									</view>
 									<view class="list_right"
-										:class="[item.match_status=='0'?'active_1':item.match_status=='1'?'active_2':'active_3']">
+										:class="[item.match_status=='0'?'active_1':item.match_status=='1'?'active_2':item.match_status=='2'?'active_3':'active_4']">
 										{{getDict(item.match_status,'status')}}
 									</view>
 								</view>
@@ -352,17 +352,21 @@
 
 						.active_1 {
 							background: linear-gradient(to right, #4caf50, #a8f3b2);
-
+						
 						}
-
+						
 						.active_2 {
 							background: linear-gradient(to right, #2196f3, #a2ccec);
-
+						
 						}
-
+						
 						.active_3 {
+							background: linear-gradient(to right, #FF5722, #FF9800);
+						
+						}
+						
+						.active_4 {
 							background: linear-gradient(to right, #949698, #c6c9cc);
-
 						}
 					}
 

+ 17 - 0
pagesMy/contact/index.vue

@@ -28,6 +28,12 @@
 				<text :user-select="true"> {{info.Address||'暂无'}}</text>
 			</view>
 		</view>
+		<view class="one">
+			<view class="one_1">公众号</view>
+			<view class="one_2">
+				<image class="image" :show-menu-by-longpress="true" :src="getUrl(info.Code)"></image>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -55,6 +61,12 @@
 					}
 				} catch (e) {}
 			},
+			// 图片处理
+			getUrl(e) {
+				const that = this;
+				if (e && e.length > 0) return that.$config.serverFile + e[0].url
+				else return '/static/match.png'
+			},
 			// 处理富文本
 			formatRichText(html) {
 				if (html) {
@@ -125,6 +137,11 @@
 				text {
 					margin: 0 0 0 1vw;
 				}
+
+				.image {
+					width: 150px;
+					height: 150px;
+				}
 			}
 		}
 	}

+ 7 - 0
pagesMy/match/add.vue

@@ -32,6 +32,7 @@
 					sign: "",
 					score: "",
 				},
+				matchPath: '',
 				matchPathList: [],
 				signList: [],
 				// 校验规则
@@ -55,6 +56,8 @@
 			const that = this;
 			that.$set(that, `id`, e && e.id || '');
 			that.$set(that, `match`, e && e.match || '');
+			that.$set(that.form, `matchPath`, e && e.matchPath || '');
+			that.$set(that, `matchPath`, e && e.matchPath || '');
 			await that.searchToken();
 			await that.searchOther();
 			await that.search();
@@ -112,6 +115,10 @@
 							title: res.errmsg,
 						});
 					}
+				} else {
+					that.$set(that, `form`, {
+						matchPath: that.matchPath
+					})
 				}
 			},
 			// 选择流程

+ 10 - 6
pagesMy/match/index.vue

@@ -28,7 +28,7 @@
 										<span>{{item.address||'在线活动'}}</span>
 									</view>
 									<view class="list_right"
-										:class="[item.match_status=='0'?'active_1':item.match_status=='1'?'active_2':'active_3']">
+										:class="[item.match_status=='0'?'active_1':item.match_status=='1'?'active_2':item.match_status=='2'?'active_3':'active_4']">
 										{{getDict(item.match_status,'status')}}
 									</view>
 								</view>
@@ -358,17 +358,21 @@
 
 						.active_1 {
 							background: linear-gradient(to right, #4caf50, #a8f3b2);
-
+						
 						}
-
+						
 						.active_2 {
 							background: linear-gradient(to right, #2196f3, #a2ccec);
-
+						
 						}
-
+						
 						.active_3 {
+							background: linear-gradient(to right, #FF5722, #FF9800);
+						
+						}
+						
+						.active_4 {
 							background: linear-gradient(to right, #949698, #c6c9cc);
-
 						}
 					}
 

+ 111 - 64
pagesMy/match/score.vue

@@ -9,48 +9,61 @@
 			</view>
 		</view>
 		<view class="two">
-			<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-view" @scrolltolower="toPage"
-				@scroll="toScroll">
-				<view class="list-scroll-view">
-					<view class="list" v-for="(item, index) in list" :key="index">
-						<view class="value">
-							<view class="title">流程名称:</view>
-							<view class="label">{{item.matchPath_name||'暂无'}}</view>
+			<tabs :tabs="tabs" @tabsChange="tabsChange">
+				<view class="tabsList">
+					<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-view" @scrolltolower="toPage"
+						@scroll="toScroll">
+						<view class="list-scroll-view">
+							<view class="list" v-for="(item, index) in list" :key="index">
+								<view class="value">
+									<view class="title">流程名称:</view>
+									<view class="label">{{item.matchPath_name||'暂无'}}</view>
+								</view>
+								<view class="value">
+									<view class="title">选手名称:</view>
+									<view class="label">{{item.sign_name||'暂无'}}</view>
+								</view>
+								<view class="value">
+									<view class="title">分数:</view>
+									<view class="label">{{item.score||'暂无'}}</view>
+								</view>
+								<view class="value">
+									<view class="title">时间:</view>
+									<view class="label">{{item.time||'暂无'}}</view>
+								</view>
+								<view class="bottom">
+									<button class="button button_1" type="default" size="mini"
+										@tap.stop="toEdit(item)">修改</button>
+									<button class="button button_2" type="default" size="mini"
+										@tap.stop="toDelete(item)">删除</button>
+								</view>
+							</view>
+							<view class="is_bottom" v-if="is_bottom">
+								<text>{{config.bottom_title||'到底了!'}}</text>
+							</view>
 						</view>
-						<view class="value">
-							<view class="title">选手名称:</view>
-							<view class="label">{{item.sign_name||'暂无'}}</view>
-						</view>
-						<view class="value">
-							<view class="title">分数:</view>
-							<view class="label">{{item.score||'暂无'}}</view>
-						</view>
-						<view class="value">
-							<view class="title">时间:</view>
-							<view class="label">{{item.time||'暂无'}}</view>
-						</view>
-						<view class="bottom">
-							<button class="button button_1" type="default" size="mini"
-								@tap.stop="toEdit(item)">修改</button>
-							<button class="button button_2" type="default" size="mini"
-								@tap.stop="toDelete(item)">删除</button>
-						</view>
-					</view>
-					<view class="is_bottom" v-if="is_bottom">
-						<text>{{config.bottom_title||'到底了!'}}</text>
-					</view>
+					</scroll-view>
 				</view>
-			</scroll-view>
+			</tabs>
 		</view>
 	</view>
 </template>
 
 <script>
+	import tabs from '../../components/tabs/index.vue';
 	export default {
+		components: {
+			tabs
+		},
 		data() {
 			return {
 				id: '',
 				user: {},
+				tabs: {
+					active: '',
+					bgColor: '#ffffff',
+					menu: []
+				},
 				config: {},
 				searchInfo: {},
 				list: [],
@@ -72,11 +85,13 @@
 		onShow: async function() {
 			const that = this;
 			that.clearPage();
+			await that.searchOther();
 			await that.search();
 		},
 		onPullDownRefresh: async function() {
 			const that = this;
 			that.clearPage();
+			await that.searchOther();
 			await that.search();
 			uni.stopPullDownRefresh();
 		},
@@ -92,6 +107,23 @@
 					}
 				} catch (e) {}
 			},
+			async searchOther() {
+				const that = this;
+				const res = await that.$api(`/matchPath`, 'GET', {
+					match: that.id
+				})
+				if (res.errcode == '0' && res.total > 0) {
+					that.$set(that.tabs, `active`, res.data[0].id)
+					const menu = []
+					for (let val of res.data) {
+						menu.push({
+							title: val.name,
+							active: val.id
+						})
+					}
+					that.$set(that.tabs, `menu`, menu)
+				}
+			},
 			searchConfig() {
 				const that = this;
 				try {
@@ -106,6 +138,7 @@
 					skip: that.skip,
 					limit: that.limit,
 					match: that.id,
+					matchPath: that.tabs.active
 				}
 				const res = await that.$api(`/score/list`, 'GET', {
 					...info,
@@ -133,9 +166,16 @@
 			toAdd() {
 				const that = this;
 				uni.navigateTo({
-					url: `/pagesMy/match/add?match=${that.id}`
+					url: `/pagesMy/match/add?match=${that.id}&matchPath=${that.tabs.active}`
 				})
 			},
+			// 选择选项卡
+			tabsChange(e) {
+				const that = this;
+				that.$set(that.tabs, `active`, e.active)
+				that.clearPage();
+				that.search()
+			},
 			// 修改
 			toEdit(item) {
 				const that = this;
@@ -241,54 +281,61 @@
 		}
 
 		.two {
-			position: relative;
-			flex-grow: 1;
 			background-color: var(--f1Color);
 
-			.list {
-				background-color: var(--mainColor);
-				border-bottom: 1px solid var(--f5Color);
-				margin: 2vw 2vw 0 2vw;
-				border-radius: 4px;
-				padding: 3vw;
+			.tabsList {
+				position: relative;
+				flex-grow: 1;
+				width: 100vw;
+				height: 90vh;
+				margin: 10px 0 0 0;
 
+				.list {
+					background-color: var(--mainColor);
+					border-bottom: 1px solid var(--f5Color);
+					margin: 2vw 2vw 0 2vw;
+					border-radius: 4px;
+					padding: 3vw;
 
-				.value {
-					display: flex;
-					align-items: center;
 
-					.title {
-						font-size: var(--font14Size);
-						font-weight: bold;
-					}
+					.value {
+						display: flex;
+						align-items: center;
+
+						.title {
+							font-size: var(--font14Size);
+							font-weight: bold;
+						}
 
-					.label {
-						font-size: var(--font12Size);
-						color: var(--f85Color);
+						.label {
+							font-size: var(--font12Size);
+							color: var(--f85Color);
+						}
 					}
-				}
 
-				.bottom {
-					margin: 2vw 0 0 0;
-					text-align: center;
+					.bottom {
+						margin: 2vw 0 0 0;
+						text-align: center;
 
-					.button {
-						color: var(--mainColor);
-						font-size: var(--font14Size);
-						border-radius: 2vw;
-					}
+						.button {
+							color: var(--mainColor);
+							font-size: var(--font14Size);
+							border-radius: 2vw;
+						}
 
-					.button_1 {
-						margin: 0 2vw 0 0;
-						background-color: var(--f3CColor);
-					}
+						.button_1 {
+							margin: 0 2vw 0 0;
+							background-color: var(--f3CColor);
+						}
 
-					.button_2 {
-						background-color: var(--fF0Color);
+						.button_2 {
+							background-color: var(--fF0Color);
+						}
 					}
 				}
 			}
 		}
+
 	}
 
 	.scroll-view {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabs/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/login/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/match/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/match/sign.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/register/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/about/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/basic.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/password.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/activity/add.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/activity/detail.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/activity/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/agree/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/contact/index.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


+ 1 - 1
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -31656,7 +31656,7 @@ var b = "development" === "development",
   T = S([]),
   P = "h5" === k ? "web" : "app-plus" === k ? "app" : k,
   A = S(undefined),
-  E = S([]) || [],
+  E = S(undefined) || [],
   O = true;
 var x = "";
 try {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/home/index.wxml


+ 3 - 0
unpackage/dist/dev/mp-weixin/pages/home/index.wxss

@@ -71,6 +71,9 @@
   background: linear-gradient(to right, #2196f3, #a2ccec);
 }
 .main .two .list .list_3 .active_3.data-v-71e217db {
+  background: linear-gradient(to right, #FF5722, #FF9800);
+}
+.main .two .list .list_3 .active_4.data-v-71e217db {
   background: linear-gradient(to right, #949698, #c6c9cc);
 }
 .main .fixd.data-v-71e217db {

+ 39 - 13
unpackage/dist/dev/mp-weixin/pages/my/index.js

@@ -262,19 +262,45 @@ var _default = {
       }))();
     },
     searchOther: function searchOther() {
-      var that = this;
-      var config = that.$config;
-      var isShow = false;
-      if (that.user.id) {
-        var hasCompetition = that.user.role.find(function (f) {
-          return f === 'Competition';
-        });
-        if (hasCompetition) isShow = true;
-      }
-      if (!isShow) config.menuList = config.menuList.filter(function (f) {
-        return f.title !== '我的赛事';
-      });
-      that.$set(that, "menuList", config.menuList);
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+        var that, config, isShow, arr, hasCompetition;
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                that = _this2;
+                config = that.$config;
+                isShow = false;
+                if (!that.user.id) {
+                  _context3.next = 8;
+                  break;
+                }
+                _context3.next = 6;
+                return that.$api("/competition", 'GET', {
+                  user: that.user.id,
+                  status: '1'
+                });
+              case 6:
+                arr = _context3.sent;
+                if (arr.errcode == '0') {
+                  hasCompetition = that.user.role.find(function (f) {
+                    return f === 'Competition';
+                  });
+                  if (hasCompetition) isShow = true;
+                }
+              case 8:
+                if (!isShow) config.menuList = config.menuList.filter(function (f) {
+                  return f.title !== '我的赛事';
+                });
+                that.$set(that, "menuList", config.menuList);
+              case 10:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3);
+      }))();
     },
     // 登录或注册
     toLogin: function toLogin() {

+ 5 - 0
unpackage/dist/dev/mp-weixin/pagesHome/match/index.js

@@ -593,6 +593,11 @@ var _default = {
             url: "/pagesHome/login/index"
           });
         }
+      } else if (that.info.match_status == '2') {
+        uni.showToast({
+          title: '活动进行中 暂不支持报名!',
+          icon: 'none'
+        });
       } else {
         uni.showToast({
           title: '比赛已结束!',

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/match/sign.wxml


+ 3 - 0
unpackage/dist/dev/mp-weixin/pagesHome/match/sign.wxss

@@ -46,6 +46,9 @@
   background-color: #2196f3;
 }
 .main .one .one_2 .active_3.data-v-7b7095a1 {
+  background-color: #FF5722;
+}
+.main .one .one_2 .active_4.data-v-7b7095a1 {
   background-color: #949698;
 }
 .main .one .name.data-v-7b7095a1 {

+ 55 - 11
unpackage/dist/dev/mp-weixin/pagesMy/activity/detail.js

@@ -156,9 +156,10 @@ var render = function () {
     _vm.tabs.active == "0" && _vm.info.brief
       ? _vm.formatRichText(_vm.info.brief)
       : null
-  var m15 = !(_vm.tabs.active == "0")
-    ? _vm.getDict(_vm.sign.cardType, "cardType") || "暂无证件类型"
-    : null
+  var m15 =
+    _vm.tabs.active == "1"
+      ? _vm.getDict(_vm.sign.cardType, "cardType") || "暂无证件类型"
+      : null
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -223,6 +224,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 37));
+var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 39));
 var tabs = function tabs() {
   __webpack_require__.e(/*! require.ensure | components/tabs/index */ "components/tabs/index").then((function () {
@@ -250,7 +252,10 @@ var _default = {
       user: {},
       config: {},
       info: {},
+      // 报名信息
       sign: {},
+      // 分数信息
+      score: {},
       // 字典表
       statusList: [],
       typeList: []
@@ -349,7 +354,7 @@ var _default = {
               case 0:
                 that = _this2;
                 if (!that.id) {
-                  _context3.next = 15;
+                  _context3.next = 19;
                   break;
                 }
                 _context3.next = 4;
@@ -357,27 +362,37 @@ var _default = {
               case 4:
                 res = _context3.sent;
                 if (!(res.errcode == '0')) {
-                  _context3.next = 14;
+                  _context3.next = 18;
                   break;
                 }
                 that.$set(that, "sign", res.data);
                 if (!res.data.match) {
-                  _context3.next = 12;
+                  _context3.next = 16;
                   break;
                 }
                 _context3.next = 10;
                 return that.$api("/match/".concat(res.data.match), 'GET', {});
               case 10:
                 arr = _context3.sent;
-                if (res.errcode == '0') that.$set(that, "info", arr.data);
-              case 12:
-                _context3.next = 15;
+                if (!(res.errcode == '0')) {
+                  _context3.next = 16;
+                  break;
+                }
+                that.$set(that, "info", arr.data);
+                if (!(arr.data.match_status == '2' || arr.data.match_status == '3')) {
+                  _context3.next = 16;
+                  break;
+                }
+                _context3.next = 16;
+                return that.searchPath();
+              case 16:
+                _context3.next = 19;
                 break;
-              case 14:
+              case 18:
                 uni.showToast({
                   title: res.errmsg
                 });
-              case 15:
+              case 19:
               case "end":
                 return _context3.stop();
             }
@@ -385,6 +400,35 @@ var _default = {
         }, _callee3);
       }))();
     },
+    searchPath: function searchPath() {
+      var _this3 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+        var that, arr;
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                that = _this3;
+                that.$set(that.tabs, "menu", [].concat((0, _toConsumableArray2.default)(that.tabs.menu), [{
+                  title: '分数信息',
+                  active: '2'
+                }]));
+                _context4.next = 4;
+                return that.$api("/score/list", 'GET', {
+                  match: that.info.id,
+                  sign: that.sign.id
+                });
+              case 4:
+                arr = _context4.sent;
+                if (arr.errcode == '0') that.$set(that, "score", arr.data);
+              case 6:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4);
+      }))();
+    },
     // 选择选项卡
     tabsChange: function tabsChange(e) {
       var that = this;

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesMy/activity/detail.wxml


+ 19 - 0
unpackage/dist/dev/mp-weixin/pagesMy/activity/detail.wxss

@@ -34,6 +34,25 @@
 .main .two .text_color.data-v-c395c098 {
   color: var(--f69Color);
 }
+.main .tabsList .list.data-v-c395c098 {
+  background-color: var(--mainColor);
+  border-bottom: 1px solid var(--f5Color);
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 4px;
+  padding: 3vw;
+}
+.main .tabsList .list .value.data-v-c395c098 {
+  display: flex;
+  align-items: center;
+}
+.main .tabsList .list .value .title.data-v-c395c098 {
+  font-size: var(--font14Size);
+  font-weight: bold;
+}
+.main .tabsList .list .value .label.data-v-c395c098 {
+  font-size: var(--font12Size);
+  color: var(--f85Color);
+}
 .main .tabsList .thr.data-v-c395c098 {
   background-color: var(--mainColor);
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesMy/activity/index.wxml


+ 3 - 0
unpackage/dist/dev/mp-weixin/pagesMy/activity/index.wxss

@@ -83,6 +83,9 @@
   background: linear-gradient(to right, #2196f3, #a2ccec);
 }
 .main .two .tabsList .list .list_3 .active_3.data-v-297ae7bf {
+  background: linear-gradient(to right, #FF5722, #FF9800);
+}
+.main .two .tabsList .list .list_3 .active_4.data-v-297ae7bf {
   background: linear-gradient(to right, #949698, #c6c9cc);
 }
 .main .two .tabsList .list .list_4.data-v-297ae7bf {

+ 20 - 0
unpackage/dist/dev/mp-weixin/pagesMy/contact/index.js

@@ -102,6 +102,15 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var m0 = _vm.getUrl(_vm.info.Code)
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        m0: m0,
+      },
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -177,6 +186,12 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
+//
+//
+//
+//
+//
+//
 var _default = {
   components: {},
   data: function data() {
@@ -217,6 +232,11 @@ var _default = {
         }
       } catch (e) {}
     },
+    // 图片处理
+    getUrl: function getUrl(e) {
+      var that = this;
+      if (e && e.length > 0) return that.$config.serverFile + e[0].url;else return '/static/match.png';
+    },
     // 处理富文本
     formatRichText: function formatRichText(html) {
       if (html) {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesMy/contact/index.wxml


+ 4 - 0
unpackage/dist/dev/mp-weixin/pagesMy/contact/index.wxss

@@ -29,4 +29,8 @@
 .main .one .one_2 text.data-v-bfa09f74 {
   margin: 0 0 0 1vw;
 }
+.main .one .one_2 .image.data-v-bfa09f74 {
+  width: 150px;
+  height: 150px;
+}