add

miaomiao/www/.idea/workspace.xml

@@ -20,38 +20,7 @@
     <favorites_list name="www" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.25333333">
-              <caret line="13" column="32" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-6.133333">
-              <caret line="229" column="42" selection-start-line="229" selection-start-column="42" selection-end-line="229" selection-end-column="42" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="account.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -112,10 +81,10 @@
         <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/templates/home/index.html" />
         <option value="$PROJECT_DIR$/js/controllers/my.js" />
-        <option value="$PROJECT_DIR$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/templates/home/userDetail.html" />
-        <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/js/controllers/account.js" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
       </list>
     </option>
   </component>
@@ -125,8 +94,8 @@
     <detection-done>true</detection-done>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="364" />
-    <option name="y" value="20" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
     <option name="width" value="1382" />
     <option name="height" value="744" />
   </component>
@@ -179,7 +148,7 @@
     <panes />
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="E:/Graduation design/huiwei" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -270,25 +239,25 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="364" y="20" width="1382" height="744" extended-state="0" />
-    <editor active="true" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
+    <editor active="false" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16648169" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32885906" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24916202" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296131" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32885906" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -309,6 +278,30 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="229" column="42" selection-start-line="229" selection-start-column="42" selection-end-line="229" selection-end-column="42" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/../../../quanzhouda/send/send/www/templates/car/car-route.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.48828828">
@@ -400,13 +393,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33273056">
-          <caret line="12" column="32" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/services/dreamservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -624,26 +610,34 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
+        <state vertical-scroll-proportion="0.80274445">
+          <caret line="605" column="21" selection-start-line="605" selection-start-column="21" selection-end-line="605" selection-end-column="21" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.133333">
-          <caret line="229" column="42" selection-start-line="229" selection-start-column="42" selection-end-line="229" selection-end-column="42" />
+        <state vertical-scroll-proportion="0.034234233">
+          <caret line="13" column="32" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.25333333">
-          <caret line="13" column="32" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        <state vertical-scroll-proportion="0.03259005">
+          <caret line="60" column="23" selection-start-line="60" selection-start-column="12" selection-end-line="60" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.03259005">
+          <caret line="17" column="45" selection-start-line="17" selection-start-column="45" selection-end-line="17" selection-end-column="45" />
           <folding />
         </state>
       </provider>

miaomiao/www/css/ionic.app.css

@@ -6288,7 +6288,8 @@ button.item.item-button-right {
 .item-thumbnail-left .item-content {
   padding-top: 8px;
   padding-left: 106px;
-  min-height: 100px; }
+  /*min-height: 100px; */
+}
   .item-thumbnail-left > img:first-child,
   .item-thumbnail-left .item-image,
   .item-thumbnail-left .item-content > img:first-child,

miaomiao/www/js/controllers/home.js

@@ -81,7 +81,7 @@
             pageIndex: 1,
             pageSize: 20,
             sex: 0,//1男,2女,0:全部,
