Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/www/.idea/workspace.xml

@@ -21,37 +21,51 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="userDetail.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/templates/home/userDetail.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.8914286">
-              <caret line="100" column="0" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
+            <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#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;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#1;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#span#0;n#div#1;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#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="style.css" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/css/style.css">
+      <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.293103">
-              <caret line="604" column="16" selection-start-line="604" selection-start-column="16" selection-end-line="604" selection-end-column="16" />
-              <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="-3.6724138">
-              <caret line="227" column="14" selection-start-line="224" selection-start-column="8" selection-end-line="227" selection-end-column="14" />
-              <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>
@@ -59,8 +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="-7.6666665">
-              <caret line="898" column="55" selection-start-line="898" selection-start-column="55" selection-end-line="898" 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>
@@ -80,11 +94,8 @@
       <list>
         <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/js/services/userservice.js" />
-        <option value="$PROJECT_DIR$/templates/add/index.html" />
-        <option value="$PROJECT_DIR$/templates/my/my-recharge.html" />
         <option value="$PROJECT_DIR$/templates/my/my-message.html" />
         <option value="$PROJECT_DIR$/js/controllers/add.js" />
-        <option value="$PROJECT_DIR$/templates/my/index.html" />
         <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
         <option value="$PROJECT_DIR$/templates/home/user-detail.html" />
         <option value="$PROJECT_DIR$/js/services/tabsService.js" />
@@ -94,12 +105,23 @@
         <option value="$PROJECT_DIR$/templates/tabs.html" />
         <option value="$PROJECT_DIR$/js/controllers/tabs.js" />
         <option value="$PROJECT_DIR$/js/services/homeservice.js" />
-        <option value="$PROJECT_DIR$/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/templates/home/search.html" />
         <option value="$PROJECT_DIR$/templates/home/index.html" />
-        <option value="$PROJECT_DIR$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/css/style.css" />
+        <option value="$PROJECT_DIR$/templates/my/index.html" />
+        <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/add/index.html" />
+        <option value="$PROJECT_DIR$/templates/my/my-account.html" />
+        <option value="$PROJECT_DIR$/templates/my/attention.html" />
+        <option value="$PROJECT_DIR$/templates/home/oldDream.html" />
+        <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>
@@ -109,10 +131,9 @@
     <detection-done>true</detection-done>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="40" />
-    <option name="y" value="171" />
-    <option name="width" value="974" />
-    <option name="height" value="744" />
+    <option name="x" value="350" />
+    <option name="width" value="1026" />
+    <option name="height" value="728" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -141,7 +162,7 @@
     <panes />
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="E:/Graduation design/huiwei" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -210,25 +231,25 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="40" y="171" width="974" height="744" 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" />
       <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.33" 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.24958263" 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.33" 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.33" 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">
