add

miaomiao/.idea/workspace.xml

@@ -21,23 +21,90 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="my-message-reply.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
+      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
+            <state vertical-scroll-proportion="-0.0">
+              <caret line="0" column="9" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="9" />
               <folding>
-                <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="payExplain.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/www/templates/my/payExplain.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-9.428572">
+              <caret line="8" column="48" selection-start-line="0" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
+              <folding>
+                <element signature="n#style#0;n#div#0;n#a#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#a#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#a#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#1;n#div#0;n#a#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#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="payDetail.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/www/templates/my/payDetail.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-15.321428">
+              <caret line="13" column="32" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="32" />
+              <folding>
+                <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#p#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#i#0;n#p#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#p#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#p#2;n#ion-content#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" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="my-account-add.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/www/templates/my/my-account-add.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-22.392857">
+              <caret line="33" column="66" selection-start-line="33" selection-start-column="66" selection-end-line="33" selection-end-column="66" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="my.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.4650621">
-              <caret line="701" column="40" selection-start-line="701" selection-start-column="40" selection-end-line="701" selection-end-column="40" />
+            <state vertical-scroll-proportion="0.3035144">
+              <caret line="232" column="39" selection-start-line="232" selection-start-column="39" selection-end-line="232" selection-end-column="39" />
+              <folding>
+                <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
+                <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
+                <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
+                <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
+                <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
+                <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
+                <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
+                <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
+                <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
+                <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
+                <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
+                <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
+                <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="router.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/www/js/config/router.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-13.5625">
+              <caret line="403" column="50" selection-start-line="403" selection-start-column="37" selection-end-line="403" selection-end-column="50" />
               <folding />
             </state>
           </provider>
@@ -45,12 +112,26 @@
       </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="HTML File" />
+      </list>
+    </option>
+  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/www/templates/my/my-message-reply.html" />
         <option value="$PROJECT_DIR$/www/templates/home/dream-detail.html" />
         <option value="$PROJECT_DIR$/../server/app/Http/Controllers/Api/V1/MyController.php" />
+        <option value="$PROJECT_DIR$/www/js/services/msgservice.js" />
+        <option value="$PROJECT_DIR$/www/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/www/js/controllers/account.js" />
+        <option value="$PROJECT_DIR$/www/templates/my/my-recharge.html" />
+        <option value="$PROJECT_DIR$/www/js/config/router.js" />
+        <option value="$PROJECT_DIR$/www/templates/my/payExplain.html" />
+        <option value="$PROJECT_DIR$/www/templates/my/payDetail.html" />
         <option value="$PROJECT_DIR$/www/js/controllers/my.js" />
       </list>
     </option>
@@ -69,7 +150,7 @@
     <option name="x" value="1358" />
     <option name="y" value="-8" />
     <option name="width" value="2576" />
-    <option name="height" value="1456" />
+    <option name="height" value="1452" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -100,10 +181,11 @@
   <component name="PropertiesComponent">
     <property name="settings.editor.selected.configurable" value="preferences.keymap" />
     <property name="settings.editor.splitter.proportion" value="0.2" />
-    <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" />
+    <property name="DefaultHtmlFileTemplate" value="HTML File" />
   </component>
   <component name="RunManager">
     <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
@@ -169,7 +251,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1358" y="-8" width="2576" height="1456" extended-state="6" />
+    <frame x="1358" y="-8" width="2576" height="1452" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Gulp" 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="3" side_tool="true" content_ui="tabs" />
@@ -177,18 +259,18 @@
       <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="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32885906" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24916202" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" 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.32885906" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -207,7 +289,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="javascript">
           <url>file://$PROJECT_DIR$/www/js/controllers/my.js</url>
-          <line>680</line>
+          <line>686</line>
         </line-breakpoint>
       </breakpoints>
       <option name="time" value="1" />
@@ -220,7 +302,7 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -229,7 +311,53 @@
       <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 />