-            age: 0,//0:全部,1:18-21,2:22-25,3:26-29,4:30-33,5:34-37,6:>38,
+            age: 0,//0:全部,1:18-21,2:22-25,3:26-29,4:30-33,5:34-37,6:>38,7:>18
             city:''
         };
             $scope.doFilter = function () {
@@ -139,10 +139,10 @@
             cordova.plugins.barcodeScanner.scan(
                     function (result) {
                         //扫码成功后执行的回调函数
-                        alert("收到一个二维码\n" +
+                        /*alert("收到一个二维码\n" +
                             "扫码文字结果: " + result.text + "\n" +
                             "格式: " + result.format + "\n" +
-                            "是否在扫码页面取消扫码: " + result.cancelled);
+                            "是否在扫码页面取消扫码: " + result.cancelled);*/
                       
                     },
                     function (error) {
@@ -296,23 +296,13 @@
 
             $scope.share = function (type,$event) {
                 $scope.toshare = true;
-                if (type==0) {//分享给朋友
-                   /* Wechat.share({
-                        text: "分享的文字",
-                        scene: Wechat.Scene.SESSION    // share to 好友
-                    }, function () {
-                        alert("Success");
-                    }, function (reason) {
-                        alert("Failed: " + reason);
-                    });*/
+                if (type==0) {
+                    //分享给朋友
                     Wechat.share({
                         message: {
-                            /*title:"瞄瞄",
-                            description:"HELLO,这是我的梦想，快来围观吧！",
-                            thumb:"img/icon_cat_h.png",*/
                             title: $scope.dream.name,
                             description: $scope.dream.about,
-                            thumb: "http://q8.9026.com/attachment//base/img/share/icon_cat_h.png",
+                            thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             media: {
                                 type: Wechat.Type.WEBPAGE,
                                 webpageUrl: "q8.9026.com//admin/share/view?id=" + id
@@ -320,20 +310,17 @@
                         },
                         scene: Wechat.Scene.SESSION
                     }, function () {
-                        alert("Success");
+                        alert("分享成功");
                     }, function (reason) {
-                        alert("Failed: " + reason);
+                        alert("分享失败");
                     });
                 }
                 if(type==1){
                     Wechat.share({
                         message: {
-                            /*title:"瞄瞄",
-                             description:"HELLO,这是我的梦想，快来围观吧！",
-                             thumb:"img/icon_cat_h.png",*/
                             title: $scope.dream.name,
                             description: $scope.dream.about,
-                            thumb: "http://q8.9026.com/attachment//base/img/share/icon_cat_h.png",
+                            thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             media: {
                                 type: Wechat.Type.WEBPAGE,
                                 webpageUrl: "q8.9026.com//admin/share/view?id=" + id
@@ -341,12 +328,11 @@
                         },
                         scene: Wechat.Scene.TIMELINE
                     }, function () {
-                        alert("Success");
+                        alert("分享","分享成功");
                     }, function (reason) {
-                        alert("Failed: " + reason);
+                        alert("分享","分享失败");
                     });
                 }
-             //   $state.go("app.shareDream",{item:$scope.dream});
             };
         //实时排行
         $scope.sort = {
@@ -481,11 +467,11 @@
                     $scope.input.show = true;
                     angular.forEach($scope.dream.interactions, function (item) {
                         item.show = false;
-                    })
+                    });
                     $scope.dream.interactions[index].show = true;
                     $scope.input.placeholder = "评论" + name+":";
                     $scope.vm.title='';
-                }
+                };
         $scope.replayOther = function ($event, name, index,currentindex) {
             $event.stopPropagation();
             if($scope.dream.interactions[index].comments[currentindex].user_id!=$scope.user.id){
@@ -493,7 +479,7 @@
                 $scope.input.show = true;
                 angular.forEach($scope.dream.interactions, function (item) {
                     item.show = false;
-                })
+                });
                 $scope.dream.interactions[index].show = true;
                 $scope.input.placeholder = "评论" + name+":";
                 $scope.vm.title='';
@@ -586,7 +572,7 @@
                     // msg.text("充值成功");
                     //   $state.go('app.my');
                 });
-            }
+            };
         $scope.submitComment = function (index) {
             var interaction = $scope.dream.interactions[index];
             var iid = interaction.id;
@@ -603,6 +589,7 @@
                 $scope.load(id);
                 $scope.closeModal();
             })
+            debugger;
         };
             $scope.bigImage = false;
             $scope.showBigImage = function ($event, imageName) {
@@ -620,7 +607,8 @@
                 $scope.qrCodemodal = modal;
             });
 
-            $scope.openCode = function() {
+            $scope.openCode = function($event) {
+                $event.stopPropagation();
                 $scope.qrCodemodal.show();
                 $scope.vm.money = '';
             };
@@ -633,7 +621,8 @@
             }).then(function(modal) {
                 $scope.CommentPicmodal = modal;
             });
