Merge branch 'dev' of http://gitlab.91isoft.com:90/wyf/tjty-app into dev

tjty-app/api/activity.js

@@ -78,12 +78,3 @@ export function addUnifiedOrder(orderVo) {
   })
 }
 
-
-//微信支付回调下
-export function addUnifiedOrderWx(orderVo) {
-  return request({
-    url: 'http://bin001.free.idcfengye.com/dealFlow/stream/wxPayNotify',
-    method: 'post',
-    data: orderVo
-  })
-}
\ No newline at end of file

tjty-app/pages_activity/activity_detail/activity_detail.vue

@@ -128,10 +128,9 @@
      console.log(this.activityId)
      this.getList(this.activityId)
     },
-    // onShow() {
-    //   console.log('onShow')
-    //   this.getList(this.activityId)
-    // },
+    onShow() {
+      this.getList(this.activityId)
+    },
     filters: {
            ellipsis(value){
                 if (!value) return '';

tjty-app/pages_activity/activity_immedSignIn/activity_immedSignIn.vue

@@ -26,7 +26,7 @@
         	<uni-easyinput :inputBorder="false" v-model="info.idCard" placeholder="请输入证件号" :clearable="false">
         	</uni-easyinput>
         </uni-forms-item>
-		<uni-forms-item label="活动分类" required name="projectId">
+		<uni-forms-item label="项目分类" required name="projectId">
 					<picker @change="projectPickerChange" :value="projectIndex" :range="projectList" range-key="projectName"
 						:disabled="projectDisable" @cancel="projectCancel">
 						<view v-if="projectIndex ===projectList.length" class="uni-input">请选择项目
@@ -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')
 			}
@@ -244,7 +245,7 @@ import {
             this.info.status = '0'
             addsignInInfo(this.info).then(response=>{
               console.log(response)   //存在的话就返回报错
-              if(response.data.code === 500)
+              if(response.code === 500)
               return uni.$showMsg(response.msg)
               this.orderVo.signupId = response.data.signupId
               this.orderVo.wechatId = this.info.wechatId

tjty-app/pages_course/tjty_course_course/course.vue

@@ -358,11 +358,6 @@
 							this.flag = false
 							this.list(this.type, this.queryParams.pageNum)	
 					},
-			
-			
-			
-			
-			
 			...mapMutations('m_user', ['updateToken']),
 			...mapMutations('m_user', ['updateUserInfo']),
 			//登录判断

tjty-app/pages_daily_answer/tjty_dailyAnswer/tjty_dailyAnswer.vue

@@ -91,10 +91,10 @@
 				</view>
 			</view>
 		</uni-popup>
-		
+
 		<uni-popup ref="masks" background-color="＃D3D3D3" :isMaskClick="false">
 			<view class="masks-popup">
-				
+
 			</view>
 		</uni-popup>
 	</view>
@@ -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;
@@ -869,9 +871,7 @@
 				}
 			}
 		}