@@ -247,48 +268,132 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/js/app.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.1183534">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="84" column="45" selection-start-line="84" selection-start-column="45" selection-end-line="84" selection-end-column="45" />
+          <folding>
+            <element signature="n#style#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#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#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#1;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#span#0;n#div#1;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/index.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" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+    <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-13.571428">
-          <caret line="24" column="11" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="11" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="604" column="16" selection-start-line="604" selection-start-column="16" selection-end-line="604" selection-end-column="16" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-recharge.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.892857">
-          <caret line="20" column="60" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="227" column="14" selection-start-line="224" selection-start-column="8" selection-end-line="227" selection-end-column="14" />
+          <folding>
+            <element signature="n#style#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#1;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#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#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#p#1;n#div#1;n#div#0;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-setting.html">
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44504505">
-          <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.0">
+          <caret line="898" column="21" selection-start-line="898" selection-start-column="21" selection-end-line="898" selection-end-column="21" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/account/login.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27387387">
-          <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
+        <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>
+            <element signature="n#style#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#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#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#1;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#span#0;n#div#1;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+    <entry file="file://$PROJECT_DIR$/css/style.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="604" column="16" selection-start-line="604" selection-start-column="16" selection-end-line="604" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <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="227" column="14" selection-start-line="224" selection-start-column="8" selection-end-line="227" selection-end-column="14" />
+          <folding>
+            <element signature="n#style#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#1;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#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#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#p#1;n#div#1;n#div#0;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$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
+          <caret line="898" column="21" selection-start-line="898" selection-start-column="21" selection-end-line="898" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/app.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-1.1183534">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-setting.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44504505">
+          <caret line="13" column="32" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/account/login.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.27387387">
+          <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/js/services/storageservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.16295026">
@@ -387,13 +492,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.107143">
-          <caret line="9" column="55" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/tabs.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.380789">
@@ -422,91 +520,206 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/search.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6742857">
+          <caret line="110" column="35" selection-start-line="110" selection-start-column="35" selection-end-line="110" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.17657657">
+          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/style.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.034234233">
+          <caret line="604" column="16" selection-start-line="604" selection-start-column="16" selection-end-line="604" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.81475127">
-          <caret line="25" column="35" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        <state vertical-scroll-proportion="0.3015873">
+          <caret line="9" column="41" selection-start-line="9" selection-start-column="41" selection-end-line="9" selection-end-column="41" />
+          <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="-13.1">
-          <caret line="101" column="38" selection-start-line="101" selection-start-column="24" selection-end-line="101" selection-end-column="38" />
+        <state vertical-scroll-proportion="-14.833333">
+          <caret line="327" column="44" selection-start-line="327" selection-start-column="37" selection-end-line="327" selection-end-column="44" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-recharge.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.666667">
-          <caret line="264" column="49" selection-start-line="264" selection-start-column="49" selection-end-line="264" selection-end-column="49" />
+        <state vertical-scroll-proportion="-10.178572">
+          <caret line="34" column="55" selection-start-line="34" selection-start-column="55" selection-end-line="34" selection-end-column="55" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/search.html">
+    <entry file="file://$PROJECT_DIR$/templates/add/addExplain.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6742857">
-          <caret line="110" column="35" selection-start-line="110" selection-start-column="35" selection-end-line="110" selection-end-column="35" />
+        <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$/templates/add/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.10575139">
+          <caret line="3" column="42" selection-start-line="3" selection-start-column="42" selection-end-line="3" selection-end-column="42" />
+          <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">
+          <caret line="2" column="33" selection-start-line="2" selection-start-column="33" selection-end-line="2" selection-end-column="33" />
           <folding>
-            <element signature="n#style#0;n#p#0;n#div#1;n#div#1;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#2;n#div#1;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#0;n#div#0;n#div#0;n#div#2;n#div#2;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#0;n#div#2;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#span#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <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" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-account.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.964286">
-          <caret line="41" column="37" selection-start-line="41" selection-start-column="37" selection-end-line="41" selection-end-column="37" />
+        <state vertical-scroll-proportion="0.21150278">
+          <caret line="6" column="36" selection-start-line="6" selection-start-column="36" selection-end-line="6" selection-end-column="36" />
           <folding>
-            <element signature="n#style#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#img#0;n#span#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#div#0;n#div#0;n#div#0;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" />
+            <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$/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.6666665">
-          <caret line="898" column="55" selection-start-line="898" selection-start-column="55" selection-end-line="898" selection-end-column="55" />
+        <state vertical-scroll-proportion="-8.5">
+          <caret line="79" column="24" selection-start-line="79" selection-start-column="12" selection-end-line="79" selection-end-column="24" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.6724138">
-          <caret line="227" column="14" selection-start-line="224" selection-start-column="8" selection-end-line="227" selection-end-column="14" />
+        <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$/css/style.css">
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.293103">
-          <caret line="604" column="16" selection-start-line="604" selection-start-column="16" selection-end-line="604" selection-end-column="16" />
+        <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$/templates/home/userDetail.html">
+    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <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$/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <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="-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" />
+            <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" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <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$/templates/home/dream-detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <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$/templates/my/my-collect.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <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.8914286">
-          <caret line="100" column="0" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
+        <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#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;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#1;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#span#0;n#div#1;n#div#1;n#ion-content#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#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>

miaomiao/www/chcp.json

@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao/www",
-  "release": "2017.08.19-07.56.06"
+  "release": "2017.08.23-09.55.35"
 }

miaomiao/www/chcp.manifest

