优化处理

public/resource/js/public.js

@@ -96,7 +96,7 @@ define(['doT', 'jquery', 'text!temp/menu_template_tpl.html', 'layer'], function
     	e.preventDefault();
     	e.stopPropagation();
     	var _this = $(this);
-    	_this.addClass('active-main-li').siblings().removeClass('active-main-li');
+    	_this.toggleClass('open').addClass('active-main-li').siblings().removeClass('active-main-li');
     });
     //隐藏菜单 显示菜单
     _doc.on('click', '.width-136-hide', function(e){

public/resource/template/menu_template_tpl.html

@@ -5,7 +5,7 @@
             [% if(it[item]["_child"] == undefined || it[item]["_child"].length == 0) { %]
                 <a href="javascript:;" ><span class="glyphicon glyphicon-credit-card" aria-hidden="true"></span> <span class="span-list">[%= it[item]["title"] %]</span></a>
             [% } else { %]
-                <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"> <span class="glyphicon glyphicon-credit-card" aria-hidden="true"></span><span class="span-list">[%= it[item]["title"] %]</span>
+                <a href="javascript:;" class="dropdown-toggle"> <span class="glyphicon glyphicon-credit-card" aria-hidden="true"></span><span class="span-list">[%= it[item]["title"] %]</span>
                     <!--<span class="glyphicon glyphicon-chevron-down" aria-hidden="true"></span>-->
                     <span id="icon_more_menu">
                     </span></a>

public/resource/template/reportList_no_edit_template_tpl.html

@@ -102,7 +102,16 @@
 					<span contenteditable class="detail-modal-maid-span-charity-fund">[%= it['data'][i]['partial_commission'][j]['charity_fund'] %]</span>
 					<span contenteditable class="detail-modal-maid-span-cash">[%= it['data'][i]['partial_commission'][j]['cash'] %]</span>
 					<span contenteditable class="detail-modal-maid-span-practical-fee">[%= it['data'][i]['partial_commission'][j]['practical_fee'] %]</span>
-					<span class="detail-modal-maid-span-date" data-dateid="[%= it['data'][i]['partial_commission'][j]['income_time']['id'] %]">[%= it['data'][i]['partial_commission'][j]['income_time']['income_time'] %]</span>
+					[% if(!it['data'][i]['partial_commission'][j]['income_time'] || (Array.isArray(it['data'][i]['partial_commission'][j]['income_time']) && it['data'][i]['partial_commission'][j]['income_time'].length<1) ) { %]
+						[% if(it['data'][i]['partial_commission'][j]['income_time_add']) { %]
+							<span class="detail-modal-maid-span-date" data-dateid="[%= it['data'][i]['partial_commission'][j]['income_time_add']['id'] %]">[%= it['data'][i]['partial_commission'][j]['income_time_add']['income_time'] %]</span>
+						[% }else{ %]
+							<span class="detail-modal-maid-span-date" data-dateid="">请点击选择</span>
+						[% } %]
+					[% }else{ %]
+						<span class="detail-modal-maid-span-date" data-dateid="[%= it['data'][i]['partial_commission'][j]['income_time']['id'] %]">[%= it['data'][i]['partial_commission'][j]['income_time']['income_time'] %]</span>
+					[% } %]
+					
 					<span class="detail-modal-maid-span-time">[%= dealT(it['data'][i]['partial_commission'][j]['confirm_date']) %]</span>
 				</div>
 				[% } %]