Merge branch 'master' of http://git.wealfavor.cn/root/wh-new-xcx

# Conflicts:
#	pages/statistics/statistics.vue
#	static/img/statistics/Group 2113.png
#	static/img/statistics/task-four.png
#	static/img/statistics/task-one.png
#	static/img/statistics/task-two.png

pages/statistics/components/drawings_stat.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<StatLoanChart ref="outObj" :genre="1" :leftText="'提放汇总占比'"></StatLoanChart>
-		<StatRanking :leftText="'提放汇总明细'"></StatRanking>
+    <stat_gather is_group :leftText="'提放汇总明细'"  :out-list="outList" ></stat_gather>
     <StatRanking ref="rankingObj" :is_margin_top="false" :is_type="2" :leftText="'个人业绩排行'" :data-list="userList"></StatRanking>
     <StatSituation ref="situationObj" :date-type-obj="dateTypeObj" :type="1"></StatSituation>
 	</view>
@@ -9,9 +9,11 @@
 
 <script>
 	import StatLoanChart from "../module/stat_loan_chart.vue"
-	import StatRanking from "../module/stat_situation.vue"
-	import StatSituation from "../module/stat_ranking.vue"
   import md5 from "js-md5";
+  import {getRanking,getDepartmentMoney} from "@/api/statistics";
+  import StatSituation from "@/pages/statistics/module/stat_situation.vue";
+  import StatRanking from "@/pages/statistics/module/stat_ranking.vue";
+  import Stat_gather from "@/pages/statistics/module/stat_gather.vue";
 
 	export default {
     props:{
@@ -28,13 +30,16 @@
       }
     },
 		components: {
+      Stat_gather,
+      StatRanking,
+      StatSituation,
 			StatLoanChart,
-			StatRanking,
-			StatSituation,
 		},
 		data() {
 			return {
-
+        userList:[],
+        moneyData:{},
+        outList:[]
 			}
 		},
     watch:{
@@ -79,7 +84,7 @@
             this.moneyData.out_money=res.data.moneyData.loanMoney
             this.moneyData.out_num=res.data.moneyData.loanNum
             this.outList=res.data.items
-            this.$refs.outObj.setPeakChartData(this.outList)
+            // this.$refs.outObj.setPeakChartData(this.outList)
           }
         })
       },

pages/statistics/statistics.vue

@@ -1,7 +1,12 @@
 <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"