Browse Source

青年夜校

wkyy 1 year ago
parent
commit
d97428b1fd
3 changed files with 19 additions and 9 deletions
  1. 2 2
      config/.env.dev.js
  2. 2 2
      pages/youth/course/shoppingCar.vue
  3. 15 5
      pages/youth/search/searchResult.vue

+ 2 - 2
config/.env.dev.js

@@ -1,8 +1,8 @@
 const UNI_APP = {  
 const UNI_APP = {  
 	ProjectName :"51充电联盟",
 	ProjectName :"51充电联盟",
 	// BASE_URL: 'http://47.98.231.198:9090/qsng-server/',
 	// BASE_URL: 'http://47.98.231.198:9090/qsng-server/',
-	// BASE_URL: 'http://114.55.55.123/qsng-server/',
-	BASE_URL: 'http://192.168.33.220:8086/education-training-server/', //颜
+	BASE_URL: 'http://114.55.55.123/qsng-server/',
+	// BASE_URL: 'http://192.168.33.220:8086/education-training-server/', //颜
 	// BASE_URL: 'http://192.168.11.120:8086/education-training-server/', //wang
 	// BASE_URL: 'http://192.168.11.120:8086/education-training-server/', //wang
 	// BASE_URL: 'http://192.168.33.230:8086/education-training-server/', //me
 	// BASE_URL: 'http://192.168.33.230:8086/education-training-server/', //me
 	// BASE_URL: 'http://192.168.77.162:8086/education-training-server/',
 	// BASE_URL: 'http://192.168.77.162:8086/education-training-server/',

+ 2 - 2
pages/youth/course/shoppingCar.vue

@@ -15,14 +15,14 @@
 				<radio value="" :checked="item.shoppingChecked" /><text></text>
 				<radio value="" :checked="item.shoppingChecked" /><text></text>
 			</label>
 			</label>
 			<!-- 照片 -->
 			<!-- 照片 -->
-			<view class="photo" v-if="item.nsCourseBase.posterUrl != null">
+			<view class="photo" v-if="item.nsCourseBase != null">
 				<img :src="item.nsCourseBase.posterUrl" alt="">
 				<img :src="item.nsCourseBase.posterUrl" alt="">
 			</view>
 			</view>
 			<view class="photo" v-else>
 			<view class="photo" v-else>
 				<img src="../../../assets/img/picture1.png" alt="">
 				<img src="../../../assets/img/picture1.png" alt="">
 			</view>
 			</view>
 			<!-- 课程信息 -->
 			<!-- 课程信息 -->
-			<view class="class-infos">
+			<view class="class-infos" v-if="item.nsCourseBase != null">
 				<view class="title">
 				<view class="title">
 					<view :class="{className,editing:edit==true}">
 					<view :class="{className,editing:edit==true}">
 						{{item.nsCourseBase.courseName}}
 						{{item.nsCourseBase.courseName}}

+ 15 - 5
pages/youth/search/searchResult.vue

@@ -6,7 +6,7 @@
 		</view>
 		</view>
 		<view class="main">
 		<view class="main">
 			<view class="result-box" v-for="(item,index) in reCoursesList" :key="index"
 			<view class="result-box" v-for="(item,index) in reCoursesList" :key="index"
-				@click="toCourseDetails(item)">
+				@click="toCourseDetails(item)" v-if="item.classStatus != '3'">
 				<view class="picture" v-if="item.posterUrl != null">
 				<view class="picture" v-if="item.posterUrl != null">
 					<img :src="item.posterUrl" alt="">
 					<img :src="item.posterUrl" alt="">
 				</view>
 				</view>
@@ -89,7 +89,15 @@
 					pageSize: 10000
 					pageSize: 10000
 				}).then((res) => {
 				}).then((res) => {
 					uni.hideLoading();
 					uni.hideLoading();
-					this.reCoursesList = res.data.data;
+					// this.reCoursesList = res.data.data;
+					var list = res.data.data;
+					var list2 = [];
+					for (var i = 0; i < list.length; i++) {
+						if(list[i].classStatus != '3') {
+							list2.push(list[i]);
+						}
+					}
+					this.reCoursesList = list2;
 				}).catch(error => {
 				}).catch(error => {
 					uni.showToast({
 					uni.showToast({
 						title: error,
 						title: error,
@@ -98,9 +106,11 @@
 				})
 				})
 			},
 			},
 			toCourseDetails(item) {
 			toCourseDetails(item) {
-				uni.navigateTo({
-					url: '/pages/youth/course/courseDetails?id='+item.course_id+'&classId='+item.class_id
-				})
+				if(item.classStatus != '4') {
+					uni.navigateTo({
+						url: '/pages/youth/course/courseDetails?id='+item.course_id+'&classId='+item.class_id
+					})
+				}
 			}
 			}
 		}
 		}
 	}
 	}