+          <folding>
+            <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/my.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" />
+          <folding>
+            <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -238,7 +366,7 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="2" column="74" selection-start-line="2" selection-start-column="74" selection-end-line="2" selection-end-column="74" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -247,7 +375,21 @@
       <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 />
+          <folding>
+            <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -258,58 +400,154 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/../server/app/Http/Controllers/Api/V1/MyController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.15472312">
+          <caret line="10" column="23" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-5.428571">
+          <caret line="8" column="93" selection-start-line="8" selection-start-column="93" selection-end-line="8" selection-end-column="93" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/services/myservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.16277258">
+          <caret line="11" column="62" selection-start-line="11" selection-start-column="62" selection-end-line="11" selection-end-column="62" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/services/msgservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4201278">
+          <caret line="56" column="57" selection-start-line="56" selection-start-column="57" selection-end-line="56" selection-end-column="57" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/www/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-14.25">
-          <caret line="165" column="92" selection-start-line="165" selection-start-column="20" selection-end-line="165" selection-end-column="92" />
+        <state vertical-scroll-proportion="0.6168224">
+          <caret line="238" column="21" selection-start-line="238" selection-start-column="21" selection-end-line="238" selection-end-column="21" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/www/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.54285717">
-          <caret line="135" column="26" selection-start-line="135" selection-start-column="26" selection-end-line="135" selection-end-column="26" />
+        <state vertical-scroll-proportion="0.10358255">
+          <caret line="7" column="46" selection-start-line="7" selection-start-column="46" selection-end-line="7" selection-end-column="46" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/config/router.js">
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/account.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.77149683">
-          <caret line="298" column="53" selection-start-line="298" selection-start-column="37" selection-end-line="298" selection-end-column="53" />
+        <state vertical-scroll-proportion="0.31152648">
+          <caret line="16" column="79" selection-start-line="16" selection-start-column="79" selection-end-line="16" selection-end-column="79" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../server/app/Http/Controllers/Api/V1/MyController.php">
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-recharge.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15472312">
-          <caret line="10" column="23" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
+        <state vertical-scroll-proportion="0.24203822">
+          <caret line="16" column="26" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/my/my-message.html">
+    <entry file="file://$PROJECT_DIR$/www/templates/my/payExplain.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.428571">
-          <caret line="8" column="93" selection-start-line="8" selection-start-column="93" selection-end-line="8" selection-end-column="93" />
+        <state vertical-scroll-proportion="-9.428572">
+          <caret line="8" column="48" selection-start-line="0" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#a#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#a#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#a#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#1;n#div#0;n#a#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#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$/www/js/config/router.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-13.5625">
+          <caret line="403" column="50" selection-start-line="403" selection-start-column="37" selection-end-line="403" selection-end-column="50" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state vertical-scroll-proportion="-6.785714">
           <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
           <folding>
-            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4650621">
-          <caret line="701" column="40" selection-start-line="701" selection-start-column="40" selection-end-line="701" selection-end-column="40" />
+        <state vertical-scroll-proportion="-0.0">
+          <caret line="0" column="9" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="9" />
+          <folding>
+            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/my-account-add.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-22.392857">
+          <caret line="33" column="66" selection-start-line="33" selection-start-column="66" selection-end-line="33" selection-end-column="66" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/payDetail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-15.321428">
+          <caret line="13" column="32" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="32" />
+          <folding>
+            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#i#0;n#p#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#p#2;n#ion-content#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" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3035144">
+          <caret line="232" column="39" selection-start-line="232" selection-start-column="39" selection-end-line="232" selection-end-column="39" />
+          <folding>
+            <marker date="1509601441048" expanded="true" signature="35606:35631" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="35878:35942" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="35994:36010" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36206:36270" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36322:36337" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36537:36568" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="36800:36818" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="38965:38983" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41278:41296" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41357:41376" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41639:41657" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="41718:41737" placeholder="..." />
+            <marker date="1509601441048" expanded="true" signature="42400:42418" placeholder="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

