account

.idea/workspace.xml

@@ -21,12 +21,66 @@
     <favorites_list name="miao" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="oldDream.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/oldDream.html">
+    <leaf>
+      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.5640074">
-              <caret line="22" column="54" selection-start-line="22" selection-start-column="54" selection-end-line="22" selection-end-column="54" />
+            <state vertical-scroll-proportion="-5.428571">
+              <caret line="35" column="53" selection-start-line="35" selection-start-column="39" selection-end-line="35" selection-end-column="53" />
+              <folding>
+                <element signature="n#style#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#i#0;n#a#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="my-account.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-account.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-4.071429">
+              <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+              <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>
+      </file>
+      <file leaf-file-name="my-account-add.html" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-account-add.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.3877551">
+              <caret line="38" column="93" selection-start-line="38" selection-start-column="93" selection-end-line="38" selection-end-column="93" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="router.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/router.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="215" column="62" selection-start-line="215" selection-start-column="62" selection-end-line="215" selection-end-column="62" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="my.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/my.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-5.233333">
+              <caret line="238" column="12" selection-start-line="238" selection-start-column="12" selection-end-line="238" selection-end-column="12" />
               <folding />
             </state>
           </provider>
@@ -58,13 +112,18 @@
         <option value="$PROJECT_DIR$/miaomiao/www/templates/tabs.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/css/ionic.app.css" />
         <option value="$PROJECT_DIR$/miaomiao/www/js/filters/filter.js" />
-        <option value="$PROJECT_DIR$/miaomiao/www/css/style.css" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html" />
-        <option value="$PROJECT_DIR$/miaomiao/www/templates/home/index.html" />
-        <option value="$PROJECT_DIR$/miaomiao/www/js/config/router.js" />
-        <option value="$PROJECT_DIR$/miaomiao/www/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/miaomiao/www/templates/home/shareDream.html" />
         <option value="$PROJECT_DIR$/miaomiao/www/js/controllers/home.js" />
+        <option value="E:/Graduation design/huiwei/index.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/add/index.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/home/index.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/my/index.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/css/style.css" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/my/my-account.html" />
+        <option value="$PROJECT_DIR$/miaomiao/www/js/config/router.js" />
+        <option value="$PROJECT_DIR$/miaomiao/www/templates/my/my-account-add.html" />
       </list>
     </option>
   </component>
@@ -75,8 +134,8 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds">
-    <option name="x" value="355" />
-    <option name="width" value="1012" />
+    <option name="x" value="349" />
+    <option name="width" value="1018" />
     <option name="height" value="728" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
@@ -106,7 +165,7 @@
     <panes />
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../quanzhouda/receive/receive" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js-jscs-nodeInterpreter" value="D:\HPE\Note.js\Install\node.exe" />
@@ -180,10 +239,10 @@
     <option name="totallyTimeSpent" value="2201000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="355" y="0" width="1012" height="728" extended-state="0" />
+    <frame x="349" y="0" width="1018" height="728" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16071428" sideWeight="0.49460918" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="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="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" />
@@ -220,75 +279,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/dream-detail.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#button#0;n#div#1;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#button#0;n#div#2;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#button#0;n#div#3;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#ion-slide-page#0;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#ion-slide-page#1;n#ion-slides#0;n#div#0;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#p#1;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#0;n#div#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#i#1;n#div#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#p#0;n#div#0;n#div#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#4;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#4;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#div#4;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#4;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#img#0;n#div#1;n#div#0;n#div#4;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#img#0;n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="73" column="46" selection-start-line="73" selection-start-column="46" selection-end-line="73" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/home.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="161" column="51" selection-start-line="161" selection-start-column="51" selection-end-line="161" selection-end-column="51" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/router.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="176" column="27" selection-start-line="171" selection-start-column="10" selection-end-line="180" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/my.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="256" column="6" selection-start-line="256" selection-start-column="6" selection-end-line="256" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/router.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -445,13 +435,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.035714">
-          <caret line="43" column="51" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-message.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.2820037">
@@ -494,13 +477,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/css/style.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.36935166">
-          <caret line="450" column="22" selection-start-line="450" selection-start-column="22" selection-end-line="450" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/config.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4021164">
@@ -526,7 +502,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3538175">
           <caret line="28" column="38" selection-start-line="28" selection-start-column="38" selection-end-line="28" selection-end-column="38" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -534,7 +509,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.9435626">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -542,7 +516,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-9.154562">
           <caret line="2" column="56" selection-start-line="2" selection-start-column="53" selection-end-line="2" selection-end-column="56" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -550,21 +523,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.05586592">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-16.285715">
