1

pages/school/courseContent.vue

@@ -12,8 +12,9 @@
 				<text>分享</text>
 			</view>
 			<view class="course-t-item" @click="setFavorite">
+				<image v-if='favorite' src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/collect.png" class="share-icon" />
+				<image v-else src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/nocollect.png" class="share-icon" />
 				
-				<u-icon :name="favorite ? 'like' : 'like-o'" size="44" :color="favorite ? pricecolor : '#333'"></u-icon>
 				<text>收藏</text>
 			</view>
 			<view class="course-t-item">

pages/school/courseInfo.vue

@@ -174,7 +174,8 @@
 				  <view class="cb-l-bt" >{{cl.TypeName}}</view>
 				  {{cl.SortName}}{{cl.Name}}
 			  </view>
-			  <view :style="{color:mc}" class="catalog-box-r">
+			  <!-- IsPay 0不可看    1已付款   2已下单 -->
+			  <view :style="{color:mc}" class="catalog-box-r" v-if="cl.IsPay!=1">
 				  {{cl.IsTrySee==1?'可试看':'购买'}}
 			  </view>
 		  </view>
@@ -202,7 +203,7 @@
 			<view class="gwuche" :style="{background:mc,'border':'1px solid'+mc}" v-if='g.is_pay==false && g.is_orders==false && g.price!=0' @click="goSettlement">
 				<text style="color: #fff;" >立即购买</text>
 			</view>
-			<view class="gwuche" :style="{background:mc,'border':'1px solid'+mc}" v-if='g.price==0||g.is_pay==true' >
+			<view class="gwuche" :style="{background:mc,'border':'1px solid'+mc}" v-if='g.price==0||g.is_pay==true' @click="goMystudy()">
 				<text style="color: #fff;" >学习中心</text>
 			</view>
 		</view>
@@ -572,9 +573,22 @@ export default {
 
 
 	gocourse(item,index){//跳入课程详情
+		if(item.IsTrySee==1){
+			uni.navigateTo({
+				url:'/pages/school/courseContent?id='+this.id+'&name='+this.g.name+'&index='+index
+			})
+		}else{
+			uni.showToast({
+				title: '购买之后才能观看',
+				icon: 'none',
+				duration: 2000
+			});
+		}
 		
+	},
+	goMystudy(){//学习中心
 		uni.navigateTo({
-			url:'/pages/school/courseContent?id='+this.id+'&name='+this.g.name+'&index='+index
+			url:'/pages/school/mystudy/mystudy'
 		})
 	},
 

pages/school/personal/followTeacher.vue

@@ -19,13 +19,13 @@
         :style="{ height: '100%' }"
       >
 	  <view class="ftBox">
-		  <view class="interDList" v-for="(x, i) in g" :key="i">
+		  <view class="interDList" v-for="(x, i) in g" :key="i" @click="goteacher(x)">
 		  	<u-avatar :src="x.TeacherLogo" size="110"></u-avatar>
 		  	<view :style="{'width':(windowWidth-30-55-20-70)+'px','margin-left':'10px'}">
 		  		<view class="teinfo">{{x.Name}}</view>
 		  		<view class="teinfo" style="margin-top: 10px;font-size: 11px;color: #999999;">{{x.Major}}</view>
 		  	</view>
-			<view class="gzbtn" @click="setFollowTeacher(x,i)" >
+			<view class="gzbtn" @click.stop="setFollowTeacher(x,i)" >
 				<text style="color: #999999;">取消关注</text>
 			</view>
 			<!-- <view class="gzbtn" v-if="x.Followteacher==0" :style="{background:mainColor,'border':'0.5px solid'+mainColor}" @click="setFollowTeacher(x,i)">
@@ -188,6 +188,9 @@ export default {
 	gbAuth(){
 		uni.navigateBack()
 	},
+	goteacher(item){//老师详情
+		uni.navigateTo({ url: '/pages/school/teacherDetails?ID='+item.TeacherId })
+	}
   },
 };
 </script>

pages/school/personal/studycard.vue

@@ -231,7 +231,7 @@ export default {
 	padding: 15px;
 	display: flex;
 	flex-direction: column;
-	position: relative;
+	
 }
 .studycard  .item {
   display: flex;
@@ -253,6 +253,7 @@ export default {
   padding: 10px;
   display: flex;
   align-items: center;
+  position: relative;
 }
 .studycard .details .item .detail .coupond {
   flex: 1;
@@ -292,10 +293,10 @@ export default {
   border-radius: 4px;
 }
 
-.studycard .imgs{
+.studycard .details .imgs{
 	width: 55px; height: 52px;
-	position: absolute;top: 16px;
-	right: 16px;
+	position: absolute;top: 0px;
+	right: 0px;
 }