miaomiao/www/.idea/workspace.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/js/controllers/my.js" line="897" mnemonic="1" />
+    <bookmark url="file://$PROJECT_DIR$/js/controllers/my.js" line="899" mnemonic="1" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="da700f62-8b79-488e-8484-af89b2c5db2d" name="Default" comment="" />
@@ -29,7 +29,7 @@
           <file leaf-file-name="my-message-sys.html" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="-9.321428">
+                <state vertical-scroll-proportion="0.0">
                   <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
                   <folding>
                     <element signature="n#style#0;n#p#0;n#a#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -38,21 +38,21 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="true">
+          <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.46254072">
-                  <caret line="204" column="38" selection-start-line="204" selection-start-column="38" selection-end-line="204" selection-end-column="38" />
+                <state vertical-scroll-proportion="0.0">
+                  <caret line="202" column="52" selection-start-line="202" selection-start-column="52" selection-end-line="202" selection-end-column="52" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="my-dream.html" pinned="false" current-in-tab="false">
+          <file leaf-file-name="my-dream.html" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="-1.0">
-                  <caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
+                <state vertical-scroll-proportion="0.58759123">
+                  <caret line="38" column="25" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="25" />
                   <folding />
                 </state>
               </provider>
@@ -61,7 +61,7 @@
           <file leaf-file-name="my-message-reply.html" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="-2.142857">
+                <state vertical-scroll-proportion="0.0">
                   <caret line="2" column="131" selection-start-line="2" selection-start-column="131" selection-end-line="2" selection-end-column="131" />
                   <folding>
                     <element signature="n#style#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -74,7 +74,7 @@
           <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/templates/add/index.html">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="-16.071428">
+                <state vertical-scroll-proportion="0.0">
                   <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
                   <folding />
                 </state>
@@ -88,22 +88,22 @@
           <file leaf-file-name="my.js" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="-10.375">
-                  <caret line="897" column="30" selection-start-line="897" selection-start-column="30" selection-end-line="897" selection-end-column="30" />
+                <state vertical-scroll-proportion="0.0">
+                  <caret line="739" column="31" selection-start-line="739" selection-start-column="31" selection-end-line="740" selection-end-column="46" />
                   <folding>
-                    <marker date="1509530604269" expanded="true" signature="35229:35254" placeholder="..." />
-                    <marker date="1509530604269" expanded="true" signature="35501:35565" placeholder="..." />
-                    <marker date="1509530604269" expanded="true" signature="35617:35633" placeholder="..." />
-                    <marker date="1509530604269" expanded="true" signature="35829:35893" placeholder="..." />
-                    <marker date="1509530604269" expanded="true" signature="35945:35960" placeholder="..." />
-                    <marker date="1509530604269" expanded="true" signature="36160:36191" placeholder="..." />
-                    <marker date="1509530604269" expanded="true" signature="36423:36441" placeholder="..." />
-                    <marker date="1509530604269" expanded="true" signature="38588:38606" placeholder="..." />
-                    <marker date="1509530604269" expanded="true" signature="40901:40919" placeholder="..." />
-                    <marker date="1509530604269" expanded="true" signature="40980:40999" placeholder="..." />
-                    <marker date="1509530604269" expanded="true" signature="41262:41280" placeholder="..." />
-                    <marker date="1509530604269" expanded="true" signature="41341:41360" placeholder="..." />
-                    <marker date="1509530604269" expanded="true" signature="41656:41674" placeholder="..." />
+                    <marker date="1509532224162" expanded="true" signature="35281:35306" placeholder="..." />
+                    <marker date="1509532224162" expanded="true" signature="35553:35617" placeholder="..." />
+                    <marker date="1509532224162" expanded="true" signature="35669:35685" placeholder="..." />
+                    <marker date="1509532224162" expanded="true" signature="35881:35945" placeholder="..." />
+                    <marker date="1509532224162" expanded="true" signature="35997:36012" placeholder="..." />
+                    <marker date="1509532224162" expanded="true" signature="36212:36243" placeholder="..." />
+                    <marker date="1509532224162" expanded="true" signature="36475:36493" placeholder="..." />
+                    <marker date="1509532224162" expanded="true" signature="38640:38658" placeholder="..." />
+                    <marker date="1509532224162" expanded="true" signature="40953:40971" placeholder="..." />
+                    <marker date="1509532224162" expanded="true" signature="41032:41051" placeholder="..." />
+                    <marker date="1509532224162" expanded="true" signature="41314:41332" placeholder="..." />
+                    <marker date="1509532224162" expanded="true" signature="41393:41412" placeholder="..." />
+                    <marker date="1509532224162" expanded="true" signature="41708:41726" placeholder="..." />
                   </folding>
                 </state>
               </provider>
