add

miaomiao/www/css/style.css

@@ -67,11 +67,10 @@
 a.tab-item-add {
     background: url("../img/btn_add.svg");
     background-size: cover;
-    /*overflow: visible;*/
     border-radius: 100%;
-    width: 64px;
+    width: 70px;
     position: relative;
-    height: 64px;
+    height: 70px;
     flex: none;
     top: -30px;
     opacity: 1;
@@ -130,6 +129,12 @@ overflow:auto;
     margin-top: 2px;
     margin-right: 5px;
 }
+.defaultClass{
+    border: 2px solid #fff;
+}
+.chosenClass{
+    border: 2px solid #FE3939;
+}
 .search-input{
     display: -webkit-box;
     display: -webkit-flex;
@@ -182,10 +187,12 @@ overflow:auto;
     padding-top:50px
 }
 .subcontent {
-    border-bottom:5px solid #FBF2F5;
+    width: 100%;
 }
 .subcontent img{
-    max-width:17%;
+    width:20%;
+    margin: 10px 5% 10px 0;
+    max-height: 60px;
     border-radius:50%;
 }
     .subcontent i {
@@ -257,22 +264,25 @@ overflow:auto;
     background-color: #00C3DA;
     text-align: center;
     color:#FFF;
+    /*height: 230px;*/
 }
 .user-box .myinfo {
     padding-top:30px;
 }
 .user-box .myinfo img {
-    width:60px;
-    height: 60px;
+    width:80px;
+    height: 80px;
+    border: 2px solid #fff;
     border-radius:100%;
 }
 .user-row {
     margin-top:10px;
+    padding: 10px 0;
 }
 .user-dz {
 text-align:center;
 border-bottom:10px solid #F2F2F2;
-padding:10px;
+padding:18px;
 }
 .user-dz .num{
     font-weight:bold;
@@ -307,7 +317,17 @@ padding:10px;
 .list-set-arrow .icon {
     color:#00C3DA;
 }
-/*my-recharge*/
+.myprofile .item{
+    border-bottom: 1px solid #969696;
+    padding: 10px 0 10px 10px;
+}
+.myprofile input[type=date]{
+    padding-right: 0;
+}
+.myprofile input{
+    padding-right: 30px;
+}
+    /*my-recharge*/
 .re-border {
 padding-right:3px;  
 }
@@ -470,8 +490,13 @@ padding-right:3px;
     color: #929292;
     top:15px;
 }
