bug修改

application/index/view/finance/commission.html

@@ -207,6 +207,8 @@
 									<th class="text-center">现金奖(元)</th>
 									<th class="text-center">实收佣金(元)</th>
 									<th class="text-center">确认时间</th>
+									<th class="text-center">操作</th>
+									
 								</tr>
 							</thead>
 							<tbody class="text-center" id="maid_new_table_list">

application/index/view/finance/tax.html

@@ -207,6 +207,8 @@
 									<th class="text-center">现金奖(元)</th>
 									<th class="text-center">实收佣金(元)</th>
 									<th class="text-center">确认时间</th>
+									<th class="text-center">操作</th>
+									
 								</tr>
 							</thead>
 							<tbody class="text-center" id="maid_new_table_list">

public/resource/css/call_genjin_modal.css

@@ -124,11 +124,14 @@ html{
 .call-btn-area>div#call_btn_cancel{
 	background-color: white;
 	color: #FF9419;
+	cursor: pointer;
 }
 .call-btn-area>div#call_btn_ok{
 	background-color: #FF9419;
 	color: white;
 	margin-left: .3rem;
+	cursor: pointer;
+	
 }
 .call-btn-area>div#call_btn_ok_temp{
 	background-color: #ccc;

public/resource/js/callPhoneIndex.js

@@ -283,6 +283,9 @@ define(['doT', 'text!temp/callPhone_template_tpl.html', 'css!style/home.css', 'c
 				console.log(user.user_id);
 				if(user.user_id== 'null'){
 					alert('当前用户不存在');
+					$('.user_call').hide();
+				}else{
+					$('.user_call').show();
 				}
 				$('.call-user-five').html('');
 				$('.detail-modal-body-sec-2').show();

public/resource/js/commission.js

-define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_template_tpl.html',  'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
+define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_no_edit_template_tpl.html',  'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax) {
 	bargain = {
 		pageNo: 1,
 		/*第几页*/
@@ -13,7 +13,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_t
 		maidTotalCommission: 0,//应收总佣金
 		init: function() {
 			//初始化dot
-			$(document.body).append(template + template_tax + template_maid + template_maid_sub1);
+			$(document.body).append(template + template_tax);
 			bargain.getList(1);
 			bargain.event();
 		},

public/resource/js/tax.js

-define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_template_tpl.html',  'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
+define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_no_edit_template_tpl.html',  'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax) {
 	bargain = {
 		pageNo: 1,
 		/*第几页*/
@@ -13,7 +13,7 @@ define(['doT','text!temp/tax_template_tpl.html', 'text!temp/reportList_template_
 		maidTotalCommission: 0,//应收总佣金
 		init: function() {
 			//初始化dot
-			$(document.body).append(template + template_tax + template_maid + template_maid_sub1);
+			$(document.body).append(template + template_tax);
 			bargain.getList(1);
 			bargain.event();
 		},

public/resource/template/financeUpdateLog_template_tpl.html

 <script id="financeUpdateLog_list_tpl" type="text/template">
-    [% if(it) { %]
+    [% if(it[0]) { %]
     [% for(var item in it){ %]
     <tr>
         <td width="15%">[%= it[item]['create_time'] %]</td>

public/resource/template/tax_template_tpl.html

@@ -8,8 +8,6 @@
         <td>[%= it[item]['internal_address'] %]</td>
         <td>[%= it[item]['house_number'] %]</td>
         <td>[%= it[item]['fee'] %]</td>
-        
-        
         <td>
             <a class="btn1 btn-info details-btn" href="#modal_detail" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详情</a>
             <a class="btn1 btn-info timeline"  href="#modal-time" data-toggle="modal" data-id='[%= it[item]["id"] %]'>时间轴</a>