dad

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -21,7 +21,7 @@
     <favorites_list name="miao" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+    <leaf />
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -87,7 +87,7 @@
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="ProjectPane" proportions="" version="1">
       <flattenPackages />
       <showMembers />
       <showModules />
@@ -100,10 +100,23 @@
       <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes />
+    <panes>
+      <pane id="Scope" />
+      <pane id="Scratches" />
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="miao" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+    </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/.." />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/miaomiao/www" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -180,7 +193,7 @@
     <frame x="349" y="0" width="1018" height="728" extended-state="0" />
     <editor active="false" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16016427" sideWeight="0.49460918" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15918367" 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" />
@@ -221,7 +234,6 @@
       <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>
@@ -250,7 +262,6 @@
       <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 />
         </state>
       </provider>
     </entry>
@@ -482,7 +493,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.035250463">
           <caret line="1" column="41" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -498,7 +508,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.33509701">
           <caret line="16" column="31" selection-start-line="16" selection-start-column="31" selection-end-line="16" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -506,10 +515,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.58939093">
           <caret line="233" column="43" selection-start-line="233" selection-start-column="43" selection-end-line="233" selection-end-column="43" />
-          <folding>
-            <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#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" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -517,7 +522,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-10.178572">
           <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -525,7 +529,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5102421">
           <caret line="226" column="55" selection-start-line="226" selection-start-column="37" selection-end-line="226" selection-end-column="55" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -533,9 +536,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-6.107143">
           <caret line="43" column="51" selection-start-line="43" selection-start-column="41" selection-end-line="43" selection-end-column="51" />
-          <folding>
-            <element signature="n#style#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -543,7 +543,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.392857">
           <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -551,18 +550,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.17625232">
           <caret line="5" column="102" selection-start-line="5" selection-start-column="88" selection-end-line="5" selection-end-column="102" />
-          <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#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#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#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#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#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#p#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#img#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#div#1;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -570,14 +557,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.9310344">
           <caret line="30" column="52" selection-start-line="30" selection-start-column="49" selection-end-line="30" selection-end-column="52" />
-          <folding>
-            <element signature="n#style#0;n#label#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#em#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#a#2;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#em#0;n#a#2;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#6;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -585,16 +564,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-6.357143">
           <caret line="65" column="108" selection-start-line="65" selection-start-column="104" selection-end-line="65" selection-end-column="108" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#0;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#0;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#input#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#0;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#2;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#0;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#1;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#1;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#a#1;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#1;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#em#0;n#a#1;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#ion-tab#1;n#ion-tabs#0;n#ion-pane#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -602,7 +571,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="66" column="15" selection-start-line="56" selection-start-column="14" selection-end-line="66" selection-end-column="15" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -610,7 +578,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="260" column="67" selection-start-line="260" selection-start-column="67" selection-end-line="260" selection-end-column="67" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -618,7 +585,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.9664903">
           <caret line="690" column="15" selection-start-line="690" selection-start-column="15" selection-end-line="690" selection-end-column="15" />
-          <folding />
         </state>
       </provider>
     </entry>

miaomiao/www/.idea/workspace.xml

@@ -20,7 +20,53 @@
     <favorites_list name="www" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="userDetail.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/templates/home/userDetail.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" />
+              <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" />
+              </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">
+          <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>
+          </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">
+          <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>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-7.6666665">
+              <caret line="898" column="55" selection-start-line="898" selection-start-column="55" selection-end-line="898" selection-end-column="55" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -32,7 +78,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/js/services/userservice.js" />
         <option value="$PROJECT_DIR$/templates/add/index.html" />
@@ -40,7 +85,6 @@
         <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/home/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" />
@@ -49,10 +93,13 @@
         <option value="$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/templates/tabs.html" />
         <option value="$PROJECT_DIR$/js/controllers/tabs.js" />
-        <option value="$PROJECT_DIR$/templates/home/search.html" />
         <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/home/userDetail.html" />
       </list>
     </option>
   </component>
@@ -62,9 +109,9 @@
     <detection-done>true</detection-done>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1382" />
+    <option name="x" value="40" />
+    <option name="y" value="171" />
+    <option name="width" value="974" />
     <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
@@ -78,7 +125,7 @@
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
+    <navigator proportions="" version="1">
       <flattenPackages />
       <showMembers />
       <showModules />
@@ -91,23 +138,10 @@
       <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="Scratches" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="www" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-    </panes>
