소스 검색

修复bug

chenxiong 3 년 전
부모
커밋
b5590f5aba
6개의 변경된 파일15개의 추가작업 그리고 10개의 파일을 삭제
  1. 2 2
      common/request.js
  2. 5 2
      components/course/courseSection.vue
  3. 2 1
      pages/index/index.vue
  4. 4 3
      pages2/wd/class.vue
  5. 1 1
      pages3/polyv/detail.vue
  6. 1 1
      pages4/login/login.vue

+ 2 - 2
common/request.js

@@ -5,9 +5,9 @@ import api from './api.js'
 var num = 1
 //接口api   
 // export const BASE_URL = 'https://api.xyyxt.net'   //release
-// export const BASE_URL = 'http://api.xyyxt.net:19009'   //预发布
+export const BASE_URL = 'https://test.xyyxt.net'   //预发布
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test
-export const BASE_URL = 'http://192.168.1.222:5055'    //dev
+// export const BASE_URL = 'http://192.168.1.222:5055'    //dev
 
  //图片上传api
 // export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release

+ 5 - 2
components/course/courseSection.vue

@@ -29,10 +29,13 @@
 							<text>回放</text>
 						</view> -->
 					</view>
-					<view style="font-size: 20rpx;color: #FF3B30;" v-if="menuItem.sectionType == 3 && !menuItem.recordingUrl">
-						<view >
+					<view style="font-size: 20rpx;color: #FF3B30;" v-if="menuItem.sectionType == 3">
+						<view v-if="!menuItem.recordingUrl">
 							<text>当前直播回放视频请稍后再查看</text>
 						</view>
+						<view v-else>
+							回放中
+						</view>
 					</view>
 				</view>
 				<view v-if="menuItem.sectionType==null">{{menuItem.name || ''}}</view>

+ 2 - 1
pages/index/index.vue

@@ -192,6 +192,7 @@ export default {
 	},
 	onPullDownRefresh() {},
 	async onLoad(option) {
+		this.dictObj
 		this.getAdvertising();
 		if(this.$method.isLogin()) {
 			try  {
@@ -703,7 +704,7 @@ export default {
 		}
 	},
 	onReachBottom() {},
-	computed: { ...mapGetters(['userInfo']) }
+	computed: { ...mapGetters(['dictObj','userInfo']) },
 };
 </script>
 

+ 4 - 3
pages2/wd/class.vue

@@ -25,7 +25,7 @@
 				</view>
 
 				<!-- 不在学习服务期 -->
-				<template v-if="sysTime < item.serviceStartTime || sysTime > item.serviceEndTime">
+				<template v-if="item.serviceStartTime && (sysTime < item.serviceStartTime || sysTime > item.serviceEndTime)">
 					<view class="class-warm" v-if="item.gradeId != 0 && item.gradeStatus == 1">
 						<view class="class-warm__text">
 							<view class="date">
@@ -94,7 +94,8 @@
 											<text v-else-if="item.stuAllNum+item.recordNum >= item.secAllNum+item.examNum">已学完</text>
 										</template>
 										<template v-else>
-											已过学习服务期,不可以学习了哦!
+											<template v-if="item.serviceStartTime">已过学习服务期,不可以学习了哦!</template>
+											
 										</template>
 									</view>
 								</view>
@@ -200,7 +201,7 @@
 
 						<view>
 							<u-button
-								:class="{disabled:sysTime <= item.serviceStartTime || sysTime >= item.serviceEndTime || (item.classStartTime && sysTime <= item.classStartTime) || (item.classEndTime && sysTime >= item.classEndTime) || item.learningStatus == 2 || item.classStatus == 0 || (item.learningStatus == 3 && sysTime < item.learningTimeStart)}"
+								:class="{disabled:(item.serviceStartTime && (sysTime <= item.serviceStartTime || sysTime >= item.serviceEndTime)) || (item.classStartTime && sysTime <= item.classStartTime) || (item.classEndTime && sysTime >= item.classEndTime) || item.learningStatus == 2 || item.classStatus == 0 || (item.learningStatus == 3 && sysTime < item.learningTimeStart)}"
 								type="warning" size="mini" @click.stop="studyIn(item.goodsId,item.gradeId,item,index)">
 								进入学习</u-button>
 						</view>

+ 1 - 1
pages3/polyv/detail.vue

@@ -7,7 +7,7 @@
     <view id="top">
       <view class="video_box" v-if="!startStatus">
         <image
-          :src="$method.splitImgHost(detail.coverUrl)"
+          :src="$method.splitImgHost(goodsData.coverUrl)"
           mode="widthFix"
           style="width: 100%; height: 421rpx"
         ></image>

+ 1 - 1
pages4/login/login.vue

@@ -1,6 +1,6 @@
 <template>
 	<view style="height: 100%;">
-		<image mode="widthFix" src="/pages5/static/login_bg.jpg" class="full_img"></image>
+		<image mode="widthFix" src="/pages4/static/login_bg.jpg" class="full_img"></image>
 		<u-navbar title="登录" :border-bottom="false" background="{ background: '#ffffff',opacity:0.4; }" title-color="#ffffff" back-icon-color="#ffffff"></u-navbar>
 		<view style="padding: 30rpx;">
 			<view style="width: 400rpx;">