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

This commit is contained in:
2018-04-26 17:09:00 +08:00
6 changed files with 183 additions and 57 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ header {
font-size: 17px;
text-align: center;
line-height: 44px;
background: #D74B28;
background: #FFF;
/*background: -webkit-linear-gradient(top,rgba(215,75,40,1),rgba(215,75,40,0.8));*/
z-index: 9999;
/*border-bottom: 1px solid rgba(215,75,40,0.8);*/
+1 -3
View File
@@ -1296,9 +1296,7 @@ input[type=range]::-webkit-slider-thumb {
.contentStart{background:#F18D00;}
.contentStart .time{width:65px;height:30px;line-height:1.6rem;text-align:center;font-size:0.7rem;color:#fff;background:rgba(0,0,0,0.3);border-radius:1.25rem;display:block;position:absolute;top:0.75rem;right:0.75rem;z-index:4;}
.contentStart #time{font-size:0.7rem;vertical-align:middle;}
.contentStart .startImg01{width:50%;position:absolute;top:30%;left:50%;margin-left:-25%;z-index:3;}
.contentStart .startImg02{width:100%;position:absolute;bottom:0;z-index:2;}
.contentStart .startImg03{width:100%;position:absolute;top:0;z-index:1;}
.contentStart .startImg{width:100%;}
/* 引导页 */
.swiper-container{width:100%;height:100%;background:#fff;z-index:10000;}
Binary file not shown.

After

Width:  |  Height:  |  Size: 420 KiB

+38 -28
View File
@@ -88,6 +88,7 @@
plus.navigator.setFullscreen(false);
} else {
loadStartPage();
//显示启动导航
mui.openWindow({
id: 'guide',
@@ -103,34 +104,6 @@
}
});
}
// 加载菜单信息,控制是否显示贷款菜单
$.ajax({
type: "GET",
url:BASE_PATH+"/rest/version/info",
dataType:'json',
async : false,
success: function(data) {
if(data.status){
//存入localStorage Boolean类型变成String
localStorage.setItem("showLoanMenu", data.data.showLoanMenu);
}else{
localStorage.setItem("showLoanMenu", false);
}
},
error: function(XMLHttpRequest, textStatus, errorThrown) {
localStorage.setItem("showLoanMenu", false);
if(plus.webview.getWebviewById('error.html')==null){
clicked('error.html',true,false,{},{},function(){
window.location.reload();
})
}else{
$(".loadingBg").hide();
plus.nativeUI.closeWaiting();
plus.webview.getWebviewById("error.html").show();
}
}
})
var self = plus.webview.currentWebview();
for (var i = 0; i < 4; i++) {
var temp = {};
@@ -184,6 +157,43 @@
}
});
// 加载启动页信息
function loadStartPage() {
$.ajax({
type: "GET",
url:BASE_PATH+"/rest/page/startPage",
dataType:'json',
async : false,
success: function(resData) {
if (resData.status) {
var data = resData.data;
if (data.imgUrl != null) {
localStorage.setItem("startPageImgUrl", data.imgUrl);
}
if (data.url != null) {
localStorage.setItem("startPageClickUrl", data.url);
}
//存入localStorage Boolean类型变成String
//加载菜单信息,控制是否显示贷款菜单
localStorage.setItem("showLoanMenu", data.showLoanMenu);
} else {
localStorage.setItem("showLoanMenu", false);
}
},
error: function(XMLHttpRequest, textStatus, errorThrown) {
localStorage.setItem("showLoanMenu", false);
if(plus.webview.getWebviewById('error.html')==null){
clicked('error.html',true,false,{},{},function(){
window.location.reload();
})
}else{
$(".loadingBg").hide();
plus.nativeUI.closeWaiting();
plus.webview.getWebviewById("error.html").show();
}
}
})
}
</script>
</body>
+45 -25
View File
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>掌上有房</title>
<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">
@@ -13,18 +13,15 @@
<link rel="stylesheet" type="text/css" href="css/mui.min.css"/>
<link rel="stylesheet" href="css/main.css">
<link rel="stylesheet" href="css/theme-blue.css">
<script src="config.js"></script>
</head>
<body>
<div class="page-group">
<div class="page-group" id="app">
<div class="page page-current">
<div class="content contentStart">
<a class="time" onclick="skip()">跳过 <span id="time">5</span></a>
<img src="images/startImg01.png" class="startImg01">
<img src="images/startImg02.png" class="startImg02">
<img src="images/startImg03.png" class="startImg03">
<a class="time" @click="skip()">跳过 <span id="time">5</span></a>
<img :src="imgUrl" class="startImg" @click="openView">
</div>
</div>
</div>
@@ -40,30 +37,53 @@
</script>
<script type="text/javascript" src="js/common.js" charset="utf-8"></script>
<script src="js/mui.min.js"></script>
<script type="text/javascript" src="config.js" charset="utf-8"></script>
<script type="text/javascript" src="js/axios.min.js" charset="utf-8"></script>
<script type="text/javascript" src="js/axiosPlugin.js" charset="utf-8"></script>
<script type="text/javascript" src="js/vue.js" charset="utf-8"></script>
<script>
mui.plusReady(function() {
});
/* 5s倒计时后跳转页面 */
function run(){
var time = document.getElementById("time");
if(time.innerHTML == 0){
lauchFlag = true;
new Vue({
el: '#app',
data: {
imgUrl:"images/startImg.png",
url:""
},
methods: {
skip: function() {
lauchFlag = true;
plus.navigator.setFullscreen(false);
plus.webview.currentWebview().close();
return false;
}
time.innerHTML = time.innerHTML * 1 - 1;
}
window.setInterval("run();", 1000);
function skip() {
lauchFlag = true;
},
openView: function() {
if (this.url != null && this.url != "") {
clicked('views/webview_embed.html', true,false,{},{url:this.url})
}
}
},
mounted(){
var startPageImgUrl = localStorage.getItem("startPageImgUrl")
if (startPageImgUrl != null) {
this.imgUrl = startPageImgUrl;
}
var startPageClickUrl = localStorage.getItem("startPageClickUrl")
if (startPageClickUrl != null) {
this.url = startPageClickUrl;
}
}
});
/* 5s倒计时后跳转页面 */
function run(){
var time = document.getElementById("time");
if(time.innerHTML == 0){
lauchFlag = true;
plus.navigator.setFullscreen(false);
plus.webview.currentWebview().close();
}
return false;
}
time.innerHTML = time.innerHTML * 1 - 1;
}
window.setInterval("run();", 1000);
</script>
</body>
+98
View File
@@ -0,0 +1,98 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8"/>
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<meta name="HandheldFriendly" content="true"/>
<meta name="MobileOptimized" content="320"/>
<title></title>
<script type="text/javascript" src="../js/common.js"></script>
<script type="text/javascript" charset="utf-8">
var ws=null,embed=null;
// 扩展API加载完毕,现在可以正常调用扩展API
function plusReady(){
ws=plus.webview.currentWebview();
ws.addEventListener('show',createEmbed,false);
}
// 判断扩展API是否准备,否则监听"plusready"事件
if(window.plus){
plusReady();
}else{
document.addEventListener("plusready",plusReady,false);
}
// 创建子Webview
function createEmbed(){
var topoffset='45px';
if(plus.navigator.isImmersedStatusbar()){// 兼容immersed状态栏模式
topoffset=(Math.round(plus.navigator.getStatusbarHeight())+45)+'px';
}
plus.nativeUI.showWaiting('',{style:'black',modal:false,background:'rgba(0,0,0,0)'});
var self = plus.webview.currentWebview();
var url = self.url;
embed=plus.webview.create(url,
'embed', {
top : topoffset,
bottom : '0px',
position : 'dock',
dock : 'bottom',
bounce : 'vertical'
});
ws.append(embed);
embed.addEventListener('loaded', function() {
plus.nativeUI.closeWaiting();
}, false);
embed.addEventListener('loading', function() {
plus.nativeUI.showWaiting('', {
style : 'black',
modal : false,
background : 'rgba(0,0,0,0)'
});
}, false);
}
// 打开网址
function openUrl() {
var url = document.getElementById("url");
embed.loadURL(url.value);
url.blur();
}
// 页面加载后自动打开
document.addEventListener("DOMContentLoaded", function() {
if (embed) {
openUrl();
} else {
auto = true;
}
}, false);
// 页面跳转完成事件
function onBrowserLoading() {
document.getElementById("url").value = embed.getURL();
}
</script>
<link rel="stylesheet" href="../css/common.css" type="text/css" charset="utf-8"/>
<style type="text/css">
#url{
width:98%;
-webkit-user-select:auto;
padding-left:0;
padding-right:0;
background: rgba(0,0,0,0);
border: 0px;
border-bottom:1px solid #ECB100;
border-radius: 0;
outline:none;
}
</style>
</head>
<body>
<header id="header">
<div class="nvbt iback" onclick="back(),plus.nativeUI.closeWaiting();"></div>
<!-- <div class="nvtt">
<form action="?" method="get" onsubmit="openUrl();return false;">
<input id="url" type="url" value="${url}"/>
</form>
</div>
<div class="nvbt" onclick="openUrl();">Go</div> -->
</header>
</body>
<script type="text/javascript" src="../js/immersed.js" ></script>
</html>