修改部分存在的问题

h5_web/common/config.js

@@ -1,8 +1,8 @@
 /**
  * 配置通用 
  */
-// const baseUrl = 'https://wx.hw.hongweisoft.com/veterans' // 测试环境地址
-const baseUrl = 'http://api.veterans.hongweisoft.com' // 正式环境地址
+const baseUrl = 'https://wx.hw.hongweisoft.com/veterans' // 测试环境地址
+// const baseUrl = 'http://api.veterans.hongweisoft.com' // 正式环境地址
 const config = {
 	baseUrl: `${baseUrl}/app` ,// 201服务器地址
 	uploadUrl: `${baseUrl}/file/upload/single/minio`, // 测试环境上传地址

h5_web/components/judge-auth/judge-auth.vue

@@ -1,11 +1,14 @@
 <template>
-  <u-modal
-    v-model="show"
-    :content="content"
-    :show-cancel-button="true"
-    @cancel="cancel"
-    @confirm="confirm"
-  ></u-modal>
+  <view class="">
+  	<u-modal
+  	  v-model="show"
+  	  :content="content"
+  	  :show-cancel-button="true"
+  	  @cancel="cancel"
+  	  @confirm="confirm"
+  	></u-modal>
+		<u-toast ref="uToast" />
+  </view>
 </template>
 
 <script>
@@ -23,19 +26,19 @@ export default {
      * @param {Object} bool
      */
     modalShow(url) {
-			console.log(url);
 			this.$u.api.getmemberinfo().then(res => {
-				console.log('用户基本信息:', res.data)
 				if (res.code === 200){
 					this.$u.vuex('vuex_memberInfo', res.data);
-					this.auditStatus = Number(res.data.auditStatus)
+					if (res.data.auditStatus || res.data.auditStatus === 0) {
+						this.auditStatus = Number(res.data.auditStatus)
+					}
 					switch (Number(res.data.auditStatus)){
 						case 0:
 							this.content = '您的认证正在审核中,该功能需要认证后才能使用!'
 							this.show = true
 							break;
 						case 1:
-							this.content = '您的认证未通过,无法使用该功能!'
+							this.content = '您的认证未通过,,该功能需要认证后才能使用!'
 							this.show = true
 							break;
 						case 2:
@@ -72,7 +75,7 @@ export default {
      */
     confirm() {
       this.show = false;
-			if (this.auditStatus === 1 || this.auditStatus === 3 ) {
+			if (this.auditStatus === 1 || this.auditStatus === 3 || this.auditStatus === 9) {
 				uni.navigateTo({
 				  url: '/pages/applyEducationCode/applyEducationCode'
 				});

h5_web/pages.json

@@ -509,7 +509,8 @@
 				"navigationBarTitleText": "课程详细",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#3D5D4C",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
 			}
 
 		}, {

h5_web/pages/applyEducationCode/applyEducationCode.vue

@@ -290,7 +290,7 @@
 						.replaceAll(':', '=')
 						.replaceAll(',', '&');
 					// 清空其他路由，直接跳转最后登录的页面
-					uni.reLaunch({
+					uni.navigateTo({
 						url: `/${last_page}?${str}`
 					});
 					return;

h5_web/pages/mine/mine.vue

@@ -45,7 +45,7 @@
 					<view>技能培训</view>
 				</view>
 				<view class="mine-info-gain-item">
-					<view>{{ countData.learnTime || 0 }}<text>小时</text></view>
+					<view>{{ countData.learnTime ? (Number(countData.learnTime) / 3600).toFixed(2) : 0 }}<text>小时</text></view>
 					<view>学习时长</view>
 				</view>
 				<view class="mine-info-gain-item">

h5_web/pages/mine/skillsTraining/skillsTrainingDetails/skillsTrainingDetails.vue

@@ -70,7 +70,7 @@
 							</view>
 							<view class="right">
 								<view>{{ item.name }}</view>
-								<view>{{` 共${item.amount}课,已学完${item.finishCount},学习进度${item.finishPercent}% `}}</view>
+								<view>{{` 共${item.amount || 0}课,已学完${item.finishCount || 0},学习进度${item.finishPercent || 0}% `}}</view>
 							</view>
 						</view>
 					</view>

h5_web/pages/skillsTraining/courseDetailed/courseDetailed.vue

@@ -4,7 +4,7 @@
 		<!-- 视频 -->
 		<view class="details-video" v-if="isPlay">
 			<video class="details-video-con" id="myVideo" @timeupdate="timeUpdate" :src="videoInfo.videoUrl" controls
-				:initial-time="initial_time" object-fit="fill" play-btn-position="center" @tap="videoClick">
+				:initial-time="initial_time" object-fit="fill" play-btn-position="center" @tap="videoClick" @loadedmetadata="loadedmetadata">
 				<cover-view class="video-control">
 					<cover-view class="multi rate" @tap.stop="showSwitchRate">x {{ currentRate }}</cover-view>
 				</cover-view>
@@ -122,7 +122,8 @@
 					starLevel: 0,
 					content: ''
 				},
-				currentDuration: 0
+				currentDuration: 0,
+				duration: 0
 			}
 		},
 		onLoad(page) {
@@ -142,10 +143,19 @@
 			this.submitTimeLong({
 				tabId: this.videoInfo.id,
 				playDuration: playDuration,
-				currentDuration: this.currentDuration
+				currentDuration: this.currentDuration,
+				duration: this.duration
 			}, 0, true)
 		},
 		methods: {
+			/**
+			 * 获取视频总时长
+			 * @param {Object} data
+			 */
+			loadedmetadata(data) {
+				console.log(data);
+				this.duration = data.detail.duration
+			},
 			/**
 			 * 显示倍速浮层
 			 * @param {Object} rate
@@ -211,6 +221,7 @@
 				this.submitTimeLong ({
 					tabId: this.videoInfo.id,
 					playDuration: playDuration,
+					duration: this.duration,
 					currentDuration: this.currentDuration
 				}, index);
 			},
@@ -264,13 +275,15 @@
 			submitTimeLong({
 				tabId,
 				playDuration,
-				currentDuration
+				currentDuration,
+				duration
 			}, index, flag) {
 				if (tabId) {
 					this.$u.api.training.videoTimeLongApi({
 						tabId,
 						playDuration,
-						currentDuration
+						currentDuration,
+						duration
 					}).then(res => {
 						if (res.code === 200) {
 							if (!flag) {

h5_web/pages/skillsTraining/skillsPackage/skillsPackage.vue

@@ -166,7 +166,7 @@
 					this.$u.route({
 						url: 'pages/skillsTraining/courseDetailed/courseDetailed',
 						params: {
-							id
+							id: item
 						}
 					})
 				} else {

h5_web/pages/skillsTraining/skillsTraining.vue

@@ -1,7 +1,8 @@
 <!-- 技能培训 -->
 <template>
 	<view class="training">
-		<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>
 		<!-- banner -->
 		<view class="training-banner">
 			<u-swiper v-if="bannerList.length" :list="bannerList" name="bannerUrl" border-radius="0" mode="round"
@@ -12,7 +13,7 @@
 		<view class="training-total" @click="jumpPage('/pages/mine/skillsTraining/skillsTraining')" v-if="isAddClass">
 			<view class="training-total-left">
 				<view>我的技能培训</view>
-				<view>学习时长：{{ skillTotal.learnTime }}小时</view>
+				<view>学习时长：{{ skillTotal.learnTime ? (Number(skillTotal.learnTime) / 3600).toFixed(2) : 0 }}小时</view>
 			</view>
 			<view class="training-total-right">
 				<u-icon name="arrow-right" size="44" color="#666"></u-icon>
@@ -26,38 +27,41 @@
 
 		<!-- 报班通知 -->
 		<view class="training-notice">
-			<view class="training-notice-title">
-				<view>报班通知</view>
-				<view @click="jumpPage('pages/skillsTraining/registrationNotice/registrationNotice')">
-					<text>更多</text>
-					<u-icon name="arrow-right"></u-icon>
+			<template v-if="enrollList.length">
+				<view class="training-notice-title">
+					<view>报班通知</view>
+					<view @click="jumpPage('pages/skillsTraining/registrationNotice/registrationNotice')">
+						<text>更多</text>
+						<u-icon name="arrow-right"></u-icon>
+					</view>
 				</view>
-			</view>
-			<view class="training-notice-content">
-				<swiper class="swiper" :indicator-dots="true" :autoplay="false" :interval="1000" :duration="500"
-					indicator-color="#D8D8D8" indicator-active-color="#D8D8D8">
-					<swiper-item v-for="(item, index) in enrollList" :key="index">
-						<view class="swiper-item">
-							<view class="left">
-								<u-image :src="item.img" mode="aspectFill" border-radius="10" height="220" width="204">
-									<view slot="error">
-										<u-image src="../../static/img/no-image.png" width="204" height="220"
-											border-radius="10" mode="aspectFill" />
+				<view class="training-notice-content">
+					<swiper class="swiper" :indicator-dots="true" :autoplay="false" :interval="1000" :duration="500"
+						indicator-color="#D8D8D8" indicator-active-color="#D8D8D8">
+						<swiper-item v-for="(item, index) in enrollList" :key="index">
+							<view class="swiper-item">
+								<view class="left">
+									<u-image :src="item.img" mode="aspectFill" border-radius="10" height="220"
+										width="204">
+										<view slot="error">
+											<u-image src="../../static/img/no-image.png" width="204" height="220"
+												border-radius="10" mode="aspectFill" />
+										</view>
+									</u-image>
+								</view>
+								<view class="right">
+									<view class="item">{{ item.name }}</view>
+									<view class="item">{{ item.schoolName }}</view>
+									<view class="item">
+										<u-parse :html="item.description"></u-parse>
 									</view>
-								</u-image>
-							</view>
-							<view class="right">
-								<view class="item">{{ item.name }}</view>
-								<view class="item">{{ item.schoolName }}</view>
-								<view class="item">
-									<u-parse :html="item.description"></u-parse>
+									<view class="btn" @click="signUp(item)">报名</view>
 								</view>
-								<view class="btn" @click="signUp(item)">报名</view>
 							</view>
-						</view>
-					</swiper-item>
-				</swiper>
-			</view>
+						</swiper-item>
+					</swiper>
+				</view>
+			</template>
 		</view>
 
 		<!-- 技能包 -->
@@ -75,8 +79,8 @@
 					<view class="border-1">
 						<u-image :src="item.img" mode="aspectFill" border-radius="10" height="180" width="294">
 							<view slot="error">
-								<u-image src="../../static/img/no-image.png" height="190" width="300"
-									border-radius="10" mode="aspectFill" />
+								<u-image src="../../static/img/no-image.png" height="190" width="300" border-radius="10"
+									mode="aspectFill" />
 							</view>
 						</u-image>
 					</view>
@@ -209,17 +213,17 @@
 			},
 			adoptAuth(item) {
 				this.$u.api.skillTraining.signUpClassApi({
-						packageId: item.id
-					}).then(res => {
-						if (res.code === 200) {
-							this.jumpPage('/pages/skillsTraining/submitSuccess/submitSuccess');
-						} else {
-							this.$refs.uToast.show({
-								title: res.msg,
-								type: 'error'
-							})
-						}
-					})
+					packageId: item.id
+				}).then(res => {
+					if (res.code === 200) {
+						this.jumpPage('/pages/skillsTraining/submitSuccess/submitSuccess');
+					} else {
+						this.$refs.uToast.show({
+							title: res.msg,
+							type: 'error'
+						})
+					}
+				})
 			},
 			/**
 			 * 问题咨询