@@ -122,8 +122,8 @@
           <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state vertical-scroll-proportion="0.33280253">
-                  <caret line="312" column="25" selection-start-line="312" selection-start-column="16" selection-end-line="312" selection-end-column="25" />
+                <state vertical-scroll-proportion="0.42881945">
+                  <caret line="300" column="21" selection-start-line="300" selection-start-column="21" selection-end-line="300" selection-end-column="22" />
                   <folding>
                     <element signature="e#10842#11161#0" expanded="false" />
                     <element signature="e#11426#11513#0" expanded="false" />
@@ -171,6 +171,7 @@
         <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
         <option value="$PROJECT_DIR$/js/services/myservice.js" />
         <option value="$PROJECT_DIR$/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/js/filters/filter.js" />
         <option value="$PROJECT_DIR$/templates/my/my-dream.html" />
       </list>
     </option>
@@ -181,10 +182,10 @@
     <detection-done>true</detection-done>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="1358" />
+    <option name="x" value="-8" />
     <option name="y" value="-8" />
-    <option name="width" value="2576" />
-    <option name="height" value="1456" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -215,7 +216,7 @@
   <component name="PropertiesComponent">
     <property name="settings.editor.selected.configurable" value="preferences.keymap" />
     <property name="settings.editor.splitter.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="E:/Graduation design/huiwei/www" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -285,25 +286,25 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1358" y="-8" width="2576" height="1456" extended-state="6" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <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.16798107" 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="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32885906" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24916202" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" 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.32885906" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -580,13 +581,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.28582802">
-          <caret line="51" column="25" selection-start-line="51" selection-start-column="25" selection-end-line="51" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/home/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-21.75">
@@ -642,7 +636,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.46195653">
           <caret line="47" column="25" selection-start-line="47" selection-start-column="23" selection-end-line="47" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -650,7 +643,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-7.0">
           <caret line="7" column="28" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -658,13 +650,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-6.516667">
           <caret line="799" column="25" selection-start-line="799" selection-start-column="25" selection-end-line="799" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-16.071428">
+        <state vertical-scroll-proportion="0.0">
           <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
           <folding />
         </state>
@@ -672,7 +663,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.142857">
+        <state vertical-scroll-proportion="0.0">
           <caret line="2" column="131" selection-start-line="2" selection-start-column="131" selection-end-line="2" selection-end-column="131" />
           <folding>
             <element signature="n#style#0;n#a#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -681,17 +672,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="211" column="48" selection-start-line="211" selection-start-column="48" selection-end-line="211" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/my-message-sys.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.321428">
+        <state vertical-scroll-proportion="0.0">
           <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
           <folding>
             <element signature="n#style#0;n#p#0;n#a#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -699,48 +682,55 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-10.375">
