YanaDH 7 年之前
父节点
当前提交
0e9e09b1db

+ 242 - 140
miaomiao/www/.idea/workspace.xml

@@ -20,64 +20,51 @@
     <favorites_list name="www" />
     <favorites_list name="www" />
   </component>
   </component>
   <component name="FileEditorManager">
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="home.js" pinned="false" current-in-tab="false">
+    <leaf>
+      <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
         <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-16.4375">
-              <caret line="552" column="56" selection-start-line="552" selection-start-column="56" selection-end-line="552" selection-end-column="57" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.11807817">
-              <caret line="86" column="99" selection-start-line="86" selection-start-column="99" selection-end-line="86" selection-end-column="99" />
+            <state vertical-scroll-proportion="0.35907644">
+              <caret line="460" column="75" selection-start-line="460" selection-start-column="75" selection-end-line="460" selection-end-column="75" />
               <folding>
               <folding>
-                <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#a#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="e#9926#10781#0" expanded="false" />
+                <element signature="e#10832#11151#0" expanded="false" />
+                <element signature="e#11208#11375#0" expanded="false" />
+                <element signature="e#11416#11503#0" expanded="false" />
+                <element signature="e#12114#14707#0" expanded="false" />
+                <element signature="e#14839#14955#0" expanded="false" />
+                <element signature="e#17716#18619#0" expanded="false" />
               </folding>
               </folding>
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-18.214285">
-              <caret line="26" column="46" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" />
-              <folding>
-                <element signature="n#style#0;n#img#0;n#a#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#em#0;n#a#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#img#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#em#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#b#0;n#a#2;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="-3.21875">
+              <caret line="467" column="16" selection-start-line="467" selection-start-column="16" selection-end-line="467" selection-end-column="16" />
+              <folding />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file leaf-file-name="style.css" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/css/style.css">
+      <file leaf-file-name="payExplain.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-6.8166666">
-              <caret line="113" column="79" selection-start-line="113" selection-start-column="79" selection-end-line="113" selection-end-column="79" />
-              <folding />
+            <state vertical-scroll-proportion="-6.214286">
+              <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
+              <folding>
+                <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#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#2;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#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" />
+                <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+              </folding>
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -97,25 +84,26 @@
         <option value="$PROJECT_DIR$/templates/my/my-message-sys.html" />
         <option value="$PROJECT_DIR$/templates/my/my-message-sys.html" />
         <option value="$PROJECT_DIR$/js/services/homeservice.js" />
         <option value="$PROJECT_DIR$/js/services/homeservice.js" />
         <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
         <option value="$PROJECT_DIR$/templates/my/my-message-reply.html" />
-        <option value="$PROJECT_DIR$/templates/home/index.html" />
         <option value="$PROJECT_DIR$/js/services/msgservice.js" />
         <option value="$PROJECT_DIR$/js/services/msgservice.js" />
-        <option value="$PROJECT_DIR$/js/config/config.js" />
         <option value="$PROJECT_DIR$/templates/my/index.html" />
         <option value="$PROJECT_DIR$/templates/my/index.html" />
         <option value="$PROJECT_DIR$/templates/my/attention.html" />
         <option value="$PROJECT_DIR$/templates/my/attention.html" />
         <option value="$PROJECT_DIR$/templates/home/search.html" />
         <option value="$PROJECT_DIR$/templates/home/search.html" />
         <option value="$PROJECT_DIR$/js/controllers/add.js" />
         <option value="$PROJECT_DIR$/js/controllers/add.js" />
         <option value="$PROJECT_DIR$/templates/my/care.html" />
         <option value="$PROJECT_DIR$/templates/my/care.html" />
