Merge branch 'test'

application/index/controller/Finance.php

@@ -3633,7 +3633,7 @@ class Finance extends Basic
         $where['b.is_open'] = $is_open;
         $where['a.type'] = $type;
         $where['b.status'] = ['in', '10,11,13'];
-        $where['b.father_id'] = 0;
+        $where['b.father_id'] = $where['a.is_del'] = 0;
         $price = $m_pay->sumBargainPrice('a.real_money', $where);  //未开业中介费
         return empty($price) ? '' : $price;
     }
@@ -3653,7 +3653,7 @@ class Finance extends Basic
             $where['b.is_open'] = $is_open;
             $where['a.type'] = $type;
             $where['b.status'] = ['in', '10,11,13'];
-            $where['b.father_id'] = 0;
+            $where['b.father_id'] = $where['a.is_del'] = 0;
             $price = $m_pay->sumBargainPrice('a.refund_money', $where);  //未开业中介费
         } else {
             $where['type'] = $type;

public/resource/js/getCollection.js

@@ -1284,7 +1284,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 		},
 		
 		getValueFunction : function(data){
-			var persent = 70% ; 
+			var persent = 0.7*1; 
 			$('.zhzd').show();
 			$('.zjcon').hide();
 			var doc = $('#modal-addPic');