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

application/index/controller/Finance.php

@@ -835,7 +835,7 @@ class Finance extends Basic
         $log_data = [];
         foreach ($tax as $k => $v) {
             $tax[$k]['agent_name'] = $m_agent->getAgentsById($v['agent_id'], 'name');
-            $log_data[] = '[经纪人:id:'.$v['agent_id'].',名字:'.$tax[$k]['agent_name'].',税费:'.$v['fee'].']';
+            $log_data[] = '[经纪人:id:'.$v['agent_id'].',名字:'.$tax[$k]['agent_name'].',税费:'.$v['fee'].'][开票比例:'.$this->params['scale'].']';
         }
 
         if ($this->params['id'] && $this->params['id'] > 0) { //编辑

application/index/controller/Houses.php

@@ -377,7 +377,7 @@ class Houses extends Basic
 
         $img = new GHousesImgs();
         $id  = $img->getHouseImagesInfo('id', [
-            'id' => $this->params['house_id'],
+            'id' => $this->params['id'],
             'house_id' => $this->params['house_id'],
             'img_status' => 0
         ]);

application/model/GHouses.php

@@ -113,7 +113,6 @@ class GHouses extends BaseModel
                 foreach ($img_data as $k => $v) {
                     switch ($v->img_type) {
                         case 1 :
-                            $data['id']    = $v->id;
                             $data['cover'] = $v->img_name;
                             break;
                         case 2 :

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

@@ -75,7 +75,7 @@
 						<div class="bottom-border">业务员<span class="left">{{item.name}}{{item.phone}}</span></div>
 					</li>
 					<li class="main-sec-li">
-						<div class="bottom-border">分佣比例<span class="left">{{item.scale}}%</span></div>
+						<div class="bottom-border">分佣比例<span class="left">{{(item.scale*1).toFixed(2)}}%</span></div>
 					</li>
 					<li class="main-sec-li li-border-bottom">
 						<div>应分佣金<span class="left">{{item.should_commission}}元</span></div>

public/resource/js/reportList.js

@@ -916,7 +916,12 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'text!temp/reportList_s
 			    success: function(_data) {
 			        if(typeof _data === 'object') {
 			            if(_data['code'] == '200') {
-			                alert('新增成功！');
+			            	if(_tempTableObj.attr('data-type') === 'edit'){
+								alert('编辑成功！');
+							}else{
+								alert('新增成功！');
+							};
+			                
 			                bargain.taxShow();
 			            } else {
 			                layerTipsX(_data['msg']);

public/resource/js/shop_edit.js

@@ -179,8 +179,9 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 										//独家合同
 										var exclusive_img_str = '';
 										for(var i in _data['exclusive_img']) {
-											exclusive_img_str += '<li><img title="点击查看大图" src="{0}" /><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
-												'0': _urlCut + _data['exclusive_img'][i]
+											exclusive_img_str += '<li data-imgid="{id}"><img title="点击查看大图" src="{0}" /><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
+												'0': _urlCut + _data['exclusive_img'][i]['img_name'],
+												'id': _data['exclusive_img'][i]['id']
 											});
 										};
 										_imgUploadDujia.html(exclusive_img_str);
@@ -299,15 +300,17 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 
 									//详情页轮播图
 									for(var i in _data['slide_show']) {
-										_imgUploadLunbo.append('<li><img title="点击查看大图" src="{0}" /><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
-											'0': _urlCut + _data['slide_show'][i]
+										_imgUploadLunbo.append('<li data-imgid="{id}"><img title="点击查看大图" src="{0}" /><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
+											'0': _urlCut + _data['slide_show'][i]['img_name'],
+											'id': _data['slide_show'][i]['id']
 										}));
 									};
 
 									//楼层平面图
 									for(var i in _data['plan']) {
-										_imgUploadLouceng.append('<li><img title="点击查看大图" src="{0}" /><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
-											'0': _urlCut + _data['plan'][i]
+										_imgUploadLouceng.append('<li data-imgid="{id}"><img title="点击查看大图" src="{0}" /><a href="javascript:;" class="delet-pic-btn">删除</a></li>'.stringFormatObj({
+											'0': _urlCut + _data['plan'][i]['img_name'],
+											'id': _data['plan'][i]['id']
 										}));
 									};
 
@@ -377,9 +380,47 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 
 			//图片上传删除键事件
 			_doc.on('click', '.delet-pic-btn', function(e) {
+				var _this = $(this);
 				e.preventDefault();
 				e.stopPropagation();
-				confirm('确定删除该文件吗？') && $(this).parent().remove();
+				if(confirm('确定删除该文件吗？')){
+					var _imgId = _this.parent().attr('data-imgid');
+					if(_imgId){
+						$.ajax({
+						    type: 'POST',
+						    url: '/index/delHouseFile',
+						    data: {
+						    	'id': _imgId,
+						    	'house_id': _id
+						    },
+						    timeout: 30000,
+						    dataType: 'json',
+						    beforeSend: function() {},
+						    success: function(_data) {
+						        if(typeof _data === 'object') {
+						            if(_data['code'] == '200') {
+						                _this.parent().remove();
+						            } else {
+						                alert(_data['msg']);
+						            }
+						        } else {
+						            alert('数据错误');
+						        };
+						    },
+						    error: function() {
+						        alert('enter error');
+						    },
+						    complete: function(xhr, textStatus){
+						        if(textStatus === 'timeout') {
+						            //处理超时的逻辑
+						            alert('请求超时,请重试');
+						        };
+						    }
+						});
+					}else{
+						_this.parent().remove();
+					}
+				};
 			});
 
 			//图片预览点击放大事件

public/resource/js/storeList.js

@@ -362,7 +362,7 @@ define(['doT', 'text!temp/store_template_tpl.html', 'css!style/home.css', 'ckfin
                         var _html = ' <option value="" selected="selected">请选择</option>';
                         $.each(data.data, function(i, n) {
                             if (n.district_name == name && (typeof name != undefined)) {
-                                _html += '<option  value="' + n.id + '">' + n.district_name + '</option>';
+                                _html += '<option selected="selected" value="' + n.id + '">' + n.district_name + '</option>';
 							} else {
                                 _html += '<option value="' + n.id + '">' + n.district_name + '</option>';
 							}

public/resource/js/user.js

@@ -443,7 +443,7 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
             var params = {};
             params.user_name    = $("#add_user_form input[name='user_name']").val();
             params.user_phone  = $("#add_user_form input[name='user_phone']").val();
-            params.agents_id  = $("#add_user_form input[name='agent_id']").val();//客方
+            params.agents_id  = user.agent_id;//客方
             params.sex = $("#user_sex option:selected").val();
             params.price_demand=$("#price_type2").val();
             params.area_demand=$("#area_type2").val();