YanaDH 7 tahun lalu
induk
melakukan
bac88cfaa2

+ 146 - 350
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -22,22 +22,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/index.html">
+      <file leaf-file-name="oldDream.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/oldDream.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.29469547">
-              <caret line="48" column="89" selection-start-line="48" selection-start-column="89" selection-end-line="48" selection-end-column="89" />
-              <folding>
-                <element signature="n#style#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-                <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#div#0;n#div#1;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" />
-              </folding>
+            <state vertical-scroll-proportion="0.5640074">
+              <caret line="22" column="54" selection-start-line="22" selection-start-column="54" selection-end-line="22" selection-end-column="54" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -60,21 +50,21 @@
         <option value="$PROJECT_DIR$/miaomiao/www/templates/my/personalLetter.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/my/my-message.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/my/my-recharge.html" />
-        <option value="$PROJECT_DIR$/miaomiao/www/templates/home/shareDream.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/my/withdraw.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/my/my-dream.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/my/attention-detail.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/my/attention.html" />
-        <option value="$PROJECT_DIR$/miaomiao/www/js/config/router.js" />
-        <option value="$PROJECT_DIR$/miaomiao/www/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/home/userDetail.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/tabs.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/css/ionic.app.css" />
         <option value="$PROJECT_DIR$/miaomiao/www/js/filters/filter.js" />
         <option value="$PROJECT_DIR$/miaomiao/www/css/style.css" />
-        <option value="$PROJECT_DIR$/miaomiao/www/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/home/index.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/js/config/router.js" />
+        <option value="$PROJECT_DIR$/miaomiao/www/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/home/shareDream.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/js/controllers/home.js" />
       </list>
     </option>
   </component>
@@ -85,8 +75,8 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds">
-    <option name="x" value="435" />
-    <option name="width" value="932" />
+    <option name="x" value="355" />
+    <option name="width" value="1012" />
     <option name="height" value="728" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
@@ -116,7 +106,7 @@
     <panes />
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../quanzhouda" />
+    <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" />
@@ -190,26 +180,26 @@
     <option name="totallyTimeSpent" value="2201000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="435" y="0" width="932" height="728" extended-state="0" />
