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

This commit is contained in:
xuhe@fangjia.com
2018-04-12 10:53:29 +08:00
6 changed files with 226 additions and 33 deletions
@@ -44,10 +44,10 @@ Vue.component('my_focus',{
},
methods:{
loadMyFocus:function(){
// if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
// $("#myFocusFirstPage").hide()
// $("#myFocus").hide();
// }else{
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
$("#myFocusFirstPage").hide()
$("#myFocus").hide();
}else{
axios.get("/rest/quotations/userCollectCityInfo").then(function(response){
if(response.data.data.length==0){
$("#myFocusFirstPage").hide();
@@ -58,7 +58,7 @@ Vue.component('my_focus',{
}).catch(function(error){
console.log(error)
})
// }
}
}
},mounted:function(){
this.loadMyFocus();
+15 -10
View File
@@ -81,7 +81,7 @@
</span>
</div>
</div>-->
<div class="content-block priceRecovery" id="price_feedback">
<div class="content-block priceRecovery" id="price_feedback" v-bind:style="{display:isShow}">
<p><label>估的准吗?</label></p>
<p><small>您的反馈很重要,是我们努力的动力</small></p>
<div class="row">
@@ -142,13 +142,12 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script>
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
var self = plus.webview.currentWebview();
var hid = self.hid;
//init();
// document.addEventListener('plusready', onPlusReady, false);
// function onPlusReady(){
// var self = plus.webview.currentWebview();
// var hid = self.hid;
var houseStatus = ""
// hid = '104631167348637696';
hid = '104631167348637696';
var house_info = new Vue({
el:'#house_info',
data:{
@@ -184,7 +183,7 @@ $.config = {router: false}
var price_feedback = new Vue({
el:"#price_feedback",
data:{
isShow:"none"
},
methods:{
feedback:function(i,event){
@@ -196,9 +195,15 @@ $.config = {router: false}
hid:hid,
reason:i
}).then(function(response){
alert("感谢您的反馈!")
$("#price_feedback").hide();
}).catch(function(error){console.log(error)})
},
feedbackable:function(){
}
},mounted(){
}
})
@@ -261,7 +266,7 @@ $.config = {router: false}
console.log(error)
})
}
// }
//添加管理AJAX请求
+13 -16
View File
@@ -486,7 +486,19 @@ $.config = {router: false}
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
var city = "";
getPosition();
plus.geolocation.getCurrentPosition(function(p){
//province = p.address.province;
city = p.address.city;
//region = p.address.district;
}, function(e){
},
{
provider:'baidu',
enableHighAccuracy:true,
coordsType:'bd09ll'
}
);
alert(city)
var myFocus = new Vue({
el:"#myFocus"
})
@@ -653,21 +665,6 @@ $(document).ready(function () {
function getPosition(){
plus.geolocation.getCurrentPosition(function(p){
province = p.address.province;
city = p.address.city;
region = p.address.district;
}, function(e){
},
{
provider:'baidu',
enableHighAccuracy:true,
coordsType:'bd09ll'
}
);
}
//$(document).on("click",".open-about01", function () {
// markFocus();
// $.popup(".popup-about01");
+90
View File
@@ -0,0 +1,90 @@
<!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="../../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="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<h1 class="title">关于我们</h1>
</header>
<div class="content">
<div class="list-block media-list mb05">
<ul>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">客服电话</div>
<div class="item-after">400-188-3787</div>
</div>
</div>
</a>
</li>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">Email</div>
<div class="item-after">service@fangjia.com</div>
</div>
</div>
</a>
</li>
</ul>
</div>
<div class="list-block media-list mb05">
<ul>
<li>
<a onclick="clicked('${basePath}/user/agreement',true);" class="item-link item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">服务协议</div>
</div>
</div>
</a>
</li>
</ul>
</div>
<div class="content-block">
<p style="text-align:center;margin-top:5rem;">V1.1<br>上海估家网络科技有限公司</p>
<p style="text-align:center;"></p>
</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="${basePath}/js/light7.js?version=${version!}" charset="utf-8"></script>
<script type="text/javascript" src="${basePath}/js/cn.js?version=${version!}" charset="utf-8"></script>
<script type="text/javascript" src="${basePath}/js/common.js?version=${version!}"></script>
<#include "/monitor/monitor.html">
</body>
</html>
+101
View File
@@ -0,0 +1,101 @@
<!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="../../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="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<h1 class="title">管理设置1</h1>
</header>
<div class="content">
<div class="list-block media-list">
<ul>
<li>
<a onclick="clicked('about.html',true);" class="item-link item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title">关于我们</div>
<div class="item-after">V1.1</div>
</div>
</div>
</a>
</li>
</ul>
</div>
<div class="content-block">
<p>微信交流群</p>
<img src="images/wx.png" style="width:180px;margin:0 auto;">
<p style="text-align:center;">扫码加入</p>
<p>商务合作QQ:275525147</p>
<p style="margin-top:2rem;"><a href="01_index.html" class="button button-big button-fill theme">退出登录</a></p>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="../../js/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>
<script type="text/javascript" src="../../js/common.js"></script>
<script type="text/javascript" src="../../js/mui.min.js"></script>
<script type="text/javascript">
mui.init({
gestureConfig: {
longtap: true
}
});
function download(imgUrl) {
var suffix = '/qun.png';
var downLoader = plus.downloader.createDownload(imgUrl, {
method: 'GET',
filename: '_downloads/image' + suffix
}, function(download, status) {
var fileName = download.filename;
plus.gallery.save(fileName, function() {
plus.ui.alert("保存成功");
});
});
downLoader.start();
}
/*mui.plusReady(function() {
document.getElementById("img").addEventListener("longtap", function(event) {
download("${basePath}/img/${advertisement.imgId?c}");
})
});*/
</script>
</body>
</html>
+2 -2
View File
@@ -41,7 +41,7 @@
<button class="button button-link button-nav pull-left" style="display: none;" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="clicked(BASE_PATH+'/user/setting', true)">
<button class="button button-link button-nav pull-right" onclick="clicked('../setting/setting.html', true)">
<span class="icon icon-set"></span>
</button>
</header>
@@ -110,7 +110,7 @@
<button class="button button-link button-nav pull-left" style="display: none;" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="clicked(BASE_PATH+'/user/setting',true)">
<button class="button button-link button-nav pull-right" onclick="clicked('../setting/setting.html', true)">
<span class="icon icon-set"></span>
</button>
</header>