@@ -13,7 +13,7 @@
   },
   {
     "file": ".idea/workspace.xml",
-    "hash": "3ccbb989a07e8cdf3ffcc7821b1067dc"
+    "hash": "4171b3999655f1262098329ca055a80f"
   },
   {
     "file": ".idea/www.iml",
@@ -369,11 +369,11 @@
   },
   {
     "file": "js/config/router.js",
-    "hash": "f9a910ea1acd6dd7e7ec9a8da05fd4cf"
+    "hash": "3e72be424ee66203c122c2fefe33a151"
   },
   {
     "file": "js/controllers/account.js",
-    "hash": "1a153ea6181e71139369cd8d49ab4bfb"
+    "hash": "4991794aac4d09176ea22253e945b93c"
   },
   {
     "file": "js/controllers/add.js",
@@ -381,15 +381,15 @@
   },
   {
     "file": "js/controllers/home.js",
-    "hash": "257a42b636c148205f9b22b257229efe"
+    "hash": "2ed102ad7af44e4947f9dca76153aa24"
   },
   {
     "file": "js/controllers/my.js",
-    "hash": "f6f400bdbdc9df3974d12a10f1ad6e00"
+    "hash": "ff5d39a366893ac3a0eed80e03f970cd"
   },
   {
     "file": "js/controllers/tabs.js",
-    "hash": "333555665b72432afcb2ebf25bf56870"
+    "hash": "d337cec4fb6f2991cc6b4b7190474309"
   },
   {
     "file": "js/directives/directive.js",
@@ -397,7 +397,7 @@
   },
   {
     "file": "js/filters/filter.js",
-    "hash": "25ae9b574b9fcc88bc41b6e365620de4"
+    "hash": "85292a7deef8d136aa06e31d1533ac8b"
   },
   {
     "file": "js/platformOverrides.js",
@@ -413,7 +413,7 @@
   },
   {
     "file": "js/services/homeservice.js",
-    "hash": "5393ec41531f20b0d4ac048cf215ffd8"
+    "hash": "6c4903ba1b134dcca60a67627174c0bc"
   },
   {
     "file": "js/services/httpinterceptor.js",
@@ -721,19 +721,19 @@
   },
   {
     "file": "templates/add/index.html",
-    "hash": "a0f6606b64db009012a391fd7399d43b"
+    "hash": "61eca4efaae8005807542e281a0dcaec"
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "9ca03321494815680a0673d4a1cfc3a6"
+    "hash": "7d9debbf1ade697a2f74fdb7e9f9b4ed"
   },
   {
     "file": "templates/home/index.html",
-    "hash": "c73a2f81ea8240137b7d8b3d6b0f4fb1"
+    "hash": "457c77c56b4de63bb16662bb2cc7de6d"
   },
   {
     "file": "templates/home/oldDream.html",
-    "hash": "cdc45222a9d115d7f6d3a559fdf5b036"
+    "hash": "922da9795dc56e0094f1cb58a700630a"
   },
   {
     "file": "templates/home/search.html",
@@ -749,15 +749,15 @@
   },
   {
     "file": "templates/home/userDetail.html",
-    "hash": "e367c5879554243574f978c4bd48814c"
+    "hash": "862d2ca61b2dec9999bb5bc27811de31"
   },
   {
     "file": "templates/my/aboutMiao.html",
-    "hash": "4437231b45e1115c8cd9468db1081d1a"
+    "hash": "14f633904f3a23cf129b10e1cf252fa1"
   },
   {
     "file": "templates/my/attention.html",
-    "hash": "4112c1afcccc9819956425c09cf0b4d7"
+    "hash": "8af4dce83fd9db4e13f68081e7e347d5"
   },
   {
     "file": "templates/my/contact.html",
@@ -765,7 +765,7 @@
   },
   {
     "file": "templates/my/index.html",
-    "hash": "8d9e40c2994d49d5cb7d5a1cc887e0ba"
+    "hash": "37d3379fe956d9563bc1d59d4a0610ab"
   },
   {
     "file": "templates/my/my-account-add.html",
@@ -773,15 +773,15 @@
   },
   {
     "file": "templates/my/my-account.html",
-    "hash": "3dae457fe6ba45bdb8b4983e65157070"
+    "hash": "50c8e1c8478586d490d99bc50fd969c5"
   },
   {
     "file": "templates/my/my-collect.html",
-    "hash": "6d0cdeb5be41aaed62e4e965fae9d8c9"
+    "hash": "dd9e35c5753a34b5dd3fa208249bb8fc"
   },
   {
     "file": "templates/my/my-dream.html",
-    "hash": "f86ee815e900a04bb91368d3ce380752"
+    "hash": "e2e3ca673469c30dfb5bad01f9a19a23"
   },
   {
     "file": "templates/my/my-message-reply.html",
@@ -801,7 +801,7 @@
   },
   {
     "file": "templates/my/my-recharge.html",
-    "hash": "4fb207146b72cc84508907932cd07a95"
+    "hash": "10484fc6c9fe31890552481d7f0c73e6"
   },
   {
     "file": "templates/my/my-setting.html",

miaomiao/www/js/config/router.js

@@ -125,7 +125,7 @@
             views: {
                 'app-home': {
                     templateUrl: 'templates/my/my-collect.html',
-                    controller: 'collectCtrl'
+                    controller: 'homeCollectCtrl'
                 }
             }
         })