+    <frame x="355" y="0" width="1012" 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.16071428" sideWeight="0.49460918" 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="7" 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.32884097" sideWeight="0.5" order="8" 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.32884097" sideWeight="0.5" order="9" 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.17120343" sideWeight="0.5" order="2" 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.125817" sideWeight="0.5" order="6" 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.33022922" sideWeight="0.5053908" order="1" 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.06334232" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295129" sideWeight="0.5" order="3" 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">
@@ -230,140 +220,42 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/config.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#2;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#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#0;n#ion-slide-page#0;n#ion-slides#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#0;n#ion-slide-page#1;n#ion-slides#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#ion-slide-page#1;n#ion-slides#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#p#0;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#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#0;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#i#0;n#div#0;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#i#1;n#div#0;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#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#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#div#1;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#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#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#p#0;n#div#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#div#1;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#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#4;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#0;n#div#4;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#4;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#0;n#div#4;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#1;n#div#0;n#div#4;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#0;n#div#4;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#2;n#div#0;n#div#4;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#5;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$/miaomiao/www/templates/home/dream-detail.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#2;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#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#0;n#ion-slide-page#0;n#ion-slides#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#0;n#ion-slide-page#1;n#ion-slides#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#ion-slide-page#1;n#ion-slides#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#p#0;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#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#0;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#i#0;n#div#0;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#i#1;n#div#0;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#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#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#div#1;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#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#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#p#0;n#div#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#div#1;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#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#4;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#0;n#div#4;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#4;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#0;n#div#4;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#1;n#div#0;n#div#4;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#0;n#div#4;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#2;n#div#0;n#div#4;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#5;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$/miaomiao/www/templates/my/my-dream.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="2" column="52" selection-start-line="2" selection-start-column="52" selection-end-line="2" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#2;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#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#0;n#ion-slide-page#0;n#ion-slides#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#0;n#ion-slide-page#1;n#ion-slides#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#ion-slide-page#1;n#ion-slides#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#p#0;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#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#0;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#i#0;n#div#0;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#i#1;n#div#0;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#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#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#div#1;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#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#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#p#0;n#div#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#div#1;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#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#4;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#0;n#div#4;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#4;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#0;n#div#4;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#1;n#div#0;n#div#4;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#0;n#div#4;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#2;n#div#0;n#div#4;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#5;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#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#button#0;n#div#2;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#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#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#0;n#ion-slide-page#0;n#ion-slides#0;n#div#0;n#div#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#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#0;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#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#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#i#0;n#div#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#i#1;n#div#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#2;n#div#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#2;n#div#0;n#div#0;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#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#3;n#div#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#3;n#div#0;n#div#0;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#0;n#div#3;n#div#0;n#div#0;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#3;n#div#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#1;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#4;n#div#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#4;n#div#0;n#div#0;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#4;n#div#0;n#div#0;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#4;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#div#1;n#div#0;n#div#4;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -379,31 +271,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="161" column="51" selection-start-line="161" selection-start-column="51" selection-end-line="161" selection-end-column="51" />
-          <folding>
-            <marker date="1502245248354" expanded="true" signature="1004:1056" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1100:1146" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1192:1266" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1308:1374" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1420:1485" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1626:1706" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1742:2233" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1836:2223" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1882:2016" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2045:2209" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2273:3247" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2297:2399" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2518:3173" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2977:3061" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3067:3158" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3192:3235" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3285:4860" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3374:3690" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3729:3850" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3852:4831" placeholder="{&quot;preferFrontCamera&quot;: false...}" />
-            <marker date="1502245248354" expanded="true" signature="4307:4425" placeholder="//..." />
-            <marker date="1502245248354" expanded="true" signature="4535:4666" placeholder="//..." />
-            <marker date="1502245248354" expanded="true" signature="4972:5049" placeholder="{...}" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -446,31 +314,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <marker date="1502245248354" expanded="true" signature="1004:1056" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1100:1146" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1192:1266" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1308:1374" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1420:1485" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1626:1706" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1742:2233" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1836:2223" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1882:2016" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2045:2209" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2273:3247" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2297:2399" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2518:3173" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2977:3061" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3067:3158" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3192:3235" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3285:4860" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3374:3690" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3729:3850" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3852:4831" placeholder="{&quot;preferFrontCamera&quot;: false...}" />
-            <marker date="1502245248354" expanded="true" signature="4307:4425" placeholder="//..." />
-            <marker date="1502245248354" expanded="true" signature="4535:4666" placeholder="//..." />
-            <marker date="1502245248354" expanded="true" signature="4972:5049" placeholder="{...}" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -499,31 +343,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
-          <folding>
-            <marker date="1502245248354" expanded="true" signature="1004:1056" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1100:1146" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1192:1266" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1308:1374" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1420:1485" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1626:1706" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1742:2233" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1836:2223" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1882:2016" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2045:2209" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2273:3247" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2297:2399" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2518:3173" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2977:3061" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3067:3158" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3192:3235" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3285:4860" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3374:3690" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3729:3850" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3852:4831" placeholder="{&quot;preferFrontCamera&quot;: false...}" />
-            <marker date="1502245248354" expanded="true" signature="4307:4425" placeholder="//..." />
-            <marker date="1502245248354" expanded="true" signature="4535:4666" placeholder="//..." />
-            <marker date="1502245248354" expanded="true" signature="4972:5049" placeholder="{...}" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -576,13 +396,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/chcp.json">
-      <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$/miaomiao/www/templates/my/personalLetter.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.44504505">
@@ -611,13 +424,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/shareDream.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.392857">
-          <caret line="5" column="48" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/add.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -653,13 +459,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-dream.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.6785714">
-          <caret line="2" column="52" selection-start-line="2" selection-start-column="52" selection-end-line="2" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/aboutMiao.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -674,32 +473,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/router.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.1666667">
-          <caret line="23" column="38" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/my.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6163873">
-          <caret line="168" column="38" selection-start-line="168" selection-start-column="38" selection-end-line="168" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/oldDream.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.75">
-          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/miaomiao/www/lib/ionic/css/ionic.css">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33969465">
           <caret line="4327" column="24" selection-start-line="4327" selection-start-column="24" selection-end-line="4327" selection-end-column="24" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -721,9 +498,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.36935166">
           <caret line="450" column="22" selection-start-line="450" selection-start-column="22" selection-end-line="450" selection-end-column="22" />