-.detail-like .send span em{
-    color: #FF6600;
+.detail-like .send img{
+    width: 30px;
+    height: 20px;
+    top: 5px;
+}
+ .detail-like .send span em{
+    color: #00C3DA;
 }
 .hdcontent {
     padding-top:49px;

miaomiao/www/img/icon_ recharge.svg

@@ -0,0 +1,4 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46" height="37" viewBox="0 0 46 37">
+  <title>icon_ recharge</title>
+  <image width="46" height="37" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAlCAYAAAA9ftv0AAAACXBIWXMAAAsSAAALEgHS3X78AAADHElEQVRYw+2ZsWrbQBjHfwoeA/YLFLs0twXiBziwt45RniDqE8Rru9TZutUvULDfwJ3apcQGTaWDCt1UiE2XbpWh0PG6/M9chJ004MgK9MBYd9ZZP3363//7zo6cc4QtSvM2cEa92hdnTXqD04ML+BPwjHq2P8ArZ81oDS7oayDSSUXNoA+Bho7fOGteevDvivRv4NhZs6xbuKM0/wg8Bxzw1IM7P1BH6AD+F9AC3h1EaT7Q+KrO0Gof9H50wONqn/3BYwPn0YM3wuMozfs15z3aBH4IXD2miP/U8RIY15y3A5wDixB84awZ1plaUj4HFv9dZZ+usm8ZdKThdXPWzO4NHqV5FxjtkG3srBlvgB0AMdDewADwXnOn94l4F2juCDwrQQ2B18HQXOcUgYP0gVPgNErzOTC9E9xZk6kS27UkWsAMONHQpSK6uMVJhkBPr+o1XoL+CiQKkP8sLul8AcycNX1VsW/3tThHAXTfWVMIeCR/3nbDE0W90PusUWG0ffJYAbGgu3oCTY2P1fc6j4FE82LN61QdcZ+Vh86ahRzFQ0+AgbOmvNedaREPgQtgGqV531mTNSqKdkcLa+V36YpuE5g4a5JbTKIABlGaF3KhKdC5y8dn/2CHK+k1u+UcXy5PA9n0gKWHVmRbzppBwDACCmfN0Fkz9POiNE+qSvneKXwmTEryQYnoIkrzsaDHkke8QW5JVT7eD+zNJzbChKJzZsC5ItvW00zCEiBK8xXQ21eRdRLol5LmCdJ/Uwu0U87AVYFnJcls8/g58E39H+qXs2qrSvCyROaB24RS6QHH6j9Rv68k5bPrCbCqCnwWJJTwCST3/J547e/BT3AroLMhCezKyzNF64Vu5FrX7IZS0MK8Ai7DraSinUn/Zz7ik2AhtB4o6sNAy0Vwzeld1wyKszYwd9ZMG4GHdhWRhaLzUK0pG4yDa2ZRmifa8WRaA2Gy8sXZ2h7DH/Z9lRbvcPOwrS2dNZ0NtflSwIXcox98drMMLv+Vsm3/t2t7DNdSlOaJpNTedJPy+NGNOZvA97hh7ipgXUlmsa0G+gtp1mLp1S2FGQAAAABJRU5ErkJggg=="/>
+</svg>

miaomiao/www/img/icon_cat_h.svg

@@ -0,0 +1,12 @@
+<svg id="隔离模式" xmlns="http://www.w3.org/2000/svg" width="27.16" height="30" viewBox="0 0 27.16 30">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #ccf3f8;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <title>icon_cat_h</title>
+  <path class="cls-1" d="M12.77,32.83V29.07c-6,.71-6.19-3.31-6.59-4C5.36,23.68,3.46,23.32,4,22.65c1.36-.71,2.74.18,4.34,2.6,1.16,1.75,3.42,1.46,4.56,1.16a5.69,5.69,0,0,1,1.52-2.73c-6.17-1.13-8.74-5-8.74-9.55a9,9,0,0,1,2.12-5.9A8,8,0,0,1,8,2.85c2.55-.23,5.19,1.87,5.4,2a18.63,18.63,0,0,1,4.95-.61,18.62,18.62,0,0,1,5,.62c.49-.39,2.95-2.19,5.32-2a8.06,8.06,0,0,1,.24,5.29,8.93,8.93,0,0,1,2.15,5.93c0,4.58-2.59,8.43-8.77,9.54A5.78,5.78,0,0,1,24,27.77v5Z" transform="translate(-3.92 -2.83)"/>
+</svg>

miaomiao/www/img/icon_cat_n.svg

@@ -0,0 +1,12 @@
+<svg id="隔离模式" xmlns="http://www.w3.org/2000/svg" width="27.16" height="30" viewBox="0 0 27.16 30">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #c7c7c7;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <title>icon_cat_n</title>
+  <path class="cls-1" d="M12.77,32.83V29.07c-6,.71-6.19-3.31-6.59-4C5.36,23.68,3.46,23.32,4,22.65c1.36-.71,2.74.18,4.34,2.6,1.16,1.75,3.42,1.46,4.56,1.16a5.69,5.69,0,0,1,1.52-2.73c-6.17-1.13-8.74-5-8.74-9.55a9,9,0,0,1,2.12-5.9A8,8,0,0,1,8,2.85c2.55-.23,5.19,1.87,5.4,2a18.63,18.63,0,0,1,4.95-.61,18.62,18.62,0,0,1,5,.62c.49-.39,2.95-2.19,5.32-2a8.06,8.06,0,0,1,.24,5.29,8.93,8.93,0,0,1,2.15,5.93c0,4.58-2.59,8.43-8.77,9.54A5.78,5.78,0,0,1,24,27.77v5Z" transform="translate(-3.92 -2.83)"/>
+</svg>

miaomiao/www/js/config/router.js

@@ -51,6 +51,26 @@
                     }
                 }
             })