miaomiao/www/js/controllers/account.js

@@ -13,12 +13,13 @@
                 storage.setObject('user', result.data.data.user);
                 storage.set('token', result.data.data.token);
                 $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
+                $scope.user=storage.getObject('user');
                 $state.go('app.home');
             }, function (error) {
                // msg.hide();
                 // msg.error(error.data.message);
             });
-        }
+        };
         $scope.loginbywx = function () {
             var scope = "snsapi_userinfo", state = "_" + (+new Date());
             Wechat.auth(scope, state, function (response) {
@@ -27,7 +28,7 @@
             }, function (reason) {
                 alert("Failed: " + reason);
             });
-        }
+        };
         //获取验证码
         $scope.getVerifyCode = function () {
             // if (!util.isMobile($scope.vm.mobile)) {

miaomiao/www/js/controllers/home.js

@@ -3,6 +3,18 @@
         , function ($scope, $ionicTabsDelegate, $http, config, $state, msg, $ionicPopover, homeService, $ionicPopup, $timeout, $ionicSideMenuDelegate) {
             $scope.$on('$ionicView.beforeEnter', function (viewResult) {
                 $ionicTabsDelegate.showBar(true);
+                //$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){
+                        $scope.showMessage=0;
+                    }
+                    else {
+                        $scope.showMessage=1;
+                    }
+                },function(error){
+
+                });
             });
         $scope.type = 'hot';//tab切换
 
@@ -145,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;
@@ -212,7 +225,17 @@
                 homeService.myInfo().then(function(result){
                     $scope.user = result.data.data;
                 });
-                console.log($scope.user);
+                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){
+                        $scope.showMessage=0;
+                    }
+                    else {
+                        $scope.showMessage=1;
+                    }
+                },function(error){
+
+                });
             });
             $scope.$on('$ionicView.leave', function () {
                 if($scope.multi.promise)$interval.cancel($scope.multi.promise);
@@ -390,8 +413,8 @@
             $scope.leftTimer = $interval(function () {
                 if (countDown >= 1) leftTimer(countDown - 1);
             },1000);*/
-           /* if(countDown<=0){
-              $scope.timer='结束'; 
+            /*if(countDown<=0){
+              $scope.timer='结束';
             }*/
         };
         $scope.changeIndex = function (index) {
@@ -576,7 +599,17 @@
                 homeService.myInfo().then(function(result){
                     $scope.user = result.data.data;
                 });
-                console.log($scope.user);
+                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){
+                        $scope.showMessage=0;
+                    }
+                    else {
+                        $scope.showMessage=1;
+                    }
+                },function(error){
+
+                });
             });
             $scope.$on('$ionicView.leave', function () {
                 if($scope.multi.promise)$interval.cancel($scope.multi.promise);
@@ -888,7 +921,6 @@
                     $scope.items.is_care=result.data.data;
                 })
             };
