1

pages/school/articleDetails.vue

@@ -44,7 +44,7 @@
 				  </view>
 				  <text style="font-size: 11px;color: #9A9A9A;">{{cx.CreateDate}}</text>
 			  </view>
-			  <view style="width: 100%;margin-top: 15px;font-size: 11px;color: #121212;">
+			  <view style="width: 100%;margin-top: 10px;font-size: 11px;color: #121212;line-height: 18px;">
 				  {{cx.Content}}
 			  </view>
 			  <view class="comment-dao" style="flex-wrap: wrap;margin-top: 5px;" v-if="cx.CommentImgList.length>0">

pages/school/courseContent.vue

@@ -20,7 +20,9 @@
 				</view>
 			</view>
 		    <view  v-if="selectcourse.Type!=1" class="studyimg">
-			   <image @click="previewImage(index)" v-if="selectcourse.ImageList.length>0 && selectcourse.ImageList[0].Path"  style="width:100%;height:100%;" :src="selectcourse.ImageList[0].Path" mode=""></image>
+			   <image @click="previewImage(index)" 
+			   v-if="selectcourse && selectcourse.ImageList.length>0 && selectcourse.ImageList[0].Path"  
+			   style="width:100%;height:100%;" :src="selectcourse.ImageList[0].Path" mode=""></image>
 			   <image style="width:100%;height:100%;" v-else src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/xuexibanner%20.png" mode=""></image>
 			   
 		    </view>
@@ -37,11 +39,11 @@
 				
 				<text>收藏</text>
 			</view>
-			<view class="course-t-item">
+			<!-- <view class="course-t-item">
 				<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/huanc.png" class="share-icon" />
 				<text>缓存</text>
-			</view>
-			<button style="width: 33.3%;height: 80%;position: absolute;left: 0,top:0;opacity: 0;" open-type="share"></button>
+			</view> -->
+			<button style="width: 50%;height: 80%;position: absolute;left: 0,top:0;opacity: 0;" open-type="share"></button>
 		</view>
 		<view style="width: 100%;height: 15px;background: #FAF8F9;"></view>
 		<view class="title">
@@ -496,7 +498,7 @@
 		position: relative;
 	}
 	.courseContent .course-t-item{
-		width: 33.3%;
+		width: 50%;
 		height: 100%;
 		display: flex;
 		flex-direction: column;

pages/school/courseInfo.vue

@@ -111,8 +111,8 @@
 			</view>
 		  </view>
 	  </view>
-	  <view style="width: 100%;height: 10px;background: #FAF8F9;"></view>
-      <view class="sku-box u-skeleton-rect" style="align-items: flex-start;">
+	  <view style="width: 100%;height: 10px;background: #FAF8F9;" v-if="g.goods_marketing_award.integral.title != ''"></view>
+      <view class="sku-box u-skeleton-rect" style="align-items: flex-start;" v-if="g.goods_marketing_award.integral.title != ''">
         <view class="label" style="margin-top: 5px;">活动</view>
         <view class="content" style="display: flex;flex-direction: column">
           <view
@@ -167,7 +167,7 @@
 	  
 	  <view class="tiaoti">
 	  		<view class="tiaoti-l"></view>
-	  		<text style="font-size: 16px;color: #1B1D1E;margin-left: 5px;">评价 <text style="font-size: 11px;color: #1C1E1F;margin-left: 5px;font-weight: 0;">{{commentcount}}条</text> </text>
+	  		<text style="font-size: 16px;color: #1B1D1E;margin-left: 5px;">评价 <text style="font-size: 11px;color: #1C1E1F;margin-left: 5px;font-weight: 0;" v-if="commentcount>0">{{commentcount}}条</text> </text>
 	  </view>
 	  <view class="sku-box u-skeleton-rect" style="justify-content: center;"  v-if="comments.length == 0 && setting.is_comment == 1">
 	    <view class="label">暂无评价信息</view>

pages/school/teacherDetails.vue

@@ -30,7 +30,7 @@
 					<u-avatar :src="teacher.teacherResult.TeacherLogo" size="140"></u-avatar>
 					<view class="teacherbox-r">
 						<text style="font-size: 16px;color: #121212;font-weight: bold;">{{teacher.teacherResult.Name}}</text>
-						<text style="font-size: 12px;color: #9A9A9A;margin: 10px 0;">{{teacher.teacherResult.Major}}</text>
+						<text style="font-size: 12px;color: #999999;margin: 10px 0;">{{teacher.teacherResult.Major}}</text>
 						<view class="teacherbox-b">
 							<view class="teacher-b-item" :style="{background:mc}" v-for="(x, i) in teacher.teacherResult.LableNameList" :key="ci">
 								{{x}}
@@ -286,8 +286,8 @@
 		}
 	.teacherDetails .course-top{
 		width: 100%;
-		height: 250px;
-		background: #A8D2C9;
+		height: 200px;
+		background: rgba(167, 210, 200, 0.5);
 	}
 	.teacherDetails .goback{
 		margin-left: 8px;
@@ -328,6 +328,7 @@
 		height: 100px;
 		background: #F5F6F7;
 		margin-top: -20px;
+		font-family: aa;
 		border-top-right-radius: 20px;
 		border-top-left-radius: 20px;
 	}
@@ -362,7 +363,7 @@
 	}
 	.teacherDetails .kecheng{
 		width: 100%;
-		margin-top: -20px;
+		margin-top: -30px;
 		background: #FFF;
 		border-top-right-radius: 20px;
 		border-top-left-radius: 20px;

pages/search/search.vue

@@ -169,7 +169,9 @@ export default {
       this.searchHistory = uni.getStorageSync("search_his");
     }
     this.mainColor = this.$uiConfig.mainColor;
-	this.IsEducation = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation :0;
+	this.IsEducation = uni.getStorageSync('basedata')
+	? (uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation?uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation:0) 
+	:0;
   },
   methods: {
 	//为你推荐

pages/user-center/user-center.vue

@@ -717,7 +717,7 @@ export default {
 	margin-bottom: 20px;
 }
 .userStyle .miniHeadTop{
-	height:240px;
+	height:200px;
 }
 .userBox .headCommon{
 	width:94%;