+            .state('app.oldDream', {
+                url: '/home/oldDream',
+                params:{id:null},
+                views: {
+                    'app-home': {
+                        templateUrl: 'templates/home/oldDream.html',
+                        controller: 'oldDreamCtrl'
+                    }
+                }
+            })
+            .state('app.supportDream', {
+                url: '/home/supportDream',
+                params:{id:null},
+                views: {
+                    'app-home': {
+                        templateUrl: 'templates/home/supportDream.html',
+                        controller: 'supportDreamCtrl'
+                    }
+                }
+            })
             .state('app.home_search', {
                 url: '/home/search',
                 views: {

miaomiao/www/js/controllers/home.js

@@ -3,13 +3,11 @@
         , function ($scope, $http, config, $state, msg, $ionicPopover, homeService) {
         $scope.type = 'hot';//tab切换
 
-            $scope.width = function() {
-                var height = window.screen.width /20;
-                $scope.heightStyle = {
-                    "height": "height" ,
-                    "border": "1px solid red"
-                };
-            };
+            $scope.chosedIndex = 0;
+           $scope.clickAvatar = function(index){
+               $scope.chosedIndex = index;
+           };
+
         $ionicPopover.fromTemplateUrl('my-popover.html', {
             scope: $scope
         }).then(function (popover) {
@@ -41,6 +39,7 @@
             users: [],
             dreams:[]
         };
+
         $scope.load = function (init) {
             if (init) {
                 $scope.filter.pageIndex = 1;
@@ -60,6 +59,7 @@
                 } else {
                     $scope.$broadcast('scroll.infiniteScrollComplete');
                 }
+
             }, function (error) {
                 msg.hide();
             });
@@ -100,8 +100,8 @@
         });
     }]);
 
-    app.controller('dreamDetailCtrl', ["$scope", "$state", "storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
-        , function ($scope, $state, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
+    app.controller('dreamDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
+        , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
         var id = $stateParams.id;
         var top3user = '';
         // id=5;
@@ -119,6 +119,7 @@
                 $scope.multi.b = new Date($scope.dream.created_at.replace(/-/g, "/"));
                 $scope.multi.c  = $scope.dream.c;
                 $scope.multi.promise =  $scope.dream.a;
+                debugger;
                 var newtop3user = '' ;
                 angular.forEach($scope.dream.top3user, function(user) {  
                   newtop3user= newtop3user +user.id+","
@@ -139,14 +140,25 @@
             }, function (error) {
                 msg.hide();
             });
-        }
+        };
+            $ionicModal.fromTemplateUrl('supportExplain.html', {
+                scope: $scope
+            }).then(function(modal) {
+                $scope.supportmodal = modal;
+            });
+            $scope.openSupportmodal = function() {
+                $scope.supportmodal.show();
+            };
+            $scope.closeSupportmodal = function() {
+                $scope.supportmodal.hide();
+            };
         $scope.multi = {
             a: '',
             b: '',
             c: '',
             result: 1,
             promise:null
-        }
+        };
         $scope.type = 1;//tab切换
         $scope.tosupport = false;
         $scope.support = function ($event) { 
@@ -222,7 +234,8 @@
                 if (number<=1) {
                     number = 1;
                 }
-                $scope.multi.result = Math.round(number * 100) / 100;
+                //$scope.multi.result = Math.round(number * 100) / 100;
+                $scope.multi.result = Math.round(number * 100 / 100);
             },1000);
             //  点击支持取消   $interval.cancel($scope.multi.promise); 获取数据后重新开始执行
         }
@@ -365,6 +378,22 @@
             $scope.toDetail = function (id) {
                 $state.go('app.home_dreamdetail',{id:id});
             };
+            $scope.toOldDream = function(){
+                $state.go("app.oldDream");
+            }
+            $scope.toSupportDream = function(){
+                $state.go("app.supportDream");
+            }
+
+        }]);
+    app.controller('oldDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
+        , function ($scope,homeService,$stateParams, $state, msg) {
+
+
+        }]);
+    app.controller('supportDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
+        , function ($scope,homeService,$stateParams, $state, msg) {
+
 
         }]);
     app.controller('searchCtrl', ["$scope","homeService", "$state", "msg", "$ionicTabsDelegate", "$ionicNavBarDelegate"

miaomiao/www/js/filters/filter.js

@@ -67,6 +67,9 @@
             var inter = (end_time.getTime() - date.getTime()) / (1000*3600*24);
             // number = Math.abs(inter * 100) / 100;
             number = inter.toFixed(2);
+            if(number<0){
+                number = 0;
+            }
             return number;
         };
     });

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

@@ -48,12 +48,10 @@
                     <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>
@@ -76,15 +74,30 @@
                 </div>
                 <div class="detail-head" ng-if="dream.top3user.length>0">
                     <div class="row">
