Merge remote-tracking branch 'origin/dev' into dev

tjty-app/pages_activity/activity/activity.vue

@@ -14,14 +14,14 @@
 				<view class="font-body">
 					<!-- // type 1--赛事活动 2-答题活动  signupNum--赛事活动人数  signupExamNum--答题活动人数 -->
 					<view class="activity_title">
-						<view style="padding: 2% 4%;">{{item.activityName |ellipsis}}</view>
+						<view style="padding: 2% 4%;white-space:pre-wrap">{{item.activityName |ellipsis}}</view>
 					</view>
 					<view style="margin-top: -70rpx;">
 						<view class="activity_font"> <text
 								style="padding-top: -1rpx;">报名截止:&nbsp;&nbsp;{{!item.signupTime ? '—' : item.signupTime}}</text>
 						</view>
 						<view class="activity_font">
-							<text>组织机构:&nbsp;&nbsp;{{item.mechanismName |ellipsisInstitutions}}</text></view>
+							<text  style="white-space:pre-wrap">组织机构:&nbsp;&nbsp;{{item.mechanismName |ellipsisInstitutions}}</text></view>
 						<view class="activity_font" style="padding-bottom:10rpx;"> <text>已报名:&nbsp;&nbsp;<text
 									style="color: #FCA624; margin-left: 12rpx;">
 									<text v-if="item.type ==='1'">{{item.signupNum}}</text>
@@ -89,11 +89,6 @@
 			this.login()
 		// 	this.getList()
 		},
