add

miaomiao/www/.idea/workspace.xml

@@ -21,45 +21,50 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="oldDream.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/home/oldDream.html">
+      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-0.6551724">
-              <caret line="2" column="28" selection-start-line="2" selection-start-column="28" selection-end-line="2" selection-end-column="28" />
+            <state vertical-scroll-proportion="-8.142858">
+              <caret line="91" column="30" selection-start-line="91" selection-start-column="30" selection-end-line="91" selection-end-column="30" />
               <folding>
-                <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#3;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#p#0;n#div#3;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="userDetail.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
+      <file leaf-file-name="my-dream.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-6.107143">
-              <caret line="78" column="48" selection-start-line="78" selection-start-column="38" selection-end-line="78" selection-end-column="48" />
-              <folding />
+            <state vertical-scroll-proportion="0.8942486">
+              <caret line="26" column="21" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
+              <folding>
+                <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#div#3;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#2;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+      <file leaf-file-name="my-collect.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/my/my-collect.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-2.913793">
-              <caret line="215" column="47" selection-start-line="215" selection-start-column="41" selection-end-line="215" selection-end-column="47" />
+            <state vertical-scroll-proportion="-12.107142">
+              <caret line="44" column="80" selection-start-line="33" selection-start-column="0" selection-end-line="44" selection-end-column="80" />
               <folding>
-                <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#3;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#p#0;n#div#3;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#div#3;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#span#2;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -68,18 +73,8 @@
       <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="-8.5">
-              <caret line="1062" column="55" selection-start-line="1062" selection-start-column="55" selection-end-line="1062" selection-end-column="55" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="my.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.47486034">
-              <caret line="351" column="55" selection-start-line="351" selection-start-column="55" selection-end-line="351" selection-end-column="55" />
+            <state vertical-scroll-proportion="-5.9666667">
+              <caret line="135" column="39" selection-start-line="135" selection-start-column="39" selection-end-line="135" selection-end-column="39" />
               <folding />
             </state>
           </provider>
@@ -117,15 +112,16 @@
         <option value="$PROJECT_DIR$/js/config/config.js" />
         <option value="$PROJECT_DIR$/templates/my/my-recharge.html" />
         <option value="$PROJECT_DIR$/templates/home/userDetail.html" />
-        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
         <option value="$PROJECT_DIR$/templates/add/index.html" />
         <option value="$PROJECT_DIR$/templates/my/my-account.html" />
-        <option value="$PROJECT_DIR$/templates/my/my-collect.html" />
         <option value="$PROJECT_DIR$/templates/my/attention.html" />
-        <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
         <option value="$PROJECT_DIR$/templates/home/oldDream.html" />
-        <option value="$PROJECT_DIR$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/js/filters/filter.js" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/templates/my/my-collect.html" />
+        <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
       </list>
     </option>
   </component>
@@ -135,8 +131,8 @@
     <detection-done>true</detection-done>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="416" />
-    <option name="width" value="974" />
+    <option name="x" value="350" />
+    <option name="width" value="1026" />
     <option name="height" value="728" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
@@ -235,7 +231,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="416" y="0" width="974" height="728" extended-state="0" />
+    <frame x="350" y="0" width="1026" height="728" extended-state="0" />
     <editor active="true" />
     <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.1688988" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -554,18 +550,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.6034483">
-          <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
-          <folding>
-            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#1;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/config/router.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-14.833333">
@@ -598,16 +582,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-collect.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.7142856">
-          <caret line="4" column="34" selection-start-line="4" selection-start-column="34" selection-end-line="4" selection-end-column="34" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/attention.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.3571428">
@@ -619,21 +593,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.3571428">
-          <caret line="2" column="34" selection-start-line="2" selection-start-column="34" selection-end-line="2" selection-end-column="34" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/my-account.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.21150278">
@@ -652,28 +611,42 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-6.107143">
+          <caret line="78" column="48" selection-start-line="78" selection-start-column="38" selection-end-line="78" selection-end-column="48" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.47486034">
+          <caret line="351" column="46" selection-start-line="351" selection-start-column="46" selection-end-line="351" selection-end-column="47" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.233333">
-          <caret line="80" column="38" selection-start-line="80" selection-start-column="38" selection-end-line="80" selection-end-column="38" />
+        <state vertical-scroll-proportion="0.5810056">
+          <caret line="69" column="23" selection-start-line="69" selection-start-column="23" selection-end-line="69" selection-end-column="23" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.913793">
-          <caret line="215" column="47" selection-start-line="215" selection-start-column="41" selection-end-line="215" selection-end-column="47" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="-5.9666667">
+          <caret line="135" column="39" selection-start-line="135" selection-start-column="39" selection-end-line="135" selection-end-column="39" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/home/oldDream.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.6551724">
-          <caret line="2" column="28" selection-start-line="2" selection-start-column="28" selection-end-line="2" selection-end-column="28" />
+        <state vertical-scroll-proportion="-12.892858">
+          <caret line="38" column="100" selection-start-line="34" selection-start-column="15" selection-end-line="38" selection-end-column="100" />
           <folding>
             <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -690,27 +663,64 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.107143">