-        <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/js/services/myservice.js" />
         <option value="$PROJECT_DIR$/js/services/myservice.js" />
         <option value="$PROJECT_DIR$/templates/my/letterDetailCtrl.html" />
         <option value="$PROJECT_DIR$/templates/my/letterDetailCtrl.html" />
         <option value="$PROJECT_DIR$/templates/my/personalLetter.html" />
         <option value="$PROJECT_DIR$/templates/my/personalLetter.html" />
         <option value="$PROJECT_DIR$/js/config/router.js" />
         <option value="$PROJECT_DIR$/js/config/router.js" />
         <option value="$PROJECT_DIR$/templates/my/letterDetail.html" />
         <option value="$PROJECT_DIR$/templates/my/letterDetail.html" />
-        <option value="$PROJECT_DIR$/js/controllers/my.js" />
-        <option value="$PROJECT_DIR$/js/controllers/home.js" />
         <option value="$PROJECT_DIR$/templates/add/index.html" />
         <option value="$PROJECT_DIR$/templates/add/index.html" />
+        <option value="$PROJECT_DIR$/templates/home/index.html" />
         <option value="$PROJECT_DIR$/css/style.css" />
         <option value="$PROJECT_DIR$/css/style.css" />
+        <option value="$PROJECT_DIR$/js/config/config.js" />
+        <option value="$PROJECT_DIR$/js/controllers/account.js" />
         <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
         <option value="$PROJECT_DIR$/templates/home/dream-detail.html" />
+        <option value="$PROJECT_DIR$/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/templates/my/payExplain.html" />
+        <option value="$PROJECT_DIR$/js/controllers/home.js" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -269,17 +257,38 @@
           <line>32</line>
           <line>32</line>
           <option name="timeStamp" value="1" />
           <option name="timeStamp" value="1" />
         </line-breakpoint>
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/js/config/config.js</url>
+          <line>8</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
       </breakpoints>
       </breakpoints>
-      <option name="time" value="2" />
+      <option name="time" value="3" />
     </breakpoint-manager>
     </breakpoint-manager>
     <watches-manager />
     <watches-manager />
   </component>
   </component>
   <component name="editorHistoryManager">
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/css/style.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="113" column="79" selection-start-line="113" selection-start-column="79" selection-end-line="113" selection-end-column="79" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
     <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
         <state vertical-scroll-proportion="0.0">
           <caret line="381" column="34" selection-start-line="381" selection-start-column="34" selection-end-line="381" selection-end-column="34" />
           <caret line="381" column="34" selection-start-line="381" selection-start-column="34" selection-end-line="381" selection-end-column="34" />
-          <folding />
+          <folding>
+            <element signature="e#9926#10781#0" expanded="false" />
+            <element signature="e#10832#11151#0" expanded="false" />
+            <element signature="e#11208#11375#0" expanded="false" />
+            <element signature="e#11416#11503#0" expanded="false" />
+            <element signature="e#12114#14707#0" expanded="false" />
+            <element signature="e#14839#14955#0" expanded="false" />
+            <element signature="e#17716#18619#0" expanded="false" />
+          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -288,6 +297,7 @@
         <state vertical-scroll-proportion="0.0">
         <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" />
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
           <folding>
+            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -298,6 +308,7 @@
             <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#textarea#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#a#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#a#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
@@ -309,7 +320,15 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
         <state vertical-scroll-proportion="0.0">
           <caret line="372" column="38" selection-start-line="372" selection-start-column="38" selection-end-line="372" selection-end-column="38" />
           <caret line="372" column="38" selection-start-line="372" selection-start-column="38" selection-end-line="372" selection-end-column="38" />
-          <folding />
+          <folding>
+            <element signature="e#9926#10781#0" expanded="false" />
+            <element signature="e#10832#11151#0" expanded="false" />
+            <element signature="e#11208#11375#0" expanded="false" />
+            <element signature="e#11416#11503#0" expanded="false" />
+            <element signature="e#12114#14707#0" expanded="false" />
+            <element signature="e#14839#14955#0" expanded="false" />
+            <element signature="e#17716#18619#0" expanded="false" />
+          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -318,6 +337,7 @@
         <state vertical-scroll-proportion="0.0">
         <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" />
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
           <folding>