-
             $scope.next = function (type) {
                 //type:1 前一个，type:2 后一个
                 if($scope.items.imgs.length>0){
@@ -934,10 +966,10 @@
                 }
             };
             $scope.toOldDream = function(){
-                if($scope.items.dreams.length==0){
+                if($scope.items.dreams.length<2){
                     msg.alert("曾经的梦想","该用户没有曾经的梦想");
                 }
-                if($scope.items.dreams.length!=0){
+                if($scope.items.dreams.length>1){
                     $state.go("app.oldDream",{user_id:$scope.items.user.id});
                 }
             };
@@ -955,6 +987,18 @@
                 })
             };
         }]);
+    app.controller('homeCollectCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg"
+        , function ($scope, $ionicTabsDelegate,$state, myService, msg) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+                $ionicTabsDelegate.showBar(false);
+                myService.collect().then(function(result){
+                    $scope.dreams = result.data.data.dreams;
+                });
+            });
+            $scope.toDetail = function (id) {
+                $state.go('app.home_dreamdetail',{id:id});
+            };
+        }]);
     app.controller('shareDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
             $scope.dream = $stateParams.item;
@@ -1021,14 +1065,15 @@
                 homeService.toUserDetail(user_id).then(function(result){
                     $scope.items = result.data.data;
                     $scope.user = result.data.data.user;
-                    $scope.dreams = $scope.user.sup_dream;
+                    $scope.dreams = $scope.user.dreams;
                 },function(error){
 
                 })
             };
             $scope.toDetail = function(){
                 $state.go("app.home_userDetail",{user_id:user_id,items:$scope.items})
-            }
+            };
+
         }]);
     app.controller('supportDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {

miaomiao/www/js/controllers/my.js

@@ -299,11 +299,11 @@
                 }
             };
             $scope.toOldDream = function(){
-                if($scope.items.dreams.length==0){
+                if($scope.items.dreams.length<2){
                     msg.alert("曾经的梦想","该用户没有曾经的梦想");
                 }
-                if($scope.items.dreams.length!=0){
-                    $state.go("app.myOldDream",{user_id:$scope.items.user.id});
+                if($scope.items.dreams.length>1){
+                    $state.go("app.oldDream",{user_id:$scope.items.user.id});
                 }
             };
             $scope.toSupportDream = function(){
@@ -350,7 +350,7 @@
                 homeService.toUserDetail(user_id).then(function(result){
                     $scope.items = result.data.data;
                     $scope.user = result.data.data.user;
-                    $scope.dreams = $scope.user.sup_dream;
+                    $scope.dreams = $scope.user.dreams;
                 },function(error){
 
                 })
@@ -379,7 +379,7 @@
                 myService.myInfo().then(function(result){
                     $scope.vm = result.data.data;
                     $scope.vm.money = '';
-                    $scope.vm.payType = 1;
+                    $scope.vm.payType = 2;
                 })
             });
             $scope.payExplain = function(){
@@ -454,6 +454,7 @@
                 myService.myInfo().then(function(result){
                     $scope.vm = result.data.data;
                     $scope.vm.money = '';
+                    $scope.vm.payType = 2;
                 })
             });
             $scope.payExplain = function(){
@@ -629,18 +630,6 @@
             });
        }]);
 
