Merge branch 'test-v2.0-0530' of https://gitee.com/zwyjjc/tl_estate into test-v2.0-0530

application/index/view/member/users_list.html

@@ -341,7 +341,7 @@
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal" id="close">关闭
                 </button>
-                <button type="button" class="btn btn-primary" id="add_user" data-dismiss="modal">
+                <button type="button" class="btn btn-primary" id="add_user" >
                     提交
                 </button>
             </div>

public/appnew/src/components/reportDetails/reportDetails.vue

@@ -31,7 +31,7 @@
 						<div class="bottom-border">商铺号<span class="left">{{house_number}}</span></div>
 					</li>
 					<li class="main-sec-li">
-						<div class="bottom-border">业态<span class="left">{{'麻辣烫'}}</span></div>
+						<div class="bottom-border">业态<span class="left">{{industry_type}}</span></div>
 						<!--新增业态-->
 					</li>
 					
@@ -187,6 +187,7 @@
 			taxDatas: [],
 			account_statement: '',
 			account_time: '',
+			industry_type:'',
 
 		}),
 		created() {
@@ -248,6 +249,7 @@
 							//							console.log(response.data.data.bargainInfo.account_statement);
 							_this.internal_title = response.data.data.bargainInfo.internal_title;
 							_this.account_statement = response.data.data.bargainInfo.account_statement;
+							_this.industry_type = response.data.data.bargainInfo.industry_type;
 							_this.account_time = response.data.data.bargainInfo.account_time;
 							_this.internal_address = response.data.data.bargainInfo.internal_address;
 							_this.user_name = response.data.data.bargainInfo.user_name;

public/resource/js/user.js

@@ -66,6 +66,7 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
                 user.user_id = $ (this).attr ("data-id");
                 user.add_user();
             });
+            
             // 跟进的提交按钮 点击
             $ (document).delegate ("#edit_add", "click", function () {
                 user.edit_add();