+    <panes />
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../LikeaCat/merchant/www" />
+    <property name="last_opened_file_path" value="E:/Graduation design/huiwei" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -176,25 +210,25 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="false" />
+    <frame x="40" y="171" width="974" height="744" 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">
@@ -220,13 +254,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/router.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.22813036">
-          <caret line="7" column="12" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-13.571428">
@@ -304,13 +331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/user-detail.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.65045047">
-          <caret line="19" column="46" selection-start-line="19" selection-start-column="46" selection-end-line="19" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../../../wuliu/wl/www/js/services/carservice.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -339,128 +359,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/templates/my/activity.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.061261263">
-          <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$/../../../LikeaCat/merchant/www/templates/account/register.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.8486487">
-          <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$/../../../LikeaCat/merchant/www/templates/account/login.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5891892">
-          <caret line="20" column="25" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/templates/my/setting.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.107143">
-          <caret line="9" column="27" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/storageservice.js">
-      <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$/../../../LikeaCat/merchant/www/js/config/router.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5540309">
-          <caret line="338" column="40" selection-start-line="338" selection-start-column="40" selection-end-line="338" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/templates/my/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-13.035714">
-          <caret line="85" column="21" selection-start-line="85" selection-start-column="21" selection-end-line="85" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/homeservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33273056">
-          <caret line="12" column="112" selection-start-line="12" selection-start-column="111" selection-end-line="12" selection-end-column="112" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/httpinterceptor.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="13" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/jpushservice.js">
-      <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$/../../../LikeaCat/merchant/www/js/services/memberservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33273056">
-          <caret line="39" column="61" selection-start-line="39" selection-start-column="60" selection-end-line="39" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/msgservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="13" selection-start-line="0" selection-start-column="12" selection-end-line="0" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/templates/my/wallet-balance.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-12.214286">
-          <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/my-profile.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-14.928572">
           <caret line="22" column="27" selection-start-line="22" selection-start-column="27" selection-end-line="22" selection-end-column="27" />
-          <folding>
-            <element signature="n#style#0;n#p#0;n#a#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$/../../../LikeaCat/merchant/www/js/services/myservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-10.766666">
-          <caret line="17" column="14" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/userservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33273056">
-          <caret line="45" column="18" selection-start-line="45" selection-start-column="17" selection-end-line="45" selection-end-column="18" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/services/commonservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="5.9">
-          <caret line="57" column="22" selection-start-line="57" selection-start-column="22" selection-end-line="57" selection-end-column="22" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -468,41 +370,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.17152658">
           <caret line="111" column="48" selection-start-line="111" selection-start-column="48" selection-end-line="111" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/controllers/my.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="624" column="0" selection-start-line="624" selection-start-column="0" selection-end-line="624" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/js/filters/filter.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7495712">
-          <caret line="44" column="10" selection-start-line="44" selection-start-column="10" selection-end-line="44" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../../LikeaCat/merchant/www/templates/my/wallet-credit.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.142858">
-          <caret line="12" column="33" selection-start-line="12" selection-start-column="33" selection-end-line="12" selection-end-column="33" />
-          <folding>
-            <element signature="n#style#0;n#input#0;n#label#0;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="0.30810812">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -510,7 +377,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-8.142858">
           <caret line="21" column="38" selection-start-line="21" selection-start-column="38" selection-end-line="21" selection-end-column="38" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -518,7 +384,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.37657657">
           <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -526,7 +391,6 @@
       <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" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -534,7 +398,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.380789">
           <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -542,7 +405,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5214408">
           <caret line="16" column="14" selection-start-line="10" selection-start-column="12" selection-end-line="16" selection-end-column="14" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -550,7 +412,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6843911">
           <caret line="21" column="15" selection-start-line="21" selection-start-column="15" selection-end-line="21" selection-end-column="15" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -558,41 +419,97 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.0428816">
           <caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/search.html">
+    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.65045047">
-          <caret line="19" column="25" selection-start-line="19" selection-start-column="25" selection-end-line="19" selection-end-column="25" />
+        <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>
+      </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" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6415094">
-          <caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
+        <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" />
           <folding />
         </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.81475127">
-          <caret line="25" column="35" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
-          <folding />
+        <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" />
+          <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" />
+          </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="-7.964286">
+          <caret line="41" column="37" selection-start-line="41" selection-start-column="37" selection-end-line="41" selection-end-column="37" />
+          <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" />
+          </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.3327616">
-          <caret line="55" column="43" selection-start-line="55" selection-start-column="43" selection-end-line="55" selection-end-column="43" />
+        <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" />
           <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="-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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/style.css">
