add

miaomiao/www/css/ionic.app.css

@@ -6294,8 +6294,8 @@ button.item.item-button-right {
     position: absolute;
     top: 10px;
     left: 10px;
-    max-width: 80px;
-    max-height: 80px;
+    max-width: 70px;
+    max-height: 70px;
     width: 100%;
     height: 100%; }
 

miaomiao/www/css/style.css

@@ -91,7 +91,19 @@ a.tab-item-add {
     padding-top:0;
     margin-top:-6px;
 }
-.btn-file-up { height: 72px; width: 72px; text-align: center; display: inline-block; line-height: 30px; font-size: 14px; background-color: #FFF; border: 1px dashed #00C3DA; border-radius: 3px; margin: 5px; float: left; color: #999; }
+.btn-file-up {
+    height: 72px;
+    width: 72px;
+    text-align: center;
+    display: inline-block;
+    line-height: 30px;
+    font-size: 14px;
+    background-color: #FFF;
+    border: 1px solid #C8C8C8;
+    border-radius: 3px; margin: 5px;
+    float: left;
+    color: #999;
+}
 .btn-file-up i { display: block; padding: 5px 0 0 0; font-size: 30px; color: #00C3DA; }
 .btn-file-up-position { position: absolute; right: 20px; }
 .img-file-up { float: left; margin: 5px 5px 5px 0; width: 72px; height: 72px; }
@@ -289,7 +301,7 @@ padding-right:3px;
     font-size:0.8rem;
 }
 .reply-item {
-    padding:0;
+    padding:0 10px 20px;
 }
 .reply-hf {
     text-align:right;
@@ -306,16 +318,23 @@ padding-right:3px;
 }
 .reply-content {
     border:none;
+    padding-left: 0;
     margin-top:5px;
-    background-color:#F6F6F6;
 }
-    .reply-content p {
-            white-space:normal;
-    }
+.reply-content p {
+    white-space:normal;
+    font-size: 15px;
+}
+.reply-content div img{
+    /*position: absolute;*/
+    max-width: 80px;
+    max-height: 80px;
+    width: 100%;
+    height: 100%;
+}
 .reply-bar {
     position: relative;
-    width: 95%;
-    left:5px;
+    width: 100%;
     background-color:#E6E6E6;
     margin:10px 0;
 }
@@ -494,7 +513,7 @@ padding-right:3px;
         background-color:#F07E19;
         color:#FFF;
         border-radius:10px;
-        padding:0 15px;
+        padding:0 px;
     }
     .more-userlist{
         padding-top:50px;

miaomiao/www/js/controllers/my.js

@@ -142,6 +142,10 @@
               console.log(result.data.data);
               $scope.dreams = result.data.data;
             });