-          <folding>
-            <element signature="e#5842#6105#2" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -731,7 +505,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4021164">
           <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -739,108 +512,131 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33202356">
           <caret line="8579" column="32" selection-start-line="8579" selection-start-column="32" selection-end-line="8579" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/userDetail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21150278">
+          <caret line="6" column="32" selection-start-line="6" selection-start-column="32" selection-end-line="6" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/services/msgservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3538175">
+          <caret line="28" column="38" selection-start-line="28" selection-start-column="38" selection-end-line="28" selection-end-column="38" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/services/httpinterceptor.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-14.833333">
-          <caret line="150" column="27" selection-start-line="150" selection-start-column="27" selection-end-line="150" selection-end-column="27" />
-          <folding>
-            <marker date="1502245248354" expanded="true" signature="1004:1056" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1100:1146" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1192:1266" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1308:1374" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1420:1485" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1626:1706" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1742:2233" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1836:2223" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="1882:2016" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2045:2209" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2273:3247" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2297:2399" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2518:3173" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="2977:3061" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3067:3158" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3192:3235" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3285:4860" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3374:3690" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3729:3850" placeholder="{...}" />
-            <marker date="1502245248354" expanded="true" signature="3852:4831" placeholder="{&quot;preferFrontCamera&quot;: false...}" />
-            <marker date="1502245248354" expanded="true" signature="4307:4425" placeholder="//..." />
-            <marker date="1502245248354" expanded="true" signature="4535:4666" placeholder="//..." />
-            <marker date="1502245248354" expanded="true" signature="4972:5049" placeholder="{...}" />
-          </folding>
+        <state vertical-scroll-proportion="-0.9435626">
+          <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$/miaomiao/www/templates/home/userDetail.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/services/commonservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.21150278">
-          <caret line="6" column="32" selection-start-line="6" selection-start-column="32" selection-end-line="6" selection-end-column="32" />
+        <state vertical-scroll-proportion="-9.154562">
+          <caret line="2" column="56" selection-start-line="2" selection-start-column="53" selection-end-line="2" selection-end-column="56" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/directives/directive.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.534483">
-          <caret line="23" column="14" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="14" />
-          <folding>
-            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#2;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#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#0;n#ion-slide-page#0;n#ion-slides#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#0;n#ion-slide-page#1;n#ion-slides#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#ion-slide-page#1;n#ion-slides#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#p#0;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#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#0;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#i#0;n#div#0;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#i#1;n#div#0;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#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#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#div#1;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#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#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#p#0;n#div#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#div#1;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#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#4;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#0;n#div#4;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#4;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#0;n#div#4;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#1;n#div#0;n#div#4;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#0;n#div#4;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#2;n#div#0;n#div#4;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#5;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="-0.05586592">
+          <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$/miaomiao/www/templates/home/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29469547">
-          <caret line="48" column="89" selection-start-line="48" selection-start-column="89" selection-end-line="48" selection-end-column="89" />
+        <state vertical-scroll-proportion="-16.285715">
+          <caret line="24" column="27" selection-start-line="24" selection-start-column="27" selection-end-line="24" selection-end-column="27" />
           <folding>
             <element signature="n#style#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-            <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#div#0;n#div#1;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" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/chcp.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-4.551724">
+          <caret line="60" column="37" selection-start-line="60" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#0;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#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/shareDream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.59332025">
+          <caret line="24" column="18" selection-start-line="24" selection-start-column="18" selection-end-line="24" selection-end-column="18" />
+          <folding>
+            <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/router.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334">
+          <caret line="193" column="30" selection-start-line="193" selection-start-column="20" selection-end-line="193" selection-end-column="30" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.26256984">
+          <caret line="711" column="15" selection-start-line="711" selection-start-column="15" selection-end-line="711" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/my.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334">
+          <caret line="293" column="26" selection-start-line="293" selection-start-column="22" selection-end-line="293" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-dream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-5.428571">
+          <caret line="11" column="69" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="69" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/oldDream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5640074">
+          <caret line="22" column="54" selection-start-line="22" selection-start-column="54" selection-end-line="22" selection-end-column="54" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