+            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -328,6 +348,7 @@
             <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#textarea#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#a#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#a#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
@@ -346,7 +367,15 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
         <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" />
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+          <folding>
+            <element signature="e#9926#10781#0" expanded="false" />
+            <element signature="e#10832#11151#0" expanded="false" />
+            <element signature="e#11208#11375#0" expanded="false" />
+            <element signature="e#11416#11503#0" expanded="false" />
+            <element signature="e#12114#14707#0" expanded="false" />
+            <element signature="e#14839#14955#0" expanded="false" />
+            <element signature="e#17716#18619#0" expanded="false" />
+          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -396,7 +425,15 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
         <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" />
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+          <folding>
+            <element signature="e#9926#10781#0" expanded="false" />
+            <element signature="e#10832#11151#0" expanded="false" />
+            <element signature="e#11208#11375#0" expanded="false" />
+            <element signature="e#11416#11503#0" expanded="false" />
+            <element signature="e#12114#14707#0" expanded="false" />
+            <element signature="e#14839#14955#0" expanded="false" />
+            <element signature="e#17716#18619#0" expanded="false" />
+          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -446,7 +483,15 @@
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
         <state vertical-scroll-proportion="0.0">
           <caret line="722" column="45" selection-start-line="722" selection-start-column="45" selection-end-line="722" selection-end-column="45" />
           <caret line="722" column="45" selection-start-line="722" selection-start-column="45" selection-end-line="722" selection-end-column="45" />
-          <folding />
+          <folding>
+            <element signature="e#9926#10781#0" expanded="false" />
+            <element signature="e#10832#11151#0" expanded="false" />
+            <element signature="e#11208#11375#0" expanded="false" />
+            <element signature="e#11416#11503#0" expanded="false" />
+            <element signature="e#12114#14707#0" expanded="false" />
+            <element signature="e#14839#14955#0" expanded="false" />
+            <element signature="e#17716#18619#0" expanded="false" />
+          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
@@ -464,13 +509,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/tabs.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/services/dreamservice.js">
     <entry file="file://$PROJECT_DIR$/js/services/dreamservice.js">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.17701863">
         <state vertical-scroll-proportion="0.17701863">
@@ -478,20 +516,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31369427">
-          <caret line="28" column="66" selection-start-line="28" selection-start-column="52" selection-end-line="28" selection-end-column="66" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5">
-          <caret line="40" column="38" selection-start-line="40" selection-start-column="34" selection-end-line="40" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/services/userservice.js">
     <entry file="file://$PROJECT_DIR$/js/services/userservice.js">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.13136943">
         <state vertical-scroll-proportion="0.13136943">
@@ -506,13 +530,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-10.466666">
-          <caret line="56" column="59" selection-start-line="56" selection-start-column="59" selection-end-line="56" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/aboutMiao.html">
     <entry file="file://$PROJECT_DIR$/templates/my/aboutMiao.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.07539683">
         <state vertical-scroll-proportion="0.07539683">
@@ -534,20 +551,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/config.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.07375777">
-          <caret line="5" column="43" selection-start-line="5" selection-start-column="43" selection-end-line="6" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3330619">
-          <caret line="142" column="36" selection-start-line="142" selection-start-column="35" selection-end-line="142" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
     <entry file="file://$PROJECT_DIR$/js/controllers/add.js">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.41925466">
         <state vertical-scroll-proportion="0.41925466">
@@ -555,13 +558,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/my/care.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-11.535714">
-          <caret line="17" column="46" selection-start-line="17" selection-start-column="46" selection-end-line="17" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
     <entry file="file://$PROJECT_DIR$/templates/my/my-message-reply.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-7.25">
         <state vertical-scroll-proportion="-7.25">