-          <caret line="78" column="48" selection-start-line="78" selection-start-column="38" selection-end-line="78" selection-end-column="48" />
-          <folding />
+        <state vertical-scroll-proportion="-5.2586207">
+          <caret line="56" column="68" selection-start-line="56" selection-start-column="68" selection-end-line="56" selection-end-column="68" />
+          <folding>
+            <element signature="n#style#0;n#button#0;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#1;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#i#0;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+          </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="-8.5">
-          <caret line="1062" column="55" selection-start-line="1062" selection-start-column="55" selection-end-line="1062" selection-end-column="55" />
-          <folding />
+        <state vertical-scroll-proportion="-8.142858">
+          <caret line="91" column="30" selection-start-line="91" selection-start-column="30" selection-end-line="91" selection-end-column="30" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#1;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-collect.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.47486034">
-          <caret line="351" column="55" selection-start-line="351" selection-start-column="55" selection-end-line="351" selection-end-column="55" />
-          <folding />
+        <state vertical-scroll-proportion="-12.107142">
+          <caret line="44" column="80" selection-start-line="33" selection-start-column="0" selection-end-line="44" selection-end-column="80" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#3;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#div#3;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#3;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#2;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8942486">
+          <caret line="26" column="21" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#3;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#2;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

miaomiao/www/js/controllers/home.js

@@ -3,7 +3,7 @@
         , function ($scope, $ionicTabsDelegate, $http, config, $state, msg, $ionicPopover, homeService, $ionicPopup, $timeout, $ionicSideMenuDelegate) {
             $scope.$on('$ionicView.beforeEnter', function (viewResult) {
                 $ionicTabsDelegate.showBar(true);
-                //$scope.load();
+                //$scope.load(true);
                 homeService.messageInfo().then(function(result){
                     $scope.infos = result.data.data;
                     if($scope.infos.letter.is_read==0 && $scope.infos.reply.is_read==0 && $scope.infos.systemInfo.is_read==0){
@@ -157,6 +157,7 @@
                 msg.hide();
                 $scope.index.banners = result.data.data.banners;
                 $scope.index.users = result.data.data.users;
+                //debugger;
                 $scope.filter.pageIndex++;
                 var more = (result.data.data.dreams.data.length >= $scope.filter.pageSize);
                 $scope.filter.hasMore = more;

miaomiao/www/js/filters/filter.js

@@ -67,7 +67,7 @@
             var inter = (end_time.getTime() - date.getTime()) / (1000*3600*24);
              //number = Math.abs(inter * 100) / 100;
             number = inter.toFixed(0);
-            if(number<0){
+            if(number<=0){
                 number="结束";
             }
             else {

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

@@ -88,7 +88,9 @@
                         </div>
                     </div>
                     <div class="reply-bar">
-                        <div style="width: {{100*dream.get_coin/dream.coin}}%;">
+                        <div ng-if="100*dream.get_coin/dream.coin<100" style="width: {{100*dream.get_coin/dream.coin}}%;">
+                        </div>
+                        <div ng-if="100*dream.get_coin/dream.coin>=100" style="width: 100%;">
                         </div>
                     </div>
                 </div>

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

@@ -5,7 +5,7 @@
         <div ng-if="dreams.length==0" class="padding" style="color: #BEBEBE; font-size: 15px">
             还未收藏任何梦想
         </div>
-        <div ng-repeat="dream in dreams" ng-if="100*dream.get_coin/dream.coin!=100" class="list">
+        <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 style="float:left;">
@@ -23,48 +23,26 @@
                         <h2>{{dream.name}}</h2>
                         <p style="overflow-y: hidden;height: 40px;">{{dream.about}}</p>
                     </div>
-                    <div 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: #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-repeat="dream in dreams" ng-if="100*dream.get_coin/dream.coin==100" class="list">
-            <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="{{ dream.user.avatar | avator }}" />
-                    </div>
-                    <div style="float:left; margin: 15px 0 0 10px">
-                        {{ dream.user.nickname}}
-                    </div>
-                </div>
-                <div class="item item-thumbnail-left reply-content">
-                    <div style="float:left; height: 60px; width: 60px">
-                        <img ng-src="{{dream.img.pic}}" />
-                    </div>
-                    <div style="float:left; width: 50%; margin-left: 10px; margin-right: 10px; height: 60px; overflow: hidden">
-                        <h2>{{dream.name}}</h2>
-                        <p style="overflow-y: hidden;height: 40px;">{{dream.about}}</p>
-                    </div>
-                    <div style="float:right; width: 15%; text-align: right; color: #00C3DA; 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">
                         已实现<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 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>
                 </div>
-                <span style="font-size: 18px">{{100*dream.get_coin/dream.coin | Rouder}}%</span> &nbsp; <span style="color: #C9C9C9; font-size: 16px">目前实现</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>
             <p style="background: #F8F8F8; height: 1rem"></p>
         </div>

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

@@ -3,7 +3,7 @@
         <div ng-if="dreams.length==0" class="padding" style="color: #BEBEBE; font-size: 15px">
             还未发布任何梦想
         </div>
-       <div ng-repeat="dream in dreams" ng-if="100*dream.get_coin/dream.coin!=100" class="list">
+       <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 style="float:left;">
@@ -21,46 +21,24 @@
                        <h2>{{dream.name}}</h2>
                        <p>{{dream.about}}</p>
                    </div>
-                   <div 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: #FF7C30; font-size: 16px">
                        进行中
                    </div>
                </div>
 
                <div class="reply-bar">
-                   <div style="width: {{100*dream.get_coin/dream.coin}}%;">
+                   <div ng-if="100*dream.get_coin/dream.coin<100" 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>
+               <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>
+               </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>
            <p style="background: #F8F8F8; height: 1rem"></p>
        </div>
-        <div ng-repeat="dream in dreams" ng-if="100*dream.get_coin/dream.coin==100" class="list">
-            <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 style="height: 60px; overflow: hidden">{{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>