TEMPAT SAMPAH
.vs/miaomiao/v14/.suo


+ 4 - 4
miaomiao/config.xml

xqd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <widget id="com.miaomiao.app" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>瞄喵</name>
-  <description>
-        An Ionic Framework and Cordova project.
+  <description>&#xD;
+        An Ionic Framework and Cordova project.&#xD;
     </description>
-  <author email="you@example.com" href="http://example.com.com/">
-      Mike
+  <author email="you@example.com" href="http://example.com.com/">&#xD;
+      Mike&#xD;
     </author>
   <content src="index.html"/>
   <access origin="*"/>

File diff ditekan karena terlalu besar
+ 364 - 363
miaomiao/npm-debug.log


+ 1 - 1
miaomiao/www/chcp.json

xqd
@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao/www",
-  "release": "2017.08.08-12.56.04"
+  "release": "2017.08.09-10.25.12"
 }

+ 11 - 11
miaomiao/www/chcp.manifest

xqd xqd xqd xqd xqd xqd xqd xqd
@@ -21,7 +21,7 @@
   },
   {
     "file": "css/ionic.app.css",
-    "hash": "699bf673a9f34d1a6d22b4e49699e016"
+    "hash": "c8154a2dcf888c45306f535ae2d5a88d"
   },
   {
     "file": "css/ionic.app.min.css",
@@ -29,7 +29,7 @@
   },
   {
     "file": "css/style.css",
-    "hash": "5904b644d66333b0d52e1dee4a726a0e"
+    "hash": "0dc2e1c0d7e961a19e220f1f7912600c"
   },
   {
     "file": "img/alipay.png",
@@ -337,7 +337,7 @@
   },
   {
     "file": "js/config/config.js",
-    "hash": "5e5c601c0a5cff697355a1eaca1358f2"
+    "hash": "953e69095f6d4566ef5fa2844d7c4027"
   },
   {
     "file": "js/config/router.js",
@@ -349,15 +349,15 @@
   },
   {
     "file": "js/controllers/add.js",
-    "hash": "a222aeb050de599cf172e1079b9d6299"
+    "hash": "3627417ad378c98ea3cf6b0a6ef5f779"
   },
   {
     "file": "js/controllers/home.js",
-    "hash": "7c27ef65ea80395c54ff9669cd59b3ed"
+    "hash": "6db6efcd925cf3e30a5a3ba6380ce07f"
   },
   {
     "file": "js/controllers/my.js",
-    "hash": "eb9868c8ff3b37b105610f63bb057c97"
+    "hash": "e4e0e52b899b6a3b758b7a612b4f14cc"
   },
   {
     "file": "js/controllers/tabs.js",
@@ -369,7 +369,7 @@
   },
   {
     "file": "js/filters/filter.js",
-    "hash": "ce08a985fe8c0f1b019864f96e564f68"
+    "hash": "28a9530fed7ad891ea99f6e55cf78600"
   },
   {
     "file": "js/platformOverrides.js",
@@ -377,7 +377,7 @@
   },
   {
     "file": "js/services/commonservice.js",
-    "hash": "e5125d5675acb3a0437c5c06c9e02ac9"
+    "hash": "30836233d6b65efbcea9316906489ed5"
   },
   {
     "file": "js/services/dreamservice.js",
@@ -693,11 +693,11 @@
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "d056c42007d6d06397a799f7889fb587"
+    "hash": "2d17cce50e79a3c29c11bdeccf6e34bb"
   },
   {
     "file": "templates/home/index.html",
-    "hash": "d52bad338f1874e1ee2537bcb3c7b5f0"
+    "hash": "5bbc59a37ba9bca45e5105899e731c15"
   },
   {
     "file": "templates/home/oldDream.html",
@@ -725,7 +725,7 @@
   },
   {
     "file": "templates/my/attention.html",
-    "hash": "83ffda4e5df1f6f0f44c559963b0dc4e"
+    "hash": "d8e428d1932a7232cc58738813d650c0"
   },
   {
     "file": "templates/my/contact.html",

+ 3 - 1
miaomiao/www/css/style.css

xqd
@@ -694,7 +694,9 @@ a:visited,a:link{
     -webkit-transform: translate3d(0,0,0);
   }
 }
