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-16 18:41:34 +08:00
5 changed files with 28 additions and 11 deletions
+1
View File
@@ -1065,6 +1065,7 @@ input::-webkit-input-placeholder{
.collection{position:absolute;right:0.75rem;top:0.4rem;text-align:center;color:#666;font-size:0.7rem;}
.collection02{border:solid 1px #C3C0BC;color:#999;}
.collection02:active{border:solid 1px #C3C0BC;color:#999;}
.icon-collection01{width:16px;height:16px;background:url(../images/icon-collection01.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;}
.icon-collection02{width:16px;height:16px;background:url(../images/icon-collection02.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;}
+6 -6
View File
@@ -10,7 +10,7 @@ function updateSerivces(){
shares[t.id]=t;
}
}, function(e){
alert("获取分享服务列表失败:"+e.message );
plus.nativeUI.alert("获取分享服务列表失败:"+e.message );
} );
}
/**
@@ -20,7 +20,7 @@ function updateSerivces(){
*/
function shareAction(sb,bh) {
if(!sb||!sb.s){
alert("无效的分享服务!");
plus.nativeUI.alert("无效的分享服务!");
return;
}
var msg={content:sharehrefDes,extra:{scene:sb.x}};
@@ -47,11 +47,11 @@ function shareAction(sb,bh) {
if ( sb.s.authenticated ) {
shareMessage(msg,sb.s);
} else {
alert("---未授权---");
plus.nativeUI.alert("---未授权---");
sb.s.authorize( function(){
shareMessage(msg,sb.s);
},function(e){
alert("认证授权失败:"+e.code+" - "+e.message );
plus.nativeUI.alert("认证授权失败:"+e.code+" - "+e.message );
});
}
@@ -63,11 +63,11 @@ function shareAction(sb,bh) {
*/
function shareMessage(msg,s){
s.send( msg, function(){
alert("分享到\""+s.description+"\"成功! " );
plus.nativeUI.alert("分享到\""+s.description+"\"成功! " );
}, function(e){
console.log(e.code+"========="+e.message)
alert( "分享到\""+s.description+"\"失败 !");
plus.nativeUI.alert( "分享到\""+s.description+"\"失败 !");
} );
}
+18 -2
View File
@@ -1701,7 +1701,8 @@
"views/house/houseManageList.html": {
"resources": [],
"refer": [
"views/house/add.html"
"views/house/add.html",
"views/evaluate/evaluateReport.html"
],
"priority": 0
},
@@ -1715,7 +1716,22 @@
"views/setting/setting.html": {
"resources": [],
"refer": [
"views/setting/about.html"
"views/setting/about.html",
"views/user/updatePass.html"
],
"priority": 0
},
"views/evaluate/evaluateReport.html": {
"resources": [],
"refer": [
"views/house/add.html"
],
"priority": 0
},
"views/setting/about.html": {
"resources": [],
"refer": [
"views/setting/agreement.html"
],
"priority": 0
}
+2 -2
View File
@@ -172,7 +172,7 @@
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
<div class="card-header">
<label>{{myCityMap.city}}</label>
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
<a v-if="collecd" class="button collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city)">关注</a>
</div>
@@ -243,7 +243,7 @@
<div class="card cardNearby" v-for="nearDist in nears" @click="showDistrictDetail(nearDist.city, nearDist.region, nearDist.name)">
<div class="card-header">{{nearDist.sname}}</div>
<div class="card-content">
<div class="card-content-inner" v-if="nearDist.avgPrice">{{nearDist.avgPrice}}元/㎡</div>
<div class="card-content-inner" v-if="nearDist.avgPrice > 0">{{nearDist.avgPrice}}元/㎡</div>
<div class="card-content-inner" v-else>暂无</div>
</div>
</div>
+1 -1
View File
@@ -23,7 +23,7 @@
<div class="page-group">
<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(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>