Merge branch 'develop' into 'sit'

Develop

See merge request K17_AITS/tra-app!27

src/pages/courseDetail/components/comment.vue

@@ -18,7 +18,7 @@
 					{{item.bbsContent}}
 				</view>
 				<view class="img_div pic-cell">
-					<image-preview v-for="img in item.imgIdList" :imgId="img" class="pic-item"></image-preview>
+					<image-preview v-for="img in item.imgIdList" :imgId="img" class="pic-item" mode="scaleToFill"></image-preview>
 				</view>
 				<view class="time_and_reply">
 					<view class="time">{{item.bbsTm.substr(0,16)}}</view>
@@ -42,7 +42,7 @@
 					<view class="message_div" v-for="childrenItem in item.children">
 						<view class="head_div">
 							<image-preview v-if="childrenItem.userIconImgId" class="img-box img"
-								:src="childrenItem.userIconImgId"></image-preview>
+								:src="childrenItem.userIconImgId" ></image-preview>
 							<image v-else src="/static/images/me/default_user_avatar.png" class="img"></image>
 						</view>
 						<view class="msg_content">
@@ -197,6 +197,7 @@
 		border-radius: 8rpx;
 		// background-color: red;
 		margin-bottom: 24rpx;
+		overflow: hidden;
 	}
 
 	.send_evaluate_div_height {