- 
+ .item.active, .item.activated{
+    background-color: #fff; 
+ }
 .bounce-animation {
   -webkit-animation: bounce ease-in 1; 
   animation: bounce ease-in 1;

+ 13 - 1
miaomiao/www/js/config/router.js

xqd
@@ -374,7 +374,19 @@
                         controller: 'shareDreamCtrl'
                     }
                 }
-            });
+            })
+            .state('app.my_shareDream', {
+                url: '/my/attention/shareDream',
+                params:{
+                    item:null
+                },
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/home/shareDream.html',
+                        controller: 'shareDreamCtrl'
+                    }
+                }
+            })
         if (localStorage['token']) {
             $urlRouterProvider.otherwise('/app/home');
         } else {

+ 1 - 1
miaomiao/www/js/controllers/account.js

xqd
@@ -42,7 +42,7 @@
             userService.getVerifyCode($scope.vm.mobile).then(function (result) {
                 wait(50);
                 // $scope.returncode = result.data;
-                msg.success(result.data.data.verify_code);
+                if(result.data.data.verify_code)msg.success(result.data.data.verify_code);
             }, function (error) {
                 $scope.vm.waitSeconds = "获取验证码";
                 wait(0);

+ 63 - 40
miaomiao/www/js/controllers/home.js

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -46,8 +46,8 @@
             users: [],
             dreams:[]
         };
-        $scope.next=function(type){
-            
+        $scope.next = function (type) {
+        
             //type:1 前一个,type:2 后一个
             if($scope.index.users.length>0){
                 if(type==1)
@@ -182,19 +182,19 @@
         };
 
         $scope.openSupport = function () {
-            msg.alert("支持乘数","支持乘数支持乘数支持乘数支持乘数");
-        };
-         $ionicModal.fromTemplateUrl('supportExplain.html', {
-             scope: $scope
-         }).then(function(modal) {
-             $scope.supportmodal = modal;
-         });
-         $scope.openSupportmodal = function() {
-             $scope.supportmodal.show();
-         };
-         $scope.closeSupportmodal = function() {
-             $scope.supportmodal.hide();
-         };
+            msg.alert("支持乘数说明","支持乘数支持乘数支持乘数支持乘数");
+        };
+         // $ionicModal.fromTemplateUrl('supportExplain.html', {
+         //     scope: $scope
+         // }).then(function(modal) {
+         //     $scope.supportmodal = modal;
+         // });
+         // $scope.openSupportmodal = function() {
+         //     $scope.supportmodal.show();
+         // };
+         // $scope.closeSupportmodal = function() {
+         //     $scope.supportmodal.hide();
+         // };
         $scope.multi = {
             a: '',
             b: '',
@@ -304,7 +304,7 @@
 
         $scope.collectionDream = function(is_collection){
             homeService.collectionDream(id,is_collection).then(function(result){
-                //$scope.dream.is_collection=result.data.data;
+                $scope.dream.is_collection=result.data.data;
             })
         };
 
@@ -422,10 +422,6 @@
         , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
             var id = $stateParams.id;
             var top3user = '';
-
-            $scope.toMessage = function(){
-                $state.go("app.dream_message");
-            }
             $scope.chosedIndex = 0;
             $scope.clickAvatar = function(index){
                 $scope.chosedIndex = index;
@@ -480,20 +476,21 @@
                     msg.hide();
                 });
             };
-             $ionicModal.fromTemplateUrl('supportExplain.html', {
-                 scope: $scope
-             }).then(function(modal) {
-                 $scope.supportmodal = modal;
-             });
-             $scope.openSupportmodal = function() {
-                 $scope.supportmodal.show();
-             };
-             $scope.closeSupportmodal = function() {
-                 $scope.supportmodal.hide();
-             };
+
             $scope.openSupport = function () {
-                msg.alert("支持乘数","支持乘数支持乘数支持乘数支持乘数");
-            };
+                msg.alert("支持乘数说明","支持乘数支持乘数支持乘数支持乘数");
+            };
+            // $ionicModal.fromTemplateUrl('supportExplain.html', {
+            //     scope: $scope
+            // }).then(function(modal) {
+            //     $scope.supportmodal = modal;
+            // });
+            // $scope.openSupportmodal = function() {
+            //     $scope.supportmodal.show();
+            // };
+            // $scope.closeSupportmodal = function() {
+            //     $scope.supportmodal.hide();
+            // };
             $scope.multi = {
                 a: '',
                 b: '',
@@ -523,7 +520,7 @@
                 $state.go("app.recharge")
             };
             $scope.shareDream = function(){
-                $state.go("app.shareDream",{item:$scope.dream});
+                $state.go("app.my_shareDream",{item:$scope.dream});
             };
 
             //实时排行
@@ -619,13 +616,21 @@
                 })
             };
 