-                        <div class="col" ng-if="dream.top3user.length>1"><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" ng-if="dream.top3user.length>2"><img ng-src="{{sort.third}}" style="border: 2px solid #fff;" ng-class="sort.slide3"/></div>
+                        <div class="col top2" ng-if="dream.top3user.length>1" style="background: url('img/img_No2.svg') no-repeat; background-size: 100% 100%;">
+                            <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[1].avatar }}" /><br>
+                            {{ dream.top3user[1].nickname }}<br>
+                            <img src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
+                            <em style="font-size: 18px">{{ dream.top3user[1].score }}</em>
+                        </div>
+                        <div class="col top1" ng-if="dream.top3user.length>0" style="background: url('img/img_No1.svg') no-repeat; background-size: 100% 100%;">
+                            <img style="width: 80px; margin: 28px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[0].avatar }}" /><br>
+                            {{ dream.top3user[0].nickname }}<br>
+                            <img src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
+                            <em style="font-size: 18px">{{ dream.top3user[0].score }}</em>
+                        </div>
+                        <div class="col top2" ng-if="dream.top3user.length>2" style="background: url('img/img_No3.svg') no-repeat; background-size: 100% 100%;">
+                            <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[2].avatar }}" /><br>
+                            {{ dream.top3user[2].nickname }}<br>
+                            <img src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
+                            <em style="font-size: 18px">{{ dream.top3user[2].score }}</em>
+                        </div>
                     </div>
                 </div>
                 <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>
+                            <button ng-click="openSupportmodal()" 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>
@@ -131,9 +144,6 @@
                                 <span>2016-08-08 11:11</span>
                                 <div>你确定是去哪里了吗？你确定是去哪里了吗？</div>
                             </div>
-                            <!-- <div class="item item-input">
-                                 <input name="comment" type="text" focus-me="input.focus" placeholder="{{input.placeholder}}" ng-model="vm.comment" ng-change="submitComment(interaction.id)" style="padding: 0 20px;">
-                             </div>-->
                             <div style="color: #00C3DA; margin-left: 50px">
                                 查看更多评论
                             </div>
@@ -301,11 +311,35 @@
             
         </div>
         <div class="send">
-            <span>余额：<em>{{dream.user_coin}}</em> 梦想币</span>&nbsp;
-            <span class="calm" ng-click="openRechargeModal()"><i class="icon ion-card"></i>充值</span>
+            <span>余额：<img src="img/icon_gold.svg" />{{dream.user_coin}}</span>&nbsp;
+            <div class="calm" ng-click="openRechargeModal()" style="height: 300px">
+                <!--<img src="img/icon_ recharge.png" />-->
+                <span style="vertical-align:middle;"><img src="img/icon_ recharge.png"></span>
+                <em>充值</em>
+            </div>
             <span style="height:100%;float: right;">
                 <a style="border-radius:100px; width:100px; font-size:1.2em; padding: 0" class="button button-calm"  ng-click="supportDream()">发送</a>
             </span>
         </div>
     </div>
+    <script id="supportExplain.html" type="text/ng-template">
+        <div class="modal">
+            <ion-header-bar class="bar-calm bar bar-header has-tabs-top">
+                <h1 class="title">说明</h1>
+                <button class="button button-clear" ng-click="closeSupportmodal()">关闭</button>
+            </ion-header-bar>
+            <ion-content>
+                <div class="list">
+                    <div class="item" style="padding:20px">
+                        <span><i class="icon ion-ios-star-outline calm re-border"></i>剩余梦想币</span>
+                        <div class="re-num">50000</div>
+                    </div>
+                    <div class="item item-input">
+                        <span class="input-label">金额</span>
+                        <input type="number" placeholder="请输入充值金额" ng-model="vm.money" >
+                    </div>
+                </div>
+            </ion-content>
+        </div>
+    </script>
 </ion-view>

miaomiao/www/templates/home/index.html

@@ -33,15 +33,23 @@
         <div class="icontent">
             <ion-slides options="data.sliderOptions" slider="data.sliderDelegate">
                 <ion-slide-page ng-repeat="banner in index.banners">
