Merge branch 'test'

application/index/view/global/footer_tpl.html

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

application/index/view/remark/remark_follow_index.html

@@ -389,7 +389,11 @@
                                                   <option value="" selected="selected">区域筛选</option>
                                                 </select>-->
 												<span class="btn btn-info btn3 ld-Marheight" id="is_taday" style="float: left;">今天</span>
+												<span class="fore-span ld-Marheight text-danger">(点击今天,再点击搜索)</span>
+												
 												<span class="fore-span ld-Marheight">跟进时间:</span>
+												<span class="fore-span ld-Marheight follow-up-time-tip text-danger"></span>
+												
 												<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date" type="date">
 												<span class="fore-span ld-Marheight">-</span>
 												<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date">

public/resource/js/RemarkFollowIndex.js

-
+ if(window === window.parent){//没有菜单 给提醒
+ 	alert('请清除缓存重新登录');
+ 	location.replace(location.origin);
+ };
 define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css',  'ckfinder', 'ckfinderStart', "datetimepicker", 'pagination', 'bootstrapJs','blow-up'], function(doT, template) {
 	var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
 	console.log(user_info_obj);
@@ -57,6 +60,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 			var m = myDate.getMonth() + 1;
 			var d = myDate.getDate();
 			var day_end = y + '-' + (m < 10 ? ('0' + m) : m) + '-' + (d < 10 ? ('0' + d) : d);
+			$('.follow-up-time-tip').html('('+'请选择小于或等于'+getBeforeDate(1)+'的时间!!!'+')');
 //			$('#start_date').val(day_end);
 //			$('#end_date').val(day_end);//客户跟进 添加 默认时间一天
 			//初始化城市 区域筛选

public/resource/js/houseList.js

 /**
  * Created by 刘丹 on 2017/12/11.
  */
-
+ if(window === window.parent){//没有菜单 给提醒
+ 	alert('请清除缓存重新登录');
+ 	location.replace(location.origin);
+ };
 define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs','blow-up'], function(doT, template) {
 	//处理文件名，长度过长时处理
 	function dealFileName(str) {

public/resource/js/performance_ranking.js

-
+ if(window === window.parent){
+ 	alert('请清除缓存重新登录');
+ 	location.replace(location.origin);
+ };
 
 
 define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker",'pagination','bootstrapJs'], function (doT) {

public/resource/js/user.js

-
+ if(window === window.parent){//没有菜单 给提醒
+ 	alert('请清除缓存重新登录');
+ 	location.replace(location.origin);
+ };
 define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfinder', 'ckfinderStart', "datetimepicker", 'pagination', 'bootstrapJs','blow-up','checkLogin'], function(doT, template) {
 	var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
 	var _doc = $(document),