123

application/index/view/finance/getCollection.html

@@ -484,7 +484,7 @@
 						<div class="col-xs-6">
 							<div class="form-group">
 								<strong><span class="col-xs-4 ld-Marheight">调整后商铺地址:</span></strong>
-								<span id="shop_addr_change" class="col-xs-6 ld-Marheight">123456</span>
+								<span id="shop_addr_change" class="col-xs-6 ld-Marheight"></span>
 							</div>
 						</div>
 						

public/resource/js/getCollection.js

@@ -977,12 +977,15 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			doc.find("#fenhong").val(data.is_dividend);
 			if (data.source == 0) {
 				$("#comes").text('APP');
+				doc.find("#status").text("正常");
 			} else if (data.source == 1){
-				$("#comes").text('只能pos机');
+				$("#comes").text('智能pos机');
+				doc.find("#status").text("正常");
 			} else {
 				$("#comes").text('调整');
+				doc.find("#status").text("被调整");
 			}
-	 		doc.find("#status").text(data.source_id);
+//	 		doc.find("#status").text(data.source_id);
 	 		doc.find("#lastTime").val(data.last_transfer_time);
 	 		
 	 		if ( data.type == 91 || data.type == 92) {