Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/.idea/workspace.xml

@@ -21,14 +21,22 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="dream-detail.html" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
+      <file leaf-file-name="config.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/www/js/config/config.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-2.1166666">
-              <caret line="311" column="87" selection-start-line="311" selection-start-column="87" selection-end-line="311" selection-end-column="92" />
-              <folding>
-                <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
-              </folding>
+            <state vertical-scroll-proportion="0.0">
+              <caret line="3" column="43" selection-start-line="3" selection-start-column="43" selection-end-line="3" selection-end-column="43" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="account.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/www/js/controllers/account.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.42881945">
+              <caret line="29" column="70" selection-start-line="29" selection-start-column="70" selection-end-line="29" selection-end-column="70" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -36,36 +44,39 @@
       <file leaf-file-name="my.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-13.0625">
-              <caret line="755" column="63" selection-start-line="755" selection-start-column="63" selection-end-line="755" selection-end-column="63" />
+            <state vertical-scroll-proportion="-3.875">
+              <caret line="502" column="42" selection-start-line="502" selection-start-column="42" selection-end-line="502" selection-end-column="42" />
               <folding>
-                <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
-                <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
-                <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="31929:31954" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="32201:32265" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="32317:32333" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="32529:32593" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="32645:32660" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="32860:32891" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="33123:33141" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="33332:33359" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="35336:35354" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="37648:37666" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="37727:37746" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="38009:38027" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="38088:38107" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="38879:38897" placeholder="..." />
+                <marker date="1509629064682" expanded="true" signature="39890:39908" placeholder="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="home.js" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/www/js/controllers/home.js">
+      <file leaf-file-name="payExplain.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/www/templates/my/payExplain.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6441083">
-              <caret line="399" column="17" selection-start-line="399" selection-start-column="17" selection-end-line="399" selection-end-column="17" />
-              <folding />
+            <state vertical-scroll-proportion="-6.785714">
+              <caret line="10" column="51" selection-start-line="10" selection-start-column="51" selection-end-line="11" selection-end-column="29" />
+              <folding>
+                <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -85,20 +96,21 @@
         <option value="$PROJECT_DIR$/../server/app/Http/Controllers/Api/V1/MyController.php" />
         <option value="$PROJECT_DIR$/www/js/services/msgservice.js" />
         <option value="$PROJECT_DIR$/www/templates/my/my-recharge.html" />
-        <option value="$PROJECT_DIR$/www/js/config/router.js" />
-        <option value="$PROJECT_DIR$/www/templates/my/payExplain.html" />
         <option value="$PROJECT_DIR$/www/templates/my/payDetail.html" />
         <option value="$PROJECT_DIR$/www/templates/account/loginAccount.html" />
-        <option value="$PROJECT_DIR$/www/js/controllers/account.js" />
-        <option value="$PROJECT_DIR$/www/js/config/config.js" />
         <option value="$PROJECT_DIR$/www/templates/my/my-message-reply.html" />
         <option value="$PROJECT_DIR$/www/templates/my/my-message-sys.html" />
         <option value="$PROJECT_DIR$/www/templates/my/my-dream.html" />
         <option value="$PROJECT_DIR$/www/templates/home/index.html" />
         <option value="$PROJECT_DIR$/www/templates/add/index.html" />
         <option value="$PROJECT_DIR$/www/templates/home/dream-detail.html" />
-        <option value="$PROJECT_DIR$/www/js/controllers/my.js" />
         <option value="$PROJECT_DIR$/www/js/controllers/home.js" />
+        <option value="$PROJECT_DIR$/www/js/controllers/account.js" />
+        <option value="$PROJECT_DIR$/www/js/config/router.js" />
+        <option value="$PROJECT_DIR$/www/js/services/myservice.js" />
+        <option value="$PROJECT_DIR$/www/js/controllers/my.js" />
+        <option value="$PROJECT_DIR$/www/templates/my/payExplain.html" />
+        <option value="$PROJECT_DIR$/www/js/config/config.js" />
       </list>
     </option>
   </component>