-                    <div class="box banner" style="height: 170px"><img ng-src="{{banner.value}}" style="height: 100%; width: 100%" /></div>
+                    <div class="box banner" style="height:170px"><img ng-src="{{banner.value}}" style="height: 100%; width: 100%" /></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">
-                    <img ng-src="{{user.user.avatar}}" ng-repeat="user in index.users"/>
-                </span>
-                <!-- <i class="icon ion-ios-arrow-right" style="font-size: 1.5rem"></i> -->
+            <div class="row" ng-if="index.users.length>0" style="background: #FAFAFA; height: 90px">
+                <div class="col col-10" style="margin-top: 7%">
+                    <i class="icon ion-ios-arrow-left" ng-click="change('next')" style="font-size: 1.5rem; color: #00C3DA; line-height: 100%"></i>
+                </div>
+                <div class="col" ng-click="change('back')" style="overflow: hidden;">
+                     <span class="subcontent">
+                        <img ng-click="clickAvatar($index)" ng-if="$index<4" ng-src="{{user.avatar}}" ng-repeat="user in index.users" ng-class="{'defaultClass':$index !=chosedIndex,'chosenClass':$index ==chosedIndex}" style="padding: 2px;"/>
+                     </span>
+                </div>
+                <div class="col col-10" style="margin-top: 7%; text-align: right">
+                    <i class="icon ion-ios-arrow-right" style="font-size: 1.5rem; color: #00C3DA;"></i>
+                </div>
+            </div>
+            <div style="background: #E6E6E6; height: 15px">
             </div>
             <div class="list">
                 <div class="item mainitem" ng-repeat="item in index.dreams">

miaomiao/www/templates/home/oldDream.html

@@ -0,0 +1,71 @@
+<ion-view view-title="瞄瞄">
+    <ion-nav-buttons side="right">
+        <button class="button button-clear homeIcon">
+            <img src="img/icon_message_h.svg" style="height: 100%; width: 100%">
+        </button>
+        <button class="button button-clear button-small" style="padding-top: 3px;">
+            <img src="img/icon_share.svg" style="height: 16px; width: 20px;">
+        </button>
+    </ion-nav-buttons>
+    <ion-content>
+        <div ng-if="100*dream.get_coin/dream.coin!==0" class="list" ng-repeat="dream in dreams">
+            <div class="item reply-item" ng-click="toDetail(dream.id)">
+                <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
+                    <div style="float:left;">
+                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
+                    </div>
+                    <div style="float:left; margin: 15px 0 0 10px">
+                        {{user.nickname}}
+                    </div>
+                </div>
+                <div class="item item-thumbnail-left reply-content">
+                    <div style="float:left; height: 60px; width: 60px">
+                        <img ng-src="{{dream.pic}}" />
+                    </div>
+                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
+                        <h2>{{dream.name}}</h2>
+                        <p>{{dream.about}}</p>
+                    </div>
+                    <div style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
+                        进行中
+                    </div>
+                </div>
+
+                <div class="reply-bar">
+                    <div style="width: {{100*dream.get_coin/dream.coin}}%;">
+                    </div>
+                </div>
+                <span style="font-size: 18px">{{100*dream.get_coin/dream.coin | Rouder}}%</span> &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
+            </div>
+            <p style="background: #F8F8F8; height: 1rem"></p>
+        </div>
+        <div ng-if="100*dream.get_coin/dream.coin==100" class="list" ng-repeat="dream in dreams">
+            <div class="item reply-item" ng-click="toDetail(dream.id)">
+                <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
+                    <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
+                    <span style="top: 10px;">{{user.nickname}}</span>
+                </div>
+                <div class="item item-thumbnail-left reply-content">
+                    <div style="float:left;">
+                        <img ng-src="{{dream.pic}}" />
+                    </div>
+                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px;">
+                        <h2>{{dream.name}}</h2>
+                        <p>{{dream.about}}</p>
+                    </div>
+                    <div style="float:right; width: 15%; text-align: right; color: #00C3DA; font-size: 16px">
+                        已实现<br>
+                        <p style="color: #DBDBDB; margin-top: 5px">已结束</p>
+                    </div>
+                </div>
+
+                <div class="reply-bar">
+                    <div style="width: {{100*dream.get_coin/dream.coin}}%;">
+                    </div>
+                </div>
+                <span style="font-size: 18px">{{100*dream.get_coin/dream.coin | Rouder}}%</span> &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
+            </div>
+            <p style="background: #F8F8F8; height: 1rem"></p>
+        </div>
+    </ion-content>
+</ion-view>