-          <caret line="897" column="30" selection-start-line="897" selection-start-column="30" selection-end-line="897" selection-end-column="30" />
-          <folding>
-            <marker date="1509530604269" expanded="true" signature="35229:35254" placeholder="..." />
-            <marker date="1509530604269" expanded="true" signature="35501:35565" placeholder="..." />
-            <marker date="1509530604269" expanded="true" signature="35617:35633" placeholder="..." />
-            <marker date="1509530604269" expanded="true" signature="35829:35893" placeholder="..." />
-            <marker date="1509530604269" expanded="true" signature="35945:35960" placeholder="..." />
-            <marker date="1509530604269" expanded="true" signature="36160:36191" placeholder="..." />
-            <marker date="1509530604269" expanded="true" signature="36423:36441" placeholder="..." />
-            <marker date="1509530604269" expanded="true" signature="38588:38606" placeholder="..." />
-            <marker date="1509530604269" expanded="true" signature="40901:40919" placeholder="..." />
-            <marker date="1509530604269" expanded="true" signature="40980:40999" placeholder="..." />
-            <marker date="1509530604269" expanded="true" signature="41262:41280" placeholder="..." />
-            <marker date="1509530604269" expanded="true" signature="41341:41360" placeholder="..." />
-            <marker date="1509530604269" expanded="true" signature="41656:41674" placeholder="..." />
-          </folding>
+        <state vertical-scroll-proportion="0.0">
+          <caret line="202" column="52" selection-start-line="202" selection-start-column="52" selection-end-line="202" selection-end-column="52" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
+    <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.0">
-          <caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="211" column="48" selection-start-line="211" selection-start-column="48" selection-end-line="211" selection-end-column="48" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.46254072">
-          <caret line="204" column="38" selection-start-line="204" selection-start-column="38" selection-end-line="204" selection-end-column="38" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="739" column="31" selection-start-line="739" selection-start-column="31" selection-end-line="740" selection-end-column="46" />
+          <folding>
+            <marker date="1509532224162" expanded="true" signature="35281:35306" placeholder="..." />
+            <marker date="1509532224162" expanded="true" signature="35553:35617" placeholder="..." />
+            <marker date="1509532224162" expanded="true" signature="35669:35685" placeholder="..." />
+            <marker date="1509532224162" expanded="true" signature="35881:35945" placeholder="..." />
+            <marker date="1509532224162" expanded="true" signature="35997:36012" placeholder="..." />
+            <marker date="1509532224162" expanded="true" signature="36212:36243" placeholder="..." />
+            <marker date="1509532224162" expanded="true" signature="36475:36493" placeholder="..." />
+            <marker date="1509532224162" expanded="true" signature="38640:38658" placeholder="..." />
+            <marker date="1509532224162" expanded="true" signature="40953:40971" placeholder="..." />
+            <marker date="1509532224162" expanded="true" signature="41032:41051" placeholder="..." />
+            <marker date="1509532224162" expanded="true" signature="41314:41332" placeholder="..." />
+            <marker date="1509532224162" expanded="true" signature="41393:41412" placeholder="..." />
+            <marker date="1509532224162" expanded="true" signature="41708:41726" placeholder="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/filters/filter.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6329618">
+          <caret line="76" column="18" selection-start-line="76" selection-start-column="18" selection-end-line="76" selection-end-column="18" />
         </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.33280253">
-          <caret line="312" column="25" selection-start-line="312" selection-start-column="16" selection-end-line="312" selection-end-column="25" />
+        <state vertical-scroll-proportion="0.42881945">
+          <caret line="300" column="21" selection-start-line="300" selection-start-column="21" selection-end-line="300" selection-end-column="22" />
           <folding>
             <element signature="e#10842#11161#0" expanded="false" />
             <element signature="e#11426#11513#0" expanded="false" />
@@ -749,5 +739,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-dream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.58759123">
+          <caret line="38" column="25" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

miaomiao/www/js/config/router.js

