fix：解决统计页面冲突

pages/statistics/statistics.vue

@@ -1,12 +1,7 @@
 <template>
-<<<<<<< HEAD
 	<view class="total-page page_env page-box container sys-list-background-color"
 		:style="[{'background-size':`100% ${$tools.topHeight()+bgSize}px`},{'background-image':`url(${bg_path})`}]">
 		<Nav :title="timeData[0]+'--'+timeData[1]" :genre="3" :back="false" is_icons is_fixed :bgHeight="bgHeight"
-=======
-	<view class="total-page page_env page-box container" >
-		<Nav :title="timeData[0]+'--'+timeData[1]" :back="false" is_icons is_fixed :bgHeight="bgHeight"
->>>>>>> 3a17a07b13e0448808520d32dde2ed379944f658
 			:navsHeight="navsHeight" :opacity="scrollTop" :justify="'left'" :color="'#fff'" :fixedHeight="160">
 			<view class="task-tabs m-t20" :style="{top:`${$tools.topHeight()}px`}">
 				<HeadFilter v-model="dateTypeObj" @onTopSelect="onTopSelect" :user-status-list="userStatusList"