-          <caret line="24" column="27" selection-start-line="24" selection-start-column="27" selection-end-line="24" selection-end-column="27" />
-          <folding>
-            <element signature="n#style#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#button#1;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -572,7 +530,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>
@@ -580,11 +537,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-4.551724">
           <caret line="60" column="37" selection-start-line="60" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-          <folding>
-            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#p#0;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#p#1;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -592,48 +544,125 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.59332025">
           <caret line="24" column="18" selection-start-line="24" selection-start-column="18" selection-end-line="24" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.26256984">
+          <caret line="711" column="15" selection-start-line="711" selection-start-column="15" selection-end-line="711" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-dream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-5.428571">
+          <caret line="11" column="69" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="69" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/oldDream.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8107607">
+          <caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://E:/Graduation design/huiwei/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21150278">
+          <caret line="6" column="18" selection-start-line="6" selection-start-column="18" selection-end-line="6" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/add/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-7.464286">
+          <caret line="11" column="124" selection-start-line="11" selection-start-column="124" selection-end-line="11" selection-end-column="124" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.10575139">
+          <caret line="3" column="16" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="16" />
           <folding>
-            <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#button#0;n#ion-nav-buttons#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#div#0;n#div#0;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#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#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/router.js">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-setting.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334">
-          <caret line="193" column="30" selection-start-line="193" selection-start-column="20" selection-end-line="193" selection-end-column="30" />
+        <state vertical-scroll-proportion="-6.107143">
+          <caret line="9" column="29" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.26256984">
-          <caret line="711" column="15" selection-start-line="711" selection-start-column="15" selection-end-line="711" selection-end-column="15" />
+        <state vertical-scroll-proportion="-5.233333">
+          <caret line="238" column="12" selection-start-line="238" selection-start-column="12" selection-end-line="238" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334">
-          <caret line="293" column="26" selection-start-line="293" selection-start-column="22" selection-end-line="293" selection-end-column="26" />
+        <state vertical-scroll-proportion="0.6306483">
+          <caret line="297" column="36" selection-start-line="297" selection-start-column="30" selection-end-line="297" selection-end-column="36" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-dream.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-5.428571">
-          <caret line="11" column="69" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="69" />
+          <caret line="35" column="53" selection-start-line="35" selection-start-column="39" selection-end-line="35" selection-end-column="53" />
+          <folding>
+            <element signature="n#style#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#i#0;n#a#0;n#div#2;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/js/config/router.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="215" column="62" selection-start-line="215" selection-start-column="62" selection-end-line="215" selection-end-column="62" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/home/oldDream.html">
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-account.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-4.071429">
+          <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <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>
+    <entry file="file://$PROJECT_DIR$/miaomiao/www/templates/my/my-account-add.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5640074">
-          <caret line="22" column="54" selection-start-line="22" selection-start-column="54" selection-end-line="22" selection-end-column="54" />
+        <state vertical-scroll-proportion="0.3877551">
+          <caret line="38" column="93" selection-start-line="38" selection-start-column="93" selection-end-line="38" selection-end-column="93" />
           <folding />
         </state>
       </provider>

miaomiao/www/js/config/router.js

@@ -200,6 +200,24 @@
                 }
             }
         })
+            .state('app.my_account', {
+                url: '/my/account',
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/my/my-account.html',
+                        controller: 'accountCtrl'
+                    }
+                }
+            })
+            .state('app.my_account_add', {
+                url: '/my/account/add',
+                views: {
+                    'app-my': {
+                        templateUrl: 'templates/my/my-account-add.html',
+                        controller: 'accountCtrl'
+                    }
+                }
+            })
             .state('app.message', {
                 url: '/home/message',
                 views: {

miaomiao/www/js/controllers/my.js

@@ -231,6 +231,11 @@
                 });
             }
 
