Browse Source

冲突解决

denghaoyue 6 years ago
parent
commit
f307b6c803
1 changed files with 0 additions and 13 deletions
  1. 0 13
      chat/src/components/index.vue

+ 0 - 13
chat/src/components/index.vue

@@ -359,29 +359,16 @@
 			<!-- 底部输入框 -->
 			<div class="footer row wrap" id='input_box'>
 				<!-- @keydown="inputNumFun()" -->
-<<<<<<< HEAD
 				<textarea
-=======
-				 <!-- <textarea  
->>>>>>> f66e6b0bf8455a9b957b56df1da1b52ef778bc8f
 						id="textarea"
 						v-model.trim="text_info"
 						placeholder="请输入你的问题:"
 						maxlength="450"
 						@keyup ='keyup_maxlength()'
 						 :style="{height:iboxheight}" 
-					
 				>
-<<<<<<< HEAD
 				</textarea>
 				<div class="send row item-center" style="border-bottom:.01rem solid #ddd;">
-=======
-				</textarea>  -->
-
-				 <autoTextarea placeholder="" lineHeight="30px" border="false" fontSize="18px" />
-
-				<div class="send row item-center" style="border-bottom:.01rem solid #ddd">
->>>>>>> f66e6b0bf8455a9b957b56df1da1b52ef778bc8f
 					<img
 							:src="meme?require('@/assets/faceActive.png'):require('@/assets/face.png')"
 							@click="faceClick"