@@ -569,14 +565,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3097826">
-          <caret line="21" column="92" selection-start-line="21" selection-start-column="92" selection-end-line="21" selection-end-column="92" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
     <entry file="file://$PROJECT_DIR$/js/services/myservice.js">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
         <state vertical-scroll-proportion="0.0">
@@ -584,13 +572,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/config/router.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="333" column="27" selection-start-line="333" selection-start-column="27" selection-end-line="333" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/my/letterDetail.html">
     <entry file="file://$PROJECT_DIR$/templates/my/letterDetail.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
         <state vertical-scroll-proportion="0.0">
@@ -605,49 +586,75 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
         <state vertical-scroll-proportion="0.0">
-          <caret line="374" column="65" selection-start-line="374" selection-start-column="65" selection-end-line="374" selection-end-column="65" />
+          <caret line="26" column="46" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" />
+          <folding>
+            <element signature="n#style#0;n#img#0;n#a#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#em#0;n#a#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#img#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#em#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#b#0;n#a#2;n#div#5;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#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
+          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/js/services/homeservice.js">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-16.4375">
-          <caret line="552" column="56" selection-start-line="552" selection-start-column="56" selection-end-line="552" selection-end-column="57" />
+        <state vertical-scroll-proportion="0.2969745">
+          <caret line="28" column="66" selection-start-line="28" selection-start-column="52" selection-end-line="28" selection-end-column="66" />
           <folding />
           <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
+    <entry file="file://$PROJECT_DIR$/templates/my/my-message.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.8166666">
-          <caret line="113" column="79" selection-start-line="113" selection-start-column="79" selection-end-line="113" selection-end-column="79" />
+        <state vertical-scroll-proportion="-10.607142">
+          <caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" />
           <folding />
           <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add/index.html">
+    <entry file="file://$PROJECT_DIR$/templates/my/index.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-18.214285">
-          <caret line="26" column="46" selection-start-line="26" selection-start-column="46" selection-end-line="26" selection-end-column="46" />
-          <folding>
-            <element signature="n#style#0;n#img#0;n#a#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#em#0;n#a#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#img#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#em#0;n#a#1;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#b#0;n#a#2;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#5;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
-          </folding>
+        <state vertical-scroll-proportion="-5.357143">
+          <caret line="6" column="35" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/services/msgservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-13.0625">
+          <caret line="43" column="17" selection-start-line="43" selection-start-column="12" selection-end-line="43" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/config/router.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.014751553">
+          <caret line="333" column="27" selection-start-line="333" selection-start-column="27" selection-end-line="333" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/config/config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
+          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
     <entry file="file://$PROJECT_DIR$/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.11807817">
-          <caret line="86" column="99" selection-start-line="86" selection-start-column="99" selection-end-line="86" selection-end-column="99" />
+        <state vertical-scroll-proportion="0.06921824">
+          <caret line="85" column="22" selection-start-line="85" selection-start-column="22" selection-end-line="85" selection-end-column="22" />
           <folding>
           <folding>
+            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
@@ -658,6 +665,7 @@
             <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#span#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#p#0;n#div#0;n#div#1;n#div#1;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#textarea#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#a#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#a#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#a#0;n#span#0;n#div#1;n#div#1;n#div#3;n#ion-view#0;n#!!top" expanded="true" />