-            $scope.openCommentPic = function(pic) {
+            $scope.openCommentPic = function(pic,$event) {
+                $event.stopPropagation();
                 $scope.CommentPicmodal.show();
                 $scope.commentPicUrl = pic;
             };

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

@@ -20,7 +20,7 @@
                 <button class="button button-calm" ng-click="support($event)">支持</button>
             </div>
             <div ng-if="codeBtn && user.id==dream.top3user[0].id" class="col dreamButton">
-                <button ng-click="openCode()" class="button button-calm" style="border: 1px solid #00C3DA">
+                <button ng-click="openCode($event)" class="button button-calm" style="border: 1px solid #00C3DA">
                     二维码
                 </button>
             </div>
@@ -41,7 +41,7 @@
                 </button>
             </div>
             <div class="col dreamButton">
-                <button ng-click="openCode()" class="button button-calm" style="border: 1px solid #00C3DA">
+                <button ng-click="openCode($event)" class="button button-calm" style="border: 1px solid #00C3DA">
                     二维码
                 </button>
             </div>
@@ -165,14 +165,15 @@
                             <span class="utitle kz">{{dream.created_at}}</span>
                             <p class="subtile" style="white-space:normal; color: #666666">{{interaction.title}}</p>
                             <div class="picts item">
-                                <img class="slt" ng-click="openCommentPic(interaction.pic1)" ng-src="{{interaction.pic1}}" ng-if="interaction.pic1" />
-                                <img class="slt" ng-click="openCommentPic(interaction.pic2)" ng-src="{{interaction.pic2}}" ng-if="interaction.pic2" />
-                                <img class="slt" ng-click="openCommentPic(interaction.pic3)" ng-src="{{interaction.pic3}}" ng-if="interaction.pic3" />
-                                <img class="slt" ng-click="openCommentPic(interaction.pic4)" ng-src="{{interaction.pic4}}" ng-if="interaction.pic4" />
-                                <img class="slt" ng-click="openCommentPic(interaction.pic5)" ng-src="{{interaction.pic5}}" ng-if="interaction.pic5" />
-                                <img class="slt" ng-click="openCommentPic(interaction.pic6)" ng-src="{{interaction.pic6}}" ng-if="interaction.pic6" />
-                                <img class="slt" ng-click="openCommentPic(interaction.pic7)" ng-src="{{interaction.pic7}}" ng-if="interaction.pic7" />
-                                <img class="slt" ng-click="openCommentPic(interaction.pic8)" ng-src="{{interaction.pic8}}" ng-if="interaction.pic8" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic1,$event)" ng-src="{{interaction.pic1}}" ng-if="interaction.pic1" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic2,$event)" ng-src="{{interaction.pic2}}" ng-if="interaction.pic2" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic3,$event)" ng-src="{{interaction.pic3}}" ng-if="interaction.pic3" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic4,$event)" ng-src="{{interaction.pic4}}" ng-if="interaction.pic4" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic5,$event)" ng-src="{{interaction.pic5}}" ng-if="interaction.pic5" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic6,$event)" ng-src="{{interaction.pic6}}" ng-if="interaction.pic6" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic7,$event)" ng-src="{{interaction.pic7}}" ng-if="interaction.pic7" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic8,$event)" ng-src="{{interaction.pic8}}" ng-if="interaction.pic8" />
+                                <img class="slt" ng-click="openCommentPic(interaction.pic9,$event)" ng-src="{{interaction.pic9}}" ng-if="interaction.pic9" />
                             </div>
                             <div>
                                 <video ng-src="{{video.file | trustUrl}}" ng-show="video.isOK" poster="{{video.vpic}}" height="72px" width="72px" controls="controls"></video>

miaomiao/www/templates/home/index.html

@@ -108,6 +108,8 @@
    <div class="item" style="padding:0">
        <p style="font-weight:bold;font-size:1.1rem">年龄</p>
        <div class="list radiodiv">
+           <ion-radio ng-model="filter.age" ng-value="'0'">所有</ion-radio>
+           <ion-radio ng-model="filter.age" ng-value="'7'"><18</ion-radio>
            <ion-radio ng-model="filter.age" ng-value="'1'">18-21</ion-radio>
            <ion-radio ng-model="filter.age" ng-value="'2'">22-25</ion-radio>
            <ion-radio ng-model="filter.age" ng-value="'3'">26-29</ion-radio>

miaomiao/www/templates/my/attention.html

@@ -5,9 +5,9 @@
         </div>
         <div class="list">
             <div class="item reply-item" >
-                <div ng-repeat="user in users" class="item" style="height:90px; border-bottom: 1px solid #EFEFEF" ng-click="toMyUserDetail(user.id)">
+                <div ng-repeat="user in users" class="item" style="height:90px; border-bottom: 2px solid #EFEFEF" ng-click="toMyUserDetail(user.id)">
                     <div style="float:left;">
-                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{ user.avatar | avator }}" />
+                        <img style="width: 45px; height: 45px;border-radius: 100%; border: 1px solid #D8D8D8" ng-src="{{ user.avatar | avator }}" />
                     </div>
                     <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
                         <h2> {{user.nickname}} </h2>

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

@@ -1,13 +1,11 @@
 <ion-view view-title="瞄喵">