+          myService.myInfo().then(function(result){
+              console.log(result.data.data);
+              $scope.user = result.data.data
+          });
       });
           $scope.toDetail = function (id) {
               $state.go('app.my_dreamdetail',{id:id});

miaomiao/www/templates/add/index.html

@@ -1,23 +1,23 @@
-<ion-view view-title="发布梦想" >
-   
-    <ion-nav-buttons side="right">
+<ion-view view-title="发布梦想互动" >
+
+    <!--<ion-nav-buttons side="right">
         <button class="button button-clear"  ng-click="doSomething()">
            发布说明
         </button>
-    </ion-nav-buttons>
+    </ion-nav-buttons>-->
     <ion-content>
         <div class="addcontent list">
-            <div class="item">你想实现的梦想</div>
+            <div class="item" style="color: #7B7B7B">你想实现的梦想</div>
             <div class="item item-input-inset itemjs">
-                <label class="item-input-wrapper" style="background: #F8F8F8; margin: 0 12px 0 5px">
+                <label class="item-input-wrapper" style="background: #fff; border: 1px solid #D7D7D7; margin: 0 12px 0 5px">
                     <input type="text" ng-model="vm.name">
                 </label>
             </div>
-            <div class="item">我的梦想介绍</div>
+            <div class="item" style="color: #7B7B7B">我的梦想互动信息</div>
             <div class="item itemjs">
-                <textarea rows="4" cols="50" placeholder="添加梦想介绍" ng-model="vm.about" style="border: 1px solid #00C3DA;padding: 10px;width: 98%;"></textarea>
+                <textarea rows="7" cols="50" placeholder="添加梦想介绍" ng-model="vm.about" style="border: 1px solid #D7D7D7;padding: 10px;width: 98%;"></textarea>
             </div>
-            <div class="item">上传图片和视频，让别人更好的了解你</div>
+            <div class="item" style="color: #7B7B7B">上传图片和视频，让别人更好的了解你</div>
             <div class="item itemjs">
                 <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
                     <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
@@ -27,9 +27,9 @@
                 </video>
                 <a class="btn-file-up" ng-click="addvideo()" ng-show="!video.isOK"><i class="icon ion-cash"></i>添加视频</a>
             </div>
-            <div class="item">实现梦想所需要的人民币</div>
+            <div class="item" style="color: #7B7B7B">实现梦想所需要的人民币</div>
             <div class="item item-input-inset itemjs">
-                <label class="item-input-wrapper" style="background: #F8F8F8; margin: 0 12px 0 5px">
+                <label class="item-input-wrapper" style="background: #fff; border: 1px solid #D7D7D7; margin: 0 12px 0 5px">
                     ￥
                     <input type="text" ng-model="vm.coin">
                 </label>

miaomiao/www/templates/home/search.html

@@ -22,7 +22,7 @@
              </div>
          </div>
          <div ng-if="isResult&&index==0">
-             <div class="list">
+             <div class="list padding">
                  <div class="item dream_item" style="color: #A7A7A7">
                      用户
                  </div>
@@ -32,17 +32,20 @@
                      <span class="level">Lv.3</span>
                  </div>
                  <div class="item" style="text-align:center;color:#00C3DA;font-size:1rem;padding:10px;" ng-click="showMore(vm.keyword,1)" ng-if="user_infos.length>=3">查看更多</div>
-                 <div class="item" style="color: #A7A7A7">
+             </div>
+             <p style="background: #FAFAFA; height: 1rem"></p>
+             <div class="list padding">
+                 <div class="item dream_item" style="color: #A7A7A7">
                      梦想
                  </div>
-                 <div class="item item-thumbnail-left" ng-repeat="dreamsarch-item_info in dream_infos" ng-if="$index<3" ng-click="toDetail(dream_info.id)">
+                 <div class="item item-thumbnail-left dream_item" ng-repeat="dreamsarch-item_info in dream_infos" ng-if="$index<3" ng-click="toDetail(dream_info.id)">
                      <img ng-src="{{dream_info.img.pic}}" />
                      <h2>{{dream_info.name}}</h2>
                      <p style="white-space:normal">{{dream_info.about}}</p>
                  </div>
                  <div class="item" style="text-align:center;color:#00C3DA;font-size:1rem;padding:10px;" ng-click="showMore(vm.keyword,2)" ng-if="dream_infos.length>=3">查看更多</div>
                  
-                 <div class="item item-divider">
+                <!-- <div class="item item-divider">
                      标签
                  </div>
                  <div class="calm search-hot">
@@ -64,7 +67,7 @@
                      <div class="box {{index==6?'keyword':''}}" ng-click="selectHot(6)">
                          搞笑达人
                      </div>
-                 </div>
+                 </div>-->
              </div>
          </div>
          <div ng-if="index>0">

miaomiao/www/templates/my/index.html

@@ -1,7 +1,6 @@
 <ion-view view-title="我的"  hide-nav-bar="true">
     <ion-content>
         <div class="user-box">
-         
             <div class="myinfo" ng-click="setAvator()">
                 <img ng-src="{{user.avatar | avator }}" />
                 <div>

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

@@ -1,19 +1,59 @@
 <ion-view view-title="我的梦想">
     <ion-content>
-       <div class="list">
-           <div class="item reply-item" ng-repeat="dream in dreams" ng-click="toDetail(dream.id)">
+       <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">
+                   <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">
-                   <img ng-src="{{dream.pic}}" />
-                   <h2>{{dream.name}}</h2>
-                   <p>{{dream.about}}</p>
+                   <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: #FF7C30; font-size: 16px">
+                       进行中
+                   </div>
                </div>
+
                <div class="reply-bar">
                    <div style="width: {{100*dream.get_coin/dream.coin}}%;">
                    </div>
                </div>
-               <div class="reply-sx"><span class="calm">{{100*dream.get_coin/dream.coin | Rouder}}%</span> <span style="font-size: 20px">目前实现</span></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>