@@ -665,5 +673,99 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
+    <entry file="file://$PROJECT_DIR$/templates/home/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.57491857">
+          <caret line="104" column="96" selection-start-line="104" selection-start-column="96" selection-end-line="104" selection-end-column="96" />
+          <folding>
+            <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#2;n#div#1;n#ion-content#0;n#ion-side-menu-content#0;n#ion-side-menus#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/style.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.06758957">
+          <caret line="258" column="24" selection-start-line="258" selection-start-column="24" selection-end-line="258" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/account.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33540374">
+          <caret line="42" column="38" selection-start-line="42" selection-start-column="38" selection-end-line="42" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/my.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.21875">
+          <caret line="467" column="16" selection-start-line="467" selection-start-column="16" selection-end-line="467" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/my-recharge.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-0.96666664">
+          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/care.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.10714286">
+          <caret line="6" column="42" selection-start-line="6" selection-start-column="42" selection-end-line="6" selection-end-column="42" />
+          <folding>
+            <element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/tabs.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.04761905">
+          <caret line="2" column="53" selection-start-line="2" selection-start-column="53" selection-end-line="2" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/my/payExplain.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-6.214286">
+          <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
+          <folding>
+            <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#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#2;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#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" />
+            <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.35907644">
+          <caret line="460" column="75" selection-start-line="460" selection-start-column="75" selection-end-line="460" selection-end-column="75" />
+          <folding>
+            <element signature="e#9926#10781#0" expanded="false" />
+            <element signature="e#10832#11151#0" expanded="false" />
+            <element signature="e#11208#11375#0" expanded="false" />
+            <element signature="e#11416#11503#0" expanded="false" />
+            <element signature="e#12114#14707#0" expanded="false" />
+            <element signature="e#14839#14955#0" expanded="false" />
+            <element signature="e#17716#18619#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   </component>
 </project>
 </project>

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

@@ -254,12 +254,19 @@ overflow:auto;
     left: 5px;
     left: 5px;
     margin-right: 5px;
     margin-right: 5px;
 }
 }
