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

This commit is contained in:
尹吉欢
2018-04-28 14:00:05 +08:00
4 changed files with 103 additions and 148 deletions
+6 -3
View File
@@ -12,6 +12,7 @@ em{font-style:normal;color:#333;}
em.up{color:#EB5F34;}
em.down{color:#88D053;}
*/
::../../images{display:none;}
.dn{display:none;}
.di{display:inline;}
@@ -450,7 +451,6 @@ input::-webkit-input-placeholder{
.cardNearbyName{margin-top:0;margin-bottom:0;padding-bottom:0.3rem;}
.cardNearbyName span{font-size:0.75rem;}
.cardNearbyBox{width:100%;background:#f3f3f3;overflow-x:auto;}
.cardNearbyBox::-webkit-scrollbar{display:none;}
.cardNearbyWin{width:22.5rem;margin-left:0.25rem;overflow:hidden;}
.cardNearby{width:6.75rem;border-radius:0.16rem;float:left;margin-right:0;color:#333;}
.cardNearby div{padding-top:0;padding-bottom:0;}
@@ -459,14 +459,13 @@ input::-webkit-input-placeholder{
.cardNearby .card-footer{font-size:0.65rem;color:#999;min-height:1.5rem;margin-top:-0.2rem;}
.cardNearbyBox01{background:none;margin-top:-0.5rem;}
.cardNearbyBox01 .cardNearbyWin{margin-bottom:0.25rem;}
.cardNearbyBox01 .cardNearby../../images{margin-bottom:0.25rem;}
.cardNearbyBox01 .cardNearby{border:solid 1px #e7e7e7;}
.cardNearbyBox01 .cardNearby .card-header{padding-top:0.25rem;line-height:1.2rem;}
.arrow-up{font-size:0;line-height:0;border-width:10px;border-color:#f3f3f3;border-top-width:0;border-style:dashed;border-bottom-style:solid;border-left-color:transparent;border-right-color:transparent;position:absolute;bottom:0;left:16%;}
.cardRentBox{width:100%;background:#fff;overflow-x:auto;border-bottom:solid 1px #e7e7e7;}
.cardRentBox::-webkit-scrollbar{display:none;}
.cardRentWin{width:25rem;overflow:hidden;margin-left:0.75rem;border-left:solid 1px #e7e7e7;}
.cardRent{border-radius:0;border-right:solid 1px #e7e7e7;box-shadow:none;float:left;margin:0;}
.cardRent .card-content-inner{font-size:0.7rem;color:#EB5F34;padding:0.5rem 0.75rem;}
@@ -1146,6 +1145,10 @@ input::-webkit-input-placeholder{
.tabs .noData img{width:30%;margin:0 auto;margin-top:3rem;}
.topic .topicContent.homeBox{overflow-x:auto;}
.topic .topicContent .topicContent_center.homeWin{width:540px;overflow:hidden;}
.topic .topicContent .topicContent_center.homeWin div{width:90px;}
/* 出错页面 */
.contentError{padding-top:30%;}
.contentError img{width:30%;margin:0 auto;}
+17 -27
View File
@@ -13,46 +13,40 @@
<link rel="stylesheet" href="../../css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
<style type="text/css">
#feedBackStart{
width: 100%;
height: 20px;
margin: 10px auto;
margin-left: 5%;
line-height: 20px; /*设置line-height与父级元素的height相等*/
overflow: hidden; /*防止内容超出容器或者产生自动换行*/
font-size:smaller;
color: #AAAAAA;
}
<style>
.list-block ul:before{height:0;}
.list-block ul:after{height:0;}
</style>
</head>
<body>
<div class="page-group" id="app">
<div class="page page-current">
<header class="bar bar-nav">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="back()">
<span class="icon icon-left"></span>
</button>
<h1 class="title">意见反馈</h1>
</header>
<div class="content" style="background-color: #EEEEEE;">
<div class="list-block media-list">
<div id="feedBackStart">
您的意见是我们的动力
</div>
<div class="content f3">
<div class="content-block-title">您的意见建议是我们的动力</div>
<div class="list-block media-list mb05">
<ul>
<li style="width:100%;height:150px;">
<a class="item-content" style="width:100%;height:100%;">
<div class="item-inner" style="width:100%;height:100%;">
<textarea v-model="content" placeholder="请输入您的意见或建议" style="width:100%;height:100%;"></textarea>
<textarea v-model="content" placeholder="请输入您的意见或建议" style="width:100%;height:100%;"></textarea>
</div>
</a>
</li>
<li style="margin-top: 10px;">
</ul>
</div>
<div class="list-block media-list">
<ul>
<li>
<a class="item-content">
<div class="item-inner">
<div class="item-title-row">
@@ -64,7 +58,7 @@
</div>
</a>
</li>
</ul>
</ul>
</div>
<div class="content-block loginBox">
<p><a class="button button-big button-fill theme" id="bundling_btn" @click="binding">提交意见</a></p>
@@ -114,13 +108,9 @@ var vue = new Vue({
},
// 联系方式检查
checkContact: function() {
if(this.contact == ""){
$.toast("请输入手机或邮箱");
return false;
}
var mobile_reg = /^1\d{10}$/;
var email_reg = /^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/;
if (!mobile_reg.test(this.contact)&&!email_reg.test(this.contact)) {
if (this.contact&&(!mobile_reg.test(this.contact)&&!email_reg.test(this.contact))) {
$.toast("手机或邮箱格式错误");
return false;
}
+75 -118
View File
@@ -9,7 +9,6 @@
<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/light7-swiper.min.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
@@ -51,45 +50,26 @@
<img src="../../images/headPortrait.png">
<p><a class="button theme" href="#" onclick="gotoLogin()" >立即登录</a></p>
</div>
<div class="topic" style="">
<div class="topicContent" style="padding-left:0;padding-right:0;padding-bottom:0;">
<div class="swiper-container">
<div class="swiper-wrapper">
<div class="swiper-slide">
<div class="topicContent_center home">
<div>
<i class="icon icon-personal01"></i>
<span>公积金查询</span>
</div>
<div>
<i class="icon icon-personal02"></i>
<span>算税费</span>
</div>
<div onclick="window.location.href='#'">
<i class="icon icon-personal03"></i>
<span>贷款评估</span>
</div>
<div>
<i class="icon icon-personal04"></i>
<span>算房贷</span>
</div>
</div>
</div>
<div class="swiper-slide">
<div class="topicContent_center home">
<div>
<i class="icon icon-personal01"></i>
<span>公积金查询</span>
</div>
<div>
<i class="icon icon-personal02"></i>
<span>算税费</span>
</div>
</div>
</div>
<div class="topic">
<div class="topicContent homeBox" style="padding-left:0;padding-right:0;">
<div class="topicContent_center home homeWin">
<div>
<i class="icon icon-personal01"></i>
<span>公积金查询</span>
</div>
<div class="swiper-pagination"></div>
</div>
<div>
<i class="icon icon-personal02"></i>
<span>算税费</span>
</div>
<div onclick="window.location.href='#'">
<i class="icon icon-personal03"></i>
<span>贷款评估</span>
</div>
<div>
<i class="icon icon-personal04"></i>
<span>算房贷</span>
</div>
</div>
</div>
</div>
<div class="buttons-tab fixed-tab theme" data-offset="44">
@@ -141,52 +121,29 @@
<p id="user_mobile"><br><span class="tag"><!--<small>土豪</small>--></span></p>
</div>
<div class="topic">
<div class="topicContent" style="padding-left:0;padding-right:0;padding-bottom:0;">
<div class="swiper-container">
<div class="swiper-wrapper" id="toolList">
<div class="swiper-slide">
<div class="topicContent_center home">
<div>
<i class="icon icon-personal01"></i>
<span>公积金查询</span>
</div>
<div>
<i class="icon icon-personal02"></i>
<span>算税费</span>
</div>
<div onclick="window.location.href='#'">
<i class="icon icon-personal03"></i>
<span>贷款评估</span>
</div>
<div>
<i class="icon icon-personal04"></i>
<span>算房贷</span>
</div>
</div>
</div>
<!--<div class="swiper-slide">
<div class="topicContent_center home">
<div>
<i class="icon icon-personal01"></i>
<span>公积金查询</span>
</div>
<div>
<i class="icon icon-personal02"></i>
<span>算税费</span>
</div>
</div>
</div>-->
<!--<div class="swiper-slide">
<div class="topicContent_center home">
<div>
<img v-bind:src="t.iconUrl" style="width:45px;height:45px;margin:0 auto;" v-on:click="goto(t.url)">
<span>{{t.toolName}}</span>
</div>
</div>
</div>-->
<div class="topicContent homeBox" style="padding-left:0;padding-right:0;">
<div class="topicContent_center home homeWin" id="toolList">
<div>
<i class="icon icon-personal01"></i>
<span>公积金查询</span>
</div>
<div class="swiper-pagination"></div>
</div>
<div>
<i class="icon icon-personal02"></i>
<span>算税费</span>
</div>
<div onclick="window.location.href='#'">
<i class="icon icon-personal03"></i>
<span>贷款评估</span>
</div>
<div>
<i class="icon icon-personal04"></i>
<span>算房贷</span>
</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)">
<span>{{t.toolName}}</span>
</div>
</div>
</div>
</div>
<div class="buttons-tab fixed-tab theme" data-offset="44" id="tab" v-cloak>
@@ -292,14 +249,9 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/user/myFocus.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/user/myCollect.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/user/myHouse.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/light7-swiper.min.js" charset="utf-8"></script>
<script>
/* tab滑动 */
$(function() {
$(".swiper-container").swiper();
});
/* 说明-房产等级 */
$(document).on('click','.alert-text-title', function () {
$.alert('房产等级是房屋在城市中的综合评级,由高至低分别为 豪宅、公寓、平房、草屋、山洞共5个级别。', '房产等级');
@@ -319,17 +271,20 @@ var tab = new Vue({
mc_num:"0"
}
})
//var toolList = new Vue({
// el:"#toolList",
// data:{
// merchantTools:[]
// },
// method:{
// goto:function(url){
// alert(url)
// }
// }
//})
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") == ""){
@@ -484,22 +439,24 @@ document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
axios.get(BASE_PATH + "/rest/usertool/merchantToolList",{params:{position:0}}).then(function(response){
var toolList = response.data.data;
var html = "";
for(var i=0;i<toolList.length;i++){
html += (i%4==0?'':'<div class="swiper-slide">')+
(i%4==0?'':'<div class="topicContent_center home">')+
'<div>'+
'<img src="'+toolList[i].iconUrl+'" style="width:45px;height:45px;margin:0 auto;" onclick="goto(\''+toolList[i].url+'\')">'+
'<span>'+toolList[i].toolName+'</span>'+
'</div>'+
(i%4==3?'':'</div>')+
(i%4==3?'':'</div>');
}
if(toolList.length%4!=3){
html += '</div>'+'</div>';
}
$("#toolList").append(html);
toolList.merchantTools = response.data.data;
/* 获取homeWin div个数并计算homeWin宽度 */
$(".homeWin").css("width",(90*(4+response.data.data.length))+"px");
// var html = "";
// for(var i=0;i<toolList.length;i++){
// html += (i%4==0?'':'<div class="swiper-slide">')+
// (i%4==0?'':'<div class="topicContent_center home">')+
// '<div>'+
// '<img src="'+toolList[i].iconUrl+'" style="width:45px;height:45px;margin:0 auto;" onclick="goto(\''+toolList[i].url+'\')">'+
// '<span>'+toolList[i].toolName+'</span>'+
// '</div>'+
// (i%4==3?'':'</div>')+
// (i%4==3?'':'</div>');
// }
// if(toolList.length%4!=3){
// html += '</div>'+'</div>';
// }
// $("#toolList").append(html);
}).catch(function(error){
console.log(error);
});
+5
View File
@@ -1777,6 +1777,9 @@ function addItems(number, lastIndex) {
return;
}
var html = '';
if(lastIndex == 0){
yesterDayDeployFlag = true;
}
for(var i in dataObj){
if(i>=lastIndex){
if((dataObj.length<lastIndex + number) || (i < lastIndex + number)){
@@ -2086,6 +2089,8 @@ $(document).on('refresh', '.pull-to-refresh-content',function(e) {
page = 1;
dataObj = [];
$("#newsList").html("");
$(".infinite-scroll-preloader").show();
$.attachInfiniteScroll($('.infinite-scroll'));
initNews(page);
}
// 加载完毕需要重置