Merge branch 'YOUFANGAPP1.1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.0.4
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
/**服务端地址**/
|
||||
//var BASE_PATH = "http://youfang.fangjia.com";
|
||||
//var BASE_PATH = "http://192.168.10.128:8084";
|
||||
//var BASE_PATH = "http://192.168.10.47:8086";
|
||||
var BASE_PATH = "http://192.168.10.47:8086";
|
||||
//var BASE_PATH = "http://192.168.10.53:8084";
|
||||
var BASE_PATH = "http://192.168.10.161:8084";
|
||||
//var BASE_PATH = "http://192.168.10.161:8084";
|
||||
//var BASE_PATH = "http://192.168.10.170:8084";
|
||||
//var BASE_PATH = "http://192.168.10.171:8084";
|
||||
//var BASE_PATH = "http://192.168.10.164:8084";
|
||||
|
||||
@@ -1429,9 +1429,11 @@ input[type=range]::-webkit-slider-thumb {
|
||||
}
|
||||
@media only screen and (-webkit-min-device-pixel-ratio:2){
|
||||
.list-block .item-inner:after{-webkit-transform:scaleY(1);transform:scaleY(1);}
|
||||
.buttons-tab:after{-webkit-transform:scaleY(1);transform:scaleY(1);}
|
||||
}
|
||||
@media only screen and (-webkit-min-device-pixel-ratio:3){
|
||||
.list-block .item-inner:after{-webkit-transform:scaleY(1);transform:scaleY(1);}
|
||||
.buttons-tab:after{-webkit-transform:scaleY(1);transform:scaleY(1);}
|
||||
}
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -75,11 +75,14 @@ function messageGoto(_this,operation,operationPage,mid){
|
||||
clicked('/views/message/detail.html',true,false,{},{mid:mid},function(){})
|
||||
}
|
||||
if(operation==1){
|
||||
var pages = operationPage+'.html';
|
||||
if(plus.webview.getWebviewById(pages)==null){
|
||||
plus.webview.create(pages, pages, subpage_style);
|
||||
}
|
||||
plus.webview.show(pages);
|
||||
// var pages = operationPage+'.html';
|
||||
// if(plus.webview.getWebviewById(pages)==null){
|
||||
// plus.webview.create(pages, pages, subpage_style);
|
||||
// }
|
||||
// plus.webview.show(pages);
|
||||
mui.fire(plus.webview.getWebviewById('HBuilder'),'switchView',{
|
||||
name:"views/house/houseDetail.html"
|
||||
});
|
||||
}
|
||||
if(operation==2){
|
||||
if (operationPage != null && operationPage != "") {
|
||||
|
||||
+40
-5
@@ -35,17 +35,17 @@
|
||||
<span class="mui-tab-label">首页</span>
|
||||
</a>
|
||||
|
||||
<a class="mui-tab-item" href="views/house/houseDetail.html">
|
||||
<a class="mui-tab-item" id="views/house/houseDetail.html" href="views/house/houseDetail.html">
|
||||
<span class="mui-icon iconfont icon-tab02"></span>
|
||||
<span class="mui-tab-label">行情</span>
|
||||
</a>
|
||||
|
||||
<a class="mui-tab-item" href="views/house/houseManageList.html">
|
||||
<a class="mui-tab-item" id="views/house/houseManageList.html" href="views/house/houseManageList.html">
|
||||
<span class="mui-icon iconfont icon-tab03"></span>
|
||||
<span class="mui-tab-label">评估</span>
|
||||
</a>
|
||||
|
||||
<a class="mui-tab-item" id="selfInfo" href="views/user/userInfo.html">
|
||||
<a class="mui-tab-item" id="views/user/userInfo.html" href="views/user/userInfo.html">
|
||||
<span class="mui-icon iconfont icon-tab04"></span>
|
||||
<span class="mui-tab-label">我的</span>
|
||||
</a>
|
||||
@@ -72,8 +72,6 @@
|
||||
localStorage.removeItem("user_token");
|
||||
localStorage.removeItem("user_token_add_time");
|
||||
}
|
||||
//document.getElementById("quotations").setAttribute("href", BASE_PATH + '/quotations/index');
|
||||
//document.getElementById("selfInfo").setAttribute("href", BASE_PATH + '/selfInfo/index');
|
||||
//mui初始化
|
||||
mui.init();
|
||||
var subpages = ['yfindex.html', 'views/house/houseDetail.html', 'views/house/houseManageList.html', 'views/user/userInfo.html'];
|
||||
@@ -217,6 +215,43 @@
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 推送消息跳转页面
|
||||
window.addEventListener('switchView',function(event){
|
||||
console.log(event.detail.name)
|
||||
plus.webview.show(plus.webview.getWebviewById("HBuilder"));
|
||||
var targetTab = event.detail.name;
|
||||
if (targetTab == activeTab) {
|
||||
return;
|
||||
}
|
||||
//若为iOS平台或非首次显示,则直接显示
|
||||
if(mui.os.ios||aniShow[targetTab]){
|
||||
if(plus.webview.getWebviewById(targetTab)==null){
|
||||
plus.webview.create(targetTab, targetTab, subpage_style)
|
||||
}
|
||||
plus.webview.show(targetTab);
|
||||
}else{
|
||||
//否则,使用fade-in动画,且保存变量
|
||||
var temp = {};
|
||||
temp[targetTab] = "true";
|
||||
mui.extend(aniShow,temp);
|
||||
plus.webview.show(targetTab,"fade-in",300);
|
||||
}
|
||||
//隐藏当前;
|
||||
plus.webview.hide(activeTab);
|
||||
//更改当前活跃的选项卡
|
||||
activeTab = targetTab;
|
||||
var defaultTab = document.getElementById(targetTab);
|
||||
//模拟首页点击
|
||||
mui.trigger(defaultTab, 'tap');
|
||||
//切换选项卡高亮
|
||||
var current = document.querySelector(".mui-bar-tab>.mui-tab-item.mui-active");
|
||||
if (defaultTab !== current) {
|
||||
current.classList.remove('mui-active');
|
||||
defaultTab.classList.add('mui-active');
|
||||
}
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
|
||||
|
||||
@@ -1502,7 +1502,9 @@
|
||||
"yfindex.html",
|
||||
"views/house/houseDetail.html"
|
||||
],
|
||||
"refer": [],
|
||||
"refer": [
|
||||
"views/user/userInfo.html"
|
||||
],
|
||||
"priority": 0
|
||||
},
|
||||
"yfindex.html": {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<title id="title"></title>
|
||||
<title id="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">
|
||||
|
||||
@@ -16,6 +16,13 @@
|
||||
|
||||
<style>
|
||||
.list-block .item-text{-webkit-line-clamp:unset;}
|
||||
img{
|
||||
width: 100%;
|
||||
height: auto;
|
||||
text-align: center;
|
||||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
}
|
||||
</style>
|
||||
|
||||
</head>
|
||||
|
||||
@@ -13,11 +13,6 @@
|
||||
<link rel="stylesheet" href="../../css/theme-orange.css">
|
||||
|
||||
<style>
|
||||
.topic .topicContent .topicContent_center.home div .icon{width:42px;height:42px;}
|
||||
.topic .topicContent .topicContent_center.home div span{font-size:0.7rem;color:#666;}
|
||||
.buttons-tab .button{font-size:0.75rem;color:#999;line-height:2.5rem;height:2.5rem;}
|
||||
.list-block ul:before{height:0;}
|
||||
.cardInfo:first-child{border-top:none;}
|
||||
.page > header.bar{position:static;padding-left:0.75rem;padding-right:0.75rem;background:#fff;border-bottom:none;}
|
||||
.page > header.barBorder{border-bottom:solid 0px #e7e7e7;}
|
||||
.page > header.bar.theme{background:#F18D00;}
|
||||
@@ -28,8 +23,17 @@
|
||||
.list-block .add01a{top:inherit;bottom:0.75rem;right:0.75rem;}
|
||||
.list-block .item-title em{font-size:0.8rem;color:#EB5F34;}
|
||||
.list-block .item-title .tag small{font-size:80%;color:#F5A100;}
|
||||
|
||||
.topic .topicContent .topicContent_center.home div .icon{width:42px;height:42px;}
|
||||
.topic .topicContent .topicContent_center.home div span{font-size:0.7rem;color:#666;}
|
||||
.contentBox{position:relative;}
|
||||
.pstion{position:absolute;top:0;height:572px;}
|
||||
.pstion{position:absolute;top:0;height:600px;}
|
||||
.buttons-tab .button{font-size:0.75rem;color:#999;line-height:2.5rem;height:2.5rem;}
|
||||
.list-block ul:before{height:0;}
|
||||
.cardInfo:first-child{border-top:none;}
|
||||
@media(min-height:750px){
|
||||
.pstion{height:700px;}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
@@ -50,7 +54,7 @@
|
||||
<img src="../../images/headPortrait.png">
|
||||
<p><a class="button theme" href="#" onclick="gotoLogin()" >立即登录</a></p>
|
||||
</div>
|
||||
<div class="topic">
|
||||
<div class="topic" style="display: none;">
|
||||
<div class="topicContent homeBox" style="padding-left:0;padding-right:0;">
|
||||
<div class="topicContent_center home homeWin">
|
||||
<div>
|
||||
@@ -123,7 +127,7 @@
|
||||
<div class="topic">
|
||||
<div class="topicContent homeBox" style="padding-left:0;padding-right:0;">
|
||||
<div class="topicContent_center home homeWin" id="toolList">
|
||||
<div>
|
||||
<!--<div>
|
||||
<i class="icon icon-personal01"></i>
|
||||
<span>公积金查询</span>
|
||||
</div>
|
||||
@@ -138,9 +142,9 @@
|
||||
<div>
|
||||
<i class="icon icon-personal04"></i>
|
||||
<span>算房贷</span>
|
||||
</div>
|
||||
</div>-->
|
||||
<div v-for="(t,index) in merchantTools">
|
||||
<img v-bind:src="t.iconUrl" style="width:45px;height:45px;margin:0 auto;" v-on:click="goto(t.url)">
|
||||
<img v-bind:src="t.iconUrl" style="width:45px;height:45px;margin:0 auto;" v-on:click="goto(t.url,userId)">
|
||||
<span>{{t.toolName}}</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -210,6 +214,7 @@
|
||||
</div>
|
||||
|
||||
<script type="text/javascript" src="../../js/zepto.js" charset="utf-8"></script>
|
||||
|
||||
<script>
|
||||
|
||||
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
|
||||
@@ -217,10 +222,12 @@ Zepto = $
|
||||
$.config = {router: false}
|
||||
|
||||
</script>
|
||||
|
||||
<script type="text/javascript" src="../../js/beacon_release.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/vue.js"></script>
|
||||
<script type="text/javascript" src="../../js/light7-2.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
|
||||
<!--<script type="text/javascript" src="../../js/sm01.js" charset="utf-8"></script>-->
|
||||
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../config.js"></script>
|
||||
<script type='text/javascript' src='../../js/common.js' charset='utf-8'></script>
|
||||
@@ -234,7 +241,7 @@ $.config = {router: false}
|
||||
<script type="text/javascript" src="../../js/user/myMessage.js" charset="utf-8"></script>
|
||||
|
||||
<script>
|
||||
|
||||
|
||||
/* 说明-房产等级 */
|
||||
$(document).on('click','.alert-text-title', function () {
|
||||
$.alert('房产等级是房屋在城市中的综合评级,由高至低分别为 豪宅、公寓、平房、草屋、山洞共5个级别。', '房产等级');
|
||||
@@ -255,20 +262,7 @@ var tab = new Vue({
|
||||
mm_num:"0"
|
||||
}
|
||||
})
|
||||
var toolList = new Vue({
|
||||
el:"#toolList",
|
||||
data:{
|
||||
merchantTools:[]
|
||||
},
|
||||
methods:{
|
||||
goto:function(url){
|
||||
// alert(url)
|
||||
if (url != null && url != "") {
|
||||
clicked('../webview_embed.html', true,false,{},{url:url})
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
//判断是否登录
|
||||
function checkIsLogin(){
|
||||
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
|
||||
@@ -482,10 +476,34 @@ function openSettingPage() {
|
||||
document.addEventListener('plusready', onPlusReady, false);
|
||||
|
||||
function onPlusReady(){
|
||||
var toolList = new Vue({
|
||||
el:"#toolList",
|
||||
data:{
|
||||
merchantTools:[],
|
||||
userId:""
|
||||
},
|
||||
methods:{
|
||||
goto:function(url,userId){
|
||||
var deviceId = plus.device.uuid;
|
||||
if(url.indexOf("?")>0){
|
||||
url+=("&uid="+userId+"&deviceId="+deviceId)
|
||||
}else{
|
||||
url+=("?uid="+userId+"&deviceId="+deviceId)
|
||||
}
|
||||
alert(url)
|
||||
if (url != null && url != "") {
|
||||
clicked('../webview_embed.html', true,false,{},{url:url})
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
axios.get(BASE_PATH + "/rest/usertool/merchantToolList",{params:{position:0}}).then(function(response){
|
||||
toolList.merchantTools = response.data.data;
|
||||
toolList.merchantTools = response.data.data.list;
|
||||
toolList.userId = response.data.data.uid;
|
||||
/* 获取homeWin div个数并计算homeWin宽度 */
|
||||
$(".homeWin").css("width",(90*(4+response.data.data.length))+"px");
|
||||
var original = 0;//公积金查询等个数
|
||||
$(".homeWin").css("width",(90*(original+response.data.data.list.length))+"px");
|
||||
// var html = "";
|
||||
// for(var i=0;i<toolList.length;i++){
|
||||
// html += (i%4==0?'':'<div class="swiper-slide">')+
|
||||
|
||||
Reference in New Issue
Block a user