miaomiao/www/templates/home/supportDream.html

@@ -0,0 +1,71 @@
+<ion-view view-title="瞄瞄">
+    <ion-nav-buttons side="right">
+        <button class="button button-clear homeIcon">
+            <img src="img/icon_message_h.svg" style="height: 100%; width: 100%">
+        </button>
+        <button class="button button-clear button-small" style="padding-top: 3px;">
+            <img src="img/icon_share.svg" style="height: 16px; width: 20px;">
+        </button>
+    </ion-nav-buttons>
+    <ion-content>
+        <div ng-if="100*dream.get_coin/dream.coin!==0" class="list" ng-repeat="dream in dreams">
+            <div class="item reply-item" ng-click="toDetail(dream.id)">
+                <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
+                    <div style="float:left;">
+                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
+                    </div>
+                    <div style="float:left; margin: 15px 0 0 10px">
+                        {{user.nickname}}
+                    </div>
+                </div>
+                <div class="item item-thumbnail-left reply-content">
+                    <div style="float:left; height: 60px; width: 60px">
+                        <img ng-src="{{dream.pic}}" />
+                    </div>
+                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
+                        <h2>{{dream.name}}</h2>
+                        <p>{{dream.about}}</p>
+                    </div>
+                    <div style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
+                        进行中
+                    </div>
+                </div>
+
+                <div class="reply-bar">
+                    <div style="width: {{100*dream.get_coin/dream.coin}}%;">
+                    </div>
+                </div>
+                <span style="font-size: 18px">{{100*dream.get_coin/dream.coin | Rouder}}%</span> &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
+            </div>
+            <p style="background: #F8F8F8; height: 1rem"></p>
+        </div>
+        <div ng-if="100*dream.get_coin/dream.coin==100" class="list" ng-repeat="dream in dreams">
+            <div class="item reply-item" ng-click="toDetail(dream.id)">
+                <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
+                    <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
+                    <span style="top: 10px;">{{user.nickname}}</span>
+                </div>
+                <div class="item item-thumbnail-left reply-content">
+                    <div style="float:left;">
+                        <img ng-src="{{dream.pic}}" />
+                    </div>
+                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px;">
+                        <h2>{{dream.name}}</h2>
+                        <p>{{dream.about}}</p>
+                    </div>
+                    <div style="float:right; width: 15%; text-align: right; color: #00C3DA; font-size: 16px">
+                        已实现<br>
+                        <p style="color: #DBDBDB; margin-top: 5px">已结束</p>
+                    </div>
+                </div>
+
+                <div class="reply-bar">
+                    <div style="width: {{100*dream.get_coin/dream.coin}}%;">
+                    </div>
+                </div>
+                <span style="font-size: 18px">{{100*dream.get_coin/dream.coin | Rouder}}%</span> &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
+            </div>
+            <p style="background: #F8F8F8; height: 1rem"></p>
+        </div>
+    </ion-content>
+</ion-view>

miaomiao/www/templates/home/userDetail.html

@@ -5,7 +5,7 @@
     <ion-content>
         <div class="user-box">
             <div class="myinfo">
-                <img style="height: 80px; width: 80px; border: 2px solid #fff" ng-src="{{user.user.avatar | avator }}" />
+                <img ng-src="{{user.user.avatar | avator }}" />
                 <div>
                     {{user.user.nickname}}
                 </div>
@@ -33,20 +33,8 @@
                 </div>
             </div>
         </div>
-        <div class="row user-dz">
-        <!--<div class="row user-dz">-->
-            <div class="col" ng-repeat="item in user.imgs">
-                <img style="width: 80px; height: 80px;" ng-src="{{item.pic}}">
-            </div>
-            <!--<div class="col">
-                <img style="width: 80px; height: 80px;" src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1784265725,2575462984&fm=117&gp=0.jpg">
-            </div>
-            <div class="col">
-                <img style="width: 80px; height: 80px;" src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1784265725,2575462984&fm=117&gp=0.jpg">
-            </div>
-            <div class="col">
-                <img style="width: 80px; height: 80px;" src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1784265725,2575462984&fm=117&gp=0.jpg">
-            </div>-->
+        <div class="user-dz" style="text-align: left">
+            <img ng-repeat="item in user.imgs" style="width: 80px; height: 80px;margin: 0 10px 0 0" ng-src="{{item.pic}}">
         </div>
         <div class="list padding" style="font-size: 18px; color: #828282">
             <div class="row" style="padding: 20px 0; border-bottom: 1px solid #E6E6E6">