+      <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/home/userDetail.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" />
+          <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" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

miaomiao/www/css/style.css

@@ -139,11 +139,15 @@ overflow:auto;
 .chosenClass{
     border: 2px solid #FE3939;
 }
+.userdetail img{
+    width:20%;
+    height: 100%;
+    margin: 3% auto 3% 3%;
+}
 .search-input{
     display: -webkit-box;
     display: -webkit-flex;
     display: -moz-box;
-    display: -moz-flex;
     display: -ms-flexbox;
     display: flex;
     -webkit-box-align: center;
@@ -339,7 +343,7 @@ padding:18px;
 .myprofile input{
     padding-right: 30px;
 }
-    /*my-recharge*/
+/*my-recharge*/
 .re-border {
 padding-right:3px;  
 }
@@ -759,4 +763,22 @@ a:visited,a:link{
     border-color: transparent;
     background-color: #00C3DA;
     color: #fff;
-}
+}
+
+/*CODE*/
+.tabs-striped.tabs-calm .tabs {
+    background-color: #00C3DA; }
+ion-tabs.tabs-color-active-calm .tab-item.tab-item-active, ion-tabs.tabs-color-active-calm .tab-item.active, ion-tabs.tabs-color-active-calm .tab-item.activated {
+    color: #00C3DA; }
+.button.button-calm {
+    background-color: #00C3DA;}
+.button.button-calm.active, .button.button-calm.activated {
+    background-color: #00C3DA; }
+.button.button-calm.button-clear {
+    color: #00C3DA; }
+.button.button-calm.button-outline {
+    border-color: #00C3DA;
+    color: #00C3DA; }
+.calm-bg {
+    background-color: #00C3DA; }
+

miaomiao/www/js/config/config.js

@@ -1,12 +1,12 @@
 (function (app) {
     //全局配置 
     app.constant("config", {
-        // server: 'http://localhost:8092/',
-        // imgServer: 'http://localhost:8092/api/attachment/download/'
-        // server: 'http://q8.9026.com/',
-        // imgServer: 'http://q8.9026.com/attachment/'
+        server: 'http://q8.9026.com/',
+        imgServer: 'http://q8.9026.com/attachment/'
         
-        server: 'http://localhost:8092/',
-        imgServer: 'http://localhost:8092/attachment/'
+        // server: 'http://localhost:8092/',
+        // imgServer: 'http://localhost:8092/attachment/'
+        //server: 'http://miao.beiyuesi.com/',
+        //imgServer: 'http://miao.beiyuesi.com/attachment/'
     });
 })(angular.module('app'));

miaomiao/www/js/config/router.js

@@ -270,16 +270,7 @@
                 views: {
                     'app-home': {
                         templateUrl: 'templates/my/my-message-sys.html',
-                        controller: 'sysCtrl'
-                    }
-                }
-            })
-            .state('app.dream_sys', {
-                url: '/my/message/sys',
-                views: {
-                    'app-home': {
-                        templateUrl: 'templates/my/my-message-sys.html',
-                        controller: 'sysCtrl'
+                        controller: 'messageSysCtrl'
                     }
                 }
             })
@@ -312,11 +303,11 @@
                 }
             })
             .state('app.letter', {
-                url: '/home/message/personalLetter',
+                url: '/home/message/letter',
                 views: {
                     'app-home': {
                         templateUrl: 'templates/my/personalLetter.html',
-                        controller: 'letterCtrl'
+                        controller: 'personalLetterCtrl'
                     }
                 }
             })

miaomiao/www/js/controllers/home.js

@@ -122,7 +122,6 @@
             dreams:[]
         };
         $scope.next = function (type) {
-        
             //type:1 前一个，type:2 后一个
             if($scope.index.users.length>0){
                 if(type==1)
@@ -882,6 +881,28 @@
                 })
             };
 
