Merge branch 'test'

application/app_broker/view/index/customerinfo_details_new.html

@@ -218,7 +218,7 @@
 
 		<script type="text/javascript" src="/app/js/jquery-1122-min.js"></script>
 		<script src="/app/js/common.js?new42" charset="utf-8"></script>
-		<script src="/app/js/customerinfo_details_new.js?new63"></script>
+		<script src="/app/js/customerinfo_details_new.js?new64"></script>
 
 	</body>
 

application/app_broker/view/index/shop_detail_pc.html

@@ -36,7 +36,7 @@
 							</tr>
 							<tr>
 								<td>业态：{{d.industry_type}}</td>
-								<td>{{(d.shop_type==1)?'当前商铺业态':'已入驻'}}：{{d.enter_num}}</td>
+								<td>{{(d.shop_type==1)?'当前经营':'已入驻'}}：{{d.enter_num}}</td>
 								<td></td>
 								<td></td>
 							</tr>

application/index/controller/ImageDepot.php

@@ -172,9 +172,16 @@ class ImageDepot extends Basic
 
     public function ceshi(){
 
+        //查询客户是否在保护期内
+        //判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期
         $user_service = new UserService();
-        $res = $user_service->isUserProtect(1);
-        dump($res);
+        $is_outstrip_twenty_four_hours = $user_service->isUserProtect(1);
+        dump($is_outstrip_twenty_four_hours);
+        if($is_outstrip_twenty_four_hours == 0){
+            dump('保护器内');
+        }else{
+            dump('超过保护期');
+        }
     }
 
 

application/index/controller/PerformanceInfo.php

@@ -210,10 +210,10 @@ class PerformanceInfo extends Basic
             $return_ = $m_commission->getPracticalFee($v["id"]);
             $practical_fee  = $return_[0]['practical_fee'] ? $return_[0]['practical_fee'] : 0;//end
 
-            //截取字符串前3位
-            $landmark  = $v["landmark"] ? mb_substr($v["landmark"],0,3,'utf-8').'****' : '';
+            //商铺地址截取字符串前3位,后面做隐藏  --暂时不用，后期可直接解除注释
+            //$landmark  = $v["landmark"] ? mb_substr($v["landmark"],0,3,'utf-8').'****' : '';
 
-            $e_data_old['landmark']             = $landmark;//商铺地址
+            $e_data_old['landmark']             = $v["landmark"];//商铺地址
             $e_data_old['house_id']             = $v['house_id'];//商铺编号
             //$e_data_old['name_phone']           = $v['name'].'-'.$v['phone'];//分佣提成方
             $e_data_old['name_phone']           = $v['name'];//分佣提成方

application/index/service/UserService.php

@@ -84,6 +84,12 @@ class UserService
 
             $id = $this->user->edit($data, $id, $operation_id);  //新增或编辑
 
+            //操作完成之后判断下是什么动作
+            if($type == 'add'){
+                //$type等于'add'说明是新增客户，需要设置保护期截止日期
+                $this->setUserProtectTime($id);
+            }
+
             if ($id <= 0) {
                 $msg = $this->getCodeMsg($id);
                 $result['status'] = 'fail';

public/app/js/customerinfo_details_new.js

@@ -958,11 +958,12 @@ function loadMain(){
 			                Compatible({
 								paraIos: {
 									'route': 'call',
-									'phone': _backPhone,
-									'userId': Number(_customerId)
+									'phone': _backPhone
+									//'userId': Number(_customerId)
 								},
 								fnAndroid: function() {
-									window.android.onPhoneCall(_backPhone, Number(_customerId));
+									//window.android.onPhoneCall(_backPhone, Number(_customerId));
+									window.android.onPhoneCall(_backPhone);
 								},
 								fn: function() {
 									console.warn('error');

public/resource/js/shop_edit.js

@@ -792,7 +792,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
 			_shangpuTypeObj.change(function() {
 				if($(this).val() == '1') {
 					//街铺
-					$('.has-housed').html('当前商铺业态');//
+					$('.has-housed').html('当前经营');//
 					_jinchangPriceObj.attr('data-alert','请填写对内转让费！').parent().prev().html('对内转让费');
 					_roomArea1Obj.attr('data-alert','请填写建筑面积！').parent().prev().html('建筑面积');
 					_businessAreaObj.attr('data-alert','请填写使用面积！').parent().prev().html('使用面积');