@@ -71,10 +59,10 @@
             <a class="item" ng-click="toDetail(user.id)">
                 <em class="fl">当前梦想</em>
             </a>
-            <a class="item">
+            <a class="item" ng-click="toOldDream()">
                 <em class="fl">曾经的梦想</em>
             </a>
-            <a class="item">
+            <a class="item" ng-click="toSupportDream()">
                 <em class="fl">支持的梦想</em>
             </a>
         </div>

miaomiao/www/templates/my/index.html

@@ -6,7 +6,7 @@
                 <div>
                     {{user.nickname}}
                 </div>
-                <div style="font-size:0.7rem"> {{user.city}}</div>
+                <div style="font-size:0.7rem; margin-bottom: 10px"> {{user.city}}</div>
             </div>
             
            <div class="row user-row">

miaomiao/www/templates/my/my-profile.html

@@ -1,24 +1,23 @@
 <ion-view view-title="个人信息" >
     <ion-content>
-     <div class="list">
+     <div class="list myprofile">
          <a class="item item-avatar-right" ng-click="setAvator()">
-             <!-- <img  src="img/demo/head5.jpg"/> -->
              <img ng-src="{{ vm.avatar | avator }}">
-             <h2>头像</h2>
+             <h2 style="margin-top: 3%">头像</h2>
              <p style="font-size:12px">点击上传</p>
          </a>
-         <div class="item">
-             <span class="fl">
+         <label class="item" style="height: 50px; padding-top: 15px">
+             <span>
                  绑定手机 
              </span>
-             <i style="float:right" class="ng-binding">{{vm.phone}}</i>
-         </div>
+             <i style="float:right; margin-right: 30px" class="ng-binding">{{vm.phone}}</i>
+         </label>
 
          <label class="item item-input ">
              <span class="input-label">昵称</span>
-             <input name="signture" type="text" placeholder="请输入" ng-model="vm.nickname">
+             <input name="signture" style="text-align: right" type="text" placeholder="请输入昵称" ng-model="vm.nickname">
          </label>
-         <label class="item item-input item-select item-select-width">
+         <label class="item item-select item-select-width">
              <span class="input-label">
                  性别
              </span>
@@ -30,9 +29,9 @@
          </label>
          <label class="item item-input ">
              <span class="input-label">个性签名</span>
-             <input name="signture" type="text" placeholder="请输入" ng-model="vm.signture">
+             <input name="signture" style="text-align: right" type="text" placeholder="请输入个性签名" ng-model="vm.signture">
          </label>
-         <label class="item item-input item-select item-select-width">
+         <label class="item item-select item-select-width">
              <span class="input-label">
                  情感状态
              </span>
@@ -45,15 +44,15 @@
 
          <label class="item item-input ">
              <span class="input-label">职业</span>
-             <input name="work" type="text" placeholder="请输入" ng-model="vm.work">
+             <input name="work" style="text-align: right" type="text" placeholder="请输入职业" ng-model="vm.work">
          </label>
          <label class="item item-input ">
              <span class="input-label">身高</span>
-             <input name="height" type="number" placeholder="请输入(单位cm)" ng-model="vm.height">
+             <input name="height" style="text-align: right" type="number" placeholder="请输入身高(单位cm)" ng-model="vm.height">
          </label>
          <label class="item item-input ">
              <span class="input-label">所在城市</span>
-             <input name="city" type="text" placeholder="请输入" ng-model="vm.city">
+             <input name="city" style="text-align: right" type="text" placeholder="请输入所在城市" ng-model="vm.city">
          </label>
         <label class="item item-input">
             <em class="fl">出生日期</em>

miaomiao/www/templates/my/my-recharge.html

@@ -33,8 +33,9 @@
                     <span>支付宝支付</span>
                 </ion-radio>
                 <ion-radio ng-model="choice" ng-value="'B'">
-                <img ng-src="img/icon_ WeChat Pay.svg" /><span>微信支付</span>
-                  </ion-radio>
+                    <img ng-src="img/icon_ WeChat Pay.svg" />
+                    <span>微信支付</span>
+                </ion-radio>
             </ion-list>
         </div>
         <div class="padding">