+            $scope.next = function (type) {
+                //type:1 前一个，type:2 后一个
+                if($scope.items.imgs.length>0){
+                    if(type==1)
+                    {
+                        var temp=  $scope.items.imgs.splice(0,1);
+                        $scope.items.imgs.push(temp[0]);
+                    }
+                    if (type==2){
+                        var temp= $scope.items.imgs.splice($scope.items.imgs.length-1,1);
+                        $scope.items.imgs.unshift(temp[0]);
+                    }
+                }
+            };
+            $scope.bigImage = false;
+            $scope.showBigImage  = function(imageName){
+                $scope.url = imageName;
+                $scope.bigImage = true;
+            };
+            $scope.hideBigImage = function(){
+                $scope.bigImage = false;
+            };
             $scope.cancelSupport = function () {
                 $scope.tosupport = false;
                 $scope.toshare = false;
@@ -946,6 +967,42 @@
                 $scope.hideAbout = false;
             };
         }]);
+    app.controller('homeMessageCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
+        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
+            $scope.$on('$ionicView.beforeEnter', function () {
+                $ionicTabsDelegate.showBar(false);
+                myService.systemInfo().then(function(result){
+                    $scope.sysInfo = result.data.data.data;
+                },function(error){
+
+                });
+            });
+            $scope.notRead = function(){
+                $scope.readStyle = {
+                    "display" : "none"
+                };
+            };
+            //系统消息
+            $scope.systemInfo = function(){
+                $state.go("app.message_sys");
+                myService.systemInfo().then(function(result){
+                },function(error){
+
+                });
+            };
+            //回复我的
+            $scope.replyMy = function(){
+                $state.go("app.message_reply");
+                myService.replyMy().then(function(result){
+
+                },function(error){
+
+                });
+            };
+            $scope.personalLetter = function(){
+                $state.go("app.letter");
+            }
+        }]);
     app.controller('oldDreamCtrl', ["$scope","homeService", "$stateParams","$state", "msg"
         , function ($scope,homeService,$stateParams, $state, msg) {
             var user_id = $stateParams.user_id;

miaomiao/www/js/controllers/my.js

@@ -15,7 +15,6 @@
                 });
             });
         };
