Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/pages/learn/course-detail.vue

@@ -242,9 +242,10 @@ export default {
   }
   .learn-list {
     .learn-list-item {
-      font: 24rpx;
+      font-size: 28rpx;
       margin-top: 30rpx;
-      margin-bottom: 30rpx;
+      margin-bottom: 30rpx;
+	  color: #333333;
     }
 
     .line-view {

src/pages/settle/prompt.vue

 <template>
 	<view class="container u-row-between" v-if="info">
 		<Settle :index="pageIndex">
-			<view class="content-view">
+			<view class="content-view">
+				<view style="min-height: 120rpx;" v-if="status == 8"></view>
 				<view class="u-flex u-row-center">
 					<image :class="['icon', {active: status != 1}]"
 						:src="imageUrl">
@@ -14,10 +15,12 @@
 					<text :class="['tips',info.tipsArr.length>1 && index===0 ? 'red' : '']"
 						v-for="(txt,index) in info.tipsArr" :key="index">{{txt}}</text>
 				</view>
-				<view class="services-view">
+				<view class="services-view">
+					<view v-if="status != 8">
 					<image class="service-info-image" :src="erweimaImage"></image>
 					<view class="content-info-tip">长按二维码添加官方客服微信</view>
 					<view class="content-info-tip">及时了解审核进度</view>
+					</view>
 				</view>
 				<button class="btn-submit" @click="$u.debounce(goPage, 500)">{{info.btnTxt}}</button>
 			</view>
@@ -261,6 +264,7 @@
 		.services-view {
 			padding-top: 50rpx;
 			text-align: center;
+			min-height: 120rpx;
 			.service-info-image {
 				margin-bottom: 30rpx;
 				width: 220rpx;