-  /*  app.controller('sysCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
-        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
-            $scope.$on('$ionicView.beforeEnter', function () {
-                myService.systemInfo().then(function(result){
-                    $scope.sysInfos = result.data.data;
-                },function(error){
-                });
-            });
-        }]);*/
-   /* app.controller('letterCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
-        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
-        }]);*/
     app.controller('messageReplyCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg", "$ionicModal"
        , function ($scope,$ionicTabsDelegate, $state, myService, msg, $ionicModal) {
             $scope.$on('$ionicView.beforeEnter', function () {

miaomiao/www/js/controllers/tabs.js

@@ -1,5 +1,8 @@
 (function (module) {
     module.controller('tabsCtrl', ["$scope","$http", "myService","storage", "$ionicHistory", "$state", function ($scope,$http, myService, storage,$ionicHistory, $state) {
+        $scope.$on('$ionicView.beforeEnter', function () {
+            $scope.user = storage.getObject('user');
+        });
         $scope.go = function(target) {
             $ionicHistory.clearHistory();
             if($state.current.name=="app.home"&&target=="app.add"){

miaomiao/www/js/filters/filter.js

@@ -65,10 +65,13 @@
             var end_time = new Date(end_time.replace(/-/g, "/"));
             var date = new Date();
             var inter = (end_time.getTime() - date.getTime()) / (1000*3600*24);
-            // number = Math.abs(inter * 100) / 100;
+             //number = Math.abs(inter * 100) / 100;
             number = inter.toFixed(0);
-            if(number<0){
-                number = "<1";
+            if(number<=0){
+                number="结束";
+            }
+            else {
+                number="剩余"+number+"天"
             }
             return number;
         };

miaomiao/www/js/services/homeservice.js

@@ -17,7 +17,7 @@
             collectionDream:function(id,is_collection){
                 return $http({
                     url:config.server + "api/dream/collection?id=" + id+"&is_collection="+is_collection,
-                    method:"get",
+                    method:"get"
                 })
             },
             search:function (keyword){
@@ -88,6 +88,18 @@
                     url:config.server + "api/user/care?id=" + id+"&is_care="+is_care,
                     method:"get"
                 })
+            },
+       /*     collectionDream:function(id,is_collection){
+                return $http({
+                    url:config.server + "api/dream/collection?id=" + id+"&is_collection="+is_collection,
+                    method:"get"
+                })
+            },*/
+            messageInfo:function(){
+                return $http({
+                    url:config.server + "api/my/info",
+                    method:"get"
+                })
             }
         };
     }]);

miaomiao/www/templates/add/index.html

@@ -1,10 +1,4 @@
-<ion-view view-title="发布梦想互动" >
-
-    <!--<ion-nav-buttons side="right">
-        <button class="button button-clear"  ng-click="doSomething()">
-           发布说明
-        </button>
-    </ion-nav-buttons>-->
+<ion-view view-title="发布梦想" >
     <ion-content>
         <div class="addcontent list">
             <div class="item" style="color: #7B7B7B">你想实现的梦想</div>

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

@@ -1,10 +1,11 @@
 <ion-view view-title="梦想">
     <ion-nav-buttons side="right">
-        <button class="button button-clear homeIcon" ng-click="toMessage()">
-            <img ng-src="img/icon_message_h.svg" style="height: 100%; width: 100%">
+        <button class="button button-clear" style="height: 37px; margin-top: 0.5px" ng-click="toMessage()">
+            <img ng-if="showMessage==1" src="img/icon_message_h.svg" style="height: 60%; width: 100%">
+            <img ng-if="showMessage==0" src="img/icon_message_n.svg" style="height: 55%; width: 100%">
         </button>
-        <button ng-click="share($event)" class="button button-clear button-small" style="padding-top: 3px;">
-            <img ng-src="img/icon_share.svg" style="height: 16px; width: 20px;">
+        <button ng-click="share($event)" class="button button-clear" style="height: 37px; margin-top: 0.5px">
+            <img src="img/icon_share.svg" style="height: 55%; width: 100%">
         </button>
     </ion-nav-buttons>
     <div ng-if="type==1 && user.id != dream.user_id" style="position: fixed; bottom: -8px; width: 100%; z-index: 5;background: #fff;border-top: 1px solid #ECF2F7;height: 68px">
@@ -87,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>
@@ -127,7 +130,7 @@
         <div ng-if="type==2" class="hdcontent">
             <div style="color: red">
                 <div class="list">
-                    <div ng-if="user.id == dream.user_id" class="item itemjs" style="padding: 10px" >
+                    <div ng-if="user.id == dream.user.id" class="item itemjs" style="padding: 10px" >
                         <a class="button button-outline button-block button-calm button-icon" ng-click="openModal()">
                             <i class="icon ion-plus"></i>
                             发布梦想互动
@@ -136,7 +139,7 @@
                     <div class="item" style="border-bottom:15px solid #F2F2F2;" ng-click="add_comment()" ng-repeat="interaction in dream.interactions">
                         <img ng-click="replay($event,dream.user.nickname)" class="head" ng-src="{{dream.user.avatar}}" />
                         <span ng-click="replay($event,dream.user.nickname)" class="utitle">{{dream.user.nickname}}</span>
-                        <span class="utitle kz">剩余{{dream.end_time | lastDate}}天</span>
+                        <span class="utitle kz">{{dream.end_time | lastDate}}</span>
                         <p ng-click="replay($event,dream.user.nickname)" class="subtile"  style="white-space:normal; color: #666666">{{interaction.title}}</p>
                         <div class="picts item">
                             <img class="slt" ng-click="showBigImage('{{interaction.pic1}}')" ng-src="{{interaction.pic1}}" ng-if="interaction.pic1"/>
@@ -148,8 +151,8 @@
                             <img class="slt" ng-src="{{interaction.pic7}}" ng-if="interaction.pic7"/>
                             <img class="slt" ng-src="{{interaction.pic8}}" ng-if="interaction.pic8"/>
                         </div>
-                        <!--<p style="margin: 10px 0 0 50px; color: #00C3DA">评论</p>-->
-                        <div class="list padding">
+                        <p style="margin: 10px 0 0 50px; color: #00C3DA">评论</p>
+                        <!--<div class="list padding">
                             <div class="item subitem" ng-click="replay($event,'百川1')">
                                 <img ng-src="img/demo/head4.jpg" />
                                 <span>百川1</span>
@@ -162,7 +165,7 @@
                             <div style="color: #00C3DA; margin-left: 50px">
                                 查看更多评论
                             </div>
-                        </div>
+                        </div>-->
                     </div>
                 </div>
             </div>

miaomiao/www/templates/home/index.html

@@ -12,7 +12,8 @@
             <img src="img/icon_search.svg" style="height: 65%; width: 100%">
         </button>
         <button class="button button-clear" style="height: 37px; margin-top: 0.5px" ui-sref="app.message">
-            <img src="img/icon_message_h.svg" style="height: 60%; width: 100%">
+            <img ng-if="showMessage==1" src="img/icon_message_h.svg" style="height: 60%; width: 100%">
+            <img ng-if="showMessage==0" src="img/icon_message_n.svg" style="height: 55%; width: 100%">
         </button>
     </ion-nav-buttons>
     <ion-side-menus>
@@ -73,7 +74,7 @@
                                             <span style="color: #F16571">{{item.care_num}}</span>
                                             <span>人关注</span>
                                         </div>
-                                        <div class="mysecond">剩余{{item.end_time | lastDate}}天</div>
+                                        <div class="mysecond">{{item.end_time | lastDate}}</div>
                                     </div>
                                 </div>
                                 <div ng-click="toDetail(item.id)">

miaomiao/www/templates/home/oldDream.html

@@ -1,6 +1,6 @@
 <ion-view view-title="瞄喵">
     <ion-content>
-        <div ng-if="100*dream.get_coin/dream.coin!==0" class="list" ng-repeat="dream in dreams">
+        <div ng-if="$index>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;">
@@ -18,44 +18,26 @@
                         <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>
-                </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">
+                    <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 ng-if="100*dream.get_coin/dream.coin<100" 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>
+                <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>

miaomiao/www/templates/home/userDetail.html

@@ -1,6 +1,8 @@
 <ion-view view-title="瞄喵">
     <ion-nav-buttons side="right">
-        <button ng-click="share($event)" class="button button-clear button-small" style="padding-top: 2px"><img src="img/icon_share.svg" style="height: 16px; width: 20px;"></button>
+        <button ng-click="share($event)" class="button button-clear" style="height: 37px; margin-top: 0.5px">
+            <img src="img/icon_share.svg" style="height: 55%; width: 100%">
+        </button>
     </ion-nav-buttons>
     <ion-content ng-click="cancelSupport()">
         <div class="user-box">
@@ -10,7 +12,7 @@
                     {{items.user.nickname}}
                 </div>
                 <div style="font-size:0.7rem; margin-bottom: 10px"> {{items.user.city}}</div>
-                <div ng-if="user.id != dream.user_id">
+                <div ng-if="user.id != items.user.id">
                     <div ng-if="items.is_care==0">
                         <span style="background: #fff; color: #00C3DA; font-size:0.7rem; border-radius: 20px; padding: 2px 20px" ng-click="attentionUser(1)">关注</span>
                     </div>

miaomiao/www/templates/my/aboutMiao.html

@@ -1,5 +1,5 @@
 <ion-view view-title="关于瞄喵">
-    <ion-content style="color: red">
+    <ion-content style="padding: 10%;color: #111;">
        {{items.value}}
     </ion-content>
 </ion-view>

miaomiao/www/templates/my/attention.html

@@ -1,5 +1,8 @@
 <ion-view view-title="瞄喵">
     <ion-content>
+        <div ng-if="users.length==0" class="padding" style="color: #BEBEBE; font-size: 15px">
+            还未关注任何用户
+        </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)">

miaomiao/www/templates/my/index.html

@@ -10,26 +10,22 @@
             </div>
             
            <div class="row user-row">
-               <div class="col"><i class="icon ion-heart"></i> 关注&nbsp;&nbsp;{{user.collection_number}}</div>
-               <div class="col"><i class="icon ion-person"></i> 粉丝&nbsp;&nbsp;{{user.collection_number}}</div>
-               <div class="col"><i class="icon ion-ios-film"></i> 梦想&nbsp;&nbsp;{{user.care_dreams_number}}</div>
+               <div class="col"><i class="icon ion-heart"></i> 关注&nbsp;&nbsp;{{user.care_number}}</div>
+               <div class="col"><i class="icon ion-person"></i> 粉丝&nbsp;&nbsp;{{user.fans_number}}</div>
+               <div class="col"><i class="icon ion-ios-film"></i> 梦想&nbsp;&nbsp;{{user.dreams_number}}</div>
            </div>
         </div>
         <div class="row user-dz">
             <div class="col">
-                <div class="num">{{user.care_dreams_number}}</div>
+                <div class="num">{{user.collection_number}}</div>
                 <div class="mysecond">收藏</div>
             </div>
-            <div class="col">
-                <div class="num">123</div>
-                <div class="mysecond">点赞</div>
-            </div>
             <div class="col">
                 <div class="num">{{user.interaction_number}}</div>
                 <div class="mysecond">发帖</div>
             </div>
             <div class="col">
-                <div class="num">123</div>
+                <div class="num">{{user.huitie}}</div>
                 <div class="mysecond">回帖</div>
             </div>
         </div>

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

@@ -6,6 +6,9 @@
         <!--下拉刷新-->
         <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
         </ion-refresher>
+        <div ng-if="items.length==0" class="padding" style="color: #BEBEBE; font-size: 15px">
+            还未添加任何账户
+        </div>
             <div class="list" style="margin-bottom: 0" ng-repeat="item in items">
                 <div class="item" style="border-bottom: 1px solid #E6E6E6;">
                     <div ng-if="!item.qrcode">

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

@@ -1,14 +1,11 @@
 <ion-view view-title="瞄喵">
     <ion-nav-buttons side="right">
-<!--         <button class="button button-clear homeIcon" ui-sref="app.my_message">
-            <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-repeat="dream in dreams" ng-if="100*dream.get_coin/dream.coin!=100" class="list">
+        <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 style="float:left;">
@@ -26,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

@@ -1,14 +1,9 @@
 <ion-view view-title="瞄喵">
-    <ion-nav-buttons side="right">
-<!--         <button class="button button-clear homeIcon" ui-sref="app.my_message">
-            <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-repeat="dream in dreams" ng-if="100*dream.get_coin/dream.coin!=100" class="list">
+        <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 style="float:left;">
@@ -26,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 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>
-        <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>

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

@@ -28,14 +28,14 @@
                选择支付方式
             </div>
             <ion-list class="re-radio">
-                <ion-radio ng-model="vm.payType" ng-value="1">
-                    <img ng-src="img/icon_ Alipay.svg" />
-                    <span>支付宝支付</span>
-                </ion-radio>
                 <ion-radio ng-model="vm.payType" ng-value="2">
                     <img ng-src="img/icon_ WeChat Pay.svg" />
                     <span>微信支付</span>
                 </ion-radio>
+                <ion-radio ng-model="vm.payType" ng-value="1">
+                    <img ng-src="img/icon_ Alipay.svg" />
+                    <span>支付宝支付</span>
+                </ion-radio>
             </ion-list>
         </div>
         <div class="padding">