@@ -396,6 +396,14 @@
                         controller: 'payExplainCtrl'
                     }
                 }
+            }) .state('app.payDetail', {
+                url: '/my/payDetail',
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/my/payDetail.html',
+                        controller: 'payDetailCtrl'
+                    }
+                }
             })
             .state('app.explain', {
                 url: '/home/explain',

miaomiao/www/js/controllers/account.js

@@ -29,38 +29,38 @@
                  //}, function (error) {
                  //   console.log("Failed: " + JSON.stringify(error));
                  //});
-                $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
-                //userService.isTest().then(function(res){
-                //    if(res.data.data){
-                //        Wechat.auth(scope, state, function (response) {
-                //            // alert("response:"+JSON.stringify(response));
-                //            // var response={code:1231};
-                //           if(response.code){
-                //               msg.loading('登录中...');
-                //               userService.wechat_login(response.code).then(function(result){
-                //                   msg.hide();
-                //                    // alert("wechat_login success: " + JSON.stringify(result));
-                //                   if(result.data.data.user){
-                //                       storage.setObject('user', result.data.data.user);
-                //                       storage.set('token', result.data.data.token);
-                //                       $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
-                //                       $scope.user=storage.getObject('user');
-                //                       $state.go('app.home');
-                //                   }else{
-                //                       $state.go("loginAccount",{wechat:result.data.data.openid})
-                //                   }
-                //               },function(error){
-                //                    console.log("loginbywx Failed: " + JSON.stringify(error));
-                //                   $state.go("loginAccount");
-                //               });
-                //           }
-                //        }, function (error) {
-                //           console.log("Failed: " + JSON.stringify(error));
-                //        })
-                //    }else{
-                //        $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
-                //    }
-                //} )
+                //$state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
+                userService.isTest().then(function(res){
+                    if(res.data.data){
+                        Wechat.auth(scope, state, function (response) {
+                            // alert("response:"+JSON.stringify(response));
+                            // var response={code:1231};
+                           if(response.code){
+                               msg.loading('登录中...');
+                               userService.wechat_login(response.code).then(function(result){
+                                   msg.hide();
+                                    // alert("wechat_login success: " + JSON.stringify(result));
+                                   if(result.data.data.user){
+                                       storage.setObject('user', result.data.data.user);
+                                       storage.set('token', result.data.data.token);
+                                       $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
+                                       $scope.user=storage.getObject('user');
+                                       $state.go('app.home');
+                                   }else{
+                                       $state.go("loginAccount",{wechat:result.data.data.openid})
+                                   }
+                               },function(error){
+                                    console.log("loginbywx Failed: " + JSON.stringify(error));
+                                   $state.go("loginAccount");
+                               });
+                           }
+                        }, function (error) {
+                           console.log("Failed: " + JSON.stringify(error));
+                        })
+                    }else{
+                        $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
+                    }
+                } )
 
             }
     }]);

miaomiao/www/js/controllers/home.js

@@ -203,7 +203,6 @@
                     }
                 );
         };
-
         $scope.$on('$ionicView.beforeLeave', function () {
             $scope.popover.hide();
             $scope.load(true);
@@ -232,7 +231,18 @@
                 });
             };
             // id=5;
+            $scope.$on('$ionicView.afterEnter', function () {
+                timerID = setInterval(function() {
+                    $scope.$apply(function(){
+                        $scope.load(id,dream_user_id,interaction_id);
+                    });
+                }, 5000);
 
+            });
+            $scope.$on('$ionicView.afterLeave', function () {
+                clearInterval(timerID);
+                timerID = null;
+            });
             $scope.$on('$ionicView.beforeEnter', function () {
                 msg.loading();
                 $ionicTabsDelegate.showBar(false);

miaomiao/www/js/controllers/my.js

@@ -227,6 +227,12 @@
         , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
 
         }]);