+            $scope.showAbout = true;
+            $scope.hideAbout = false;
             $scope.showText = function(){
                 $scope.aboutStyle = {
                     "white-space" : "normal"
                 };
-                $scope.ionDownStyle = {
-                    "display" : "none"
-                }
+                $scope.showAbout = false;
+                $scope.hideAbout = true;
+            };
+            $scope.hideText = function(){
+                $scope.aboutStyle = {
+                    "white-space" : "nowrap"
+                };
+                $scope.showAbout = true;
+                $scope.hideAbout = false;
             };
             $scope.input = {
                 placeholder: '评论',
@@ -705,6 +710,9 @@
             $scope.$on('$destroy', function() {
                 $scope.modal.remove();
             });
+            $scope.toMessage = function(){
+                $state.go("app.my_message");
+            }
         }]);
     app.controller('userDetailCtrl', ["$scope", "$state", "$ionicModal","storage","msg", "common", "config", "homeService", "$ionicTabsDelegate", "$stateParams", "$ionicModal", "$timeout", "$ionicScrollDelegate", "$interval"
         , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
@@ -753,8 +761,23 @@
         }]);
     app.controller('shareDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
-            $scope.dream = $stateParams.item
-
+            $scope.dream = $stateParams.item;
+            $scope.showAbout = true;
+            $scope.hideAbout = false;
+            $scope.showText = function(){
+                $scope.aboutStyle = {
+                    "white-space" : "normal"
+                };
+                $scope.showAbout = false;
+                $scope.hideAbout = true;
+            };
+            $scope.hideText = function(){
+                $scope.aboutStyle = {
+                    "white-space" : "nowrap"
+                };
+                $scope.showAbout = true;
+                $scope.hideAbout = false;
+            };
         }]);
     app.controller('oldDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
@@ -789,7 +812,7 @@
             $state.go('app.home_dreamdetail',{id:id});
         };
         $scope.toUser = function (id) {
-            $state.go('app.home_dreamdetail',{id:id});
+            $state.go('app.home_userDetail',{id:id});
         };
    
         $scope.$on('$ionicView.beforeEnter', function () {

+ 9 - 4
miaomiao/www/js/controllers/my.js

xqd
@@ -159,16 +159,21 @@
                 $scope.toshare = true;
             };
             $scope.shareDream = function(){
-                $state.go("app.shareDream",{item:$scope.user});
+                $state.go("app.my_shareDream",{item:$scope.user});
             };
             $scope.toDetail = function (id) {
-                $state.go('app.my_dreamdetail',{id:id});
+                $state.go('app.home_dreamdetail',{id:id});
             };
             $scope.toOldDream = function(){
-                $state.go("app.myOldDream");
+                $state.go("app.oldDream");
             };
             $scope.toSupportDream = function(){
-                $state.go("app.mySupportDream");
+                $state.go("app.supportDream");
+            };
+            $scope.collectionDream = function(is_collection){
+                homeService.collectionDream(id,is_collection).then(function(result){
+                    $scope.user.is_collection=result.data.data;
+                })
             };
         }]);
 

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