-
     }]);
     app.controller('profileCtrl', ["$scope", "$timeout","$ionicTabsDelegate","$state","$filter", "storage", "myService", "msg", "common"
       , function ($scope, $timeout, $ionicTabsDelegate, $state, $filter, storage, myService, msg, common) {
@@ -102,16 +101,17 @@
      }]);
     app.controller('aboutMiaoCtrl', ["$scope","$ionicTabsDelegate","$timeout", "$state", "myService", "msg","storage"
         , function ($scope,$ionicTabsDelegate,$timeout, $state,myService, msg, storage) {
-           /* $scope.$on('$ionicView.beforeEnter', function () {
-                $scope.payExplain();
+            $scope.$on('$ionicView.beforeEnter', function () {
+                $scope.aboutMiao();
             });
-            $scope.payExplain = function(){
-                myService.payExplain().then(function(result){
+            $scope.aboutMiao = function(){
+                myService.aboutMiao().then(function(result){
                     $scope.items = result.data.data;
+                    debugger;
                 },function(error){
                     msg.error(error.data.message)
                 })
-            };*/
+            };
         }]);
     app.controller('withdrawCtrl', ["$scope","$ionicTabsDelegate","$timeout", "$state", "myService", "msg","storage"
         , function ($scope,$ionicTabsDelegate, $timeout,$state,myService, msg, storage) {
@@ -246,7 +246,7 @@
                 }
                 if($scope.items.near_dream!=null){
                     var dream_id = $scope.items.near_dream.id;
-                    $state.go('app.home_dreamdetail',{id:dream_id});
+                    $state.go('app.my_dreamdetail',{id:dream_id});
                 }
             };
             $scope.toOldDream = function(){
@@ -254,7 +254,7 @@
                     msg.alert("曾经的梦想","该用户没有曾经的梦想");
                 }
                 if($scope.items.dreams.length!=0){
-                    $state.go("app.oldDream",{user_id:$scope.items.user.id});
+                    $state.go("app.myOldDream",{user_id:$scope.items.user.id});
                 }
             };
             $scope.toSupportDream = function(){
@@ -262,7 +262,7 @@
                     msg.alert("支持的梦想","该用户没有支持的梦想");
                 }
                 if($scope.items.sup_dreams.length!=0){
-                    $state.go("app.supportDream",{user_id:$scope.items.user.id});
+                    $state.go("app.mySupportDream",{user_id:$scope.items.user.id});
                 }
             };
             $scope.collectionDream = function(is_collection){
@@ -316,7 +316,12 @@
         }]);
     app.controller('personalLetterCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
         , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
-
+            $scope.$on('$ionicView.beforeEnter', function () {
+                myService.letter().then(function(result){
+                    $scope.comments = result.data.data;
+                },function(error){
+                });
+            });
         }]);
     app.controller('rechargeCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg"
   , function ($scope, $ionicTabsDelegate,$state, myService, msg) {
@@ -508,56 +513,32 @@
         , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
             $scope.$on('$ionicView.beforeEnter', function () {
                 $ionicTabsDelegate.showBar(false);
+                myService.messageInfo().then(function(result){
+                    $scope.infos = result.data.data;
+                },function(error){
+
+                });
             });
             //系统消息
             $scope.systemInfo = function(){
                 $state.go("app.my_message_sys");
-                myService.systemInfo().then(function(result){
-                },function(error){
-
-                });
             };
-            //回复我的
-            $scope.replyMy = function(){
-                $state.go("app.my_message_reply");
-                myService.replyMy().then(function(result){
-                    //$scope.comments = result;
-                },function(error){
 
-                });
-            };
-            $scope.personalLetter = function(){
-                $state.go("app.personalLetter");
-            }
+            $scope.notRead = function(){
+                myService.notRead().then(function(result){
 
-        }]);
-    app.controller('homeMessageCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
-        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
-            $scope.$on('$ionicView.beforeEnter', function () {
-                $ionicTabsDelegate.showBar(false);
-            });
-            //系统消息
-            $scope.systemInfo = function(){
-                $state.go("app.message_sys");
-                myService.systemInfo().then(function(result){
                 },function(error){
 
-                });
+                })
             };
             //回复我的
             $scope.replyMy = function(){
-                $state.go("app.message_reply");
-                myService.replyMy().then(function(result){
-                    //$scope.comments = result;
-                },function(error){
-
-                });
+                $state.go("app.my_message_reply");
             };
             $scope.personalLetter = function(){
-                $state.go("app.letter");
+                $state.go("app.personalLetter");
             }
 
-
         }]);
     app.controller('dreamCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
   , function ($scope, $ionicTabsDelegate,$state, myService, msg) {
@@ -589,17 +570,35 @@
     }]);
     app.controller('messageSysCtrl', ["$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('sysCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
+  /*  app.controller('sysCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
         , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
-        }]);
-    app.controller('letterCtrl', ["$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) {
-                $ionicModal.fromTemplateUrl('my-modal.html', {
+            $scope.$on('$ionicView.beforeEnter', function () {
+                myService.replyMy().then(function(result){
+                    $scope.comments = result.data.data;
+                },function(error){
+                });
+            });
+            $ionicModal.fromTemplateUrl('my-modal.html', {
                 scope: $scope,
                 animation: 'slide-in-up'
             }).then(function (modal) {
@@ -608,12 +607,12 @@
             $scope.openModal = function () {
                 $scope.modal.show();
             };
-
             $scope.closeModal = function () {
                 $scope.modal.hide();
 
             };
 
+
             //我的回复
             $scope.vm={
                 content:"",

miaomiao/www/js/directives/directive.js

@@ -18,7 +18,7 @@
         return {
             restrict: 'A',
             link: function (scope, elem, attr) {
-                console.log(elem)
+                console.log(elem);
                 debugger;
                 this.vidEnded= function(){
                     console.log('vid ended')

miaomiao/www/js/services/myservice.js

@@ -28,7 +28,7 @@
             },
             replyMy:function(){
                 return $http({
-                    url:config.server + "api/my/reply_my",
+                    url:config.server + "api/my/reply",
                     method:"get"
                 })
             },
@@ -139,6 +139,30 @@
                     method:"post",
                     data:data
                 })
+            },
+            aboutMiao:function(){
+                return $http({
+                    url:config.server + "api/my/miao",
+                    method:"get"
+                })
+            },
+            messageInfo:function(){
+                return $http({
+                    url:config.server + "api/my/info",
+                    method:"get"
+                })
+            },
+            notRead:function(){
+                return $http({
+                    url:config.server + "api/my/read",
+                    method:"get"
+                })
+            },
+            letter:function(){
+                return $http({
+                    url:config.server + "api/my/letter",
+                    method:"get"
+                })
             }
 
         };

miaomiao/www/templates/home/index.html

@@ -45,7 +45,6 @@
                                 <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;padding:0 5px;" on-drag-right="next(2)" on-drag-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>

miaomiao/www/templates/home/search.html

@@ -92,10 +92,33 @@
                  </div>
              </div>
              <div ng-if="index==2" class="list more-userlist">
-                 <div class="item" style="padding:0" ng-repeat="dream_info in dream_infos" ng-click="toDetail(dream_info.id)">
-                     <img class="reply-head" ng-src="{{dream_info.user.avatar}}" style="margin:5px 15px" />
-                     <span style="position:relative;top:-25px;font-size:1.1rem;">{{ dream_info.name }}</span>
-                     <img style="display:block;width:100%" ng-src="{{dream_info.img.pic}}" />
+                 <div class="item" style="padding:0" ng-repeat="dream_info in dream_infos">
+                     <div class="row">
+                         <div class="col avatarCol">
+                             <div class="fl" style="width: 27%; margin-right: 5px">
+                                 <img ng-src="{{dream_info.user.avatar | avator}}" ng-click="toUserDetail(dream_info.user.id)" />
+                             </div>
+                             <div class="myblock">
+                                 <div>{{dream_info.user.nickname}}<span>{{dream_info.user.birthday | getage}}岁</span></div>
+                                 <div class="mysecond">{{dream_info.user.city}}</div>
+                             </div>
+                         </div>
+                         <div class="col" style="text-align:right">
+                             <div style="margin-top:4px">
+                                 <img ng-src="img/icon_follow.svg" class="iheart" style=" width: 1rem; top: 2px; position: relative;">
+                                 <span style="color: #F16571">{{dream_info.care_num}}</span>
+                                 <span>人关注</span>
+                             </div>
+                             <div class="mysecond">剩余{{dream_info.end_time | lastDate}}天</div>
+                         </div>
+                     </div>
+                     <div ng-click="toDetail(dream_info.id)">
+                         <img ng-src="{{dream_info.img.pic}}" />
+                         <div class="homeDream">
+                             <p style="font-size: 16px">{{ dream_info.name }}</p>
+                             <p>{{ dream_info.about }}</p>
+                         </div>
+                     </div>
                  </div> 
                 
              </div>

miaomiao/www/templates/home/userDetail.html

@@ -10,11 +10,13 @@
                     {{items.user.nickname}}
                 </div>
                 <div style="font-size:0.7rem; margin-bottom: 10px"> {{items.user.city}}</div>
-                <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>
-                <div ng-if="items.is_care==1">
-                    <span style="background: #fff; color: #B3B3B3; font-size:0.7rem; border-radius: 20px; padding: 2px 20px" ng-click="attentionUser(0)">已关注</span>
+                <div ng-if="user.id != dream.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>
+                    <div ng-if="items.is_care==1">
+                        <span style="background: #fff; color: #B3B3B3; font-size:0.7rem; border-radius: 20px; padding: 2px 20px" ng-click="attentionUser(0)">已关注</span>
+                    </div>
                 </div>
             </div>
             <div class="row user-row">
@@ -36,8 +38,18 @@
                 </div>
             </div>
         </div>
-        <div class="user-dz" style="text-align: left; padding-left: 0; padding-right: 0">
-            <img ng-repeat="item in items.imgs" style="width: 75px; height: 75px;margin: 5px 0 10px 15px" ng-src="{{item.pic}}">
+        <div class="row" ng-if="items.imgs.length>0" style="background: #FAFAFA; height: 85px; padding-bottom: 15px">
+            <div class="col col-10" style="margin-top: 6%" 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;padding:0 5px;" on-drag-right="next(2)" on-drag-left="next(1)">
+                <span class="userdetail" ng-repeat="item in items.imgs">
+                    <img ng-click="showBigImage('{{item.pic}}')" ng-if="$index<4" ng-src="{{item.pic}}" style="padding: 0.5%;" />
+                </span>
+            </div>
+            <div class="col col-10" style="margin-top: 6%; text-align: right" ng-click="next(2)">
+                <i class="icon ion-ios-arrow-right" style="font-size: 1.5rem; color: #00C3DA;"></i>
+            </div>
         </div>
         <div class="list padding" style="font-size: 18px; color: #828282;">
             <div class="row" style="padding: 20px 0; border-bottom: 1px solid #E6E6E6">
@@ -82,5 +94,9 @@
             </div>
         </div>
     </div>
+    <!--点击看大图-->
+    <div ng-if="bigImage" ng-click="hideBigImage()" class="popover-backdrop">
+        <img src="{{url}}">
+    </div>
 </ion-view>
 

miaomiao/www/templates/my/aboutMiao.html

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

miaomiao/www/templates/my/attention.html

@@ -1,6 +1,6 @@
 <ion-view view-title="瞄喵">
     <ion-content>
-        <div class="list padding">
+        <div class="list">
             <div class="item reply-item" >
                 <div ng-repeat="user in users" class="item" style="height:90px; border-bottom: 1px solid #EFEFEF" ng-click="toMyUserDetail(user.id)">
                     <div style="float:left;">

miaomiao/www/templates/my/my-message-reply.html

@@ -1,7 +1,15 @@
 <ion-view view-title="回复我的">
     <ion-content>
+        <div class="list list-user-set" ng-repeat="item in comments" style="color: #737373; margin-bottom: 0">
+            <a class="item" style="border-bottom: 1px solid #EAEAEA">
+                来自 <em style="color: #000">瞄喵</em> 的私信
+                <p>{{item.content}}</p>
+            </a>
+        </div>
+    </ion-content>
+    <!--<ion-content>
         <div class="list">
-            <div class="item reply-item" ng-repeat="item in comments">
+            <div class="item reply-item">
                 <div class="row">
                     <div class="col">
                         <img  class="reply-head" src="../../img/demo/head1.jpg" />
@@ -16,7 +24,7 @@
                 </div>
                 <span class="reply-line">回复<span>@韩庚</span>：你确定是去那里吗？</span>
                 <div class="item item-thumbnail-left reply-content">
-                    <!--<img ng-src="img/demo/head7.jpg" />-->
+                    &lt;!&ndash;<img ng-src="img/demo/head7.jpg" />&ndash;&gt;
                     <img ng-src="{{item.dream_pic}}">
                     <h2>{{item.dream_name}}</h2>
                     <p>在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得的北欧时光！</p>
@@ -27,57 +35,6 @@
                 </div> 
                 <div class="reply-sx"><span class="calm">30%</span> 目前实现</div>
             </div>
-
-            <!--<div class="item reply-item">
-                <div class="row">
-                    <div class="col">
-                        <img class="reply-head" src="../../img/demo/head1.jpg" />
-                        <div class="reply-info">
-                            <div>林更新</div>
-                            <div>2016-08-08 11:00</div>
-                        </div>
-                    </div>
-                    <div class="col reply-hf">
-                        <button class="button icon-left ion-ios-redo-outline" ng-click="openModal()">回复</button>
-                    </div>
-                </div>
-                <span class="reply-line">回复<span>@韩庚</span>：你确定是去那里吗？ </span>
-                <div class="item item-thumbnail-left reply-content">
-                    <img ng-src="img/demo/head7.jpg" />
-                    <h2>有人能带我去瑞典吗？</h2>
-                    <p>在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得的北欧时光！</p>
-                </div>
-                <div class="reply-bar">
-                    <div style="width: 30%;">
-                    </div>
-                </div>
-                <div class="reply-sx"><span class="calm">30%</span> 目前实现</div>
-            </div>
-            <div class="item reply-item">
-                <div class="row">
-                    <div class="col">
-                        <img class="reply-head" src="../../img/demo/head1.jpg" />
-                        <div class="reply-info">
-                            <div>林更新</div>
-                            <div>2016-08-08 11:00</div>
-                        </div>
-                    </div>
-                    <div class="col reply-hf">
-                        <button class="button icon-left ion-ios-redo-outline" ng-click="openModal()">回复</button>
-                    </div>
-                </div>
-                <span class="reply-line">回复<span>@韩庚</span>：你确定是去那里吗？ </span>
-                <div class="item item-thumbnail-left reply-content">
-                    <img ng-src="img/demo/head7.jpg" />
-                    <h2>有人能带我去瑞典吗？</h2>
-                    <p>在斯德哥尔摩，那个只有黑白和灰色的咖啡馆里面坐下，喝一杯地道的北欧咖啡。享受难得的北欧时光！</p>
-                </div>
-                <div class="reply-bar">
-                    <div style="width: 30%;">
-                    </div>
-                </div>
-                <div class="reply-sx"><span class="calm">30%</span> 目前实现</div>
-            </div>-->
         </div>
     </ion-content>
     <script id="my-modal.html" type="text/ng-template">
@@ -99,5 +56,5 @@
             </ion-content>
 
         </ion-modal-view>
-    </script>
+    </script>-->
 </ion-view>

miaomiao/www/templates/my/my-message-sys.html

@@ -1,22 +1,11 @@
 <ion-view view-title="设置">
     <ion-content>
-        <div class="list">
+        <div class="list" ng-repeat="sysInfo in sysInfos">
             <a class="item item-icon-left">
                 <i class="icon ion-volume-medium"></i>
-                <em class="fl">张三为你的梦想，捐赠5000梦想币</em>
-            </a>
-            <a class="item item-icon-left">
-                <i class="icon ion-volume-medium"></i>
-                <em class="fl">张三为你的梦想，捐赠5000梦想币</em>
-            </a>
-            <a class="item item-icon-left">
-                <i class="icon ion-volume-medium"></i>
-                <em class="fl">张三为你的梦想，捐赠5000梦想币</em>
-            </a>
-            <a class="item item-icon-left">
-                <i class="icon ion-volume-medium"></i>
-                <em class="fl">张三为你的梦想，捐赠5000梦想币</em>
+                <em class="fl">{{sysInfo.message}}</em>
             </a>
         </div>
+        <ion-infinite-scroll ng-if="filter.hasMore" on-infinite="load(false)" distance="10%"></ion-infinite-scroll>
     </ion-content>
 </ion-view>

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

@@ -1,6 +1,6 @@
 <ion-view view-title="我的消息">
     <ion-nav-buttons side="right">
-        <button class="button button-clear" style="font-size: 16px; margin-top: 3px">
+        <button class="button button-clear" ng-click="notRead()" style="font-size: 16px; margin-top: 3px">
             全部设为已读
         </button>
     </ion-nav-buttons>
@@ -8,26 +8,29 @@
         <div class="list padding list-user-set" style="color: #737373">
             <a class="item" ng-click="systemInfo()" style="border-bottom: 1px solid #EAEAEA">
                 <em class="fl">系统消息</em>
-                <i class="fr">
-                    <em class="badge badge-assertive" style="background: red;">300</em>
+                <i class="fr" ng-if="infos.systemInfo.is_read!=0">
+                    <em class="badge badge-assertive" style="background: red; padding: 0.5px 10px; margin-top: 2px">{{infos.systemInfo.is_read}}</em>
                 </i>
                 <i class="fr" style="margin-right: 10px">
-                    300条系统消息
+                    {{infos.systemInfo.number}}条系统消息
                 </i>
             </a>
             <a class="item" ng-click="replyMy()" style="border-bottom: 1px solid #EAEAEA">
                 <em class="fl">回复我的</em>
-                <i class="fr">
-                    <em class="badge badge-assertive" style="background: red;">300</em>
+                <i class="fr" ng-if="infos.reply.is_read!=0">
+                    <em class="badge badge-assertive" style="background: red; padding: 0.5px 10px; margin-top: 2px">{{infos.reply.is_read}}</em>
                 </i>
                 <i class="fr" style="margin-right: 10px">
-                    300条回复消息
+                    {{infos.reply.number}}条回复消息
                 </i>
             </a>
             <a class="item" ng-click="personalLetter()" style="border-bottom: 1px solid #EAEAEA">
                 <em class="fl">私信</em>
-                <i class="fr" style="color: #B3B3B3">
-                    哈哈哈
+                <i class="fr" ng-if="infos.letter.is_read!=0">
+                    <em class="badge badge-assertive" style="background: red; padding: 0.5px 10px; margin-top: 2px">{{infos.letter.is_read}}</em>
+                </i>
+                <i class="fr" style="margin-right: 10px">
+                    {{infos.letter.number}}条私信
                 </i>
             </a>
           

miaomiao/www/templates/my/personalLetter.html

@@ -1,17 +1,9 @@
 <ion-view view-title="私信">
     <ion-content>
-        <div class="list list-user-set" style="color: #737373">
+        <div class="list list-user-set" ng-repeat="item in comments" style="color: #737373">
             <a class="item" style="border-bottom: 1px solid #EAEAEA">
                 来自 <em style="color: #000">瞄喵</em> 的私信
-                <p>测试文本</p>
-            </a>
-            <a class="item" style="border-bottom: 1px solid #EAEAEA">
-                来自 <em style="color: #000">瞄喵</em> 的私信
-                <p>测试文本</p>
-            </a>
-            <a class="item" style="border-bottom: 1px solid #EAEAEA">
-                来自 <em style="color: #000">瞄喵</em> 的私信
-                <p>测试文本</p>
+                <p>{{item.content}}</p>
             </a>
         </div>
     </ion-content>