@@ -113,10 +125,10 @@
     </gulpfiles>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="1358" />
+    <option name="x" value="-8" />
     <option name="y" value="-8" />
-    <option name="width" value="2576" />
-    <option name="height" value="1456" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -217,7 +229,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1358" y="-8" width="2576" height="1456" extended-state="6" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -255,7 +267,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="javascript">
           <url>file://$PROJECT_DIR$/www/js/controllers/my.js</url>
-          <line>627</line>
+          <line>622</line>
         </line-breakpoint>
       </breakpoints>
       <option name="time" value="1" />
@@ -263,12 +275,54 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="311" column="87" selection-start-line="311" selection-start-column="87" selection-end-line="311" selection-end-column="92" />
+          <folding>
+            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="755" column="63" selection-start-line="755" selection-start-column="63" selection-end-line="755" selection-end-column="63" />
+          <folding>
+            <marker date="1509629064682" expanded="true" signature="31929:31954" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32201:32265" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32317:32333" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32529:32593" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32645:32660" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32860:32891" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="33123:33141" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="33332:33359" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="35336:35354" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="37648:37666" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="37727:37746" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38009:38027" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38088:38107" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38879:38897" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="39890:39908" placeholder="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="18" column="29" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="29" />
           <folding>
-            <element signature="n#style#0;n#div#1;n#ion-view#0;n#!!top" expanded="false" />
+            <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -277,10 +331,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="17" column="21" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="21" />
-          <folding>
-            <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#p#0;n#div#3;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -289,22 +339,21 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
-            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="31929:31954" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32201:32265" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32317:32333" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32529:32593" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32645:32660" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32860:32891" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="33123:33141" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="33332:33359" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="35336:35354" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="37648:37666" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="37727:37746" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38009:38027" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38088:38107" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38879:38897" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="39890:39908" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -313,7 +362,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -322,22 +370,21 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
-            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="31929:31954" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32201:32265" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32317:32333" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32529:32593" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32645:32660" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32860:32891" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="33123:33141" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="33332:33359" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="35336:35354" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="37648:37666" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="37727:37746" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38009:38027" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38088:38107" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38879:38897" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="39890:39908" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -346,7 +393,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -355,22 +401,21 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
-            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="31929:31954" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32201:32265" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32317:32333" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32529:32593" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32645:32660" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32860:32891" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="33123:33141" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="33332:33359" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="35336:35354" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="37648:37666" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="37727:37746" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38009:38027" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38088:38107" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38879:38897" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="39890:39908" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -379,7 +424,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="2" column="74" selection-start-line="2" selection-start-column="74" selection-end-line="2" selection-end-column="74" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -388,22 +432,21 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
-            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="31929:31954" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32201:32265" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32317:32333" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32529:32593" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32645:32660" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32860:32891" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="33123:33141" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="33332:33359" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="35336:35354" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="37648:37666" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="37727:37746" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38009:38027" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38088:38107" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38879:38897" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="39890:39908" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -436,14 +479,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/config/router.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-13.5625">
-          <caret line="403" column="50" selection-start-line="403" selection-start-column="37" selection-end-line="403" selection-end-column="50" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/templates/account/login.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-4.071429">
@@ -466,41 +501,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/templates/my/payExplain.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.18550955">
-          <caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="15" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/controllers/account.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5194704">
-          <caret line="81" column="65" selection-start-line="81" selection-start-column="65" selection-end-line="81" selection-end-column="65" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/services/myservice.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7205414">
-          <caret line="213" column="69" selection-start-line="213" selection-start-column="59" selection-end-line="213" selection-end-column="69" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/config/config.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.11801242">
-          <caret line="8" column="60" selection-start-line="8" selection-start-column="60" selection-end-line="8" selection-end-column="60" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/templates/my/my-message-reply.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.0714285">
           <caret line="2" column="176" selection-start-line="2" selection-start-column="176" selection-end-line="2" selection-end-column="176" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -508,7 +512,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.7142856">
           <caret line="4" column="147" selection-start-line="4" selection-start-column="147" selection-end-line="4" selection-end-column="147" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -516,10 +519,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-7.9666667">
           <caret line="26" column="50" selection-start-line="26" selection-start-column="50" selection-end-line="26" selection-end-column="50" />
