Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

src/components/comment-input/comment-input.vue

@@ -11,7 +11,7 @@
 			<view class="picture-cont" v-if="isShow && !isReply">
 				<!-- 下方的图片展示框 -->
 				<view class="imgs-div" v-if="!isImg">
-					<image-preview class="upload-img" v-for="item in fileList" :imgId="item" mode=""></image-preview>
+					<image-preview class="upload-img" v-for="item in fileList" :imgId="item" mode="aspectFit"></image-preview>
 				</view>
 				<view class="picture" v-if="isImg">
 					<picture-upload :limit="4" v-model="fileList"></picture-upload>
@@ -75,7 +75,7 @@
 				<swiper-item key="2" class="swiper-item" v-if="!isReply">
 					<scroll-view :scroll-y="true" class="img-list">
 						<view class="img-item" v-for="memItem in memList" @click="setMemValue(memItem)">
-							<image-preview class="img_100" :src="memItem.ossAddr" :isCache="true" mode="aspectFill"></image-preview>
+							<image-preview class="img_100" :src="memItem.ossAddr" :isCache="true" mode="aspectFit"></image-preview>
 						</view>
 					</scroll-view>
 				</swiper-item>
@@ -159,6 +159,7 @@
 	const focus = (event) => {
 		isShow.value = true
 		isFocus.value = true
+		showEmoji.value = false
 		if (!isReply.value) {
 			getMemList()
 		}

src/pages/courseDetail/components/comment.vue

@@ -33,7 +33,7 @@
 						@click="showPicture(item.imgIdList, img,item)"
 						:src="img"
 						class="pic-item"
-						mode="scaleToFill"
+						mode="aspectFit"
 					></image-preview>
 				</view>
 				<view class="time_and_reply">

src/pages/index/components/answer.vue

@@ -32,9 +32,9 @@
       <view class="replay-btn" @click="reAnswer" v-if="!props.dataInfo.isHistory">
         <image class="icon" src="@/static/images/dialog/answer-restart1.png" style="width: 100%; height: 100%"></image>
       </view>
-      <view class="replay-btn" @click="stopAnswer" v-if="props.isAnswering && props.isLast">
+      <!-- <view class="replay-btn" @click="stopAnswer" v-if="props.isAnswering && props.isLast">
         <image class="icon" src="@/static/images/dialog/answer-stop1.png" style="width: 100%; height: 100%"></image>
-      </view>
+      </view> -->
       <view class="replay-btn" @click="zanAnswer">
         <image class="icon" v-if="props.dataInfo.likeStat !== 'Y'" src="@/static/images/dialog/answer-zan1.png" style="width: 100%; height: 100%"></image>
         <image class="icon" v-else src="@/static/images/dialog/answer-yizan1.png" style="width: 100%; height: 100%"></image>