+        }]);
+    app.controller('accountCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg"
+        , function ($scope,$ionicTabsDelegate, $state, myService, msg) {
+
+
         }]);
     app.controller('messageCtrl', ["$scope", "$ionicTabsDelegate","$state", "myService", "msg"
         , function ($scope,$ionicTabsDelegate, $state, myService, msg) {

miaomiao/www/templates/add/index.html

@@ -22,8 +22,8 @@
                 <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
                     <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
                 </a>
-                <!--<a class="btn-file-up" ng-click="addpict()"><i class="ion-image"></i>添加图片</a>-->
-                <a class="btn-file-up" ng-click="addpict()">
+                <a class="btn-file-up" ng-click="addpict()"><i class="ion-image"></i>添加图片</a>
+                <!--<a class="btn-file-up" ng-click="addpict()">
                     <img src="img/icon_photo.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加图片</em>
                 </a>
@@ -32,7 +32,7 @@
                 <a class="btn-file-up" ng-click="addvideo()" ng-show="!video.isOK">
                     <img src="img/icon_video.svg" style="height: 40px; width: 40px; text-align: center; line-height: 40px" /><br>
                     <em style="font-size: 16px">添加视频</em>
-                </a>
+                </a>-->
             </div>
             <div class="item" style="color: #7B7B7B">实现梦想所需要的人民币</div>
             <div class="item item-input-inset itemjs">

miaomiao/www/templates/home/index.html

@@ -1,11 +1,11 @@
 <ion-view view-title="瞄喵">
     <ion-nav-buttons side="left">
+        <button class="button button-clear" style="height: 30px; width: 30px;margin-top: 1.6px;margin-left: 8px;" ng-click="openPopover($event)">
+            <img src="img/icon_menu.svg" style="height: 60%; width: 100%;">
+        </button>
         <button class="button button-clear" style="height: 30px; width: 30px;font-size: 25px;" ng-click="toggleLeftSideMenu()">
             <img src="img/btn_filter.svg" style="height: 60%; width: 100%;">
         </button>
-        <button class="button button-clear" style="height: 30px; width: 30px;margin-top: 1.6px;margin-left: 8px;" ng-click="openPopover($event)"> 
-            <img src="img/icon_menu.svg" style="height: 60%; width: 100%;">
-        </button>
     </ion-nav-buttons>
     <ion-nav-buttons side="right">
         <button class="button button-clear" style="height: 30px; width: 30px; margin-top: 2px" ui-sref="app.home_search">

miaomiao/www/templates/my/index.html

@@ -41,7 +41,7 @@
                     {{user.coin}}
                 </i>
             </a>
-            <a class="item" ui-sref="app.my_message">
+            <a class="item" ui-sref="app.my_account">
                 <img class="fl" src="img/icon_account.svg">
                 <em style="line-height: 30px">我的账户</em>
             </a>

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

@@ -0,0 +1,86 @@
+<ion-view view-title="添加账号">
+    <ion-pane>
+        <ion-tabs class="tabs-light tabs-striped tabs-top">
+            <ion-tab title="银行卡/支付宝">
+                <ion-view>
+                    <ion-content>
+                        <div class="list">
+                            <div class="item item-input item-select" style="border-bottom: 1px solid #DDDDDD">
+                                <select ng-model="vm.bank_name">
+                                    <option value="" selected="">请选择
+                                    </option>
+                                    <option value="支付宝" >支付宝
+                                    </option>
+                                    <option value="工商银行" >工商银行
+                                    </option>
+                                    <option value="建设银行" >建设银行
+                                    </option>
+                                    <option value="招商银行" >招商银行
+                                    </option>
+                                    <option value="中国银行" >中国银行
+                                    </option>
+                                    <option value="农业银行" >农业银行
+                                    </option>
+                                    <option value="民生银行" >民生银行
+                                    </option>
+                                    <option value="交通银行" >交通银行
+                                    </option>
+                                    <option value="平安银行" >平安银行
+                                    </option>
+                                    <option value="邮政储蓄" >邮政储蓄
+                                    </option>
+                                </select>
+                                <input  type="text" ng-model="vm.bank_name" placeholder="银行名称/支付宝">
+                            </div>
+                            <div class="item item-input" style="border-bottom: 1px solid #DDDDDD">
+                                <input  type="text" ng-model="vm.bank_number"  placeholder="账号">
+                            </div>
+                            <div class="item item-input" style="border-bottom: 1px solid #DDDDDD">
+                                <input  type="number" ng-model="vm.bank_phone"  placeholder="手机号">
+                            </div>
+                        </div>
+
+                        <div class="padding">
+                            <button type="button" ng-click="addAccount()" class="button button-full button-calm">提交</button>
+                        </div>
+                    </ion-content>
+                </ion-view>
+            </ion-tab>
+            <ion-tab title="二维码">
+                <ion-view>
+                    <ion-content>
+                        <div class="list">
+                            <div class="item item-input item-select" style="border-bottom: 1px solid #DDDDDD">
+                                <span class="input-label">
+                                    选择类型
+                                </span>
+                                <select ng-model="vm.type">
+                                    <option value="1">微信二维码
+                                    </option>
+                                    <option value="2">支付宝二维码
+                                    </option>
+                                </select>
+                            </div>
+                            <div class="item item-input" style="border-bottom: 1px solid #DDDDDD">
+                                <!-- <a class="item item-avatar-right" ng-click="addpict()">
+                                     <img ng-src="{{ qrcode }}" />
+                                     <h2>二维码</h2>
+                                     <p style="font-size:12px">点击上传</p>
+                                 </a>-->
+                                <a ng-repeat="item in imgs" ng-click="showImages(item)" class="img-file-up">
+                                    <b style="background-image:url({{item}});"><em ng-click="deletefile(item)" class="ion-ios-close-outline"></em></b>
+                                </a>
+                                <a class="btn-file-up" ng-click="addpict()"><i class="ion-image"></i>上传二维码</a>
+                            </div>
+                        </div>
+
+                        <div class="padding">
+                            <button type="button" ng-click="addQrcode()" class="button button-full button-calm">提交</button>
+                        </div>
+                    </ion-content>
+                </ion-view>
+            </ion-tab>
+        </ion-tabs>
+
+    </ion-pane>
+</ion-view>

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

@@ -0,0 +1,58 @@
+<ion-view view-title="我的账号">
+   <!-- <ion-nav-buttons side="left">
+        <button class="button button-icon button-clear ion-navicon" menu-toggle="left"></button>
+    </ion-nav-buttons>-->
+    <ion-nav-buttons side="right">
+        <button class="button button-icon icon ion-ios-plus-outline light" ui-sref="app.my_account_add" style="box-shadow:none; padding-bottom: 20px"></button>
+    </ion-nav-buttons>
+    <ion-content>
+        <!--下拉刷新-->
+        <ion-refresher pulling-text="下拉刷新" on-refresh="load(true)">
+        </ion-refresher>
+        <!--<div ng-repeat="item in items">
+            <div class="list card list-inset" style="margin: 15px">
+                <div class="item">
+                    <div ng-if="!item.qrcode">
+                        <p style="font-weight:bold">{{item.bank_name}}</p>
+                        <p >账号：{{item.bank_number}}</p>
+                        <p >预留手机号：{{item.bank_phone}}</p>
+                    </div>
+                    <div ng-if="item.qrcode">
+                        <p style="font-weight:bold">{{item.bank_name}}</p>
+                        <img ng-src="{{ item.qrcode | qrcode}}" style="max-width: 70px;"/>
+                    </div>
+                    <button class="button button-stable" ng-click="destroyAccount(item.id)" style="float:right;margin-top:-70px">
+                        删除
+                    </button>
+                </div>
+            </div>
+        </div>-->
+                <div>
+                    <div class="list">
+                        <div class="item" style="border-bottom: 1px solid #E6E6E6">
+                            <div style="float:left;">
+                                <p style="font-weight:bold">建行</p>
+                                <p >账号：sdgasgs</p>
+                                <p >手机：18328067000</p>
+                            </div>
+                            <div ng-click="destroyAccount(item.id)" style="float:right; background: #F2F2F2; margin-top: 20px; padding: 5px 10px">
+                                删除
+                            </div>
+                        </div>
+                        <div class="item" style="border-bottom: 1px solid #E6E6E6">
+                            <div style="float:left;">
+                                <p style="font-weight:bold">支付宝二维码</p>
+                                <img ng-src="{{ item.qrcode | qrcode}}" style="max-width: 70px; height: 70px; width: 70px"/>
+                            </div>
+                            <div ng-click="destroyAccount(item.id)" style="float:right; background: #F2F2F2; margin-top: 35px; padding: 5px 10px">
+                                删除
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+
+        <!--上拉更多-->
+        <ion-infinite-scroll ng-if="filter.hasMore" on-infinite="load(false)" distance="10%"></ion-infinite-scroll>
+    </ion-content>
+</ion-view>