-    <ion-nav-buttons side="right">
-    </ion-nav-buttons>
     <ion-content>
         <div ng-if="dreams.length==0" class="padding" style="color: #BEBEBE; font-size: 15px">
             还未收藏任何梦想
         </div>
         <div ng-repeat="dream in dreams" class="list">
             <div class="item reply-item" ng-click="toDetail(dream.id)">
-                <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
+                <div class="item" style="height:70px; padding-left: 0; border-bottom: 1px solid #EFEFEF">
                     <div style="float:left;">
                         <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{ dream.user.avatar | avator }}" />
                     </div>
@@ -36,13 +34,15 @@
                     <div ng-if="100*dream.get_coin/dream.coin<100" style="width: {{100*dream.get_coin/dream.coin}}%;">
                     </div>
                 </div>
-                <span ng-if="100*dream.get_coin/dream.coin<100" style="font-size: 18px">{{100*dream.get_coin/dream.coin | Rouder}}%</span>
                 <div ng-if="100*dream.get_coin/dream.coin>=100" class="reply-bar">
-                    <div style="width: 100%;">
+                    <div style="width: 100%; background: #00C3DA">
                     </div>
                 </div>
-                <span ng-if="100*dream.get_coin/dream.coin>=100" style="font-size: 18px">100%</span>
-                &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
+                <div style="margin-top: 10px">
+                    <span ng-if="100*dream.get_coin/dream.coin<100" style="font-size: 18px;">{{100*dream.get_coin/dream.coin | Rouder}}%</span>
+                    <span ng-if="100*dream.get_coin/dream.coin>=100" style="font-size: 18px;">100%</span>
+                    &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
+                </div>
             </div>
             <p style="background: #F8F8F8; height: 1rem"></p>
         </div>

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

@@ -5,7 +5,7 @@
         </div>
        <div ng-repeat="dream in dreams" class="list">
            <div class="item reply-item" ng-click="toDetail(dream.id)">
-               <div class="item" style="height:70px; border-bottom: 1px solid #EFEFEF">
+               <div class="item" style="height:70px; padding-left: 0; border-bottom: 1px solid #EFEFEF">
                    <div style="float:left;">
                        <img style="width: 45px; height: 45px;border-radius: 100%;" ng-src="{{user.avatar | avator }}" />
                    </div>
@@ -13,7 +13,7 @@
                        {{user.nickname}}
                    </div>
                </div>
-               <div class="item item-thumbnail-left reply-content">
+               <div style="padding-bottom: 8px" class="item item-thumbnail-left reply-content">
                    <div style="float:left; height: 60px; width: 60px">
                        <img ng-src="{{dream.pic}}" />
                    </div>
@@ -24,8 +24,9 @@
                    <div ng-if="100*dream.get_coin/dream.coin<100" style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
                        进行中
                    </div>
-                   <div ng-if="100*dream.get_coin/dream.coin>=100" style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
+                   <div ng-if="100*dream.get_coin/dream.coin>=100" style="float:right; width: 15%; text-align: right; color: #00C3DA; font-size: 16px">
                        已实现
+                       <p style="color: #DBDBDB; margin-top: 5px">已结束</p>
                    </div>
                </div>
 
@@ -33,13 +34,16 @@
                    <div ng-if="100*dream.get_coin/dream.coin<100" style="width: {{100*dream.get_coin/dream.coin}}%;">
                    </div>
                </div>
-               <span ng-if="100*dream.get_coin/dream.coin<100" style="font-size: 18px">{{100*dream.get_coin/dream.coin | Rouder}}%</span>
                <div ng-if="100*dream.get_coin/dream.coin>=100" class="reply-bar">
-                   <div style="width: 100%;">
+                   <div style="width: 100%; background: #00C3DA">
                    </div>
                </div>
-               <span ng-if="100*dream.get_coin/dream.coin>=100" style="font-size: 18px">100%</span>
-               &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
+               <div style="margin-top: 10px">
+                   <span ng-if="100*dream.get_coin/dream.coin<100" style="font-size: 18px;">{{100*dream.get_coin/dream.coin | Rouder}}%</span>
+                   <span ng-if="100*dream.get_coin/dream.coin>=100" style="font-size: 18px;">100%</span>
+                   &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</span>
+               </div>
+
            </div>
            <p style="background: #F8F8F8; height: 1rem"></p>
        </div>