Merge branch 'test'

application/index/view/finance/daily_details.html

@@ -188,7 +188,9 @@
 	}
 	
 	.modal-body-width-du{
-		width: 1200px;
+		/*width: 1200px;*/
+		width: 998px;
+		
 	}
 	.col-xs-12 {
 		overflow: hidden;

application/index/view/finance/getCollection.html

@@ -5,7 +5,7 @@
 		padding-left: 8px;
 		padding-right: 8px;
 		
-	};
+	}
 	.reportArea{
 		float: left;
 		position: relative;

application/index/view/global/footer_tpl.html

-<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=2019018866' charset='utf-8'></script>
+<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=2019066688' charset='utf-8'></script>

application/index/view/shopinspection/shopinspectionLogList.html

@@ -24,6 +24,18 @@
     .clear{
     	clear: both;
     }
+    	/*加载图标*/
+	#main_loading_pic {
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    width: 100px;
+    height: 100px;
+    margin-left: 50px;
+    margin-top: -150px;;
+    overflow: hidden;
+    display: none;
+}
 </style>
 <div id="page-content-wrapper">
     <div class="container">
@@ -97,7 +109,10 @@
         </div>
     </div>
 </div>
-
+<!--加载图标-->
+<div id="main_loading_pic">
+		<img src="/resource/image/jz2.gif">
+</div>
 
 
 

public/resource/js/schoolBusiness.js

@@ -46,7 +46,7 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde
 			});
 			_doc.on('click', '.pdf-pre-a', function() {
 				var file_id = $(this).parent('li').attr('id') - 0 ;
-				var _url = '/index/downloadFile';
+				var _url = ServerHostImageLiu+'/index/downloadFile';
 			    window.open(_url + '?file_id=' + file_id);
 			});
             $("#search").click(function(){

public/resource/js/shopInspectionLog.js

@@ -60,7 +60,9 @@ define(['doT', 'text!temp/shop_inspectionlog_template_tpl.html', 'css!style/home
 				data: params,
 				timeout: 30000,
 				dataType: 'json',
-				beforeSend: function() {},
+				beforeSend: function() {
+			    	$('#main_loading_pic').show();
+				},
 				success: function(data) {
 
 					if(typeof data === 'object') {
@@ -84,6 +86,7 @@ define(['doT', 'text!temp/shop_inspectionlog_template_tpl.html', 'css!style/home
 					alert('error');
 				},
 				complete: function(xhr, textStatus) {
+			    	$('#main_loading_pic').hide();
 					if(textStatus === 'timeout') {
 						alert('请求超时');
 					};