+    app.controller('payDetailCtrl', ["$scope","$ionicTabsDelegate","$ionicHistory", "$state", "myService", "msg","storage"
+        , function ($scope,$ionicTabsDelegate,$ionicHistory, $state,myService, msg, storage) {
+            $scope.goBack = function(){
+                $ionicHistory.goBack();
+            }
+        }]);
     app.controller('contactCtrl', ["$scope","$ionicTabsDelegate", "$timeout","$state", "myService", "msg","storage"
         , function ($scope,$ionicTabsDelegate, $timeout,$state,myService, msg, storage) {
             $scope.vm={
@@ -754,7 +760,9 @@
             $scope.toDetail = function (id) {
                 $state.go('app.my_dreamdetail',{id:id});
             };
+            $scope.time = function(){
 
+            }
   }]);
     app.controller('collectCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg"
        , function ($scope, $ionicTabsDelegate,$state, myService, msg) {
@@ -943,7 +951,14 @@
                             '<p>'+info+'</p>' +
                             '</div>';
                     }
-                    msg.confirm('私信',letterTemplate);
+                    msg.confirm('私信',letterTemplate,'梦想页').then(function(){
+                        if($location.path()=="/app/home/message/reply"){
+                            $state.go('app.home_dreamdetail',{id:dream_id,type:2});
+                        }
+                        else {
+                            $state.go('app.my_dreamdetail',{id:dream_id,type:2});
+                        }
+                    })
                 }
                 //成为梦主
                 else if(is_max==1){

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

@@ -6,6 +6,7 @@
         <div ng-if="dreams.length==0" class="padding" style="color: #BEBEBE; font-size: 15px">
             还未发布任何梦想
         </div>
+        {{d1}}
        <div ng-if="dreams.length!=0" ng-repeat="dream in dreams" class="list">
            <div class="item reply-item" ng-click="toDetail(dream.id)">
                <div class="item" style="height:70px; padding-left: 0; border-bottom: 1px solid #EFEFEF">
@@ -25,10 +26,10 @@
                        <p>{{dream.about}}</p>
                    </div>
                    <div ng-if="100*dream.get_coin/dream.coin<100" style="float:right; width: 15%; text-align: right; color: #FF7C30; font-size: 16px">
-                       进行中
+                       {{dream.end_time|lastDate}}进行中
                    </div>
-                   <div ng-if="100*dream.get_coin/dream.coin>=100" style="float:right; width: 15%; text-align: right; color: #00C3DA; font-size: 16px">
-                       已结束
+                   <div ng-if="dream.end_time|lastDate=='已结束'" style="float:right; width: 15%; text-align: right; color: #00C3DA; font-size: 16px">
+                       {{dream.end_time|lastDate}}已结束
                        <!--<p style="color: #DBDBDB; margin-top: 5px">已结束</p>-->
                    </div>
                </div>

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

@@ -1,7 +1,7 @@
 <ion-view view-title="充值">
     <ion-nav-buttons side="right">
         <button class="button button-clear" ng-click="payExplain()">
-            支付说明
+            支付记录
         </button>
     </ion-nav-buttons>
     <ion-content>

miaomiao/www/templates/my/payDetail.html

@@ -0,0 +1,16 @@
+<ion-view view-title="支付记录">
+    <ion-content style="text-align: center; color: #0A0A0A;">
+        <p style=" margin: 80px auto; ">
+            <i class="icon ion-checkmark-circled" style="color: #148F2C; font-size: 50px;"></i>
+        </p>
+        <p style="font-size: 22px">
+            已成功充值20.00元！
+        </p>
+        <p style="font-size: 20px; font-weight: bold; margin-top: 60px">
+            交易号：30060654181981
+        </p>
+    </ion-content>
+    <div style="width: 100%; position: fixed; bottom: 0; padding: 60px">
+        <button ng-click="goBack()" class="button button-block button-calm">确认</button>
+    </div>
+</ion-view>

miaomiao/www/templates/my/payExplain.html

@@ -1,51 +1,39 @@
-<ion-view view-title="支付说明">
+<ion-view view-title="支付记录">
     <ion-content>
         <div class="list">
-            <div class="item reply-item" >
+            <a ui-sref="app.payDetail" class="item reply-item" >
                 <div class="item" style="height:90px; border-bottom: 2px solid #EFEFEF">
                     <div style="float:left;">
                         <img style="width: 45px; height: 45px;border-radius: 100%; border: 1px solid #D8D8D8" ng-src="{{ user.avatar | avator }}" />
                     </div>
-                    <div style="float:left; width: 60%; margin-left: 10px; height: 60px; overflow: hidden">
-                        <h2> 梦想 - 带我去法国 </h2>
-                        <p> 10月30日 19:26 </p>
-                    </div>
-                    <div style="float: right; font-weight: 900; font-size: 20px; margin-top: 15px">
-                       +1524.00
-                    </div>
-                </div>
-                <div class="item" style="height:90px; border-bottom: 2px solid #EFEFEF">
-                    <div style="float:left;">
-                        <img style="width: 45px; height: 45px;border-radius: 100%; border: 1px solid #D8D8D8" ng-src="{{ user.avatar | avator }}" />
-                    </div>
-                    <div style="float:left; width: 51%; margin-left: 10px; height: 60px; overflow: hidden">
+                    <div style="float:left; width: 83%; margin-left: 10px; height: 60px; overflow: hidden">
                         <h2> 微信充值 </h2>
-                        <p> 10月30日 19:26 </p>
-                        <p> 交易号：30012151591781798 </p>
-                    </div>
-                    <div style="float: right; font-weight: 900; font-size: 20px; margin-top: 15px">
-                        +1524.00
+                        <div>
+                            <div class="fl">10月30日 19:26</div>
+                            <div class="fr" style="font-weight: bolder; font-size: 16px">+1524.00</div>
+                        </div>
+                        <div style="clear:both;"> 交易号：30012151591781798 </div>
                     </div>
                 </div>
-            </div>
+            </a>
         </div>
     </ion-content>
-    <script id="my-modal.html" type="text/ng-template">
-        <ion-modal-view>
-            <ion-header-bar class="bar-calm">
-                <h1 class="title">发送私信</h1>
-                <div class="buttons">
-                    <div class="button" ng-click="hideModal()" style="font-size: 16px; margin-top: 3px">关闭</div>
-                </div>
-            </ion-header-bar>
-            <ion-content>
-                <textarea autofocus rows="5" style="width:100%; padding: 5px" ng-model="vm.content" placeholder="请输入私信内容"></textarea>
-                <div class="padding">
-                    <button class="button button-full button-calm" ng-click="closeModal()">
-                        回复
-                    </button>
-                </div>
-            </ion-content>
-        </ion-modal-view>
-    </script>
+    <!--<script id="my-modal.html" type="text/ng-template">-->
+        <!--<ion-modal-view>-->
+            <!--<ion-header-bar class="bar-calm">-->
+                <!--<h1 class="title">发送私信</h1>-->
+                <!--<div class="buttons">-->
+                    <!--<div class="button" ng-click="hideModal()" style="font-size: 16px; margin-top: 3px">关闭</div>-->
+                <!--</div>-->
+            <!--</ion-header-bar>-->
+            <!--<ion-content>-->
+                <!--<textarea autofocus rows="5" style="width:100%; padding: 5px" ng-model="vm.content" placeholder="请输入私信内容"></textarea>-->
+                <!--<div class="padding">-->
+                    <!--<button class="button button-full button-calm" ng-click="closeModal()">-->
+                        <!--回复-->
+                    <!--</button>-->
+                <!--</div>-->
+            <!--</ion-content>-->
+        <!--</ion-modal-view>-->
+    <!--</script>-->
 </ion-view>