-		created() {
-		// uni.setStorageSync("title", '赛事活动')
-		// this.getList()
-		// 	this.getList()
-		},
 		onShow() {
 			console.log('onShow')
 			this.getList()

tjty-app/pages_activity/activity_immedSignIn/activity_immedSignIn.vue

@@ -74,7 +74,8 @@ import {
 		errorMessage: '请输入姓名',
 	}, {
 		validateFunction: function(rule, value, data, callback) {
-			let nameReg = /^[A-z]{2,16}$|^[\u4E00-\u9FA5]{2,16}$/
+		//	let nameReg = /^[A-z]{2,16}$|^[\u4E00-\u9FA5]{2,16}$/
+      let nameReg = /^[A-z | \u4E00-\u9FA5]{2,16}$/
 			if (!nameReg.test(value)) {
 				callback('姓名只能输入汉字或字母且长度为2-16')
 			}

tjty-app/pages_activity/activity_signInDetail/activity_signInDetail.vue

@@ -10,7 +10,7 @@
       <view  class="signIn-body"><text>项目:<text style="display: block;float: right;margin-right: 20rpx;">{{item.projectName}}</text></text></view>
       <view  class="signIn-body"><text>费用:<text style="display: block;float: right;margin-right: 20rpx; color: #F28723;">￥{{item.projectFee}}/人</text></text></view>
       <view  class="signIn-body" v-if="item.projectFee!==0"><text>缴费方式:<text style="display: block;float: right;margin-right: 20rpx;">微信支付</text></text></view>
-      <view  class="signIn-body" v-if="item.projectFee!==0"><text>缴费时间:<text style="display: block;float: right;margin-right: 20rpx;" >{{item.transactionTime}}</text></text></view>
+      <view  class="signIn-body" v-if="item.projectFee!==0"><text>缴费时间:<text style="display: block;float: right;margin-right: 20rpx;" >{{item.transactionTime===null?'未缴费':item.transactionTime}}</text></text></view>
     </view>
   </view>
   </view>

tjty-app/pages_daily_answer/tjty_dailyAnswer/tjty_dailyAnswer.vue

@@ -117,15 +117,15 @@
 	export default {
 		data() {
 			return {
-				titleTime: '',//当前试题应该是哪一天的卷子
-				marginHight: '',//页面内容到手机顶部的距离
+				titleTime: '', //当前试题应该是哪一天的卷子
+				marginHight: '', //页面内容到手机顶部的距离
 				flagCode: '', //完成情况
 				dateList: [], //从活动开始到现在的日期
 				finishStatus: [], //完成情况过滤中间数组
-				finishSituationList: [],//完成情况数组
-				activityInfo: '',//活动信息
-				signupId: null,//报名人id
-				activityId: null,//活动id
+				finishSituationList: [], //完成情况数组
+				activityInfo: '', //活动信息
+				signupId: null, //报名人id
+				activityId: null, //活动id
 				examId: '', //试卷id
 				examTime: '', //试卷的日期
 				flagTime: '', //标志时间
@@ -148,7 +148,7 @@
 				hour: 0,
 				minutes: 0,
 				seconds: 0,
-				questionScore:''
+				questionScore: ''
 			};
 		},
 		methods: {
@@ -174,7 +174,7 @@
 					this.getFinishSituation().then(() => {
 						console.log("finishSituationList", this.finishSituationList);
 						let i = 0;
-						if (i === this.day-1) {
+						if (i === this.day - 1) {
 							console.log("所有答题已完成");
 							uni.showToast({
 								title: '所有答题已完成，请退出答题页面',
@@ -183,9 +183,9 @@
 							return
 						}
 						for (i = 0; i < this.day; i++) {
-							console.log('i',i);
-							console.log('this.day',this.day);
-							if (i < this.day-1) {
+							console.log('i', i);
+							console.log('this.day', this.day);
+							if (i < this.day - 1) {
 								if (this.finishSituationList[i].flag === false) {
 									console.log(this.finishSituationList[i]);
 									this.getNotFinish(this.finishSituationList[i].date, i)
@@ -254,11 +254,11 @@
 					// this.timer = null
 				}
 				let addScoreData = {
-					signupId:this.signupId,
-					examId:this.examId,
-					score:this.score, 
-					activityId:this.activityId, 
-					examTime:this.flagTime
+					signupId: this.signupId,
+					examId: this.examId,
+					score: this.score,
+					activityId: this.activityId,
+					examTime: this.flagTime
 				}
 				console.log(addScoreData);
 				// addScore(this.signupId, this.examId, this.score, this.activityId, this.flagTime).then(res => {
@@ -292,6 +292,7 @@
 			//获取未完成的试卷
 			getNotFinish(date, index) {
 				this.$refs.masks.open('center')
+				this.show = false
 				//显示加载框
 				uni.showLoading({
 					title: '试题抽取中'
@@ -318,7 +319,7 @@
 				console.log("date", date);
 				// dailyQuestion(this.signupId, date).then(res => {
 				getExamPapers(this.signupId, this.activityId, date).then(res => {
-					// console.log(res);
+					console.log("试卷",res);
 					if (res.code === 200) {
 						// this.flagTime = formatDate(res.data[0].examTime, 'yyyy-MM-dd') //标志时间
 						this.flagTime = res.data[0].examTime //标志时间
@@ -338,7 +339,7 @@
 							}
 						})
 						this.total = res.data[0].questionsNum
-						this.questionScore = res.data[0].score/res.data[0].questionsNum
+						this.questionScore = res.data[0].score / res.data[0].questionsNum
 						//将取到的题目id集合反转
 						questionId = questionId.reverse()
 						for (let i = 0; i < res.data.length / 4; i++) {
@@ -421,7 +422,7 @@
 						this.flagTime = res.data[0].examTime
 						// this.flagTime = formatDate(res.data[0].examTime, 'yyyy-MM-dd')
 						this.examTime = res.data[0].examTime //今天的日期
-						this.questionScore = res.data[0].score/res.data[0].questionsNum
+						this.questionScore = res.data[0].score / res.data[0].questionsNum
 						// this.examTime = formatDate(res.data[0].examTime, 'yyyy-MM-dd') //今天的日期
 						// this.day = this.getDaysBetween(res.data[0].activityStart, res.data[0]
 						// 	.examTime) //今天是答题活动的第几天
@@ -572,11 +573,11 @@
 			this.marginHight = uni.getStorageSync('menuInfo').statusBarHeight + uni.getStorageSync('menuInfo')
 				.navBarHeight + 15 + 'px'
 			this.begin()
-			this.getFinishSituation().then(()=>{
+			this.getFinishSituation().then(() => {
 				let titleTime = new Date().toISOString().substring(0, 10)
-				if(titleTime != options.examTime){
+				if (titleTime != options.examTime) {
 					this.titleTime = options.examTime
-					console.log('titleTime',this.titleTime);
+					console.log('titleTime', this.titleTime);
 				}
 			}) //判断是否完成答题
 			this.getDailyQuestion()
@@ -730,7 +731,7 @@
 			}
 
 			.content-select {
-				margin: 4% 2%;
+				margin: 6% 2%;
 				font-size: 16px;
 				font-family: Source Han Sans CN, Source Han Sans CN-Regular;
 				font-weight: 400;
@@ -770,11 +771,12 @@
 
 			button {
 				position: relative;
-				top: 10%;
-				width: 88%;
-				height: 80%;
+				top: 20%;
+				width: 85%;
+				height: 88rpx;
 				background: #3b7cde;
 				border-radius: 16px;
+				line-height: 2;
 
 				text {
 					position: relative;
@@ -870,8 +872,6 @@
 			}
 		}
 
-		.masks-popup{
-			
-		}
+		.masks-popup {}
 	}
 </style>

tjty-app/pages_events/tjty_ans_detail/tjty_ans_detail.vue

@@ -219,16 +219,16 @@
 						console.log(this.activityInfo);
 						//时间格式处理
 						let index = this.activityInfo.activityEnd.indexOf(' ')
-						// this.activityInfo.activityEnd = this.activityInfo.activityEnd.substr(0, index)
+						this.activityInfo.activityEnd = this.activityInfo.activityEnd.substr(0, index)
 						let activityEnd = this.activityInfo.activityEnd.substr(0, index)
 						// this.activityInfo.activityEnd = this.activityInfo.activityEnd
 						index = this.activityInfo.activityStart.indexOf(' ')
 						// this.activityInfo.activityStart = this.activityInfo.activityStart.substr(0, index)
 						let activityStart = this.activityInfo.activityStart.substr(0, index)
 						// this.activityInfo.activityStart = this.activityInfo.activityStart
-						this.activityInfo.activityTime = this.activityInfo.activityStart + '-' + this.activityInfo
-							.activityEnd
-						// this.activityInfo.activityTime = activityStart + '—' + activityEnd
+						// this.activityInfo.activityTime = this.activityInfo.activityStart + '-' + this.activityInfo
+						// 	.activityEnd
+						this.activityInfo.activityTime = activityStart + '—' + activityEnd
 						this.activityInfo.signupTime = this.activityInfo.signupTime
 						// this.getDaysBetween(this.activityInfo.signupTime)
 						selectexamType(this.activityInfo.examType).then(response=>{

tjty-app/pages_events/tjty_ans_detail/tjty_ans_info.vue

@@ -78,6 +78,7 @@
 	import {
 		mapState
 	} from 'vuex'
+import { resolve } from 'path';
 	// import { info } from 'console';
 	export default {
 		data() {
@@ -286,12 +287,15 @@
 			},
 			//获取当前报名此活动者
 			getPerson() {
+				// return new Promise((resolve,reject)=>{
 					getPeople(this.info.activityId).then(res => {
 						console.log("报名信息", res);
 						if (res.length > 0) {
 							this.peopleList = res
 						}
 					})
+					resolve()
+				// })
 			},
 			//活动详情
 			getActivityDetial(id) {
@@ -358,14 +362,34 @@
 					}
 					addTjtActivitySignupExams(this.info).then(res => {
 						console.log(res);
-						if (res >= 0 && res !== '') {
-							if (Date.parse(this.activityInfo.activityStart) > new Date()) {
-								this.cityCancel()
-								this.info.areId = 1
+						this.cityIndex = this.cityList.length - 1
+						this.cityCode = ''
+						this.info.cityId = ''
+						this.areaIndex = 16
+						this.areaDisable = true
+						this.areaCode = ''
+						this.info.cityAreaId = ''
+						this.schoolIndex = -1
+						this.schoolCode = ''
+						this.info.schoolId = ''
+						this.schoolDisable = true
+						this.info.idFlag = false
+						this.info.areaId = 1
 						this.info.parentName = ''
 						this.info.name = ''
 						this.info.phone = ''
 						this.info.idCard = ''
+						this.info.cityId = ''
+						this.info.cityAreaId = ''
+						this.info.schoolId = ''
+						if (res >= 0 && res !== '') {
+							if (Date.parse(this.activityInfo.activityStart) > new Date()) {
+								this.cityCancel()
+								// this.info.areId = 1
+								// this.info.parentName = ''
+								// this.info.name = ''
+								// this.info.phone = ''
+								// this.info.idCard = ''
 								return uni.$showMsg('报名成功,活动开始时间为：' + this.activityInfo.activityStart)
 							} else {
 								let time = new Date().toISOString().substring(0, 10)
@@ -386,11 +410,11 @@
 										})
 									} else {
 										this.cityCancel()
-										this.info.areId = 1
-										this.info.parentName = ''
-										this.info.name = ''
-										this.info.phone = ''
-										this.info.idCard = ''
+										// this.info.areId = 1
+										// this.info.parentName = ''
+										// this.info.name = ''
+										// this.info.phone = ''
+										// this.info.idCard = ''
 										return uni.$showMsg('报名成功，今日无考试')
 									}
 								})

tjty-app/pages_home/tjty_home_page/tjty_home_page.vue

@@ -64,7 +64,8 @@
 				<view class="home_activity_item" v-for="(item1,index1) in activityList" :key="index1"
 					@click="goActDetil(item1)">
 					<view class="activity_image">
-						<image class="image" :src="'https://www.aiwanyundong.com/stage-api' + item1.bannerImage"></image>
+						<image class="image" :src="'https://www.aiwanyundong.com/stage-api' + item1.bannerImage">
+						</image>
 					</view>
 					<view class="activity-body">
 						<view class="activity_image_title">
@@ -187,35 +188,39 @@
 					icon: 'none'
 				})
 			},
+			getWXUserCode() {
+				return new Promise((resolve, reject) => {
+					if (!this.token) {
+						resolve();
+						return
+					}
+					console.log(this.token);
+					console.log("获取登录信息")
+					new
+					uni.login({
+						provider: 'weixin',
+						success: res => {
+							console.log("uni.login res", res.code)
+							let code = res.code
+							getToken(code, this.token).then(res => {
+								// console.log(res);
+								this.updateToken(res.data.token)
+								this.updateUserInfo(res.data.user)
+							})
+						}
+					})
+					resolve();
+				})
+			},
 			//登录判断
 			login() {
-				// if (!this.token) {
 				this.getActivityList()
 				this.getExerciseList()
-				// } else {
-				// 	this.getExerciseListHaveToken()
-				// 	this.getActivityListHaveToken()
-
-				// }
 			},
-			// getExerciseListHaveToken() {
-			// 	listExerciseHaveToken().then(res => {
-			// 		this.exerciseList = [...this.exerciseList, ...res.data] || []
-			// 	}).catch(err => {
-
-			// 	})
-			// },
-			// getActivityListHaveToken() {
-			// 	listActivityStartHaveToken().then(res => {
-			// 		this.activityList = [...this.activityList, ...res.data] || []
-			// 	}).catch(err => {
-
-			// 	})
-			// },
 			getActivityList() {
 				listActivityStart().then(res => {
 					this.activityList = [...this.activityList, ...res.data] || []
-					console.log(res.data);
+					console.log("热门活动", res.data);
 				}).catch(err => {
 
 				})
@@ -223,6 +228,7 @@
 			getExerciseList() {
 				listExercise().then(res => {
 					this.exerciseList = [...this.exerciseList, ...res.data] || []
+					console.log("训练体验", res.data);
 				}).catch(err => {
 
 				})
@@ -269,8 +275,18 @@
 			}
 		},
 		onLoad() {
-			this.login()
 			this.marginHight = uni.getStorageSync('menuInfo').statusBarHeight + 9 + 'px'
+		},
+		onShow() {
+			this.getWXUserCode().then(() => {
+				this.activityList = []
+				this.exerciseList = []
+				this.login()
+			})
+		},
+		onHide() {
+			this.activityList = []
+			this.exerciseList = []
 		}
 	}
 </script>

tjty-app/pages_vote/tjty_vote_channel/tjty_vote_channel.vue

@@ -19,9 +19,9 @@
 			<view class="production-bottom">
 				<view class="production-content" v-for="(productionItem,productionIndex) in productionList"
 					:key="productionIndex">
-					<image v-if="opusType == 1" :src="productionItem.tjtActivityPictureList[0].url" mode=""></image>
+					<image v-if="opusType == '1'" :src="productionItem.tjtActivityPictureList[0].url" mode=""></image>
 				
-					<video v-if=" opusType == 2" id="myVideo" class="video"  :controls="false" :show-center-play-btn="false"
+					<video v-if="opusType == '2'" id="myVideo" class="video"  :controls="false" :show-center-play-btn="false"
 						:show-fullscreen-btn="false" :src="productionItem.tjtActivityPictureList[0].url"
 					 	@timeupdate='timeupdate'></video>
 
@@ -49,14 +49,15 @@
 		data() {
 			return {
 				// 活动作品形式（1--图片， 2--视频）
-				opusType: 2,
+				opusType: '1',
 
 				//活动id
 				projectIdMoment: '',
 				activity: {
 					activityId: '',
 					activityName: '',
-					bannerImage: ''
+					bannerImage: '',
+					
 				},
 				// 点击投票时的数据
 				voteObject: {
@@ -127,17 +128,25 @@
 						this.activity.activityId = res.data[0].activityId
 						this.activity.activityName = res.data[0].activityName
 						this.activity.bannerImage = res.data[0].bannerImage
+						this.opusType = res.data[0].fileType
 						this.projectList = res.data[0].tjtActivityProjectVoList
 						this.productionList = this.projectList[0].tjtActivityOpusVoList
+						console.log("投票通道获取内容----？", this.productionList)
 						//获取最后一个.的位置
-						var index = this.productionList[0].tjtActivityPictureList[0].url.lastIndexOf(".");
-						//获取后缀
-						var ext = this.productionList[0].tjtActivityPictureList[0].url.substr(index + 1);
-						if (ext != 'mp4') {
-							this.opusType = 1
-						} else {
-							this.opusType = 2
-						}
+						// for(let item in this.productionList){
+						// 	if(!this.productionList[item].tjtActivityPictureList[0].url){
+						// 		var index = this.productionList[item].tjtActivityPictureList[0].url.lastIndexOf(".");
+						// 		//获取后缀
+						// 		var ext = this.productionList[item].tjtActivityPictureList[0].url.substr(index + 1);
+						// 		if (ext != 'mp4') {
+						// 			this.opusType = 1
+						// 		} else {
+						// 			this.opusType = 2
+						// 		}
+						// 		return
+						// 	}
+						// }
+						
 
 						this.projectIdMoment = this.projectList[0].projectId
 					} else {
@@ -164,7 +173,7 @@
 
 			// 跳转对应的详情页
 			toVoteDetail(item) {
-
+				console.log("跳转放到投票详情页面---")
 				this.voteObject.activityId = this.activity.activityId
 				this.voteObject.opusType = this.opusType
 				// 将当前项目下的项目id传给voteObject
@@ -175,8 +184,8 @@
 				this.voteObject.opusBrief = item.opusBrief
 				this.voteObject.tjtActivityPictureList = item.tjtActivityPictureList
 				uni.navigateTo({
-					url: '/pages_vote/tjty_vote_detail/tjty_vote_detail?param=' + encodeURIComponent(JSON
-						.stringify(this.voteObject)),
+					// url: '/pages_vote/tjty_vote_detail/tjty_vote_detail?param=' + encodeURIComponent(JSON.stringify(this.voteObject)),
+					url: '/pages_vote/tjty_vote_detail/tjty_vote_detail?param=' +JSON.stringify(this.voteObject),
 				})
 			}
 		},

tjty-app/pages_vote/tjty_vote_detail/tjty_vote_detail.vue

 <template>
 	<view>
 		<view class="production-content">
-			<swiper v-if="opusType == 1" class="swiper-home" indicator-dots="true" autoplay="true" interval="2000"
+			<swiper v-if="opusType == '1'" class="swiper-home" indicator-dots="true" autoplay="true" interval="2000"
 				circular="true" indicator-color="#000" indicator-active-color="#FF0000">
 				<swiper-item v-for="(item,index) in bannerList" :key="index">
 					<image :src="item.url" :webp="true" @click="clickImg(item.url)"></image>
-
 				</swiper-item>
 			</swiper>
-			<video v-if=" opusType == 2" id="myVideo" class="video" show-fullscreen-btn :src="bannerList[0].url" :controls="true"
-				:show-mute-btn="true" direction="0"></video>
+			<video v-if=" opusType == '2'" id="myVideo" class="video" show-fullscreen-btn :src="bannerList[0].url"
+				:controls="true" :show-mute-btn="true" direction="0"></video>
 			<view class="vote-main">
 				<text class="production-name">{{name}}的作品</text>
 				<text class="vote-message">
@@ -29,6 +28,9 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex'
 	import {
 		setVoteAxios,
 		getCurrentVoteAxios
@@ -43,11 +45,31 @@
 				productionId: '',
 				bannerList: [],
 				opusBrief: '',
-				weChatId: 1,
+				weChatId: '',
 				opusType: 1,
 				opusId: ''
 			}
 		},
+		computed: {
+			...mapState('m_user', ['userInfo']),
+		},
+		onLoad(option) { //option为object类型，会序列化上个页面传递的参数
+		this.weChatId = this.userInfo.wechatId
+			console.log("详情页获取的信息：", JSON.parse(option.param))
+			if (option.param) {
+				console.log("详情页获取的信息：", JSON.parse(option.param))
+				this.name = JSON.parse(option.param).productionName
+				this.votes = JSON.parse(option.param).productionVote
+				this.projectId = JSON.parse(option.param).projectId
+				this.activityId = JSON.parse(option.param).activityId
+				this.productionId = JSON.parse(option.param).productionId
+				this.bannerList = JSON.parse(option.param).tjtActivityPictureList
+				this.opusBrief = JSON.parse(option.param).opusBrief
+				this.opusType = JSON.parse(option.param).opusType
+				this.opusId = JSON.parse(option.param).productionId
+			}
+			
+		},
 		methods: {
 
 			clickImg(imgUrl) {
@@ -101,27 +123,6 @@
 			}
 		},
 		
-		onLoad(option) { //option为object类型，会序列化上个页面传递的参数
-			if (option) {
-				if (option.param) {
-					console.log("详情页获取的信息：", JSON.parse(decodeURIComponent(option.param)))
-					this.name = JSON.parse(decodeURIComponent(option.param)).productionName
-					this.votes = JSON.parse(decodeURIComponent(option.param)).productionVote
-					this.projectId = JSON.parse(decodeURIComponent(option.param)).projectId
-					this.activityId = JSON.parse(decodeURIComponent(option.param)).activityId
-					this.productionId = JSON.parse(decodeURIComponent(option.param)).productionId
-					this.bannerList = JSON.parse(decodeURIComponent(option.param)).tjtActivityPictureList
-					this.opusBrief = JSON.parse(decodeURIComponent(option.param)).opusBrief
-					this.opusType = JSON.parse(decodeURIComponent(option.param)).opusType
-					this.opusId = JSON.parse(decodeURIComponent(option.param)).productionId
-					console.log("作品id：", this.opusId)
-					console.log("作品id：", this.bannerList)
-
-
-				}
-
-			}
-		}
 	}
 </script>