Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1

# Conflicts:
#	fangija-zsyf/views/house/houseDetail.html
This commit is contained in:
zongzhimin
2018-04-11 14:18:10 +08:00
3 changed files with 3 additions and 55 deletions
+2 -1
View File
@@ -1491,7 +1491,8 @@
"refer": [
"start.html",
"views/user/userInfo.html",
"views/evaluate/evaluateList.html"
"views/evaluate/evaluateList.html",
"views/house/houseManageList.html"
],
"priority": 0
},
-54
View File
@@ -1,54 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>房产评估</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
<link rel="shortcut icon" href="/favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="http://g.alicdn.com/msui/sm/0.6.2/css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
</head>
<body>
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav">
<!--<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<span class="icon icon-left"></span>
</button>-->
<h1 class="title">房产评估</h1>
</header>
<div class="content contentSuggest">
<div class="noData">
<img src="../../images/noData.png">
<p>评估房产&nbsp;&nbsp;发现价值</p>
<div class="content-block">
<p><a href="03_evaluation02_inputInfo.html" class="button button-big button-fill theme">立即评估</a></p>
</div>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="http://g.alicdn.com/sj/lib/zepto/zepto.js" charset="utf-8"></script>
<script>
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
Zepto = $
$.config = {router: false}
</script>
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
</body>
</html>
@@ -603,6 +603,7 @@ $.config = {router: false}
<script type="text/javascript" src="../component/myFocusComponent.js"></script>
<script type="text/javascript" src="../component/cityIncreaseRankingComponent.js"></script>
<script type="text/javascript" src="../component/cityPotentialRankingComponent.js"></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script type="text/javascript" src="../component/cityChooseComponent.js"></script>
<script>
var myFocus = new Vue({