-	
-		.masks-popup{
-			
-		}
+
+		.masks-popup {}
 	}
 </style>

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() {
@@ -140,7 +141,7 @@
 							errorMessage: '请输入姓名',
 						}, {
 							validateFunction: function(rule, value, data, callback) {
-								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')
 								}
@@ -154,7 +155,7 @@
 							errorMessage: '请输入姓名',
 						}, {
 							validateFunction: function(rule, value, data, callback) {
-								let nameReg = /^[A-z]{2,16}$|^[\u4E00-\u9FA5]{2,16}$/
+								let nameReg = /^[A-Za-z | \u4E00-\u9FA5]{2,16}$/
 								if (!nameReg.test(value)) {
 									callback('姓名只能输入汉字或字母且长度为2-16')
 								}
@@ -286,12 +287,15 @@
 			},
 			//获取当前报名此活动者
 			getPerson() {
-				getPeople(this.info.activityId).then(res => {
-					console.log("报名信息", res);
-					if (res.length > 0) {
-						this.peopleList = res
-					}
-				})
+				// 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);
+						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 = ''
+								// 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_feedback/tjty_feedback/tjty_feedback.vue

@@ -101,7 +101,8 @@
 				},
 				// 活动需要的作品形式（1--图片， 2--视频）
 				fileType: '1',
-				url: 'https://www.aiwanyundong.com/api/system/feedback/addFeedbackPicture',
+				// url: 'https://www.aiwanyundong.com/api/system/feedback/addFeedbackPicture',
+				url: 'https://www.aiwanyundong.com//stage-api/system/feedback/addFeedbackPicture',
 				// token: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImVmYzA4YjI4LTAwZGMtNGZkNy05NjRkLTU1YzgwOWMzNzAyOSJ9.sfi8a3ac3be7lXQAwbLmQQeYEnCBkUt0VzDFj0Q2VrdJPaQplA3ZocpH07jgTExdhMzWIlX6SuBJ1HazBxg4SQ',
 				clearIcon: '../../static/upload-img-icons/conteng_icon_del.png',
 				selectfile: 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjQiIGhlaWdodD0iNjQiIHZpZXdCb3g9IjAgMCA2NCA2NCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB4PSIuMjUiIHk9Ii4yNSIgd2lkdGg9IjYzLjUiIGhlaWdodD0iNjMuNSIgcng9IjMuNzUiIGZpbGw9IiNGMkYyRjIiIHN0cm9rZT0iI0YyRjJGMiIgc3Ryb2tlLXdpZHRoPSIuNSIvPjxyZWN0IHg9IjE2IiB5PSIzMSIgd2lkdGg9IjMyIiBoZWlnaHQ9IjIiIHJ4PSIxIiBmaWxsPSIjQkZCRkJGIi8+PHJlY3QgeD0iMzMiIHk9IjE2IiB3aWR0aD0iMzIiIGhlaWdodD0iMiIgcng9IjEiIHRyYW5zZm9ybT0icm90YXRlKDkwIDMzIDE2KSIgZmlsbD0iI0JGQkZCRiIvPjwvc3ZnPg==',

tjty-app/pages_home/tjty_home_page/tjty_home_page.vue

@@ -387,7 +387,6 @@
 					}
 
 					.c-card {
-
 						font-size: 32rpx;
 						width: 500rpx;
 						height: 80rpx;

tjty-app/pages_my/my/my.vue

@@ -216,6 +216,14 @@
 		position: relative;
 		overflow-x: hidden;
 		overflow-y: hidden;
+		
+		// top: 88rpx;
+		/* #ifdef APP-PLUS */
+		top: calc(var(--top-window-height) + 0px);
+		/* #endif */
+		-webkit-overflow-scroll:touch;
+		left: 0;
+		
 
 
 		.home{

tjty-app/pages_my/myActicity/myActivity.vue

@@ -25,7 +25,7 @@
 			<view class="info">
 				<view class="question" style="display: flex;width: 100%; justify-content: space-between;">
 					<view style="width: 80%;height: 100%;">
-							<view style="padding: 6% 3% 0 5%;height: 100%;">{{item.activityName}}</view>
+							<view style="padding: 6% 3% 0 5%;height: 100%;">{{item.activityName|ellipsis}}</view>
 					</view>
 					<view style="width: 20%;height: 100%;">
 						<!-- <view class="item1"> -->
@@ -44,26 +44,25 @@
 				</view>
 
 				<dividerface></dividerface>
-				<view class="item" style="display: flex">比赛时间:<view class="time">{{item.activityTime}}</view>
+				<view class="item" style="display: flex">比赛时间：<view class="time">{{item.activityTime}}</view>
 				</view>
-				<view class="item" style="display: flex">报名时间:<view class="time">
+				<view class="item" style="display: flex">报名时间：<view class="time">
 						{{item.taseCreateTime||item.tasCreateTime}}
 					</view>
 				</view>
-				<view class="item" style="display: flex;margin-left: 34rpx;">参赛人:<view class="time">
+				<view class="item" style="display: flex;margin-left: 34rpx;">参赛人：<view class="time">
 						{{item.tasName||item.taseName}}
 					</view>
 				</view>
 
 				<view style="display: flex;">
-					<button @tap="tapPopup(item.type,item.tasSignupId,item.taseSignupId)" style="width: 50%;background-color: #3b7cde;border-radius:0 0 0 16px;">报名详情</button>
+					<button @tap="tapPopup(item.type,item.tasSignupId,item.taseSignupId)" style="width: 50%;background-color: #3b7cde;border-radius:0 0 0 16px;color: aliceblue">报名详情</button>
 					<button @click="goDetail(item.type,wechatId,item.activityId)"
-						style="width: 50%;background-color: #3b7cde;border-radius:0 0 16px 0;">活动详情</button>
+						style="width: 50%;background-color: #3b7cde;border-radius:0 0 16px 0;color: aliceblue">活动详情</button>
 
 				</view>
 			</view>
 		</view>
-
 		<view class="popup" v-show="showexam" >
 					<view class="popup-info">
 					<view style="margin-bottom: 20px;margin-left: 45px;">学校&nbsp;:{{signupexamlist.school}}</view>
@@ -77,7 +76,6 @@
 					</view>
 				</view>
 		</view>
-		
 		<view class="popup" v-show="show">else
 					<view class="popup-info">
 			
@@ -116,6 +114,7 @@
 		userInfo
 	} from 'os';
 	export default {
+
 		data() {
 			return {
 				showtime:false,
@@ -130,6 +129,17 @@
 				signuplist:{}
 			}
 		},
+		
+		filters: {
+		       ellipsis(value){
+		            if (!value) return '';
+		            if (value.length > 31) {
+		              return value.slice(0,31) + '...'
+		            }
+		            return value
+		          }
+		},
+
 		computed: {
 			...mapState('m_user', ['userInfo']),
 		},

tjty-app/pages_my/my_faceback/my_faceback.vue

@@ -72,6 +72,10 @@
 		width: 100%;
 		height: auto;
 		background: #f5f5f5;
+		overflow-x: hidden;
+		overflow-y: hidden;
+		position: relative;
+		padding-bottom: 38rpx;
 	}	
 	.face_card{
 	margin:3% 5% 0 5%;

tjty-app/utils/request.js

 import store from '@/store/store.js'
 
-
-
 // 获取当前帐号信息
 const accountInfo = wx.getAccountInfoSync();