-          <folding>
-            <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-            <element signature="n#style#0;n#p#0;n#div#3;n#div#1;n#div#0;n#div#1;n#ion-content#0;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -527,15 +526,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3420635">
           <caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
-          <folding>
-            <element signature="n#style#0;n#button#1;n#ion-nav-buttons#1;n#ion-view#0;n#!!top" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/www/templates/home/dream-detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.1166666">
+        <state vertical-scroll-proportion="-211.03572">
           <caret line="311" column="87" selection-start-line="311" selection-start-column="87" selection-end-line="311" selection-end-column="92" />
           <folding>
             <element signature="n#style#0;n#button#0;n#div#0;n#div#0;n#div#1;n#ion-view#0;n#!!top" expanded="true" />
@@ -547,41 +543,81 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.14444445">
           <caret line="12" column="18" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/home.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="394" column="36" selection-start-line="394" selection-start-column="36" selection-end-line="394" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/config/router.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-13.375">
+          <caret line="413" column="33" selection-start-line="413" selection-start-column="33" selection-end-line="413" selection-end-column="33" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/services/myservice.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-7.4375">
+          <caret line="178" column="32" selection-start-line="178" selection-start-column="32" selection-end-line="178" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/templates/my/payExplain.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-6.785714">
+          <caret line="10" column="51" selection-start-line="10" selection-start-column="51" selection-end-line="11" selection-end-column="29" />
           <folding>
-            <element signature="n#style#0;n#video#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" />
+            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#1;n#div#0;n#ion-content#0;n#ion-view#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/www/js/controllers/my.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-13.0625">
-          <caret line="755" column="63" selection-start-line="755" selection-start-column="63" selection-end-line="755" selection-end-column="63" />
+        <state vertical-scroll-proportion="-3.875">
+          <caret line="502" column="42" selection-start-line="502" selection-start-column="42" selection-end-line="502" selection-end-column="42" />
           <folding>
-            <marker date="1509618721139" expanded="true" signature="32118:35114" placeholder="{...}" />
-            <marker date="1509618721139" expanded="true" signature="32221:32246" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32493:32557" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32609:32625" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32821:32885" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="32937:32952" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33152:33183" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33415:33433" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="33624:33651" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="35628:35646" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="37940:37958" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38019:38038" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38301:38319" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="38380:38399" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="39171:39189" placeholder="..." />
-            <marker date="1509618721139" expanded="true" signature="40182:40200" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="31929:31954" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32201:32265" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32317:32333" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32529:32593" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32645:32660" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="32860:32891" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="33123:33141" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="33332:33359" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="35336:35354" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="37648:37666" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="37727:37746" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38009:38027" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38088:38107" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="38879:38897" placeholder="..." />
+            <marker date="1509629064682" expanded="true" signature="39890:39908" placeholder="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/js/controllers/home.js">
+    <entry file="file://$PROJECT_DIR$/www/js/config/config.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="3" column="43" selection-start-line="3" selection-start-column="43" selection-end-line="3" selection-end-column="43" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/js/controllers/account.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6441083">
-          <caret line="399" column="17" selection-start-line="399" selection-start-column="17" selection-end-line="399" selection-end-column="17" />
+        <state vertical-scroll-proportion="0.42881945">
+          <caret line="29" column="70" selection-start-line="29" selection-start-column="70" selection-end-line="29" selection-end-column="70" />
           <folding />
         </state>
       </provider>

miaomiao/www/js/config/router.js

@@ -413,7 +413,7 @@
                 views: {
                     'app-home': {
                         templateUrl: 'templates/my/payExplain.html',
-                        controller: 'explainCtrl'
+                        controller: 'payExplainCtrl'
                     }
                 }
             })

miaomiao/www/js/controllers/my.js

