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

This commit is contained in:
尹吉欢
2018-04-16 17:51:44 +08:00
3 changed files with 20 additions and 3 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;}
+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
}
+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>