修复bug

h5_web/pages/myInterview/myInterview.vue

@@ -15,7 +15,8 @@
 -->
 <template>
 	<view class="interview">
-		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }" :border-bottom="false"></u-navbar>
+		<u-navbar back-text="" title="" back-icon-color="#FFFFFF" :background="{ background: '#3D5D4C' }"
+			:border-bottom="false"></u-navbar>
 		<z-paging ref="paging" v-model="interviewList" @query="queryList">
 			<view class="interview-list">
 				<view class="interview-list-item" v-for="(item, index) in interviewList" :key="index">
@@ -25,7 +26,8 @@
 							<image src="../../static/img/shijian.png" />
 						</view>
 					</view>
-					<view class="interview-list-item-date" :class="{'disable': item.status == 40 || item.status == 80}">{{ item.interviewTime }}</view>
+					<view class="interview-list-item-date" :class="{'disable': item.status == 40 || item.status == 80}">
+						{{ item.interviewTime }}</view>
 					<view class="interview-list-item-way">{{ item.interviewAddress }}</view>
 					<view class="interview-list-item-position">
 						<view class="left">
@@ -53,12 +55,12 @@
 					</view>
 					<!-- 当状态为30时且面试时间大于当前时间 -->
 					<view class="interview-list-item-button"
-						v-if="Number(item.status) === 30 && new Date(item.interviewTime).valueOf() < new Date().valueOf()">
+						v-if="Number(item.interviewMethod === 0) && Number(item.status) === 30 && new Date(item.interviewTime).valueOf() < new Date().valueOf()">
 						<view class="submit btn" @click="videoInterview(item)">发起视频面试</view>
 					</view>
 					<!-- 当状态为30时且面试时间小于当前时间 -->
 					<view class="interview-list-item-button"
-						v-else-if="Number(item.status) === 30 && new Date(item.interviewTime).valueOf() >= new Date().valueOf()">
+						v-else-if="Number(item.interviewMethod === 0) && Number(item.status) === 30 && new Date(item.interviewTime).valueOf() >= new Date().valueOf()">
 						<view class="not btn">未到视频面试</view>
 					</view>
 					<!-- 当状态为50时,拒绝入职/接受入职 -->
@@ -188,11 +190,14 @@
 			 * @param {Number} state
 			 */
 			changeInterviewState(item, state) {
-				this.$u.api.interview.changeInterviewStateApi({ status: state, id: item.id }).then(res => {
+				this.$u.api.interview.changeInterviewStateApi({
+					status: state,
+					id: item.id
+				}).then(res => {
 					console.log(res)
 					if (res.code === 200) {
 						let msg;
-						switch(state) {
+						switch (state) {
 							case 30:
 								msg = '已接受面试'
 								break;

h5_web/pages/skillsTraining/registrationNotice/registrationNotice.vue

@@ -13,7 +13,7 @@
 						<view class="name">{{ item.name }}</view>
 						<view class="school">{{ item.schoolName }}</view>
 						<view class="content">
-							<u-parse :html="item.description"></u-parse>
+							<!-- <u-parse :html="item.description"></u-parse> -->
 						</view>
 						<view class="button" @click="signUp(item)">报名</view>
 					</view>

h5_web/pages/skillsTraining/skillsPackage/skillsPackage.vue

@@ -61,10 +61,11 @@
 								@click="jumpPageDetails(item.id)">
 								<!-- jumpPage('pages/skillsTraining/courseDetailed/courseDetailed', { id: item.id }) -->
 								<view class="img">
-									<u-image :src="item.img" width="90%" height="196" border-radius="10" mode="aspectFill">
+									<u-image :src="item.img" width="90%" height="196" border-radius="10"
+										mode="aspectFill">
 										<view slot="error">
-											<u-image src="../../../static/img/default-company.png" height="220" width="95%"
-												border-radius="10" mode="aspectFill" />
+											<u-image src="../../../static/img/default-company.png" height="220"
+												width="95%" border-radius="10" mode="aspectFill" />
 										</view>
 									</u-image>
 								</view>
@@ -90,7 +91,7 @@
 		</view>
 		<view class="package-btn" v-if="isApply == 0" @click="signUp">报名</view>
 		<u-toast ref="uToast" />
-		<judge-auth ref="judgeAuth"  @adoptAuth="adoptAuth"/>
+		<judge-auth ref="judgeAuth" @adoptAuth="adoptAuth" />
 	</view>
 </template>
 
@@ -175,7 +176,9 @@
 						packageId: this.packageId
 					}).then(res => {
 						if (res.code === 200) {
-							this.jumpPage('/pages/skillsTraining/submitSuccess/submitSuccess');
+							this.jumpPage('/pages/skillsTraining/submitSuccess/submitSuccess', {
+								schoolName: this.details.schoolName
+							});
 						} else {
 							this.$refs.uToast.show({
 								title: res.msg,

h5_web/pages/skillsTraining/submitSuccess/submitSuccess.vue

@@ -9,7 +9,7 @@
 				<u-image src="../../../static/img/success-icon.png" mode="aspectFill" width="176" height="176"></u-image>
 			</view>
 			<view class="box-content-tips1">意向已提交</view>
-			<view class="box-content-tips2">恭喜您，已将培训意向提交贵州工业职业技术学院，后续老师会根据报名情况确定是否开班，并联系您办理报名入学手续。</view>
+			<view class="box-content-tips2">恭喜您，已将培训意向提交{{ schoolName }}，后续老师会根据报名情况确定是否开班，并联系您办理报名入学手续。</view>
 			<view class="box-content-btn" @click="returnIndex">返回首页</view>
 		</view>
 	</view>
@@ -19,9 +19,13 @@
 	export default {
 		data() {
 			return {
-				
+				schoolName: ''
 			}
 		},
+		onLoad(page) {
+			const { schoolName } = page
+			this.schoolName = schoolName
+		},
 		methods: {
 			returnIndex() {
 				uni.switchTab({

h5_web/pages/upgrade/courseDetail/courseDetail.vue

@@ -283,8 +283,8 @@
 				if (this.query.tabId) {
 					this.$u.api.training.getClassesCommentApi(this.query).then(res => {
 						if (res.code === 200) {
-							this.total = Number(res.data.total);
-							this.commentList = res.data.rows
+							this.total = Number(res.total);
+							this.commentList = res.rows
 						}
 					})
 				}

h5_web/pages/upgrade/professionalIntroduction/professionalIntroduction.scss

@@ -116,7 +116,7 @@
 				
 				.list {
 					.swiper {
-						height: 290rpx;
+						height: 320rpx;
 					}
 					.swiper-item {
 						width: 50%!important;

h5_web/pages/upgrade/professionalIntroduction/professionalIntroduction.vue

@@ -41,11 +41,10 @@
 							class="swiper"
 							:indicator-dots="false"
 							:autoplay="false"
-							height="196rpx"
 						>
 							<swiper-item class="swiper-item" v-for="(item, index) in details.courseList" :key="index" @click="jumpPage('/pages/upgrade/courseDetail/courseDetail', { id: item.id })">
 								<view class="image">
-									<u-image :src="item.img" width="95%" height="196" border-radius="10"/>
+									<u-image :src="item.img" width="95%" height="196rpx" border-radius="10"/>
 								</view>
 								<view class="classes-name">{{ item.name }}</view>
 								<view class="classes-teacher">讲师：{{ item.teacherName }}</view>