-.myblock span {
+.myblock .age {
     color: #fff;
     color: #fff;
     background: #00C3DA;
     background: #00C3DA;
     margin-left:8px;
     margin-left:8px;
     border-radius:10px;
     border-radius:10px;
-    padding: 0px 10px
+    padding: 0 10px;
+}
+.sign{
+    color: #00C3DA;
+    margin-left:8px;
+    /*border-radius:10px;*/
+    /*border: 1px solid #00c3da;*/
+    /*padding: 0 10px*/
 }
 }
 .homeDream{
 .homeDream{
     background: #767778;
     background: #767778;
@@ -549,7 +556,7 @@ a:visited,a:link{
         width:40%;
         width:40%;
         /*max-height:95px;*/
         /*max-height:95px;*/
         float:left;
         float:left;
-        border: 1px solid #B5B5B5;
+        /*border: 1px solid #B5B5B5;*/
         margin:5px 5px 5px 0;
         margin:5px 5px 5px 0;
     }
     }
 
 

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

@@ -102,7 +102,7 @@
                 }
                 }
                 $scope.vm.waitSeconds = "正在发送";
                 $scope.vm.waitSeconds = "正在发送";
                 userService.getVerifyCode($scope.vm.mobile).then(function (result) {
                 userService.getVerifyCode($scope.vm.mobile).then(function (result) {
-                    wait(50);
+                    wait(60);
                     // $scope.returncode = result.data;
                     // $scope.returncode = result.data;
                     if(result.data.data.verify_code)msg.success(result.data.data.verify_code);
                     if(result.data.data.verify_code)msg.success(result.data.data.verify_code);
                 }, function (error) {
                 }, function (error) {

+ 18 - 22
miaomiao/www/js/controllers/home.js

@@ -10,7 +10,6 @@
             //    effect: 'fade',
             //    effect: 'fade',
             //    speed: 500
             //    speed: 500
             //};
             //};
-
             homeService.messageInfo().then(function(result){
             homeService.messageInfo().then(function(result){
                 $scope.infos = result.data.data;
                 $scope.infos = result.data.data;
                 if($scope.infos.letter.is_read==0 && $scope.infos.reply.is_read==0 && $scope.infos.systemInfo.is_read==0){
                 if($scope.infos.letter.is_read==0 && $scope.infos.reply.is_read==0 && $scope.infos.systemInfo.is_read==0){
@@ -162,13 +161,7 @@
             });
             });
         };
         };
             $scope.clickAvatar = function(id,dream_id){
             $scope.clickAvatar = function(id,dream_id){
-                if(dream_id!=0){
-                    $state.go('app.home_dreamdetail',{id:dream_id,dream_user_id:id,type:2});
-                }
-                else {
-                    $scope.toUserDetail(id);
-                }
-
+                $state.go('app.home_dreamdetail',{id:dream_id,dream_user_id:id,type:2});
             };
             };
         $scope.qrscan = function () {
         $scope.qrscan = function () {
             cordova.plugins.barcodeScanner.scan(
             cordova.plugins.barcodeScanner.scan(
@@ -381,13 +374,12 @@
                     Wechat.share({
                     Wechat.share({
                         message: {
                         message: {
                             title: $scope.dream.name,
                             title: $scope.dream.name,
-                            description: $scope.dream.about,
+                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '<br/>' + $scope.dream.about,
                             thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             media: {
                             media: {
                                 type: Wechat.Type.WEBPAGE,
                                 type: Wechat.Type.WEBPAGE,
                                 webpageUrl: config.server + "/admin/share/view?id=" + id
                                 webpageUrl: config.server + "/admin/share/view?id=" + id
-
-                }
+                            }
                         },
                         },
                         scene: Wechat.Scene.SESSION
                         scene: Wechat.Scene.SESSION
                     }, function () {
                     }, function () {
@@ -400,7 +392,7 @@
                     Wechat.share({
                     Wechat.share({
                         message: {
                         message: {
                             title: $scope.dream.name,
                             title: $scope.dream.name,
-                            description: $scope.dream.about,
+                            description: $scope.dream.user.nickname + '在瞄喵发布了一个新的梦想。' + '<br/>' + $scope.dream.about,
                             thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             thumb: "q8.9026.com/base/img/share/icon_cat_h.png",
                             media: {
                             media: {
                                 type: Wechat.Type.WEBPAGE,
                                 type: Wechat.Type.WEBPAGE,
@@ -470,10 +462,8 @@
                 if (number<=1) {
                 if (number<=1) {
                     number = 1;
                     number = 1;
                 }
                 }
-                //$scope.multi.result = Math.round(number * 100) / 100;
                 $scope.multi.result = Math.round(number * 100 / 100);
                 $scope.multi.result = Math.round(number * 100 / 100);
             },1000);
             },1000);
-            //  点击支持取消   $interval.cancel($scope.multi.promise); 获取数据后重新开始执行
         };
         };
         $scope.supportDream = function (data) {
         $scope.supportDream = function (data) {
             if(!$scope.vm.coin){
             if(!$scope.vm.coin){
@@ -543,7 +533,7 @@
                 $scope.dream.interactions[index].showmore = true;
                 $scope.dream.interactions[index].showmore = true;
             }
             }
         };
         };
-        $scope.replay = function ($event, name, to_suerid, index) {
+        $scope.replay = function ($event, name, to_userid, index) {
             $event.stopPropagation();
             $event.stopPropagation();
             $scope.input.focus = true;
             $scope.input.focus = true;
             $scope.input.show = true;
             $scope.input.show = true;
@@ -553,6 +543,7 @@
             $scope.dream.interactions[index].show = true;
             $scope.dream.interactions[index].show = true;
             $scope.dream.interactions[index].focus = true;
             $scope.dream.interactions[index].focus = true;
             $scope.input.placeholder = "评论" + name+":";
             $scope.input.placeholder = "评论" + name+":";
+            $scope.to_userid = to_userid;
             $scope.vm.title='';
             $scope.vm.title='';
             $scope.vm.comment='';
             $scope.vm.comment='';
         };
         };
@@ -571,7 +562,7 @@
                 $scope.vm.title='';
                 $scope.vm.title='';
                 $scope.vm.comment='';
                 $scope.vm.comment='';
             }
             }
-            else {
+            else if($scope.timer!='已结束') {
                 msg.confirm("评论","是否删除评论").then(function(result){
                 msg.confirm("评论","是否删除评论").then(function(result){
                     if(result==true)
                     if(result==true)
                     {
                     {
@@ -660,12 +651,17 @@
                 comment_user_id:to_userid,
                 comment_user_id:to_userid,
                 to_user_id: $scope.dream.user.id
                 to_user_id: $scope.dream.user.id
             };
             };
-            homeService.add_comment(data).then(function(){
-                msg.success('评论成功');
-                $scope.vm.comment = '' ;
-                $scope.load(id);
-                $scope.closeModal();
-            });
+            if($scope.timer=='已结束'){
+                msg.alert("评论","该梦想已结束,不支持评论");
+            }
+            else {
+                homeService.add_comment(data).then(function(){
+                    msg.success('评论成功');
+                    $scope.vm.comment = '' ;
+                    $scope.load(id);
+                    $scope.closeModal();
+                });
+            }
         };
         };
             $scope.bigImage = false;
             $scope.bigImage = false;
             $scope.showBigImage = function ($event, imageName) {
             $scope.showBigImage = function ($event, imageName) {

+ 1 - 0
miaomiao/www/js/controllers/my.js

@@ -478,6 +478,7 @@
                       // msg.alert("支付失败:" + JSON.stringify(reason));
                       // msg.alert("支付失败:" + JSON.stringify(reason));
                   });
                   });
               }
               }
+
              // msg.text("充值成功");
              // msg.text("充值成功");
             //   $state.go('app.my');
             //   $state.go('app.my');
           });
           });

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

@@ -16,7 +16,7 @@
                     ×{{multi.result}}
                     ×{{multi.result}}
                 </button>
                 </button>
             </div>
             </div>
-            <div ng-if="timer!='已结束'&& 100*dream.get_coin/dream.coin<100" class="col dreamButton">
+            <div ng-if="timer!='已结束'" class="col dreamButton">
                 <button class="button button-calm" ng-click="support($event)">支持</button>
                 <button class="button button-calm" ng-click="support($event)">支持</button>
             </div>
             </div>
             <div ng-if="codeBtn && user.id==dream.top3user[0].id && dream.code!=''" class="col dreamButton">
             <div ng-if="codeBtn && user.id==dream.top3user[0].id && dream.code!=''" class="col dreamButton">
@@ -188,7 +188,7 @@
                                         <span style="margin-top: 10px; display: inline-block;font-size: 12px">{{c.user_nickname}}</span>
                                         <span style="margin-top: 10px; display: inline-block;font-size: 12px">{{c.user_nickname}}</span>
                                         <span style="font-size: 12px" class="utitle kz">{{c.updated_at}}</span>
                                         <span style="font-size: 12px" class="utitle kz">{{c.updated_at}}</span>
                                         <p style="white-space:normal; color: #666666;font-size: 12px">
                                         <p style="white-space:normal; color: #666666;font-size: 12px">
-                                            <span ng-if="c.to_user_nickname&&c.to_user_nickname!=' '&&c.to_user_nickname!=dream.user.nickname" style="font-size: 12px">
+                                            <span ng-if="c.to_user_nickname&&c.to_user_nickname!=''&&c.to_user_nickname!=dream.user.nickname" style="font-size: 12px">
                                                 回复<span style="color:#333333;font-size: 12px"> {{c.to_user_nickname}}</span> :
                                                 回复<span style="color:#333333;font-size: 12px"> {{c.to_user_nickname}}</span> :
                                             </span>
                                             </span>
                                             {{c.content}}
                                             {{c.content}}
@@ -201,7 +201,7 @@
                                     <p ng-click="showmore($index)" ng-if="interaction.comments.length>4" style="color: #00C3DA; margin-top: 10px; margin-bottom: 10px"> {{interaction.showmore?"只看最近评论":"查看更多评论"}}</p>
                                     <p ng-click="showmore($index)" ng-if="interaction.comments.length>4" style="color: #00C3DA; margin-top: 10px; margin-bottom: 10px"> {{interaction.showmore?"只看最近评论":"查看更多评论"}}</p>
                                 </div>
                                 </div>
                                 <div class="col-20">
                                 <div class="col-20">
-                                    <p ng-if="user.id == dream.user.id" ng-click="destroyInter(interaction.id,interaction.dream_id)" style="color: #00C3DA; margin-top: 10px; margin-bottom: 10px">删除该互动</p>
+                                    <p ng-if="user.id == dream.user.id&&timer!='已结束'" ng-click="destroyInter(interaction.id,interaction.dream_id)" style="color: #00C3DA; margin-top: 10px; margin-bottom: 10px">删除该互动</p>
                                 </div>
                                 </div>
                             </div>
                             </div>
                         </div>
                         </div>

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

@@ -74,7 +74,8 @@
                             </div>
                             </div>
                             <div class="col" style="overflow: hidden;padding:0 5px;" on-drag-right="next(2)" on-drag-left="next(1)">
                             <div class="col" style="overflow: hidden;padding:0 5px;" on-drag-right="next(2)" on-drag-left="next(1)">
                                 <span class="subcontent" ng-repeat="user in index.users">
                                 <span class="subcontent" ng-repeat="user in index.users">
-                                    <img ng-click="clickAvatar(user.other_user_id,user.dream_id)" ng-if="$index<4" ng-src="{{user.other_user.avatar |avator}}" ng-class="{'chosenClass':user.dream_number>0}" style="padding: 0.5%;" />
+                                    <!--<img ng-click="clickAvatar(user.other_user_id,user.dream_id)" ng-if="$index<4" ng-src="{{user.other_user.avatar |avator}}" ng-class="{'chosenClass':user.dream_number>0}" style="padding: 0.5%;" />-->
+                                    <img ng-click="clickAvatar(user.id,user.dream_id)" ng-if="$index<4" ng-src="{{user.other_user.avatar |avator}}" class="chosenClass" style="padding: 0.5%;" />
                                 </span>
                                 </span>
                             </div>
                             </div>
                             <div class="col col-10" style="margin-top: 7%; text-align: right" ng-click="next(2)">
                             <div class="col col-10" style="margin-top: 7%; text-align: right" ng-click="next(2)">
@@ -91,8 +92,8 @@
                                             <img ng-src="{{item.user.avatar | avator}}" ng-click="toUserDetail(item.user.id)" />
                                             <img ng-src="{{item.user.avatar | avator}}" ng-click="toUserDetail(item.user.id)" />
                                         </div>
                                         </div>
                                         <div class="myblock">
                                         <div class="myblock">
-                                            <div>{{item.user.nickname}}<span>{{item.user.birthday | getage}}岁</span></div>
-                                            <div class="mysecond">{{item.user.city}}</div>
+                                            <div>{{item.user.nickname}}<span class="age">{{item.user.birthday | getage}}岁</span></div>
+                                            <div class="mysecond">{{item.user.city}}<span class="sign" ng-if="item.signs!=''" ng-repeat="sign in item.signs">{{sign}}</span></div>
                                         </div>
                                         </div>
                                     </div>
                                     </div>
                                     <div class="col" style="text-align:right">
                                     <div class="col" style="text-align:right">

+ 48 - 2
miaomiao/www/templates/my/payExplain.html

@@ -1,5 +1,51 @@
 <ion-view view-title="支付说明">
 <ion-view view-title="支付说明">
-    <ion-content class="padding" style="color: red">
-        <div ng-bind-html="items.value | trustHtml"></div>
+    <ion-content>
+        <div class="list">
+            <div 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">
+                        <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>
+            </div>
+        </div>
     </ion-content>
     </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>
 </ion-view>
 </ion-view>