add

miaomiao/www/css/ionic.app.css

@@ -5647,7 +5647,7 @@ ion-tabs.tabs-color-active-dark .tab-item {
  * --------------------------------------------------
  */
 .item {
-  border-color: #ddd;
+  border: 0px solid #ddd;
   background-color: #fff;
   color: #444;
   position: relative;
@@ -5655,8 +5655,6 @@ ion-tabs.tabs-color-active-dark .tab-item {
   display: block;
   margin: -1px;
   padding: 16px;
-  border-width: 1px;
-  border-style: solid;
   font-size: 16px; }
   .item h2 {
     margin: 0 0 2px 0;
@@ -6812,7 +6810,7 @@ button.item.item-button-right {
 .swiper-wrapper {
   position: relative;
   width: 100%;
-  height: 100%;
+  /*height: 100%;*/
   z-index: 1;
   display: -webkit-box;
   display: -moz-box;
@@ -7248,7 +7246,8 @@ button.swiper-pagination-bullet {
 ion-slides {
   width: 100%;
   height: 100%;
-  display: block; }
+  display: block;
+}
 
 .slide-zoom {
   display: block;
@@ -7278,7 +7277,8 @@ ion-slides {
     width: auto;
     height: auto;
     max-width: 100%;
-    max-height: 100%; }
+    max-height: 100%;
+  }
 
 .scroll-refresher {
   position: absolute;

miaomiao/www/css/style.css

@@ -141,7 +141,7 @@ overflow:auto;
     border-color: #00C3DA;
 }
 .swiper-wrapper {
-    position:relative
+    position:relative;
 }
 .icontent {
     padding-top:50px
@@ -181,9 +181,10 @@ overflow:auto;
     }
     .mainitem .myblock {
         display:inline-block;
+        color: #5A5A5A;
     }
 .mysecond {
-    color: #A3A3A3;
+    color: #BEBEBE;
     margin-top:5px;
     font-size: 15px;
 }
@@ -195,10 +196,11 @@ overflow:auto;
     margin-right: 5px;
 }
 .myblock span {
-    padding:1px;
-    border: 1px solid #00C3DA;
-    margin-left:5px;
-    border-radius:5px;
+    color: #fff;
+    background: #00C3DA;
+    margin-left:8px;
+    border-radius:10px;
+    padding: 0px 10px
 }
 /*my-html*/
 .user-box {
@@ -314,16 +316,16 @@ padding-right:3px;
     position: relative;
     width: 95%;
     left:5px;
-    background-color:#fff;
-    border: 1px solid #00C3DA;
-    margin-top:10px;
+    background-color:#E6E6E6;
+    margin:10px 0;
 }
     .reply-bar div {
         display: block;
         position: relative;
-        background:#00C3DA;
-        height: 20px; /* �߶� */
-        line-height: 20px;
+        background:#FF6600;
+        height: 5px;
+        line-height: 5px;
+        border-radius:5px;
     }
 .reply-sx {
     font-size:1.5rem;
@@ -346,52 +348,58 @@ padding-right:3px;
 }
 .detail-list .detail-item2 h2 {
     font-weight:500;
-
 }
 .detail-item2 .icon {
     color:#00C3DA;
 }
 .detail-head {
     text-align:center;
+    background: #F3F3F3;
 }
-.detail-head img {
+.detail-head img{
     width:80px;
     border-radius:100%;
-}
-.detail-list .item {
-    background-color:#F3F3F3;
+    margin-top: 5px;
+
 }
 .detail-like {
     position:absolute;
     width:100%;
     bottom:0;
     z-index:888;
-    background-color:#FFFFFF;
+    background-color:#F7F7F7;
     font-size:1.2rem;
 }
-    .detail-like .box {
-        border:1px solid  #EAEAEA;
-        margin:5px;
-        text-align:center;
-    }
-        .detail-like .box p {
-            font-size:1.2rem;
-            color:#9F9F9F;
-        }
-        .detail-like .selected{
-              border:1px solid  #00C3DA;
-        }
-    .detail-like .send {
-        border:1px solid #EAEAEA;
-        font-size:1.2rem;
-        height: 3rem;
-        line-height: 3rem;
-        padding-left: 2rem;
-    }
-    .detail-like .send span{
-        /*position:relative;*/
-        top:15px;
-    }
+.detail-like .box {
+    border:1px solid  #EAEAEA;
+    background: #fff;
+    color: #CECECE;
+    padding: 15px 1%;
+    margin:2%;
+    text-align:center;
+}
+.detail-like .box em{
+    font-size:16px;
+    color:#00C3DA;
+}
+.detail-like .selected{
+    border:1px solid  #00C3DA;
+}
+.detail-like .send {
+    font-size:1.2rem;
+    height: 3rem;
+    line-height: 3rem;
+    padding: 0 1rem;
+    margin-bottom: 10px;
+}
+.detail-like .send span{
+    /*position:relative;*/
+    color: #929292;
+    top:15px;
+}
+.detail-like .send span em{
+    color: #FF6600;
+}
 .hdcontent {
     padding-top:49px;
 }
@@ -450,21 +458,23 @@ padding-right:3px;
 .search-hot {
     font-size:1rem;
 }
-    .search-hot .box {
-        border:1px solid #00C3DA;
-        padding:10px;
-        width:30%;
-        float:left;
-        margin:5px;
-        text-align:center;
-    }
-    .search-hot .keyword {
-        background-color:#00C3DA;
-        color:#FFF;
-    }
-    .search-select{
-        background-color:#FBF2F5;
-    }
+.search-hot .box {
+    border:1px solid #EDEDED;
+    color: #B7B7B7;
+    padding:3px;
+    width:30%;
+    border-radius: 30px;
+    float:left;
+    margin:5px;
+    text-align:center;
+}
+.search-hot .keyword {
+    background-color:#00C3DA;
+    color:#FFF;
+}
+.search-select{
+    background-color:#FBF2F5;
+}
 
 .sarch-item {
     font-size:1rem;

miaomiao/www/js/controllers/home.js

@@ -254,15 +254,15 @@
         $scope.showText = function(){ 
             $scope.aboutStyle = {
                 "white-space" : "normal"
-              }
+              };
             $scope.ionDownStyle = {
                 "display" : "none"
             }
-        }
+        };
         $scope.input = {
             placeholder: '评论',
             focus:false
-        }
+        };
      
         $scope.replay = function ($event, name) {
             $event.stopPropagation();

miaomiao/www/templates/home/dream-detail.html

@@ -1,10 +1,9 @@
-<ion-view view-title="梦想"> 
+<ion-view view-title="梦想">
     <ion-nav-buttons side="right">
         <button class="button button-clear icon ion-email-unread"></button>
         <!-- <button class="button button-clear icon ion-ios-compose-outline" style="padding-left:10px"></button> -->
     </ion-nav-buttons>
-    <ion-content style="background-color:#F3F3F3" ng-click="cancelSupport()">
-     
+    <ion-content ng-click="cancelSupport()">
         <div class="tabs-striped tabs-top">
             <div class="tabs" style="top:0">
                 <a ng-class="type==1?'tab-item active':'tab-item'" ng-click="changeType(1)">
@@ -19,44 +18,46 @@
             </div>
         </div>
         <div class="icontent" ng-if="type==1">
-            <ion-slides slider="data.slider">
-                <ion-slide-page ng-if="dream.video">
-                    <div class="box banner">
-                        <video ng-src="{{dream.video | trustUrl}}" height="300px" width="100%"  class="centerme" controls="controls" ></video>
-                    </div>
-                </ion-slide-page>
-                <ion-slide-page ng-repeat="img in dream.imgs" >
-                    <div class="box banner"><img ng-src="{{img.pic}}" style="width: 100%" /></div>
-                </ion-slide-page>
-            </ion-slides>
             <div class="list detail-list">
+                <div class="item" style="padding: 0">
+                    <ion-slides slider="data.slider">
+                        <ion-slide-page ng-if="dream.video">
+                            <div class="box banner">
+                                <video ng-src="{{dream.video | trustUrl}}" height="300px" width="100%"  class="centerme" controls="controls" ></video>
+                            </div>
+                        </ion-slide-page>
+                        <ion-slide-page ng-repeat="img in dream.imgs" >
+                            <div class="box banner"><img ng-src="{{img.pic}}" style="width: 100%" /></div>
+                        </ion-slide-page>
+                    </ion-slides>
+                </div>
                 <div class="item">
-                    <h2>{{dream.name}}</h2>
-                    <p ng-style="aboutStyle">
+                    <p>{{dream.name}}</p>
+                    <p style="font-size: 13px" ng-style="aboutStyle">
                         {{dream.about}}
                     </p>
                     <div style="text-align: center">
                         <i class="icon ion-chevron-down" ng-style="ionDownStyle" style="color: #00C3DA" ng-click="showText()"></i>
                     </div>
                 </div>
-                <div class="item row detail-item2">
-                    <div class="col" style="text-align:left">
-                        <h2>{{timer}}</h2>
-                        <p><i class="icon ion-clock"></i> 剩余时间</p>
-                    </div>
-                    <div class="col" style="text-align:right">
-                        <h2>{{dream.score}}</h2>
-                        <p><i class="icon ion-social-usd-outline"></i> 当前获得梦想分数</p>
-                    </div>
-                </div>
-                <div class="item" style="padding:0">
-                    <div class="reply-bar" style="border: 1px solid #00C3DA">
-                        <div style="width: {{100*dream.get_coin/dream.coin}}%;">
+                <div class="item detail-item2" style="padding:5px; border-top: 1px solid #E6E6E6;">
+                    <div class="row">
+                        <div class="col" style="text-align:left">
+                            <h2>{{timer}}</h2>
+                            <!--<p><i class="icon ion-clock"></i> 剩余时间</p>-->
+                            <p>剩余时间</p>
+                        </div>
+                        <div class="col" style="text-align:right">
+                            <h2>{{dream.score}}</h2>
+                            <!--<p><i class="icon ion-social-usd-outline"></i> 当前获得梦想分数</p>-->
+                            <p>当前获得梦想分数</p>
                         </div>
                     </div>
-                    <div class="row" >
+                </div>
+                <div class="item" style="padding:5px; border-top: 1px solid #E6E6E6;">
+                    <div class="row">
                         <div class="col" style="text-align:left">
-                            <h2>{{dream.get_coin}}</h2>
+                            <p style="color: #FF6600; font-size: 16px">{{dream.get_coin}}</p>
                             <p>目前已获梦想币</p>
                         </div>
                         <div class="col" style="text-align:right">
@@ -64,17 +65,33 @@
                             <p>我要求的梦想币</p>
                         </div>                    
                     </div>
+                    <div class="reply-bar">
+                        <div style="width: {{100*dream.get_coin/dream.coin}}%;">
+                        </div>
+                    </div>
                 </div>
-                <div class="item row detail-head "  >
-                    <div class="col"><img ng-src="{{sort.second}}"  ng-class="sort.slide2" /></div>
-                    <div class="col"><img ng-src="{{sort.first}}" ng-class="sort.slide1" /></div>
-                    <div class="col"><img ng-src="{{sort.third}}"  ng-class="sort.slide3"/></div>
+                <div class="detail-head">
+                    <div class="row">
+                        <div class="col"><img ng-src="{{sort.second}}" style="border: 2px solid #fff;" ng-class="sort.slide2" /></div>
+                        <div class="col"><img ng-src="{{sort.first}}" style="width: 90px;border: 2px solid #fff; margin-top: 0"  ng-class="sort.slide1" /></div>
+                        <div class="col"><img ng-src="{{sort.third}}" style="border: 2px solid #fff;" ng-class="sort.slide3"/></div>
+                    </div>
                 </div>
-                <div class="item">
-                    <button class="button button-outline button-calm" style="width:30%;white-space:normal;line-height:20px; border: 1px solid #00C3DA">支持乘数×{{multi.result}}</button>
-                    <button class="button button-calm" style="width:45%" ng-click="support($event)">支持</button>
-                    <button class="button button-outline button-calm" style="width:25%" ng-click="collectionDream(1)" ng-if="dream.is_collection==0">＋收藏</button>
-                    <button class="button button-outline" style="width:25%" ng-if="dream.is_collection==1" ng-click="collectionDream(0)">取消收藏</button>
+                <div class="item" style="padding-right: 0; padding-left: 0">
+                    <div class="row">
+                        <div class="col">
+                            <button class="button button-outline button-calm" style="width:100%; border-radius:30px; white-space:normal;line-height:20px; border: 1px solid #00C3DA">支持乘数×{{multi.result}}</button>
+                        </div>
+                        <div class="col">
+                            <button class="button button-calm" style="width:100%; border-radius:30px; font-size: 20px;" ng-click="support($event)">支持</button>
+                        </div>
+                        <div class="col" ng-if="dream.is_collection==0">
+                            <button class="button button-outline button-calm" style="width:100%; border-radius:30px; border: 1px solid #00C3DA" ng-click="collectionDream(1)">＋关注</button>
+                        </div>
+                        <div class="col" ng-if="dream.is_collection==1">
+                            <button class="button button-outline" style="width:100%; border-radius:30px; border: 1px solid #A3A3A3"  ng-click="collectionDream(0)">已关注</button>
+                        </div>
+                    </div>
                 </div>
             </div>
        
@@ -115,9 +132,6 @@
                              </div>
                         </div>
                     </div>
-
-
-
                 </div>
             </div>
         </div>
@@ -168,6 +182,7 @@
         </ion-content>
       </div>
     </script>
+
     <script id="recharge-modal.html" type="text/ng-template">
       <div class="modal">
         <ion-header-bar class="bar-calm bar bar-header has-tabs-top">
@@ -210,39 +225,33 @@
         <div>
             <div class="row">
                 <div class="col box {{index==1?'selected':''}}" ng-click="changeIndex(1)" ng-model="coin">
-                    <h2 class="calm">5个</h2>
-                    <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
+                    <em>5个</em>虚拟币
                 </div>
                 <div class="col box {{index==2?'selected':''}}" ng-click="changeIndex(2)" ng-model="coin">
-                    <h2 class="calm">10个</h2>
-                    <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
+                    <em>10个</em>虚拟币
                 </div>
                 <div class="col box {{index==3?'selected':''}}" ng-click="changeIndex(3)" ng-model="coin">
-                    <h2 class="calm">15个</h2>
-                    <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
+                    <em>20个</em>虚拟币
                 </div>
             </div>
             <div class="row">
                 <div class="col box {{index==4?'selected':''}}" ng-click="changeIndex(4)" ng-model="coin">
-                    <h2 class="calm">20个</h2>
-                    <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
+                    <em>50个</em>虚拟币
                 </div>
                 <div class="col box {{index==5?'selected':''}}" ng-click="changeIndex(5)" ng-model="coin">
-                    <h2 class="calm">25个</h2>
-                    <p><i class="icon ion-social-codepen-outline calm"></i>虚拟币</p>
+                    <em>100个</em>虚拟币
                 </div>
                 <div class="col box {{index==6?'selected':''}}" ng-click="changeIndex(6)" ng-model="coin">
-                    <h2 class="calm">30个</h2>
-                    <p><i class="icon ion-social-codepen-outline calm"></i> 虚拟币</p>
+                    <em>200个</em>虚拟币
                 </div>
             </div>
             
         </div>
         <div class="send">
-            <span>余额：<i class="calm">{{dream.user_coin}}</i> 梦想币</span> 
+            <span>余额：<em>{{dream.user_coin}}</em> 梦想币</span>&nbsp;
             <span class="calm" ng-click="openRechargeModal()"><i class="icon ion-card"></i>充值</span>
             <span style="height:100%;float: right;">
-            <a style="border-radius:0;width:80px;font-size:1.2em;" class="button button-calm"  ng-click="supportDream()">发送</a>
+                <a style="border-radius:100px; width:100px; font-size:1.2em; padding: 0" class="button button-calm"  ng-click="supportDream()">发送</a>
             </span>
         </div>
     </div>

miaomiao/www/templates/home/index.html

@@ -1,4 +1,4 @@
-<ion-view view-title="瞄瞄" >
+<ion-view view-title="瞄瞄">
     <ion-nav-buttons side="left">
         <button class="button button-clear icon ion-ios-list-outline" ng-click="openPopover($event)"></button>
     </ion-nav-buttons>
@@ -26,12 +26,11 @@
             </div>
         </div>
         <div class="icontent">
-            <ion-slides   options="data.sliderOptions" slider="data.sliderDelegate">
+            <ion-slides style="height: 170px;" options="data.sliderOptions" slider="data.sliderDelegate">
                 <ion-slide-page ng-repeat="banner in index.banners">
-                    <div class="box banner"><img ng-src="{{banner.value}}" /></div>  
+                    <div class="box banner"><img ng-src="{{banner.value}}" /></div>
                 </ion-slide-page>
             </ion-slides>
-             
             <div class="item item-image" style="margin: 20px 0; border: none;" ng-if="index.users.length>0">
                 <!-- <i class="icon ion-ios-arrow-left" style="font-size: 1.5rem;"></i> -->
                 <span class="subcontent">
@@ -45,22 +44,23 @@
                         <div class="col">
                             <img ng-src="{{item.user.avatar}}" />
                             <div  class="myblock">
-                               <div>{{item.user.nickname}}<span class="calm">{{item.user.birthday | getage}}岁</span></div>
+                               <div>{{item.user.nickname}}<span>{{item.user.birthday | getage}}岁</span></div>
                                 <div class="mysecond">{{item.user.city}}</div>
                             </div>
                         </div>
                         <div class="col" style="text-align:right">
                             <div style="margin-top:8px">
-                                <!--<img ng-src="img/heart.png" class="iheart" />-->
                                 <img ng-src="img/icon_follow.svg" class="iheart">
-                                <span class="calm">{{item.care_num}}</span>
+                                <span style="color: #F16571">{{item.care_num}}</span>
                                 <span>人关注</span>
                             </div>
                             <div  class="mysecond">剩余{{item.end_time | lastDate}}天</div>
                         </div>
                     </div>
-                        <img ng-src="{{item.img.pic}}" />
+                    <div style="height: 100%">
+                        <img style="height: 20%" ng-src="{{item.img.pic}}" />
                     </div>
+                </div>
             </div>
         </div>
         <!--上拉更多-->

miaomiao/www/templates/home/search.html

@@ -7,22 +7,18 @@
         <button class="button button-calm button-right" style="width: 25%; left: 6%; border: 1px solid #fff" ng-click="$ionicGoBack()">取消</button>
     </ion-nav-buttons>
      <ion-content>
-         <div class="list" ng-if="!isResult">
-             <div class="item" style="padding:10px;font-size:1rem">热门搜索</div>
+         <div class="list" style="margin-bottom: 50px" ng-if="!isResult">
+             <div class="item" style="padding:10px;font-size:1.2rem; margin-top: 20px; color: #373737">热门搜索</div>
              <div class="item calm search-hot">
-
                  <div class="box {{keyword==key?'keyword':''}}" ng-click="search(key)" ng-repeat="(key, value) in hot_searches">
                      {{key}}
                  </div>
-               
              </div>
-             <div class="item" style="padding:10px;font-size:1.1rem;line-height:44px">历史搜索</div>
-             <div class="list">
-
-                <div class="item {{keyword==history_search.search?'search-select':''}}" ng-click="search(history_search.search)" ng-repeat="history_search in history_searches">
+             <div class="item" style="padding:10px;font-size:1.2rem; margin-top: 20px; color: #373737">历史搜索</div>
+             <div class="list padding">
+                <div class="item {{keyword==history_search.search?'search-select':''}}" style="border-top: 1px solid #EDEDED; border-bottom: 1px solid #EDEDED; color: #CECECE" ng-click="search(history_search.search)" ng-repeat="history_search in history_searches">
                      {{history_search.search}}
                  </div>
-
              </div>
          </div>
          <div ng-if="isResult&&index==0">