Merge remote-tracking branch 'origin/master'

# Conflicts:
#	components/footer/footer.vue

components/footer/footer.vue

@@ -11,7 +11,6 @@
 		</view>
 		<u-button style="margin: 0 0 0 20rpx;width: 20%;height: 70%;" text="发送" type="success" v-show="!inputFalg" @click="send">
 		</u-button>
-
 		<view class="icon" v-show="inputFalg">
 			<image v-for="(item,index) in imageList" :key="index+''" :src="item.url" style="width:68rpx" mode="widthFix"
 				@click="iconbtn(item.title)"></image>