@@ -21,7 +21,6 @@
                 $ionicTabsDelegate.showBar(false);
                 msg.loading();
                 myService.myInfo().then(function(result){
-                  // alert(JSON.stringify(result.data.data));
                   $scope.vm = result.data.data;
                     console.log($scope.vm.avatar);
                   $scope.vm.sex = $scope.vm.sex+'';
@@ -231,10 +230,6 @@
                 $ionicHistory.goBack();
             }
         }]);
-    app.controller('explainCtrl', ["$scope","$ionicTabsDelegate", "$state", "myService", "msg","storage"
-        , function ($scope,$ionicTabsDelegate, $state,myService, msg, storage) {
-
-        }]);
     app.controller('contactCtrl', ["$scope","$ionicTabsDelegate", "$timeout","$state", "myService", "msg","storage"
         , function ($scope,$ionicTabsDelegate, $timeout,$state,myService, msg, storage) {
             $scope.vm={
@@ -727,7 +722,6 @@
             $scope.imgs = [];
             $scope.video = {};
             $scope.addpict = function () {
-                // alert('选择图片');
                 common.chooseImage().then(function (img) {
                     common.uploadFiles(img,1).then(function (result) {
                         var response = JSON.parse(result.response);
@@ -747,7 +741,6 @@
                 })
             };
             $scope.addvideo = function () {
-                // alert('选择视频');
                 common.chooseVideo().then(function (file) {
                     common.uploadFiles(file, 2).then(function (result) {
                         var response = JSON.parse(result.response);

miaomiao/www/js/services/myservice.js

@@ -175,7 +175,7 @@
             },
             payExplain:function(){
                 return $http({
-                    url:config.server + "api/my/pay/article",
+                    url:config.server + "api/my/account_log",
                     method:"get"
                 })
             },

miaomiao/www/templates/my/payExplain.html

@@ -1,39 +1,22 @@
 <ion-view view-title="交易记录">
     <ion-content>
         <div class="list">
-            <a class="item reply-item" >
+            <div ng-if="items.length==0" class="padding">暂无交易记录</div>
+            <div ng-repeat="item in items" 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 }}" />
+                        <img style="width: 45px; height: 45px;border-radius: 100%; border: 1px solid #D8D8D8" ng-src="{{item.avatar}}" />
                     </div>
                     <div style="float:left; width: 83%; margin-left: 10px; height: 60px; overflow: hidden">
-                        <h2> 微信充值 </h2>
+                        <h2> {{item.channel}} </h2>
                         <div>
-                            <div class="fl">10月30日 19:26</div>
-                            <div class="fr" style="font-weight: bolder; font-size: 16px">+1524.00</div>
+                            <div class="fl">{{item.created_at}}</div>
+                            <div class="fr" style="font-weight: bolder; font-size: 16px">{{item.to_amount}}</div>
                         </div>
-                        <div style="clear:both;"> 交易号：30012151591781798 </div>
+                        <div style="clear:both;"> 交易号：{{item.transaction_id}} </div>
                     </div>
                 </div>
-            </a>
+            </div>
         </div>
     </ion-content>
-    <!--<script id="my-modal.html" type="text/ng-template">-->
-        <!--<ion-modal-view>-->
-            <!--<ion-header-bar class="bar-calm">-->
-                <!--<h1 class="title">发送私信</h1>-->
-                <!--<div class="buttons">-->
-                    <!--<div class="button" ng-click="hideModal()" style="font-size: 16px; margin-top: 3px">关闭</div>-->
-                <!--</div>-->
-            <!--</ion-header-bar>-->
-            <!--<ion-content>-->
-                <!--<textarea autofocus rows="5" style="width:100%; padding: 5px" ng-model="vm.content" placeholder="请输入私信内容"></textarea>-->
-                <!--<div class="padding">-->
-                    <!--<button class="button button-full button-calm" ng-click="closeModal()">-->
-                        <!--回复-->
-                    <!--</button>-->
-                <!--</div>-->
-            <!--</ion-content>-->
-        <!--</ion-modal-view>-->
-    <!--</script>-->
 </ion-view>