xqd xqd xqd
@@ -7,10 +7,10 @@
             <img src="img/icon_share.svg" style="height: 16px; width: 20px;">
         </button>
     </ion-nav-buttons>
-    <div ng-if="type==1" style="position: fixed; bottom: -8px; width: 100%; z-index: 5">
+    <div ng-if="type==1" style="position: fixed; bottom: -8px; width: 100%; z-index: 5;background: #fff;border-top: 1px solid #ECF2F7;">
         <div class="row">
             <div class="col">
-                <button ng-click="openSupportmodal()" class="button button-outline button-calm" style="width:100%; background: #fff; border-radius:30px; white-space:normal;line-height:20px; border: 1px solid #00C3DA">支持乘数×{{multi.result}}</button>
+                <button ng-click="openSupport()" class="button button-outline button-calm" style="width:100%; background: #fff; border-radius:30px; white-space:normal;line-height:20px; border: 1px solid #00C3DA">支持乘数×{{multi.result}}</button>
             </div>
             <div class="col">
                 <button class="button button-calm" style="width:100%; border-radius:30px; font-size: 20px;" ng-click="support($event)">支持</button>
@@ -73,7 +73,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="item" style="padding:5px; border-top: 1px solid #E6E6E6;">
+                <div class="item" style="padding:0 5px; border-top: 1px solid #E6E6E6;">
                     <div class="row">
                         <div class="col" style="text-align:left">
                             <p style="color: #FF6600; font-size: 16px">{{dream.get_coin}}</p>
@@ -102,10 +102,10 @@
                         </div>
                     </div>
                 </div>
-                <div ng-if="dream.top3user.length==0">
+                <div ng-if="dream.top3user.length==0" style="background: #f6f6f6;">
                     <div class="row" >
-                        <div class="col">
-                            <img src="img/pic_leaves.png" style="height: 100%; width: 100%">
+                        <div class="col" align="center">
+                            <img src="img/pic_leaves.png">
                         </div>
                     </div>
                 </div>

+ 2 - 3
miaomiao/www/templates/home/index.html

xqd xqd
@@ -16,8 +16,7 @@
         </button>
     </ion-nav-buttons>
     <ion-side-menus>
-        <ion-side-menu-content>
-           
+        <ion-side-menu-content drag-content="false">
             <ion-content>
                     <!--下拉刷新-->
                     <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
@@ -45,7 +44,7 @@
                             <div class="col col-10" style="margin-top: 7%" ng-click="next(1)">
                                 <i class="icon ion-ios-arrow-left" style="font-size: 1.5rem; color: #00C3DA; line-height: 100%"></i>
                             </div>
-                            <div class="col" style="overflow: hidden;">
+                            <div class="col" style="overflow: hidden;" on-swipe-right="next(2)" on-swipe-left="next(1)">
                                 <span class="subcontent" ng-repeat="user in index.users">
                                     <img ng-click="clickAvatar($index)" ng-if="$index<4" ng-src="{{user.avatar |avator}}" ng-class="{'defaultClass':$index !=chosedIndex,'chosenClass':$index ==chosedIndex}" style="padding: 0.5%;" />
                                 </span>

+ 2 - 1
miaomiao/www/templates/home/shareDream.html

xqd
@@ -19,7 +19,8 @@
                     {{dream.about}}
                 </p>
                 <div style="text-align: center">
-                    <i class="icon ion-chevron-down" ng-style="ionDownStyle" style="color: #00C3DA" ng-click="showText()"></i>
+                    <i class="icon ion-chevron-down" ng-if="showAbout" ng-style="aboutStyle" style="color: #00C3DA;" ng-click="showText()"></i>
+                    <i class="icon ion-chevron-up" ng-if="hideAbout" ng-style="aboutStyle" style="color: #00C3DA" ng-click="hideText()"></i>
                 </div>
             </div>
             <div class="item detail-item2" style="padding:5px; border-top: 1px solid #E6E6E6;">

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

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

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini